From: Thierry Reding <treding@xxxxxxxxxx>
Some users of the STMPE MFD bindings use unsupported properties such as
"id", "blocks" and "irq-trigger". These look like they may have been
under discussion at some point but never made it into the bindings that
were accepted upstream.
Remove these unknown properties from the device trees to avoid errors
during validation against the DT schema.
Signed-off-by: Thierry Reding <treding@xxxxxxxxxx>
---
arch/arm/boot/dts/am5729-beagleboneai.dts | 3 ---
arch/arm/boot/dts/exynos4412-p4note.dtsi | 1 -
arch/arm/boot/dts/imx53-m53.dtsi | 3 ---
arch/arm/boot/dts/imx6q-novena.dts | 3 ---
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 3 ---
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 3 ---
arch/arm/boot/dts/spear1310-evb.dts | 1 -
arch/arm/boot/dts/spear1340-evb.dts | 2 --
arch/arm/boot/dts/spear320-hmi.dts | 3 ---
arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 3 ---
arch/arm/boot/dts/tegra30-apalis.dtsi | 3 ---
arch/arm/boot/dts/tegra30-colibri.dtsi | 3 ---
12 files changed, 31 deletions(-)
diff --git a/arch/arm/boot/dts/am5729-beagleboneai.dts b/arch/arm/boot/dts/am5729-beagleboneai.dts
index 149cfafb90bf..ab5b2e3b2b65 100644
--- a/arch/arm/boot/dts/am5729-beagleboneai.dts
+++ b/arch/arm/boot/dts/am5729-beagleboneai.dts
@@ -416,9 +416,6 @@ stmpe811@41 {
interrupts = <30 IRQ_TYPE_LEVEL_LOW>;
interrupt-parent = <&gpio2>;
interrupt-controller;
- id = <0>;
- blocks = <0x5>;
- irq-trigger = <0x1>;
st,mod-12b = <1>; /* 12-bit ADC */
st,ref-sel = <0>; /* internal ADC reference */
st,adc-freq = <1>; /* 3.25 MHz ADC clock speed */
diff --git a/arch/arm/boot/dts/exynos4412-p4note.dtsi b/arch/arm/boot/dts/exynos4412-p4note.dtsi
index 22c3086e0076..8f5fbb4125b7 100644
--- a/arch/arm/boot/dts/exynos4412-p4note.dtsi
+++ b/arch/arm/boot/dts/exynos4412-p4note.dtsi
@@ -169,7 +169,6 @@ adc@41 {
interrupt-parent = <&gpx0>;
interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
- irq-trigger = <0x1>;
st,adc-freq = <3>;
st,mod-12b = <1>;
st,ref-sel = <0>;
diff --git a/arch/arm/boot/dts/imx53-m53.dtsi b/arch/arm/boot/dts/imx53-m53.dtsi
index fe5e0d308e99..e5c43cb6f784 100644
--- a/arch/arm/boot/dts/imx53-m53.dtsi
+++ b/arch/arm/boot/dts/imx53-m53.dtsi
@@ -49,11 +49,8 @@ &i2c2 {
touchscreen@41 {
compatible = "st,stmpe610";
reg = <0x41>;
- id = <0>;
- blocks = <0x5>;
interrupts = <6 0x0>;
interrupt-parent = <&gpio7>;
- irq-trigger = <0x1>;
stmpe_touchscreen {
compatible = "st,stmpe-ts";
diff --git a/arch/arm/boot/dts/imx6q-novena.dts b/arch/arm/boot/dts/imx6q-novena.dts
index 225cf6b7a7a4..448a09369e18 100644
--- a/arch/arm/boot/dts/imx6q-novena.dts
+++ b/arch/arm/boot/dts/imx6q-novena.dts
@@ -280,9 +280,6 @@ touch: stmpe811@44 {
compatible = "st,stmpe811";
reg = <0x44>;
irq-gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>;
- id = <0>;
- blocks = <0x5>;
- irq-trigger = <0x1>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_stmpe_novena>;
vio-supply = <®_3p3v>;
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index ed2739e39085..5e36fc7015cd 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -301,9 +301,6 @@ stmpe811@41 {
interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
interrupt-parent = <&gpio4>;
interrupt-controller;
- id = <0>;
- blocks = <0x5>;
- irq-trigger = <0x1>;
/* 3.25 MHz ADC clock speed */
st,adc-freq = <1>;
/* 12-bit ADC */
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 4e2a309c93fa..c2f3cb633ac8 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -246,9 +246,6 @@ stmpe811@41 {
interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
interrupt-parent = <&gpio6>;
interrupt-controller;
- id = <0>;
- blocks = <0x5>;
- irq-trigger = <0x1>;
/* 3.25 MHz ADC clock speed */
st,adc-freq = <1>;
/* 12-bit ADC */
diff --git a/arch/arm/boot/dts/spear1310-evb.dts b/arch/arm/boot/dts/spear1310-evb.dts
index 8fcb6be6e7c7..29a26995c82e 100644
--- a/arch/arm/boot/dts/spear1310-evb.dts
+++ b/arch/arm/boot/dts/spear1310-evb.dts
@@ -363,7 +363,6 @@ stmpe610@0 {
pl022,duplex = <0>;
interrupts = <6 0x4>;
interrupt-parent = <&gpio1>;
- irq-trigger = <0x2>;
stmpe_touchscreen {
compatible = "st,stmpe-ts";
diff --git a/arch/arm/boot/dts/spear1340-evb.dts b/arch/arm/boot/dts/spear1340-evb.dts
index f70ff56d4542..58136577a6a1 100644
--- a/arch/arm/boot/dts/spear1340-evb.dts
+++ b/arch/arm/boot/dts/spear1340-evb.dts
@@ -319,7 +319,6 @@ stmpe801@41 {
reg = <0x41>;
interrupts = <4 0x4>;
interrupt-parent = <&gpio0>;
- irq-trigger = <0x2>;
stmpegpio: stmpe_gpio {
compatible = "st,stmpe-gpio";
@@ -472,7 +471,6 @@ stmpe610@1 {
pl022,duplex = <0>;
interrupts = <100 0>;
interrupt-parent = <&gpiopinctrl>;
- irq-trigger = <0x2>;
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts
index 367ba48aac3e..f522c5cca4e9 100644
--- a/arch/arm/boot/dts/spear320-hmi.dts
+++ b/arch/arm/boot/dts/spear320-hmi.dts
@@ -237,9 +237,6 @@ stmpe811@41 {
reg = <0x41>;
irq-over-gpio;
irq-gpios = <&gpiopinctrl 29 0x4>;
- id = <0>;
- blocks = <0x5>;
- irq-trigger = <0x1>;
stmpegpio: stmpe-gpio {
compatible = "stmpe,gpio";
diff --git a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
index 6a3a72f81c44..e4e17c0e01fd 100644
--- a/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi
@@ -992,9 +992,6 @@ touchscreen@41 {
reg = <0x41>;
irq-gpio = <&gpio TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
- id = <0>;
- blocks = <0x5>;
- irq-trigger = <0x1>;
/* 3.25 MHz ADC clock speed */
st,adc-freq = <1>;
/* 12-bit ADC */
diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
index b2ac51fb15b1..28e7d445c076 100644
--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
@@ -975,9 +975,6 @@ touchscreen@41 {
reg = <0x41>;
irq-gpio = <&gpio TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
- id = <0>;
- blocks = <0x5>;
- irq-trigger = <0x1>;
/* 3.25 MHz ADC clock speed */
st,adc-freq = <1>;
/* 12-bit ADC */
diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index 413e35215804..88b7f2925e9e 100644
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -844,9 +844,6 @@ touchscreen@41 {
reg = <0x41>;
irq-gpio = <&gpio TEGRA_GPIO(V, 0) IRQ_TYPE_LEVEL_LOW>;
interrupt-controller;
- id = <0>;
- blocks = <0x5>;
- irq-trigger = <0x1>;
/* 3.25 MHz ADC clock speed */
st,adc-freq = <1>;
/* 12-bit ADC */
--
2.34.1
