Skip to content

Commit df34df4

Browse files
torvaldstorvalds
committed
Merge tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging/IIO updates from Greg KH: "Here is the big set of Staging/IIO driver patches for 4.17-rc1. It is a lot, over 500 changes, but not huge by previous kernel release standards. We deleted more lines than we added again (27k added vs. 91k remvoed), thanks to finally being able to delete the IRDA drivers and networking code. We also deleted the ccree crypto driver, but that's coming back in through the crypto tree to you, in a much cleaned-up form. Added this round is at lot of "mt7621" device support, which is for an embedded device that Neil Brown cares about, and of course a handful of new IIO drivers as well. And finally, the fsl-mc core code moved out of the staging tree to the "real" part of the kernel, which is nice to see happen as well. Full details are in the shortlog, which has all of the tiny cleanup patches described. All of these have been in linux-next for a while with no reported issues" * tag 'staging-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (579 commits) staging: rtl8723bs: Remove yield call, replace with cond_resched() staging: rtl8723bs: Replace yield() call with cond_resched() staging: rtl8723bs: Remove unecessary newlines from 'odm.h'. staging: rtl8723bs: Rework 'struct _ODM_Phy_Status_Info_' coding style. staging: rtl8723bs: Rework 'struct _ODM_Per_Pkt_Info_' coding style. staging: rtl8723bs: Replace NULL pointer comparison with '!'. staging: rtl8723bs: Factor out rtl8723bs_recv_tasklet() sections. staging: rtl8723bs: Fix function signature that goes over 80 characters. staging: rtl8723bs: Fix lines too long in update_recvframe_attrib(). staging: rtl8723bs: Remove unnecessary blank lines in 'rtl8723bs_recv.c'. staging: rtl8723bs: Change camel case to snake case in 'rtl8723bs_recv.c'. staging: rtl8723bs: Add missing braces in else statement. staging: rtl8723bs: Add spaces around ternary operators. staging: rtl8723bs: Fix lines with trailing open parentheses. staging: rtl8723bs: Remove unnecessary length #define's. staging: rtl8723bs: Fix IEEE80211 authentication algorithm constants. staging: rtl8723bs: Fix alignment in rtw_wx_set_auth(). staging: rtl8723bs: Remove braces from single statement conditionals. staging: rtl8723bs: Remove unecessary braces from switch statement. staging: rtl8723bs: Fix newlines in rtw_wx_set_auth(). ...
2 parents 9abf8ac + 049b5e2 commit df34df4

File tree

655 files changed

+27014
-91102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

655 files changed

+27014
-91102
lines changed

‎Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_VOC_short_raw
22
Date: September 2015
33
KernelVersion: 4.3
4-
Contact: Matt Ranostay <mranostay@gmail.com>
4+
Contact: Matt Ranostay <matt.ranostay@konsulko.com>
55
Description:
66
Get the raw calibration VOC value from the sensor.
77
This value has little application outside of calibration.

‎Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
What /sys/bus/iio/devices/iio:deviceX/in_proximity_input
22
Date: March 2014
33
KernelVersion: 3.15
4-
Contact: Matt Ranostay <mranostay@gmail.com>
4+
Contact: Matt Ranostay <matt.ranostay@konsulko.com>
55
Description:
66
Get the current distance in meters of storm (1km steps)
77
1000-40000 = distance in meters
88

99
What /sys/bus/iio/devices/iio:deviceX/sensor_sensitivity
1010
Date: March 2014
1111
KernelVersion: 3.15
12-
Contact: Matt Ranostay <mranostay@gmail.com>
12+
Contact: Matt Ranostay <matt.ranostay@konsulko.com>
1313
Description:
1414
Show or set the gain boost of the amp, from 0-31 range.
1515
18 = indoors (default)

‎Documentation/devicetree/bindings/iio/adc/axp20x_adc.txt

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
* X-Powers AXP ADC bindings
2+
3+
Required properties:
4+
- compatible: should be one of:
5+
- "x-powers,axp209-adc",
6+
- "x-powers,axp221-adc",
7+
- "x-powers,axp813-adc",
8+
- #io-channel-cells: should be 1,
9+
10+
Example:
11+
12+
&axp22x {
13+
adc {
14+
compatible = "x-powers,axp221-adc";
15+
#io-channel-cells = <1>;
16+
};
17+
};
18+
19+
ADC channels and their indexes per variant:
20+
21+
AXP209
22+
------
23+
0 | acin_v
24+
1 | acin_i
25+
2 | vbus_v
26+
3 | vbus_i
27+
4 | pmic_temp
28+
5 | gpio0_v
29+
6 | gpio1_v
30+
7 | ipsout_v
31+
8 | batt_v
32+
9 | batt_chrg_i
33+
10 | batt_dischrg_i
34+
35+
AXP22x
36+
------
37+
0 | pmic_temp
38+
1 | batt_v
39+
2 | batt_chrg_i
40+
3 | batt_dischrg_i
41+
42+
AXP813
43+
------
44+
0 | pmic_temp
45+
1 | gpio0_v
46+
2 | batt_v
47+
3 | batt_chrg_i
48+
4 | batt_dischrg_i

‎Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ Optional properties:
3232
to "clock" property. Frequency must be a multiple of the rcc
3333
clock frequency. If not, SPI CLKOUT frequency will not be
3434
accurate.
35+
- pinctrl-names: Set to "default".
36+
- pinctrl-0: List of phandles pointing to pin configuration
37+
nodes to set pins in mode of operation for dfsdm
38+
on external pin.
3539

3640
Contents of a STM32 DFSDM child nodes:
3741
--------------------------------------
@@ -68,8 +72,8 @@ Optional properties:
6872
- st,adc-channel-types: Single-ended channel input type.
6973
- "SPI_R": SPI with data on rising edge (default)
7074
- "SPI_F": SPI with data on falling edge
71-
- "MANCH_R": manchester codec, rising edge = logic 0
72-
- "MANCH_F": manchester codec, falling edge = logic 1
75+
- "MANCH_R": manchester codec, rising edge = logic 0, falling edge = logic 1
76+
- "MANCH_F": manchester codec, rising edge = logic 1, falling edge = logic 0
7377
- st,adc-channel-clk-src: Conversion clock source.
7478
- "CLKIN": external SPI clock (CLKIN x)
7579
- "CLKOUT": internal SPI clock (CLKOUT) (default)

‎Documentation/devicetree/bindings/iio/potentiometer/ad5272.txt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
* Analog Devices AD5272 digital potentiometer
2+
3+
The node for this device must be a child node of a I2C controller, hence
4+
all mandatory properties for your controller must be specified. See directory:
5+
6+
Documentation/devicetree/bindings/i2c
7+
8+
for more details.
9+
10+
Required properties:
11+
- compatible: Must be one of the following, depending on the model:
12+
adi,ad5272-020
13+
adi,ad5272-050
14+
adi,ad5272-100
15+
adi,ad5274-020
16+
adi,ad5274-100
17+
18+
Optional properties:
19+
- reset-gpios: GPIO specification for the RESET input. This is an
20+
active low signal to the AD5272.
21+
22+
Example:
23+
ad5272: potentiometer@2f {
24+
reg = <0x2F>;
25+
compatible = "adi,ad5272-020";
26+
reset-gpios = <&gpio3 6 GPIO_ACTIVE_HIGH>;
27+
};

‎Documentation/devicetree/bindings/iio/temperature/mlx90632.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
* Melexis MLX90632 contactless Infra Red temperature sensor
2+
3+
Link to datasheet: https://www.melexis.com/en/documents/documentation/datasheets/datasheet-mlx90632
4+
5+
There are various applications for the Infra Red contactless temperature sensor
6+
and MLX90632 is most suitable for consumer applications where measured object
7+
temperature is in range between -20 to 200 degrees Celsius with relative error
8+
of measurement below 1 degree Celsius in object temperature range for
9+
industrial applications. Since it can operate and measure ambient temperature
10+
in range of -20 to 85 degrees Celsius it is suitable also for outdoor use.
11+
12+
Be aware that electronics surrounding the sensor can increase ambient
13+
temperature. MLX90632 can be calibrated to reduce the housing effect via
14+
already existing EEPROM parameters.
15+
16+
Since measured object emissivity effects Infra Red energy emitted, emissivity
17+
should be set before requesting the object temperature.
18+
19+
Required properties:
20+
- compatible: should be "melexis,mlx90632"
21+
- reg: the I2C address of the sensor (default 0x3a)
22+
23+
Example:
24+
25+
mlx90632@3a {
26+
compatible = "melexis,mlx90632";
27+
reg = <0x3a>;
28+
};

‎Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Broadcom VCHIQ firmware services
2+
3+
Required properties:
4+
5+
- compatible: Should be "brcm,bcm2835-vchiq"
6+
- reg: Physical base address and length of the doorbell register pair
7+
- interrupts: The interrupt number
8+
See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
9+
10+
Example:
11+
12+
mailbox@7e00b840 {
13+
compatible = "brcm,bcm2835-vchiq";
14+
reg = <0x7e00b840 0xf>;
15+
interrupts = <0 2>;
16+
};

‎Documentation/networking/dpaa2/index.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
===================
2+
DPAA2 Documentation
3+
===================
4+
5+
.. toctree::
6+
:maxdepth: 1
7+
8+
overview

‎drivers/staging/fsl-mc/overview.rst renamed to ‎Documentation/networking/dpaa2/overview.rst

File renamed without changes.

‎Documentation/networking/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Contents:
88

99
batman-adv
1010
can
11+
dpaa2/index
1112
kapi
1213
z8530book
1314
msg_zerocopy

‎Documentation/networking/irda.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎MAINTAINERS

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4370,6 +4370,12 @@ L: [email protected]
43704370
S: Maintained
43714371
F: drivers/staging/fsl-dpaa2/ethernet
43724372

4373+
DPAA2 ETHERNET SWITCH DRIVER
4374+
M: Razvan Stefanescu <[email protected]>
4375+
L: [email protected]
4376+
S: Maintained
4377+
F: drivers/staging/fsl-dpaa2/ethsw
4378+
43734379
DPT_I2O SCSI RAID DRIVER
43744380
M: Adaptec OEM Raid Solutions <[email protected]>
43754381
L: [email protected]
@@ -8587,11 +8593,12 @@ W: https://linuxtv.org
85878593
S: Maintained
85888594
F: drivers/media/radio/radio-maxiradio*
85898595

8590-
MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVER
8596+
MCP4018 AND MCP4531 MICROCHIP DIGITAL POTENTIOMETER DRIVERS
85918597
M: Peter Rosin <[email protected]>
85928598
L: [email protected]
85938599
S: Maintained
85948600
F: Documentation/ABI/testing/sysfs-bus-iio-potentiometer-mcp4531
8601+
F: drivers/iio/potentiometer/mcp4018.c
85958602
F: drivers/iio/potentiometer/mcp4531.c
85968603

85978604
MCR20A IEEE-802.15.4 RADIO DRIVER
@@ -8915,6 +8922,13 @@ W: http://www.melexis.com
89158922
S: Supported
89168923
F: drivers/iio/temperature/mlx90614.c
89178924

8925+
MELEXIS MLX90632 DRIVER
8926+
M: Crt Mori <[email protected]>
8927+
L: [email protected]
8928+
W: http://www.melexis.com
8929+
S: Supported
8930+
F: drivers/iio/temperature/mlx90632.c
8931+
89188932
MELFAS MIP4 TOUCHSCREEN DRIVER
89198933
M: Sangwon Jee <[email protected]>
89208934
W: http://www.melfas.com
@@ -11529,8 +11543,9 @@ M: Stuart Yoder <[email protected]>
1152911543
M: Laurentiu Tudor <[email protected]>
1153011544
L: [email protected]
1153111545
S: Maintained
11532-
F: drivers/staging/fsl-mc/
11546+
F: drivers/bus/fsl-mc/
1153311547
F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt
11548+
F: Documentation/networking/dpaa2/overview.rst
1153411549

1153511550
QT1010 MEDIA DRIVER
1153611551
M: Antti Palosaari <[email protected]>

‎arch/arm/boot/dts/bcm2835-rpi.dtsi

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
firmware = <&firmware>;
2828
#power-domain-cells = <1>;
2929
};
30+
31+
mailbox@7e00b840 {
32+
compatible = "brcm,bcm2835-vchiq";
33+
reg = <0x7e00b840 0xf>;
34+
interrupts = <0 2>;
35+
};
3036
};
3137
};
3238

‎drivers/bus/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,6 @@ config DA8XX_MSTPRI
199199
configuration. Allows to adjust the priorities of all master
200200
peripherals.
201201

202+
source "drivers/bus/fsl-mc/Kconfig"
203+
202204
endmenu

‎drivers/bus/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ obj-$(CONFIG_ARM_CCI) += arm-cci.o
88
obj-$(CONFIG_ARM_CCN) += arm-ccn.o
99

1010
obj-$(CONFIG_BRCMSTB_GISB_ARB) += brcmstb_gisb.o
11+
12+
# DPAA2 fsl-mc bus
13+
obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/
14+
1115
obj-$(CONFIG_IMX_WEIM) += imx-weim.o
1216
obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o
1317
obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o

‎drivers/bus/fsl-mc/Kconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
#
3+
# DPAA2 fsl-mc bus
4+
#
5+
# Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
6+
#
7+
8+
config FSL_MC_BUS
9+
bool "QorIQ DPAA2 fsl-mc bus driver"
10+
depends on OF && (ARCH_LAYERSCAPE || (COMPILE_TEST && (ARM || ARM64 || X86_LOCAL_APIC || PPC)))
11+
select GENERIC_MSI_IRQ_DOMAIN
12+
help
13+
Driver to enable the bus infrastructure for the QorIQ DPAA2
14+
architecture. The fsl-mc bus driver handles discovery of
15+
DPAA2 objects (which are represented as Linux devices) and
16+
binding objects to drivers.

‎drivers/bus/fsl-mc/Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
#
3+
# Freescale Management Complex (MC) bus drivers
4+
#
5+
# Copyright (C) 2014 Freescale Semiconductor, Inc.
6+
#
7+
obj-$(CONFIG_FSL_MC_BUS) += mc-bus-driver.o
8+
9+
mc-bus-driver-objs := fsl-mc-bus.o \
10+
mc-sys.o \
11+
mc-io.o \
12+
dpbp.o \
13+
dpcon.o \
14+
dprc.o \
15+
dprc-driver.o \
16+
fsl-mc-allocator.o \
17+
fsl-mc-msi.o \
18+
dpmcp.o

0 commit comments

Comments
 (0)