| Message ID | 20241018-post-reset-v1-1-5aadb7550037@chromium.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Using i2c-hid-of-elan driver instead of i2c-hid-of driver | expand |
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts index 19c1e2bee494c98c0db87308494713a26e304cd2..32ec6fd30fdb7449e9e606f69d16556bcdecc369 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts @@ -21,8 +21,6 @@ &i2c0 { touchscreen@2c { compatible = "hid-over-i2c"; reg = <0x2c>; - pinctrl-names = "default"; - pinctrl-0 = <&touchscreen_pins>; interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>; post-power-on-delay-ms = <200>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts index f34964afe39b5353de7b17e82d14d1fba88551ab..b75ab2d33550808196f2d1d4bf0d34ccb713a07a 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts @@ -23,9 +23,6 @@ trackpad@2c { reg = <0x2c>; hid-descr-addr = <0x20>; - pinctrl-names = "default"; - pinctrl-0 = <&trackpad_pins>; - interrupts-extended = <&pio 7 IRQ_TYPE_LEVEL_LOW>; wakeup-source; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts index 0b45aee2e29953b6117b462034a00dff2596b9ff..ebe6e161354c414d91859494ec9295db75a3baf9 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts @@ -19,8 +19,6 @@ &touchscreen { compatible = "hid-over-i2c"; reg = <0x10>; interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&touchscreen_pins>; post-power-on-delay-ms = <10>; hid-descr-addr = <0x0001>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts index 72852b7600383972d98d9b0edd40b6e99e34a85b..2dc64cc539f815b9848b8243e5b487f22d605a6d 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts @@ -32,8 +32,6 @@ &touchscreen { compatible = "hid-over-i2c"; reg = <0x10>; interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&touchscreen_pins>; post-power-on-delay-ms = <10>; hid-descr-addr = <0x0001>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts index 757d0afd14fb064fc1de4608e65eb1a561c4dfa6..53e996f9c605dc36df03d4b0051a91e19fefb38d 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts @@ -19,8 +19,6 @@ &touchscreen { compatible = "hid-over-i2c"; reg = <0x10>; interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&touchscreen_pins>; post-power-on-delay-ms = <10>; hid-descr-addr = <0x0001>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts index 6641b087e7c5f3a957e43ac985137dfd84ac7878..d7db621383c6b823af08ca07e0794758d062e211 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts @@ -19,8 +19,6 @@ &touchscreen { compatible = "hid-over-i2c"; reg = <0x10>; interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&touchscreen_pins>; post-power-on-delay-ms = <10>; hid-descr-addr = <0x0001>; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi index bbe6c338f465ee7c11bfbfc30767bdb142706480..e5b51b27980ae90a8f1099f71a891bb0562a375a 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi @@ -16,9 +16,6 @@ trackpad@2c { reg = <0x2c>; hid-descr-addr = <0x20>; - pinctrl-names = "default"; - pinctrl-0 = <&trackpad_pins>; - interrupts-extended = <&pio 7 IRQ_TYPE_LEVEL_LOW>; wakeup-source; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper.dtsi index 078bc765646f57fd8c55e97325893ab50e4dac51..a96c64a9251044b2c1ba4289467b411e6c744abe 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper.dtsi @@ -12,9 +12,6 @@ trackpad@2c { reg = <0x2c>; hid-descr-addr = <0x20>; - pinctrl-names = "default"; - pinctrl-0 = <&trackpad_pins>; - interrupts-extended = <&pio 7 IRQ_TYPE_LEVEL_LOW>; wakeup-source; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts index 8ce9568fee95a6faba0c238f6c43f43948c26d9b..2c740b3e5d3d91980ed89e07a6be70ff51906145 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts @@ -25,9 +25,6 @@ trackpad@2c { reg = <0x2c>; hid-descr-addr = <0x20>; - pinctrl-names = "default"; - pinctrl-0 = <&trackpad_pins>; - interrupts-extended = <&pio 7 IRQ_TYPE_LEVEL_LOW>; wakeup-source; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts index cce326aec1aa594deb6f5b14340d3552d110b160..bce368fcc884008086c091a29e3f69e541215ee5 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts @@ -38,9 +38,6 @@ trackpad@2c { reg = <0x2c>; hid-descr-addr = <0x20>; - pinctrl-names = "default"; - pinctrl-0 = <&trackpad_pins>; - interrupts-extended = <&pio 7 IRQ_TYPE_LEVEL_LOW>; wakeup-source; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi index 76d33540166f900c99c419c4f97ca0a56cf658f5..9b1600d5c4c1247c97fd59aa7603eaa835420117 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi @@ -12,9 +12,6 @@ trackpad@2c { reg = <0x2c>; hid-descr-addr = <0x20>; - pinctrl-names = "default"; - pinctrl-0 = <&trackpad_pins>; - interrupts-extended = <&pio 7 IRQ_TYPE_LEVEL_LOW>; wakeup-source; diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi index 783c333107bcbf7368398feae0a29e5f0ee50c19..65f70627f2dcc4af832b8a08f7cdce354c800fae 100644 --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi @@ -100,14 +100,13 @@ &dsi_out { &i2c0 { status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&touchscreen_pins>; touchscreen: touchscreen@10 { compatible = "elan,ekth3500"; reg = <0x10>; - pinctrl-names = "default"; - pinctrl-0 = <&touchscreen_pins>; - interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>; reset-gpios = <&pio 156 GPIO_ACTIVE_LOW>; @@ -116,7 +115,7 @@ touchscreen: touchscreen@10 { &i2c2 { pinctrl-names = "default"; - pinctrl-0 = <&i2c2_pins>; + pinctrl-0 = <&i2c2_pins>, <&trackpad_pins>; status = "okay"; clock-frequency = <400000>; @@ -124,9 +123,6 @@ trackpad@15 { compatible = "elan,ekth3000"; reg = <0x15>; - pinctrl-names = "default"; - pinctrl-0 = <&trackpad_pins>; - interrupts-extended = <&pio 7 IRQ_TYPE_LEVEL_LOW>; wakeup-source;
Some mt8183 devices use second source touchscreen/trackpad and share the same pinctrl property with the original touchscreen/trackpad. Currently, multiple touchscreen/trackpad drivers might probe simultaneously, causing a race condition of getting the same pin. Move the pinctrl property to the i2c node to workaround this issue. Fixes: dd6e3b06214f ("arm64: dts: mt8183: Add kukui-jacuzzi-burnet board") Fixes: 52e84f233459 ("arm64: dts: mt8183: Add kukui-jacuzzi-cozmo board") Fixes: 6cd7fdc8c530 ("arm64: dts: mt8183: Add kukui-jacuzzi-fennel board") Fixes: 124d64392de2 ("arm64: dts: mt8183: Add kukui-jacuzzi-juniper board") Fixes: f006bcf1c972 ("arm64: dts: mt8183: Add kukui-jacuzzi-willow board") Fixes: 055ef10ccdd4 ("arm64: dts: mt8183: Add jacuzzi pico/pico6 board") Signed-off-by: Hsin-Te Yuan <yuanhsinte@chromium.org> --- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-burnet.dts | 2 -- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts | 3 --- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-damu.dts | 2 -- .../boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 2 -- .../boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 2 -- .../boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 2 -- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel.dtsi | 3 --- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-juniper.dtsi | 3 --- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico.dts | 3 --- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 3 --- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-willow.dtsi | 3 --- arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 10 +++------- 12 files changed, 3 insertions(+), 35 deletions(-)