From c0b9c616e881a1ea6b158dcad73e2198c483a56a Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Wed, 6 Mar 2024 00:18:04 +0100 Subject: [PATCH 1/5] ARM: dts: qcom: msm8974pro-castor: Clean up formatting Clean up some easy things do prepare the dts for further changes. * Move pinctrl-names below pinctrl-* * Move status as last property * Remove default linux,input-type value Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio Link: https://lore.kernel.org/r/20240306-castor-changes-v1-1-2286eaf85fff@z3ntu.xyz Signed-off-by: Bjorn Andersson --- ...-msm8974pro-sony-xperia-shinano-castor.dts | 65 ++++++++----------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index ee94741a26ed..2db2ddf00580 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -23,34 +23,30 @@ gpio-keys { compatible = "gpio-keys"; - pinctrl-names = "default"; pinctrl-0 = <&gpio_keys_pin_a>; + pinctrl-names = "default"; key-volume-down { label = "volume_down"; gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; linux,code = ; }; key-camera-snapshot { label = "camera_snapshot"; gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; linux,code = ; }; key-camera-focus { label = "camera_focus"; gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; linux,code = ; }; key-volume-up { label = "volume_up"; gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; linux,code = ; }; }; @@ -67,8 +63,8 @@ vin-supply = <&pm8941_s3>; startup-delay-us = <70000>; - pinctrl-names = "default"; pinctrl-0 = <&lcd_backlight_en_pin_a>; + pinctrl-names = "default"; }; vreg_vsp: lcd-dcdc-regulator { @@ -80,8 +76,8 @@ gpio = <&pm8941_gpios 20 GPIO_ACTIVE_HIGH>; enable-active-high; - pinctrl-names = "default"; pinctrl-0 = <&lcd_dcdc_en_pin_a>; + pinctrl-names = "default"; }; vreg_boost: vreg-boost { @@ -121,8 +117,8 @@ gpio = <&pm8941_gpios 18 GPIO_ACTIVE_HIGH>; enable-active-high; - pinctrl-names = "default"; pinctrl-0 = <&wlan_regulator_pin>; + pinctrl-names = "default"; }; }; @@ -131,9 +127,10 @@ }; &blsp2_i2c2 { - status = "okay"; clock-frequency = <355000>; + status = "okay"; + synaptics@2c { compatible = "syna,rmi4-i2c"; reg = <0x2c>; @@ -147,8 +144,8 @@ vdd-supply = <&pm8941_l22>; vio-supply = <&pm8941_lvs3>; - pinctrl-names = "default"; pinctrl-0 = <&ts_int_pin>; + pinctrl-names = "default"; syna,startup-delay-ms = <100>; @@ -166,9 +163,10 @@ }; &blsp2_i2c5 { - status = "okay"; clock-frequency = <355000>; + status = "okay"; + lp8566_wled: backlight@2c { compatible = "ti,lp8556"; reg = <0x2c>; @@ -232,8 +230,8 @@ compatible = "brcm,bcm43438-bt"; max-speed = <3000000>; - pinctrl-names = "default"; pinctrl-0 = <&bt_host_wake_pin>, <&bt_dev_wake_pin>, <&bt_reg_on_pin>; + pinctrl-names = "default"; host-wakeup-gpios = <&tlmm 95 GPIO_ACTIVE_HIGH>; device-wakeup-gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>; @@ -242,17 +240,16 @@ }; &pm8941_coincell { - status = "okay"; - qcom,rset-ohms = <2100>; qcom,vset-millivolts = <3000>; + + status = "okay"; }; &pm8941_gpios { gpio_keys_pin_a: gpio-keys-active-state { pins = "gpio2", "gpio5"; function = "normal"; - bias-pull-up; power-source = ; }; @@ -260,7 +257,6 @@ bt_reg_on_pin: bt-reg-on-state { pins = "gpio16"; function = "normal"; - output-low; power-source = ; }; @@ -268,7 +264,6 @@ wlan_sleep_clk_pin: wl-sleep-clk-state { pins = "gpio17"; function = "func2"; - output-high; power-source = ; }; @@ -276,7 +271,6 @@ wlan_regulator_pin: wl-reg-active-state { pins = "gpio18"; function = "normal"; - bias-disable; power-source = ; }; @@ -284,20 +278,18 @@ lcd_dcdc_en_pin_a: lcd-dcdc-en-active-state { pins = "gpio20"; function = "normal"; - bias-disable; power-source = ; input-disable; output-low; }; - }; &pm8941_lpg { - status = "okay"; - qcom,power-source = <1>; + status = "okay"; + multi-led { color = ; function = LED_FUNCTION_STATUS; @@ -530,41 +522,38 @@ }; &sdhc_1 { - status = "okay"; - vmmc-supply = <&pm8941_l20>; vqmmc-supply = <&pm8941_s3>; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_on>; pinctrl-1 = <&sdc1_off>; + pinctrl-names = "default", "sleep"; + + status = "okay"; }; &sdhc_2 { - status = "okay"; - vmmc-supply = <&pm8941_l21>; vqmmc-supply = <&pm8941_l13>; cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>; - pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc2_on>; pinctrl-1 = <&sdc2_off>; + pinctrl-names = "default", "sleep"; + + status = "okay"; }; &sdhc_3 { - status = "okay"; - max-frequency = <100000000>; vmmc-supply = <&vreg_wlan>; non-removable; - pinctrl-names = "default"; pinctrl-0 = <&sdc3_on>; + pinctrl-names = "default"; - #address-cells = <1>; - #size-cells = <0>; + status = "okay"; bcrmf@1 { compatible = "brcm,bcm4339-fmac", "brcm,bcm4329-fmac"; @@ -572,8 +561,8 @@ brcm,drive-strength = <10>; - pinctrl-names = "default"; pinctrl-0 = <&wlan_sleep_clk_pin>; + pinctrl-names = "default"; }; }; @@ -682,8 +671,6 @@ }; &usb { - status = "okay"; - phys = <&usb_hs1_phy>; phy-select = <&tcsr 0xb000 0>; extcon = <&smbb>, <&usb_id>; @@ -692,14 +679,16 @@ hnp-disable; srp-disable; adp-disable; + + status = "okay"; }; &usb_hs1_phy { - status = "okay"; - v1p8-supply = <&pm8941_l6>; v3p3-supply = <&pm8941_l24>; extcon = <&smbb>; qcom,init-seq = /bits/ 8 <0x1 0x64>; + + status = "okay"; }; From 0268bfec8ae06bc1091c2b9058287391872f8853 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Wed, 6 Mar 2024 00:18:05 +0100 Subject: [PATCH 2/5] ARM: dts: qcom: msm8974pro-castor: Add mmc aliases Add the mmc0 & mmc1 aliases to make sure internal storage always becomes /dev/mmcblk0 and SD card becomes /dev/mmcblk1 Signed-off-by: Luca Weiss Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20240306-castor-changes-v1-2-2286eaf85fff@z3ntu.xyz Signed-off-by: Bjorn Andersson --- .../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 2db2ddf00580..da554f72528a 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -12,6 +12,8 @@ chassis-type = "tablet"; aliases { + mmc0 = &sdhc_1; + mmc1 = &sdhc_2; serial0 = &blsp1_uart2; serial1 = &blsp2_uart1; }; From 26b950f2af40bd6cc36c3ac8ee6643ff3e905753 Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Wed, 6 Mar 2024 00:18:06 +0100 Subject: [PATCH 3/5] ARM: dts: qcom: msm8974pro-castor: Remove camera button definitions >From what I can tell, the camera buttons are not part of Z2 Tablet hardware even though other devices based on 'shinano' do have them. Fixes: ab80661883de ("ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet") Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio Link: https://lore.kernel.org/r/20240306-castor-changes-v1-3-2286eaf85fff@z3ntu.xyz Signed-off-by: Bjorn Andersson --- .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index da554f72528a..97b55bda9189 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -34,18 +34,6 @@ linux,code = ; }; - key-camera-snapshot { - label = "camera_snapshot"; - gpios = <&pm8941_gpios 3 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - - key-camera-focus { - label = "camera_focus"; - gpios = <&pm8941_gpios 4 GPIO_ACTIVE_LOW>; - linux,code = ; - }; - key-volume-up { label = "volume_up"; gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>; From ead56f2e68b874c3549a67c6ae0c6186f780bf2f Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Wed, 6 Mar 2024 00:18:07 +0100 Subject: [PATCH 4/5] ARM: dts: qcom: msm8974pro-castor: Add debounce-interval for keys Set the debounce-interval for the GPIO keys. Signed-off-by: Luca Weiss Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20240306-castor-changes-v1-4-2286eaf85fff@z3ntu.xyz Signed-off-by: Bjorn Andersson --- .../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index 97b55bda9189..c9f74bf2f8bd 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -32,12 +32,14 @@ label = "volume_down"; gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>; linux,code = ; + debounce-interval = <15>; }; key-volume-up { label = "volume_up"; gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>; linux,code = ; + debounce-interval = <15>; }; }; From b756001175b1145a4855c8cfa77ceec78350c36a Mon Sep 17 00:00:00 2001 From: Luca Weiss Date: Wed, 6 Mar 2024 00:18:08 +0100 Subject: [PATCH 5/5] ARM: dts: qcom: msm8974pro-castor: Rename wifi node name Give the wifi node a generic node name 'wifi'. Signed-off-by: Luca Weiss Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20240306-castor-changes-v1-5-2286eaf85fff@z3ntu.xyz Signed-off-by: Bjorn Andersson --- .../dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts index c9f74bf2f8bd..20f98a9e49ea 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts @@ -547,7 +547,7 @@ status = "okay"; - bcrmf@1 { + wifi@1 { compatible = "brcm,bcm4339-fmac", "brcm,bcm4329-fmac"; reg = <1>;