Merge tag 'v4.18-rc6-dts-raw'
Linux 4.18-rc6
diff --git a/Bindings/arm/samsung/samsung-boards.txt b/Bindings/arm/samsung/samsung-boards.txt
index bdadc3d..6970f30 100644
--- a/Bindings/arm/samsung/samsung-boards.txt
+++ b/Bindings/arm/samsung/samsung-boards.txt
@@ -66,7 +66,7 @@
- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale
Octa board.
- "insignal,origen" - for Exynos4210-based Insignal Origen board.
- - "insignal,origen4412 - for Exynos4412-based Insignal Origen board.
+ - "insignal,origen4412" - for Exynos4412-based Insignal Origen board.
Optional nodes:
diff --git a/Bindings/display/tilcdc/tilcdc.txt b/Bindings/display/tilcdc/tilcdc.txt
index 6fddb4f..3055d5c 100644
--- a/Bindings/display/tilcdc/tilcdc.txt
+++ b/Bindings/display/tilcdc/tilcdc.txt
@@ -36,7 +36,7 @@
- port/ports: to describe a connection to an external encoder. The
binding follows Documentation/devicetree/bindings/graph.txt and
- suppors a single port with a single endpoint.
+ supports a single port with a single endpoint.
- See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and
Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting
diff --git a/Bindings/gpio/nintendo,hollywood-gpio.txt b/Bindings/gpio/nintendo,hollywood-gpio.txt
index 20fc72d..45a61b4 100644
--- a/Bindings/gpio/nintendo,hollywood-gpio.txt
+++ b/Bindings/gpio/nintendo,hollywood-gpio.txt
@@ -1,7 +1,7 @@
Nintendo Wii (Hollywood) GPIO controller
Required properties:
-- compatible: "nintendo,hollywood-gpio
+- compatible: "nintendo,hollywood-gpio"
- reg: Physical base address and length of the controller's registers.
- gpio-controller: Marks the device node as a GPIO controller.
- #gpio-cells: Should be <2>. The first cell is the pin number and the
diff --git a/Bindings/input/touchscreen/hideep.txt b/Bindings/input/touchscreen/hideep.txt
index 121d9b7..1063c30 100644
--- a/Bindings/input/touchscreen/hideep.txt
+++ b/Bindings/input/touchscreen/hideep.txt
@@ -32,7 +32,7 @@
reg = <0x6c>;
interrupt-parent = <&gpx1>;
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- vdd-supply = <&ldo15_reg>";
+ vdd-supply = <&ldo15_reg>;
vid-supply = <&ldo18_reg>;
reset-gpios = <&gpx1 5 0>;
touchscreen-size-x = <1080>;
diff --git a/Bindings/interrupt-controller/nvidia,tegra20-ictlr.txt b/Bindings/interrupt-controller/nvidia,tegra20-ictlr.txt
index 1099fe0..f246ccb 100644
--- a/Bindings/interrupt-controller/nvidia,tegra20-ictlr.txt
+++ b/Bindings/interrupt-controller/nvidia,tegra20-ictlr.txt
@@ -15,7 +15,7 @@
include "nvidia,tegra30-ictlr".
- reg : Specifies base physical address and size of the registers.
Each controller must be described separately (Tegra20 has 4 of them,
- whereas Tegra30 and later have 5"
+ whereas Tegra30 and later have 5).
- interrupt-controller : Identifies the node as an interrupt controller.
- #interrupt-cells : Specifies the number of cells needed to encode an
interrupt source. The value must be 3.
diff --git a/Bindings/interrupt-controller/st,stm32-exti.txt b/Bindings/interrupt-controller/st,stm32-exti.txt
index 136bd61..6a36bf6 100644
--- a/Bindings/interrupt-controller/st,stm32-exti.txt
+++ b/Bindings/interrupt-controller/st,stm32-exti.txt
@@ -12,7 +12,7 @@
specifier, shall be 2
- interrupts: interrupts references to primary interrupt controller
(only needed for exti controller with multiple exti under
- same parent interrupt: st,stm32-exti and st,stm32h7-exti")
+ same parent interrupt: st,stm32-exti and st,stm32h7-exti)
Example:
diff --git a/Bindings/mips/brcm/soc.txt b/Bindings/mips/brcm/soc.txt
index 356c297..3a66d3c 100644
--- a/Bindings/mips/brcm/soc.txt
+++ b/Bindings/mips/brcm/soc.txt
@@ -152,7 +152,7 @@
- compatible : should contain one of:
"brcm,bcm7425-timers"
"brcm,bcm7429-timers"
- "brcm,bcm7435-timers and
+ "brcm,bcm7435-timers" and
"brcm,brcmstb-timers"
- reg : the timers register range
- interrupts : the interrupt line for this timer block
diff --git a/Bindings/net/fsl-fman.txt b/Bindings/net/fsl-fman.txt
index df873d1..f8c3389 100644
--- a/Bindings/net/fsl-fman.txt
+++ b/Bindings/net/fsl-fman.txt
@@ -238,7 +238,7 @@
Must include one of the following:
- "fsl,fman-dtsec" for dTSEC MAC
- "fsl,fman-xgec" for XGEC MAC
- - "fsl,fman-memac for mEMAC MAC
+ - "fsl,fman-memac" for mEMAC MAC
- cell-index
Usage: required
diff --git a/Bindings/power/power_domain.txt b/Bindings/power/power_domain.txt
index 9b387f8..7dec508 100644
--- a/Bindings/power/power_domain.txt
+++ b/Bindings/power/power_domain.txt
@@ -133,7 +133,7 @@
node with the label "power".
In the second example the consumer device are partitioned across two PM domains,
the first with index 0 and the second with index 1, of a power controller that
-is represented by a node with the label "power.
+is represented by a node with the label "power".
Optional properties:
- required-opps: This contains phandle to an OPP node in another device's OPP
diff --git a/Bindings/regulator/tps65090.txt b/Bindings/regulator/tps65090.txt
index ca69f5e..ae326f2 100644
--- a/Bindings/regulator/tps65090.txt
+++ b/Bindings/regulator/tps65090.txt
@@ -16,7 +16,7 @@
Optional properties:
- ti,enable-ext-control: This is applicable for DCDC1, DCDC2 and DCDC3.
If DCDCs are externally controlled then this property should be there.
-- "dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3.
+- dcdc-ext-control-gpios: This is applicable for DCDC1, DCDC2 and DCDC3.
If DCDCs are externally controlled and if it is from GPIO then GPIO
number should be provided. If it is externally controlled and no GPIO
entry then driver will just configure this rails as external control
diff --git a/Bindings/reset/st,sti-softreset.txt b/Bindings/reset/st,sti-softreset.txt
index a21658f..3661e61 100644
--- a/Bindings/reset/st,sti-softreset.txt
+++ b/Bindings/reset/st,sti-softreset.txt
@@ -15,7 +15,7 @@
controller binding usage.
Required properties:
-- compatible: Should be st,stih407-softreset";
+- compatible: Should be "st,stih407-softreset";
- #reset-cells: 1, see below
example:
diff --git a/Bindings/soc/qcom/qcom,geni-se.txt b/Bindings/soc/qcom/qcom,geni-se.txt
index d330c73..68b7d62 100644
--- a/Bindings/soc/qcom/qcom,geni-se.txt
+++ b/Bindings/soc/qcom/qcom,geni-se.txt
@@ -39,7 +39,7 @@
Optional property:
- clock-frequency: Desired I2C bus clock frequency in Hz.
- When missing default to 400000Hz.
+ When missing default to 100000Hz.
Child nodes should conform to I2C bus binding as described in i2c.txt.
diff --git a/Bindings/sound/qcom,apq8016-sbc.txt b/Bindings/sound/qcom,apq8016-sbc.txt
index 6a4aadc..84b28db 100644
--- a/Bindings/sound/qcom,apq8016-sbc.txt
+++ b/Bindings/sound/qcom,apq8016-sbc.txt
@@ -30,7 +30,7 @@
Board connectors:
* Headset Mic
- * Secondary Mic",
+ * Secondary Mic
* DMIC
* Ext Spk
diff --git a/Bindings/sound/qcom,apq8096.txt b/Bindings/sound/qcom,apq8096.txt
index aa54e49..c7600a9 100644
--- a/Bindings/sound/qcom,apq8096.txt
+++ b/Bindings/sound/qcom,apq8096.txt
@@ -35,7 +35,7 @@
"Digital Mic3"
Audio pins and MicBias on WCD9335 Codec:
- "MIC_BIAS1
+ "MIC_BIAS1"
"MIC_BIAS2"
"MIC_BIAS3"
"MIC_BIAS4"
diff --git a/Bindings/w1/w1-gpio.txt b/Bindings/w1/w1-gpio.txt
index 6e09c35..3709190 100644
--- a/Bindings/w1/w1-gpio.txt
+++ b/Bindings/w1/w1-gpio.txt
@@ -15,7 +15,7 @@
Examples:
- onewire@0 {
+ onewire {
compatible = "w1-gpio";
gpios = <&gpio 126 0>, <&gpio 105 0>;
};
diff --git a/src/arm/imx6qdl-zii-rdu2.dtsi b/src/arm/imx6qdl-zii-rdu2.dtsi
index 19a075a..f14df0b 100644
--- a/src/arm/imx6qdl-zii-rdu2.dtsi
+++ b/src/arm/imx6qdl-zii-rdu2.dtsi
@@ -692,7 +692,7 @@
dsa,member = <0 0>;
eeprom-length = <512>;
interrupt-parent = <&gpio6>;
- interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
+ interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
#interrupt-cells = <2>;
diff --git a/src/arm/omap4-droid4-xt894.dts b/src/arm/omap4-droid4-xt894.dts
index bdf73cb..e7c3c56 100644
--- a/src/arm/omap4-droid4-xt894.dts
+++ b/src/arm/omap4-droid4-xt894.dts
@@ -159,13 +159,7 @@
dais = <&mcbsp2_port>, <&mcbsp3_port>;
};
-};
-&dss {
- status = "okay";
-};
-
-&gpio6 {
pwm8: dmtimer-pwm-8 {
pinctrl-names = "default";
pinctrl-0 = <&vibrator_direction_pin>;
@@ -192,7 +186,10 @@
pwm-names = "enable", "direction";
direction-duty-cycle-ns = <10000000>;
};
+};
+&dss {
+ status = "okay";
};
&dsi1 {
