github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-24 07:03:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
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>
This commit is contained in:
Raymond Hackley 2026-02-23 22:05:12 +00:00 committed by Bjorn Andersson
parent 3aa9971299
commit 2145054750
6 changed files with 88 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm64/boot/dts/qcom/msm8216-samsung-fortuna3g.dts
View File

@ -16,6 +16,15 @@ &battery {
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_accel {
&st_magn {
status = "okay";
};
&usb {
extcon = <&muic_sm5502>, <&muic_sm5502>;
status = "okay";
};
&usb_hs_phy {
extcon = <&muic_sm5502>;
};

32
arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi
View File

@ -144,14 +144,31 @@ reg_vdd_tsp_a: regulator-vdd-tsp-a {
&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 @@ rt5033_reg_safe_ldo: SAFE_LDO {
charger: charger {
compatible = "richtek,rt5033-charger";
monitored-battery = <&battery>;
richtek,usb-connector = <&usb_con>;
status = "disabled";
};
};
};
@ -348,15 +365,6 @@ &sound {
"AMIC3", "MIC BIAS External1";
};
&usb {
extcon = <&muic>, <&muic>;
status = "okay";
};
&usb_hs_phy {
extcon = <&muic>;
};
&venus {
status = "okay";
};

15
arch/arm64/boot/dts/qcom/msm8916-samsung-gprimeltecan.dts
View File

@ -86,7 +86,7 @@ rt5033_reg_safe_ldo: SAFE_LDO {
charger: charger {
compatible = "richtek,rt5033-charger";
monitored-battery = <&battery>;
richtek,usb-connector = <&usb_con>;
richtek,usb-connector = <&usb_con_sm5502>;
};
};
};
@ -95,3 +95,16 @@ &mpss_mem {
/* 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>;
};

18
arch/arm64/boot/dts/qcom/msm8916-samsung-grandprimelte.dts
View File

@ -24,7 +24,25 @@ &bosch_magn {
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>;
};

19
arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
View File

@ -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";

18
arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
View File

@ -16,7 +16,25 @@ &battery {
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>;
};