arm64: dts: qcom: msm8916-samsung-fortuna: Move SM5504 from rossa and refactor MUIC

MUIC varies on fortuna/rossa devices, which could be either SM5502 or
SM5504. Move SM5504 from msm8916-samsung-rossa-common to
msm8916-samsung-fortuna-common and refactor MUIC.

Disable MUIC by default in msm8916-samsung-fortuna-common, and explicitly
specify them in each fortuna/rossa board.

Signed-off-by: Raymond Hackley <raymondhackley@protonmail.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20260223220514.2556033-2-wonderfulshrinemaidenofparadise@postmarketos.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/msm8216-samsung-fortuna3g.dts b/arch/arm64/boot/dts/qcom/msm8216-samsung-fortuna3g.dts
index fba68bf8bf79c9c7b2911ff02ba882f0c5d324ac..aed90c8089aaac7ae063aaa02e2c4b4fef599c56 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8216-samsung-fortuna3g.dts
+++ b/arch/arm64/boot/dts/qcom/msm8216-samsung-fortuna3g.dts
@@ -16,6 +16,15 @@
        constant-charge-voltage-max-microvolt = <4350000>;
 };
 
+&charger {
+       richtek,usb-connector = <&usb_con_sm5502>;
+       status = "okay";
+};
+
+&muic_sm5502 {
+       status = "okay";
+};
+
 &st_accel {
        status = "okay";
 };
@@ -23,3 +32,12 @@
 &st_magn {
        status = "okay";
 };
+
+&usb {
+       extcon = <&muic_sm5502>, <&muic_sm5502>;
+       status = "okay";
+};
+
+&usb_hs_phy {
+       extcon = <&muic_sm5502>;
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi
index fb790b02736acff017d12318de1c01100a33c808..fd62e82075c405cea0f69d4cf9ec692a326b0e11 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi
@@ -144,14 +144,31 @@
 &blsp_i2c1 {
        status = "okay";
 
-       muic: extcon@25 {
+       /* MUIC/extcon varies depending on model variant */
+       muic_sm5504: extcon@14 {
+               compatible = "siliconmitus,sm5504-muic";
+               reg = <0x14>;
+               interrupts-extended = <&tlmm 12 IRQ_TYPE_EDGE_FALLING>;
+               pinctrl-0 = <&muic_int_default>;
+               pinctrl-names = "default";
+               status = "disabled";
+
+               usb_con_sm5504: connector {
+                       compatible = "usb-b-connector";
+                       label = "micro-USB";
+                       type = "micro";
+               };
+       };
+
+       muic_sm5502: extcon@25 {
                compatible = "siliconmitus,sm5502-muic";
                reg = <0x25>;
                interrupts-extended = <&tlmm 12 IRQ_TYPE_EDGE_FALLING>;
                pinctrl-0 = <&muic_int_default>;
                pinctrl-names = "default";
+               status = "disabled";
 
-               usb_con: connector {
+               usb_con_sm5502: connector {
                        compatible = "usb-b-connector";
                        label = "micro-USB";
                        type = "micro";
@@ -298,7 +315,7 @@
                charger: charger {
                        compatible = "richtek,rt5033-charger";
                        monitored-battery = <&battery>;
-                       richtek,usb-connector = <&usb_con>;
+                       status = "disabled";
                };
        };
 };
@@ -348,15 +365,6 @@
                "AMIC3", "MIC BIAS External1";
 };
 
-&usb {
-       extcon = <&muic>, <&muic>;
-       status = "okay";
-};
-
-&usb_hs_phy {
-       extcon = <&muic>;
-};
-
 &venus {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gprimeltecan.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-gprimeltecan.dts
index 677e4e286ac02205c291674bff650217f024420b..15dcfe8234d9a11bb696b8496e0d161752269fa7 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gprimeltecan.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gprimeltecan.dts
@@ -86,7 +86,7 @@
                charger: charger {
                        compatible = "richtek,rt5033-charger";
                        monitored-battery = <&battery>;
-                       richtek,usb-connector = <&usb_con>;
+                       richtek,usb-connector = <&usb_con_sm5502>;
                };
        };
 };
@@ -95,3 +95,16 @@
        /* Firmware for gprimeltecan needs more space */
        reg = <0x0 0x86800000 0x0 0x5400000>;
 };
+
+&muic_sm5502 {
+       status = "okay";
+};
+
+&usb {
+       extcon = <&muic_sm5502>, <&muic_sm5502>;
+       status = "okay";
+};
+
+&usb_hs_phy {
+       extcon = <&muic_sm5502>;
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandprimelte.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandprimelte.dts
index 582bfcb0968470a7965d1a17944f8c9c7b8b6e27..268277c1caf4f75ccd8f5c1a622ca66741addf6d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-grandprimelte.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-grandprimelte.dts
@@ -24,7 +24,25 @@
        status = "okay";
 };
 
+&charger {
+       richtek,usb-connector = <&usb_con_sm5502>;
+       status = "okay";
+};
+
 &mpss_mem {
        /* Firmware for grandprimelte needs more space */
        reg = <0x0 0x86800000 0x0 0x5400000>;
 };
+
+&muic_sm5502 {
+       status = "okay";
+};
+
+&usb {
+       extcon = <&muic_sm5502>, <&muic_sm5502>;
+       status = "okay";
+};
+
+&usb_hs_phy {
+       extcon = <&muic_sm5502>;
+};

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
index e33453c3e51e848fed078d950710304508fe4d4c..5b08f0e11105e6463c4fcc58531894f26e8a4dca 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
@@ -2,28 +2,9 @@
 
 #include "msm8916-samsung-fortuna-common.dtsi"
 
-/* SM5504 MUIC instead of SM5502 */
-/delete-node/ &muic;
-
 /* IST3038 instead of Zinitix BT541 */
 /delete-node/ &touchscreen;
 
-&blsp_i2c1 {
-       muic: extcon@14 {
-               compatible = "siliconmitus,sm5504-muic";
-               reg = <0x14>;
-               interrupts-extended = <&tlmm 12 IRQ_TYPE_EDGE_FALLING>;
-               pinctrl-0 = <&muic_int_default>;
-               pinctrl-names = "default";
-
-               usb_con: connector {
-                       compatible = "usb-b-connector";
-                       label = "micro-USB";
-                       type = "micro";
-               };
-       };
-};
-
 &blsp_i2c5 {
        touchscreen: touchscreen@50 {
                compatible = "imagis,ist3038";

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
index 1981bb71f6a928def5b6e9d1ed5197af4fcd2194..a5106afc3c59da27444b361164d6d64cb9c1a3df 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
@@ -16,7 +16,25 @@
        constant-charge-voltage-max-microvolt = <4400000>;
 };
 
+&charger {
+       richtek,usb-connector = <&usb_con_sm5504>;
+       status = "okay";
+};
+
 &mpss_mem {
        /* Firmware for rossa needs more space */
        reg = <0x0 0x86800000 0x0 0x5800000>;
 };
+
+&muic_sm5504 {
+       status = "okay";
+};
+
+&usb {
+       extcon = <&muic_sm5504>, <&muic_sm5504>;
+       status = "okay";
+};
+
+&usb_hs_phy {
+       extcon = <&muic_sm5504>;
+};