diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 17:43:33 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-07 17:43:33 -0400 |
| commit | 74fee4e88fd196c712abfdae89acfa272abf10f8 (patch) | |
| tree | 942a2668830b36f5cf9bc9f2c77948f8b04c2742 /Documentation/devicetree/bindings/input | |
| parent | 7d955656121f547ff9a708ed7ee4c86a08bf628a (diff) | |
| parent | 84024468cf1612783e6ab317da5b72fa41487ac6 (diff) | |
Merge tag 'devicetree-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree updates from Rob Herring:
"There's a few orphans in the conversion to %pOF printf specifiers
included here that no one else picked up.
Summary:
- Convert more DT code to use of_property_read_* API.
- Improve DT overlay support when adding multiple overlays
- Convert printk's to %pOF format specifiers. Most went via subsystem
trees, but picked up the remaining orphans
- Correct unittests to use preferred "okay" for "status" property
value
- Add a KASLR seed property
- Vendor prefixes for Mellanox, Theobroma System, Adaptrum, Moxa
- Fix modalias buffer handling
- Clean-up of include paths for building dtbs
- Add bindings for amc6821, isl1208, tsl2x7x, srf02, and srf10
devices
- Add nvmem bindings for MediaTek MT7623 and MT7622 SoC
- Add compatible string for Allwinner H5 Mali-450 GPU
- Fix links to old OpenFirmware docs with new mirror on
devicetree.org
- Remove status property from binding doc examples"
* tag 'devicetree-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (45 commits)
devicetree: Adjust status "ok" -> "okay" under drivers/of/
dt-bindings: Remove "status" from examples
dt-bindings: pinctrl: sh-pfc: Use generic node name
dt-bindings: Add vendor Mellanox
dt-binding: net/phy: fix interrupts description
virt: Convert to using %pOF instead of full_name
macintosh: Convert to using %pOF instead of full_name
ide: pmac: Convert to using %pOF instead of full_name
microblaze: Convert to using %pOF instead of full_name
dt-bindings: usb: musb: Grammar s/the/to/, s/is/are/
of: Use PLATFORM_DEVID_NONE definition
of/device: Fix of_device_get_modalias() buffer handling
of/device: Prevent buffer overflow in of_device_modalias()
dt-bindings: add amc6821, isl1208 trivial bindings
dt-bindings: add vendor prefix for Theobroma Systems
of: search scripts/dtc/include-prefixes path for both CPP and DTC
of: remove arch/$(SRCARCH)/boot/dts from include search path for CPP
of: remove drivers/of/testcase-data from include search path for CPP
of: return of_get_cpu_node from of_cpu_device_node_get if CPUs are not registered
iio: srf08: add device tree binding for srf02 and srf10
...
Diffstat (limited to 'Documentation/devicetree/bindings/input')
4 files changed, 1 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt b/Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt index b77f50bd6403..262deab73588 100644 --- a/Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt +++ b/Documentation/devicetree/bindings/input/brcm,bcm-keypad.txt | |||
| @@ -72,7 +72,6 @@ Example: | |||
| 72 | /* Required Board specific properties */ | 72 | /* Required Board specific properties */ |
| 73 | keypad,num-rows = <5>; | 73 | keypad,num-rows = <5>; |
| 74 | keypad,num-columns = <5>; | 74 | keypad,num-columns = <5>; |
| 75 | status = "okay"; | ||
| 76 | 75 | ||
| 77 | linux,keymap = <MATRIX_KEY(0x00, 0x02, KEY_F) /* key_forward */ | 76 | linux,keymap = <MATRIX_KEY(0x00, 0x02, KEY_F) /* key_forward */ |
| 78 | MATRIX_KEY(0x00, 0x03, KEY_HOME) /* key_home */ | 77 | MATRIX_KEY(0x00, 0x03, KEY_HOME) /* key_home */ |
diff --git a/Documentation/devicetree/bindings/input/ti,drv260x.txt b/Documentation/devicetree/bindings/input/ti,drv260x.txt index ee09c8f4474a..4c5312eaaa85 100644 --- a/Documentation/devicetree/bindings/input/ti,drv260x.txt +++ b/Documentation/devicetree/bindings/input/ti,drv260x.txt | |||
| @@ -43,7 +43,7 @@ haptics: haptics@5a { | |||
| 43 | mode = <DRV260X_LRA_MODE>; | 43 | mode = <DRV260X_LRA_MODE>; |
| 44 | library-sel = <DRV260X_LIB_LRA>; | 44 | library-sel = <DRV260X_LIB_LRA>; |
| 45 | vib-rated-mv = <3200>; | 45 | vib-rated-mv = <3200>; |
| 46 | vib-overdriver-mv = <3200>; | 46 | vib-overdrive-mv = <3200>; |
| 47 | } | 47 | } |
| 48 | 48 | ||
| 49 | For more product information please see the link below: | 49 | For more product information please see the link below: |
diff --git a/Documentation/devicetree/bindings/input/touchscreen/colibri-vf50-ts.txt b/Documentation/devicetree/bindings/input/touchscreen/colibri-vf50-ts.txt index 9d9e930f3251..df531b5b6a0d 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/colibri-vf50-ts.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/colibri-vf50-ts.txt | |||
| @@ -32,5 +32,4 @@ Example: | |||
| 32 | pinctrl-1 = <&pinctrl_touchctrl_default>; | 32 | pinctrl-1 = <&pinctrl_touchctrl_default>; |
| 33 | pinctrl-2 = <&pinctrl_touchctrl_gpios>; | 33 | pinctrl-2 = <&pinctrl_touchctrl_gpios>; |
| 34 | vf50-ts-min-pressure = <200>; | 34 | vf50-ts-min-pressure = <200>; |
| 35 | status = "disabled"; | ||
| 36 | }; | 35 | }; |
diff --git a/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt b/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt index d4927c202aef..e67e58b61706 100644 --- a/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt +++ b/Documentation/devicetree/bindings/input/touchscreen/imx6ul_tsc.txt | |||
| @@ -35,5 +35,4 @@ Example: | |||
| 35 | measure-delay-time = <0xfff>; | 35 | measure-delay-time = <0xfff>; |
| 36 | pre-charge-time = <0xffff>; | 36 | pre-charge-time = <0xffff>; |
| 37 | touchscreen-average-samples = <32>; | 37 | touchscreen-average-samples = <32>; |
| 38 | status = "okay"; | ||
| 39 | }; | 38 | }; |
