ARM: dts: qcom: msm8974-sony-castor: Split into shinano-common
authorLuca Weiss <luca@z3ntu.xyz>
Thu, 14 Mar 2024 18:56:22 +0000 (19:56 +0100)
committerBjorn Andersson <andersson@kernel.org>
Wed, 3 Apr 2024 03:43:41 +0000 (22:43 -0500)
In preparation for adding the Sony Xperia Z3 smartphone, split the
common parts into shinano-common.dtsi.

No functional change intended.

Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Luca Weiss <luca@z3ntu.xyz>
Link: https://lore.kernel.org/r/20240314-shinano-common-v2-1-a0fce1c72c74@z3ntu.xyz
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts
arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-common.dtsi [new file with mode: 0644]

index 20f98a9e49eaf6757a9704fc2c3aed66fbc87a1f..409d1798de34ecbdb5edad84dfc8d12737fb9521 100644 (file)
@@ -1,48 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0
-#include "qcom-msm8974pro.dtsi"
-#include "pm8841.dtsi"
-#include "pm8941.dtsi"
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+#include "qcom-msm8974pro-sony-xperia-shinano-common.dtsi"
 
 / {
        model = "Sony Xperia Z2 Tablet";
        compatible = "sony,xperia-castor", "qcom,msm8974pro", "qcom,msm8974";
        chassis-type = "tablet";
 
-       aliases {
-               mmc0 = &sdhc_1;
-               mmc1 = &sdhc_2;
-               serial0 = &blsp1_uart2;
-               serial1 = &blsp2_uart1;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               pinctrl-0 = <&gpio_keys_pin_a>;
-               pinctrl-names = "default";
-
-               key-volume-down {
-                       label = "volume_down";
-                       gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_VOLUMEDOWN>;
-                       debounce-interval = <15>;
-               };
-
-               key-volume-up {
-                       label = "volume_up";
-                       gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_VOLUMEUP>;
-                       debounce-interval = <15>;
-               };
-       };
-
        vreg_bl_vddio: lcd-backlight-vddio {
                compatible = "regulator-fixed";
                regulator-name = "vreg_bl_vddio";
                pinctrl-0 = <&lcd_backlight_en_pin_a>;
                pinctrl-names = "default";
        };
-
-       vreg_vsp: lcd-dcdc-regulator {
-               compatible = "regulator-fixed";
-               regulator-name = "vreg_vsp";
-               regulator-min-microvolt = <5600000>;
-               regulator-max-microvolt = <5600000>;
-
-               gpio = <&pm8941_gpios 20 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-
-               pinctrl-0 = <&lcd_dcdc_en_pin_a>;
-               pinctrl-names = "default";
-       };
-
-       vreg_boost: vreg-boost {
-               compatible = "regulator-fixed";
-
-               regulator-name = "vreg-boost";
-               regulator-min-microvolt = <3150000>;
-               regulator-max-microvolt = <3150000>;
-
-               regulator-always-on;
-               regulator-boot-on;
-
-               gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-
-               pinctrl-names = "default";
-               pinctrl-0 = <&boost_bypass_n_pin>;
-       };
-
-       vreg_vph_pwr: vreg-vph-pwr {
-               compatible = "regulator-fixed";
-               regulator-name = "vph-pwr";
-
-               regulator-min-microvolt = <3600000>;
-               regulator-max-microvolt = <3600000>;
-
-               regulator-always-on;
-       };
-
-       vreg_wlan: wlan-regulator {
-               compatible = "regulator-fixed";
-
-               regulator-name = "wl-reg";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-
-               gpio = <&pm8941_gpios 18 GPIO_ACTIVE_HIGH>;
-               enable-active-high;
-
-               pinctrl-0 = <&wlan_regulator_pin>;
-               pinctrl-names = "default";
-       };
-};
-
-&blsp1_uart2 {
-       status = "okay";
-};
-
-&blsp2_i2c2 {
-       clock-frequency = <355000>;
-
-       status = "okay";
-
-       synaptics@2c {
-               compatible = "syna,rmi4-i2c";
-               reg = <0x2c>;
-
-               interrupt-parent = <&tlmm>;
-               interrupts = <86 IRQ_TYPE_EDGE_FALLING>;
-
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               vdd-supply = <&pm8941_l22>;
-               vio-supply = <&pm8941_lvs3>;
-
-               pinctrl-0 = <&ts_int_pin>;
-               pinctrl-names = "default";
-
-               syna,startup-delay-ms = <100>;
-
-               rmi4-f01@1 {
-                       reg = <0x1>;
-                       syna,nosleep-mode = <1>;
-               };
-
-               rmi4-f11@11 {
-                       reg = <0x11>;
-                       syna,sensor-type = <1>;
-                       touchscreen-inverted-x;
-               };
-       };
 };
 
 &blsp2_i2c5 {
                        rom-addr = /bits/ 8 <0xa0>;
                        rom-val = /bits/ 8 <0xff>;
                };
+
                rom-a1h {
                        rom-addr = /bits/ 8 <0xa1>;
                        rom-val = /bits/ 8 <0x3f>;
                };
+
                rom-a2h {
                        rom-addr = /bits/ 8 <0xa2>;
                        rom-val = /bits/ 8 <0x20>;
                };
+
                rom-a3h {
                        rom-addr = /bits/ 8 <0xa3>;
                        rom-val = /bits/ 8 <0x5e>;
                };
+
                rom-a4h {
                        rom-addr = /bits/ 8 <0xa4>;
                        rom-val = /bits/ 8 <0x02>;
                };
+
                rom-a5h {
                        rom-addr = /bits/ 8 <0xa5>;
                        rom-val = /bits/ 8 <0x04>;
                };
+
                rom-a6h {
                        rom-addr = /bits/ 8 <0xa6>;
                        rom-val = /bits/ 8 <0x80>;
                };
+
                rom-a7h {
                        rom-addr = /bits/ 8 <0xa7>;
                        rom-val = /bits/ 8 <0xf7>;
                };
+
                rom-a9h {
                        rom-addr = /bits/ 8 <0xa9>;
                        rom-val = /bits/ 8 <0x80>;
                };
+
                rom-aah {
                        rom-addr = /bits/ 8 <0xaa>;
                        rom-val = /bits/ 8 <0x0f>;
                };
+
                rom-aeh {
                        rom-addr = /bits/ 8 <0xae>;
                        rom-val = /bits/ 8 <0x0f>;
        };
 };
 
-&pm8941_coincell {
-       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 = <PM8941_GPIO_S3>;
-       };
-
        bt_reg_on_pin: bt-reg-on-state {
                pins = "gpio16";
                function = "normal";
                output-low;
                power-source = <PM8941_GPIO_S3>;
        };
-
-       wlan_sleep_clk_pin: wl-sleep-clk-state {
-               pins = "gpio17";
-               function = "func2";
-               output-high;
-               power-source = <PM8941_GPIO_S3>;
-       };
-
-       wlan_regulator_pin: wl-reg-active-state {
-               pins = "gpio18";
-               function = "normal";
-               bias-disable;
-               power-source = <PM8941_GPIO_S3>;
-       };
-
-       lcd_dcdc_en_pin_a: lcd-dcdc-en-active-state {
-               pins = "gpio20";
-               function = "normal";
-               bias-disable;
-               power-source = <PM8941_GPIO_S3>;
-               input-disable;
-               output-low;
-       };
-};
-
-&pm8941_lpg {
-       qcom,power-source = <1>;
-
-       status = "okay";
-
-       multi-led {
-               color = <LED_COLOR_ID_RGB>;
-               function = LED_FUNCTION_STATUS;
-
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               led@5 {
-                       reg = <5>;
-                       color = <LED_COLOR_ID_BLUE>;
-               };
-
-               led@6 {
-                       reg = <6>;
-                       color = <LED_COLOR_ID_GREEN>;
-               };
-
-               led@7 {
-                       reg = <7>;
-                       color = <LED_COLOR_ID_RED>;
-               };
-       };
-};
-
-&remoteproc_adsp {
-       cx-supply = <&pm8841_s2>;
-       status = "okay";
-};
-
-&remoteproc_mss {
-       cx-supply = <&pm8841_s2>;
-       mss-supply = <&pm8841_s3>;
-       mx-supply = <&pm8841_s1>;
-       pll-supply = <&pm8941_l12>;
-       status = "okay";
 };
 
 &rpm_requests {
-       regulators-0 {
-               compatible = "qcom,rpm-pm8841-regulators";
-
-               pm8841_s1: s1 {
-                       regulator-min-microvolt = <675000>;
-                       regulator-max-microvolt = <1050000>;
-               };
-
-               pm8841_s2: s2 {
-                       regulator-min-microvolt = <500000>;
-                       regulator-max-microvolt = <1050000>;
-               };
-
-               pm8841_s3: s3 {
-                       regulator-min-microvolt = <500000>;
-                       regulator-max-microvolt = <1050000>;
-               };
-
-               pm8841_s4: s4 {
-                       regulator-min-microvolt = <500000>;
-                       regulator-max-microvolt = <1050000>;
-               };
-       };
-
        regulators-1 {
-               compatible = "qcom,rpm-pm8941-regulators";
-
-               vdd_l1_l3-supply = <&pm8941_s1>;
-               vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;
-               vdd_l4_l11-supply = <&pm8941_s1>;
-               vdd_l5_l7-supply = <&pm8941_s2>;
-               vdd_l6_l12_l14_l15-supply = <&pm8941_s2>;
-               vdd_l9_l10_l17_l22-supply = <&vreg_boost>;
-               vdd_l13_l20_l23_l24-supply = <&vreg_boost>;
-               vdd_l21-supply = <&vreg_boost>;
-
-               pm8941_s1: s1 {
-                       regulator-min-microvolt = <1300000>;
-                       regulator-max-microvolt = <1300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
-
-               pm8941_s2: s2 {
-                       regulator-min-microvolt = <2150000>;
-                       regulator-max-microvolt = <2150000>;
-                       regulator-boot-on;
-               };
-
-               pm8941_s3: s3 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-system-load = <154000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
-
-               pm8941_s4: s4 {
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-               };
-
-               pm8941_l1: l1 {
-                       regulator-min-microvolt = <1225000>;
-                       regulator-max-microvolt = <1225000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
-
-               pm8941_l2: l2 {
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-               };
-
-               pm8941_l3: l3 {
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-               };
-
-               pm8941_l4: l4 {
-                       regulator-min-microvolt = <1225000>;
-                       regulator-max-microvolt = <1225000>;
-               };
-
-               pm8941_l5: l5 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8941_l6: l6 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-boot-on;
-               };
-
-               pm8941_l7: l7 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-boot-on;
-               };
-
-               pm8941_l8: l8 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8941_l9: l9 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <2950000>;
-               };
-
                pm8941_l11: l11 {
                        regulator-min-microvolt = <1300000>;
                        regulator-max-microvolt = <1350000>;
                };
 
-               pm8941_l12: l12 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
-
-               pm8941_l13: l13 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <2950000>;
-                       regulator-boot-on;
-               };
-
-               pm8941_l14: l14 {
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-               };
-
-               pm8941_l15: l15 {
-                       regulator-min-microvolt = <2050000>;
-                       regulator-max-microvolt = <2050000>;
-               };
-
-               pm8941_l16: l16 {
-                       regulator-min-microvolt = <2700000>;
-                       regulator-max-microvolt = <2700000>;
-               };
-
-               pm8941_l17: l17 {
-                       regulator-min-microvolt = <2700000>;
-                       regulator-max-microvolt = <2700000>;
-               };
-
-               pm8941_l18: l18 {
-                       regulator-min-microvolt = <2850000>;
-                       regulator-max-microvolt = <2850000>;
-               };
-
                pm8941_l19: l19 {
                        regulator-min-microvolt = <2850000>;
                        regulator-max-microvolt = <2850000>;
                };
-
-               pm8941_l20: l20 {
-                       regulator-min-microvolt = <2950000>;
-                       regulator-max-microvolt = <2950000>;
-                       regulator-system-load = <500000>;
-                       regulator-allow-set-load;
-                       regulator-boot-on;
-               };
-
-               pm8941_l21: l21 {
-                       regulator-min-microvolt = <2950000>;
-                       regulator-max-microvolt = <2950000>;
-                       regulator-boot-on;
-               };
-
-               pm8941_l22: l22 {
-                       regulator-min-microvolt = <3000000>;
-                       regulator-max-microvolt = <3000000>;
-               };
-
-               pm8941_l23: l23 {
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-               };
-
-               pm8941_l24: l24 {
-                       regulator-min-microvolt = <3075000>;
-                       regulator-max-microvolt = <3075000>;
-                       regulator-boot-on;
-               };
-
-               pm8941_lvs3: lvs3 {};
-       };
-};
-
-&sdhc_1 {
-       vmmc-supply = <&pm8941_l20>;
-       vqmmc-supply = <&pm8941_s3>;
-
-       pinctrl-0 = <&sdc1_on>;
-       pinctrl-1 = <&sdc1_off>;
-       pinctrl-names = "default", "sleep";
-
-       status = "okay";
-};
-
-&sdhc_2 {
-       vmmc-supply = <&pm8941_l21>;
-       vqmmc-supply = <&pm8941_l13>;
-
-       cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>;
-
-       pinctrl-0 = <&sdc2_on>;
-       pinctrl-1 = <&sdc2_off>;
-       pinctrl-names = "default", "sleep";
-
-       status = "okay";
-};
-
-&sdhc_3 {
-       max-frequency = <100000000>;
-       vmmc-supply = <&vreg_wlan>;
-       non-removable;
-
-       pinctrl-0 = <&sdc3_on>;
-       pinctrl-names = "default";
-
-       status = "okay";
-
-       wifi@1 {
-               compatible = "brcm,bcm4339-fmac", "brcm,bcm4329-fmac";
-               reg = <1>;
-
-               brcm,drive-strength = <10>;
-
-               pinctrl-0 = <&wlan_sleep_clk_pin>;
-               pinctrl-names = "default";
        };
 };
 
        status = "okay";
 };
 
-&tlmm {
-       lcd_backlight_en_pin_a: lcd-backlight-vddio-state {
-               pins = "gpio69";
-               function = "gpio";
-               drive-strength = <10>;
-               output-low;
-               bias-disable;
-       };
-
-       sdc1_on: sdc1-on-state {
-               clk-pins {
-                       pins = "sdc1_clk";
-                       drive-strength = <16>;
-                       bias-disable;
-               };
-
-               cmd-data-pins {
-                       pins = "sdc1_cmd", "sdc1_data";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-       };
-
-       sdc2_on: sdc2-on-state {
-               clk-pins {
-                       pins = "sdc2_clk";
-                       drive-strength = <6>;
-                       bias-disable;
-               };
-
-               cmd-data-pins {
-                       pins = "sdc2_cmd", "sdc2_data";
-                       drive-strength = <6>;
-                       bias-pull-up;
-               };
-
-               cd-pins {
-                       pins = "gpio62";
-                       function = "gpio";
-                       drive-strength = <2>;
-                       bias-disable;
-               };
-       };
-
-       sdc3_on: sdc3-on-state {
-               clk-pins {
-                       pins = "gpio40";
-                       function = "sdc3";
-                       drive-strength = <10>;
-                       bias-disable;
-               };
-
-               cmd-pins {
-                       pins = "gpio39";
-                       function = "sdc3";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-
-               data-pins {
-                       pins = "gpio35", "gpio36", "gpio37", "gpio38";
-                       function = "sdc3";
-                       drive-strength = <10>;
-                       bias-pull-up;
-               };
-       };
+&synaptics_touchscreen {
+       vio-supply = <&pm8941_lvs3>;
+};
 
-       ts_int_pin: ts-int-pin-state {
-               pins = "gpio86";
+&tlmm {
+       bt_dev_wake_pin: bt-dev-wake-state {
+               pins = "gpio96";
                function = "gpio";
                drive-strength = <2>;
                bias-disable;
                output-low;
        };
 
-       bt_dev_wake_pin: bt-dev-wake-state {
-               pins = "gpio96";
+       lcd_backlight_en_pin_a: lcd-backlight-vddio-state {
+               pins = "gpio69";
                function = "gpio";
-               drive-strength = <2>;
+               drive-strength = <10>;
+               output-low;
                bias-disable;
        };
 };
-
-&usb {
-       phys = <&usb_hs1_phy>;
-       phy-select = <&tcsr 0xb000 0>;
-       extcon = <&smbb>, <&usb_id>;
-       vbus-supply = <&chg_otg>;
-
-       hnp-disable;
-       srp-disable;
-       adp-disable;
-
-       status = "okay";
-};
-
-&usb_hs1_phy {
-       v1p8-supply = <&pm8941_l6>;
-       v3p3-supply = <&pm8941_l24>;
-
-       extcon = <&smbb>;
-       qcom,init-seq = /bits/ 8 <0x1 0x64>;
-
-       status = "okay";
-};
diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-common.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-common.dtsi
new file mode 100644 (file)
index 0000000..3a0c003
--- /dev/null
@@ -0,0 +1,535 @@
+// SPDX-License-Identifier: GPL-2.0
+#include "qcom-msm8974pro.dtsi"
+#include "pm8841.dtsi"
+#include "pm8941.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
+
+/ {
+       aliases {
+               mmc0 = &sdhc_1;
+               mmc1 = &sdhc_2;
+               serial0 = &blsp1_uart2;
+               serial1 = &blsp2_uart1;
+       };
+
+       chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+
+               pinctrl-0 = <&gpio_keys_pin_a>;
+               pinctrl-names = "default";
+
+               key-volume-down {
+                       label = "volume_down";
+                       gpios = <&pm8941_gpios 2 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_VOLUMEDOWN>;
+                       debounce-interval = <15>;
+               };
+
+               key-volume-up {
+                       label = "volume_up";
+                       gpios = <&pm8941_gpios 5 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_VOLUMEUP>;
+                       debounce-interval = <15>;
+               };
+       };
+
+       vreg_vsp: lcd-dcdc-regulator {
+               compatible = "regulator-fixed";
+               regulator-name = "vreg_vsp";
+               regulator-min-microvolt = <5600000>;
+               regulator-max-microvolt = <5600000>;
+
+               gpio = <&pm8941_gpios 20 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+
+               pinctrl-0 = <&lcd_dcdc_en_pin_a>;
+               pinctrl-names = "default";
+       };
+
+       vreg_boost: vreg-boost {
+               compatible = "regulator-fixed";
+
+               regulator-name = "vreg-boost";
+               regulator-min-microvolt = <3150000>;
+               regulator-max-microvolt = <3150000>;
+
+               regulator-always-on;
+               regulator-boot-on;
+
+               gpio = <&pm8941_gpios 21 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&boost_bypass_n_pin>;
+       };
+
+       vreg_vph_pwr: vreg-vph-pwr {
+               compatible = "regulator-fixed";
+               regulator-name = "vph-pwr";
+
+               regulator-min-microvolt = <3600000>;
+               regulator-max-microvolt = <3600000>;
+
+               regulator-always-on;
+       };
+
+       vreg_wlan: wlan-regulator {
+               compatible = "regulator-fixed";
+
+               regulator-name = "wl-reg";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+
+               gpio = <&pm8941_gpios 18 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+
+               pinctrl-0 = <&wlan_regulator_pin>;
+               pinctrl-names = "default";
+       };
+};
+
+&blsp1_uart2 {
+       status = "okay";
+};
+
+&blsp2_i2c2 {
+       clock-frequency = <355000>;
+
+       status = "okay";
+
+       synaptics_touchscreen: synaptics@2c {
+               compatible = "syna,rmi4-i2c";
+               reg = <0x2c>;
+
+               interrupt-parent = <&tlmm>;
+               interrupts = <86 IRQ_TYPE_EDGE_FALLING>;
+
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               vdd-supply = <&pm8941_l22>;
+               /* vio-supply is set in dts */
+
+               pinctrl-0 = <&ts_int_pin>;
+               pinctrl-names = "default";
+
+               syna,startup-delay-ms = <100>;
+
+               rmi4-f01@1 {
+                       reg = <0x1>;
+                       syna,nosleep-mode = <1>;
+               };
+
+               rmi4-f11@11 {
+                       reg = <0x11>;
+                       syna,sensor-type = <1>;
+                       touchscreen-inverted-x;
+               };
+       };
+};
+
+&pm8941_coincell {
+       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 = <PM8941_GPIO_S3>;
+       };
+
+       wlan_sleep_clk_pin: wl-sleep-clk-state {
+               pins = "gpio17";
+               function = "func2";
+               output-high;
+               power-source = <PM8941_GPIO_S3>;
+       };
+
+       wlan_regulator_pin: wl-reg-active-state {
+               pins = "gpio18";
+               function = "normal";
+               bias-disable;
+               power-source = <PM8941_GPIO_S3>;
+       };
+
+       lcd_dcdc_en_pin_a: lcd-dcdc-en-active-state {
+               pins = "gpio20";
+               function = "normal";
+               bias-disable;
+               power-source = <PM8941_GPIO_S3>;
+               input-disable;
+               output-low;
+       };
+};
+
+&pm8941_lpg {
+       qcom,power-source = <1>;
+
+       status = "okay";
+
+       multi-led {
+               color = <LED_COLOR_ID_RGB>;
+               function = LED_FUNCTION_STATUS;
+
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               led@5 {
+                       reg = <5>;
+                       color = <LED_COLOR_ID_BLUE>;
+               };
+
+               led@6 {
+                       reg = <6>;
+                       color = <LED_COLOR_ID_GREEN>;
+               };
+
+               led@7 {
+                       reg = <7>;
+                       color = <LED_COLOR_ID_RED>;
+               };
+       };
+};
+
+&remoteproc_adsp {
+       cx-supply = <&pm8841_s2>;
+       status = "okay";
+};
+
+&remoteproc_mss {
+       cx-supply = <&pm8841_s2>;
+       mss-supply = <&pm8841_s3>;
+       mx-supply = <&pm8841_s1>;
+       pll-supply = <&pm8941_l12>;
+       status = "okay";
+};
+
+&rpm_requests {
+       regulators-0 {
+               compatible = "qcom,rpm-pm8841-regulators";
+
+               pm8841_s1: s1 {
+                       regulator-min-microvolt = <675000>;
+                       regulator-max-microvolt = <1050000>;
+               };
+
+               pm8841_s2: s2 {
+                       regulator-min-microvolt = <500000>;
+                       regulator-max-microvolt = <1050000>;
+               };
+
+               pm8841_s3: s3 {
+                       regulator-min-microvolt = <500000>;
+                       regulator-max-microvolt = <1050000>;
+               };
+
+               pm8841_s4: s4 {
+                       regulator-min-microvolt = <500000>;
+                       regulator-max-microvolt = <1050000>;
+               };
+       };
+
+       regulators-1 {
+               compatible = "qcom,rpm-pm8941-regulators";
+
+               vdd_l1_l3-supply = <&pm8941_s1>;
+               vdd_l2_lvs1_2_3-supply = <&pm8941_s3>;
+               vdd_l4_l11-supply = <&pm8941_s1>;
+               vdd_l5_l7-supply = <&pm8941_s2>;
+               vdd_l6_l12_l14_l15-supply = <&pm8941_s2>;
+               vdd_l9_l10_l17_l22-supply = <&vreg_boost>;
+               vdd_l13_l20_l23_l24-supply = <&vreg_boost>;
+               vdd_l21-supply = <&vreg_boost>;
+
+               pm8941_s1: s1 {
+                       regulator-min-microvolt = <1300000>;
+                       regulator-max-microvolt = <1300000>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               pm8941_s2: s2 {
+                       regulator-min-microvolt = <2150000>;
+                       regulator-max-microvolt = <2150000>;
+                       regulator-boot-on;
+               };
+
+               pm8941_s3: s3 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-system-load = <154000>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               pm8941_s4: s4 {
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+               };
+
+               pm8941_l1: l1 {
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               pm8941_l2: l2 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
+
+               pm8941_l3: l3 {
+                       regulator-min-microvolt = <1200000>;
+                       regulator-max-microvolt = <1200000>;
+               };
+
+               pm8941_l4: l4 {
+                       regulator-min-microvolt = <1225000>;
+                       regulator-max-microvolt = <1225000>;
+               };
+
+               pm8941_l5: l5 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8941_l6: l6 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-boot-on;
+               };
+
+               pm8941_l7: l7 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-boot-on;
+               };
+
+               pm8941_l8: l8 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8941_l9: l9 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+               };
+
+               pm8941_l12: l12 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               pm8941_l13: l13 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-boot-on;
+               };
+
+               pm8941_l14: l14 {
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+               };
+
+               pm8941_l15: l15 {
+                       regulator-min-microvolt = <2050000>;
+                       regulator-max-microvolt = <2050000>;
+               };
+
+               pm8941_l16: l16 {
+                       regulator-min-microvolt = <2700000>;
+                       regulator-max-microvolt = <2700000>;
+               };
+
+               pm8941_l17: l17 {
+                       regulator-min-microvolt = <2700000>;
+                       regulator-max-microvolt = <2700000>;
+               };
+
+               pm8941_l18: l18 {
+                       regulator-min-microvolt = <2850000>;
+                       regulator-max-microvolt = <2850000>;
+               };
+
+               pm8941_l20: l20 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-system-load = <500000>;
+                       regulator-allow-set-load;
+                       regulator-boot-on;
+               };
+
+               pm8941_l21: l21 {
+                       regulator-min-microvolt = <2950000>;
+                       regulator-max-microvolt = <2950000>;
+                       regulator-boot-on;
+               };
+
+               pm8941_l22: l22 {
+                       regulator-min-microvolt = <3000000>;
+                       regulator-max-microvolt = <3000000>;
+               };
+
+               pm8941_l23: l23 {
+                       regulator-min-microvolt = <2800000>;
+                       regulator-max-microvolt = <2800000>;
+               };
+
+               pm8941_l24: l24 {
+                       regulator-min-microvolt = <3075000>;
+                       regulator-max-microvolt = <3075000>;
+                       regulator-boot-on;
+               };
+
+               pm8941_lvs3: lvs3 {};
+       };
+};
+
+&sdhc_1 {
+       vmmc-supply = <&pm8941_l20>;
+       vqmmc-supply = <&pm8941_s3>;
+
+       pinctrl-0 = <&sdc1_on>;
+       pinctrl-1 = <&sdc1_off>;
+       pinctrl-names = "default", "sleep";
+
+       status = "okay";
+};
+
+&sdhc_2 {
+       vmmc-supply = <&pm8941_l21>;
+       vqmmc-supply = <&pm8941_l13>;
+
+       cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>;
+
+       pinctrl-0 = <&sdc2_on>;
+       pinctrl-1 = <&sdc2_off>;
+       pinctrl-names = "default", "sleep";
+
+       status = "okay";
+};
+
+&sdhc_3 {
+       max-frequency = <100000000>;
+       vmmc-supply = <&vreg_wlan>;
+       non-removable;
+
+       pinctrl-0 = <&sdc3_on>;
+       pinctrl-names = "default";
+
+       status = "okay";
+
+       wifi@1 {
+               compatible = "brcm,bcm4339-fmac", "brcm,bcm4329-fmac";
+               reg = <1>;
+
+               brcm,drive-strength = <10>;
+
+               pinctrl-0 = <&wlan_sleep_clk_pin>;
+               pinctrl-names = "default";
+       };
+};
+
+&tlmm {
+       sdc1_on: sdc1-on-state {
+               clk-pins {
+                       pins = "sdc1_clk";
+                       drive-strength = <16>;
+                       bias-disable;
+               };
+
+               cmd-data-pins {
+                       pins = "sdc1_cmd", "sdc1_data";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+       };
+
+       sdc2_on: sdc2-on-state {
+               clk-pins {
+                       pins = "sdc2_clk";
+                       drive-strength = <6>;
+                       bias-disable;
+               };
+
+               cmd-data-pins {
+                       pins = "sdc2_cmd", "sdc2_data";
+                       drive-strength = <6>;
+                       bias-pull-up;
+               };
+
+               cd-pins {
+                       pins = "gpio62";
+                       function = "gpio";
+                       drive-strength = <2>;
+                       bias-disable;
+               };
+       };
+
+       sdc3_on: sdc3-on-state {
+               clk-pins {
+                       pins = "gpio40";
+                       function = "sdc3";
+                       drive-strength = <10>;
+                       bias-disable;
+               };
+
+               cmd-pins {
+                       pins = "gpio39";
+                       function = "sdc3";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+
+               data-pins {
+                       pins = "gpio35", "gpio36", "gpio37", "gpio38";
+                       function = "sdc3";
+                       drive-strength = <10>;
+                       bias-pull-up;
+               };
+       };
+
+       ts_int_pin: ts-int-pin-state {
+               pins = "gpio86";
+               function = "gpio";
+               drive-strength = <2>;
+               bias-disable;
+       };
+};
+
+&usb {
+       phys = <&usb_hs1_phy>;
+       phy-select = <&tcsr 0xb000 0>;
+       extcon = <&smbb>, <&usb_id>;
+       vbus-supply = <&chg_otg>;
+
+       hnp-disable;
+       srp-disable;
+       adp-disable;
+
+       status = "okay";
+};
+
+&usb_hs1_phy {
+       v1p8-supply = <&pm8941_l6>;
+       v3p3-supply = <&pm8941_l24>;
+
+       extcon = <&smbb>;
+       qcom,init-seq = /bits/ 8 <0x1 0x64>;
+
+       status = "okay";
+};