Skip to content

arm64: dts: qcom: msm8916-samsung-rossa: refactor #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: msm8916/6.17-rc6
Choose a base branch
from
Open

arm64: dts: qcom: msm8916-samsung-rossa: refactor #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1bddfe4
Revert "arm64: dts: qcom: msm8916-samsung-fortunaltezt: Add display p…
wonderfulShrineMaidenOfParadise Sep 17, 2025
f6326b9
Revert "arm64: dts: qcom: msm8916-samsung-heatqlte: Add display panel"
wonderfulShrineMaidenOfParadise Sep 15, 2025
bfe82d4
Revert "arm64: dts: qcom: msm8916-samsung-rossa: Add display panel"
wonderfulShrineMaidenOfParadise Sep 15, 2025
3ac9484
UPSTREAM: arm64: dts: qcom: msm8916-samsung-rossa: Move touchscreen t…
wonderfulShrineMaidenOfParadise Oct 4, 2025
f2dc3ae
arm64: dts: qcom: msm8916-samsung-fortuna: Move SM5504 from rossa and…
wonderfulShrineMaidenOfParadise Sep 15, 2025
1d67edf
arm64: dts: qcom: msm8916-samsung-coreprimeltevzw: add device tree
ChipmunkMC Aug 29, 2025
312c26d
squash! arm64: dts: qcom: msm8916-samsung-coreprimeltevzw: add device…
wonderfulShrineMaidenOfParadise Sep 15, 2025
854694e
squash! arm64: dts: qcom: msm8916-samsung-fortunaltezt: Add initial d…
bolilingmeng89006 Sep 17, 2025
3d13e05
squash! arm64: dts: qcom: msm8916-samsung-heatqlte: Add initial devic…
wonderfulShrineMaidenOfParadise Sep 15, 2025
072988a
squash! arm64: dts: qcom: msm8916-samsung-fortunaltezt/heatqlte: Add …
wonderfulShrineMaidenOfParadise Sep 15, 2025
647fe90
arm64: dts: qcom: msm8916-samsung-rossa: Add display panel (v2)
wonderfulShrineMaidenOfParadise Sep 15, 2025
6a7a0b4
arm64: dts: qcom: msm8916-samsung-fortunaltezt: Add display panel
bolilingmeng89006 Apr 5, 2024
711ab2c
arm64: dts: qcom: msm8916-samsung-heatqlte: Add display panel
garethppls Apr 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/qcom/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3ltezt.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3u-eur.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5ltezt.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-coreprimeltevzw.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e5.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e7.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-fortunaltezt.dtb
Expand Down
18 changes: 18 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8216-samsung-fortuna3g.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,28 @@
constant-charge-voltage-max-microvolt = <4350000>;
};

&charger {
richtek,usb-connector = <&usb_con_sm5502>;
status = "okay";
};

&muic_sm5502 {
status = "okay";
};

&st_accel {
status = "okay";
};

&st_magn {
status = "okay";
};

&usb {
extcon = <&muic_sm5502>, <&muic_sm5502>;
status = "okay";
};

&usb_hs_phy {
extcon = <&muic_sm5502>;
};
44 changes: 44 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8916-samsung-coreprimeltevzw.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
// SPDX-License-Identifier: GPL-2.0-only

/dts-v1/;

#include "msm8916-samsung-rossa-common.dtsi"

/ {
model = "Samsung Galaxy Core Prime LTE Verizon Wireless";
compatible = "samsung,coreprimeltevzw", "qcom,msm8916";
chassis-type = "handset";
};

&battery {
charge-term-current-microamp = <150000>;
constant-charge-current-max-microamp = <700000>;
constant-charge-voltage-max-microvolt = <4400000>;
};

&charger {
richtek,usb-connector = <&usb_con_sm5502>;
status = "okay";
};

&mpss_mem {
/* Firmware for rossa needs more space */
Copy link
Member

@stephan-gh stephan-gh Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/* Firmware for rossa needs more space */
/* Firmware for coreprimeltevzw needs more space */

? if every rossa is like that it could be in rossa-common.dtsi

Copy link
Author

@wonderfulShrineMaidenOfParadise wonderfulShrineMaidenOfParadise Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to inspect every variant. Will check this later.

Copy link
Author

@wonderfulShrineMaidenOfParadise wonderfulShrineMaidenOfParadise Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

min_addr: 0x86800000, max_addr: 0x8bc00000, relocatable: True, align: 0x400000
Size: 0x5400000, round: 0x6000000

reg = <0x0 0x86800000 0x0 0x5800000>;
};

&muic_sm5502 {
status = "okay";
};

&s3fwrn5_nfc {
status = "disabled";
};

&usb {
extcon = <&muic_sm5502>, <&muic_sm5502>;
status = "okay";
};

&usb_hs_phy {
extcon = <&muic_sm5502>;
};
32 changes: 20 additions & 12 deletions arch/arm64/boot/dts/qcom/msm8916-samsung-fortuna-common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,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";
Expand Down Expand Up @@ -326,7 +343,7 @@
charger: charger {
compatible = "richtek,rt5033-charger";
monitored-battery = <&battery>;
richtek,usb-connector = <&usb_con>;
status = "disabled";
};
};
};
Expand Down Expand Up @@ -422,15 +439,6 @@
"AMIC3", "MIC BIAS External1";
};

&usb {
extcon = <&muic>, <&muic>;
status = "okay";
};

&usb_hs_phy {
extcon = <&muic>;
};

&venus {
status = "okay";
};
Expand Down
19 changes: 18 additions & 1 deletion arch/arm64/boot/dts/qcom/msm8916-samsung-fortunaltezt.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
constant-charge-voltage-max-microvolt = <4350000>;
};

&charger {
richtek,usb-connector = <&usb_con_sm5502>;
status = "okay";
};

/* On fortunaltezt backlight is controlled with MIPI DCS commands */
&clk_pwm {
status = "disabled";
Expand All @@ -37,10 +42,13 @@
status = "disabled";
};

&muic_sm5502 {
status = "okay";
};

&panel {
/* Actually hx8389c without PWM. There is no other variant */
compatible = "samsung,hx8389c-gh9607501a";

/delete-property/ backlight;
};

Expand All @@ -55,3 +63,12 @@
"0", "0", "1";
status = "okay";
};

&usb {
extcon = <&muic_sm5502>, <&muic_sm5502>;
status = "okay";
};

&usb_hs_phy {
extcon = <&muic_sm5502>;
};
15 changes: 14 additions & 1 deletion arch/arm64/boot/dts/qcom/msm8916-samsung-gprimeltecan.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
charger: charger {
compatible = "richtek,rt5033-charger";
monitored-battery = <&battery>;
richtek,usb-connector = <&usb_con>;
richtek,usb-connector = <&usb_con_sm5502>;
};
};
};
Expand All @@ -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>;
};
18 changes: 18 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8916-samsung-grandprimelte.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>;
};
21 changes: 21 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8916-samsung-heatqlte.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

#include "msm8916-samsung-rossa-common.dtsi"

/* CYTTSP4 instead of IST3038 */
/delete-node/ &touchscreen;

/*
* NOTE: The original firmware from Samsung can only boot ARM32 kernels.
* Unfortunately, the firmware is signed and cannot be replaced easily.
Expand All @@ -28,6 +31,24 @@
constant-charge-voltage-max-microvolt = <4350000>;
};

&charger {
richtek,usb-connector = <&usb_con_sm5504>;
status = "okay";
};

&muic_sm5504 {
status = "okay";
};

&panel {
compatible = "samsung,s6288a0";
};

&usb {
extcon = <&muic_sm5504>, <&muic_sm5504>;
status = "okay";
};

&usb_hs_phy {
extcon = <&muic_sm5504>;
};
32 changes: 17 additions & 15 deletions arch/arm64/boot/dts/qcom/msm8916-samsung-rossa-common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,26 @@

#include "msm8916-samsung-fortuna-common.dtsi"

/* SM5504 MUIC instead of SM5502 */
/delete-node/ &muic;

/* Touchscreen varies depending on model variant */
/* 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>;
&blsp_i2c5 {
touchscreen: touchscreen@50 {
compatible = "imagis,ist3038";
reg = <0x50>;

interrupts-extended = <&tlmm 13 IRQ_TYPE_EDGE_FALLING>;

touchscreen-size-x = <480>;
touchscreen-size-y = <800>;

vdd-supply = <&reg_vdd_tsp_a>;
vddio-supply = <&pm8916_l6>;

pinctrl-0 = <&tsp_int_default>;
pinctrl-names = "default";

usb_con: connector {
compatible = "usb-b-connector";
label = "micro-USB";
type = "micro";
};
linux,keycodes = <KEY_APPSELECT KEY_BACK>;
};
};

Expand All @@ -35,6 +36,7 @@

&panel {
/delete-property/ backlight;
compatible = "samsung,cprime-panel";
};

&s3fwrn5_nfc {
Expand Down
34 changes: 14 additions & 20 deletions arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,25 @@
constant-charge-voltage-max-microvolt = <4400000>;
};

&blsp_i2c5 {
touchscreen@50 {
compatible = "imagis,ist3038";
reg = <0x50>;

interrupts-extended = <&tlmm 13 IRQ_TYPE_EDGE_FALLING>;

touchscreen-size-x = <480>;
touchscreen-size-y = <800>;

vdd-supply = <&reg_vdd_tsp_a>;
vddio-supply = <&pm8916_l6>;

pinctrl-0 = <&tsp_int_default>;
pinctrl-names = "default";

linux,keycodes = <KEY_APPSELECT KEY_BACK>;
};
&charger {
richtek,usb-connector = <&usb_con_sm5504>;
status = "okay";
};

&mpss_mem {
/* Firmware for rossa needs more space */
reg = <0x0 0x86800000 0x0 0x5800000>;
};

&panel {
compatible = "samsung,cprime-panel";
&muic_sm5504 {
status = "okay";
};

&usb {
extcon = <&muic_sm5504>, <&muic_sm5504>;
status = "okay";
};

&usb_hs_phy {
extcon = <&muic_sm5504>;
};