Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3u-eur.dtb
dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5-zt.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
69 changes: 69 additions & 0 deletions arch/arm64/boot/dts/qcom/msm8916-samsung-coreprimeltevzw.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// SPDX-License-Identifier: GPL-2.0-only

/dts-v1/;

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

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

Choose a reason for hiding this comment

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

I feel like this back and forth of deleting SM5502 and SM5504 goes a bit too far now. fortuna-common.dtsi defines SM5502, which is then replaced to SM5504 in rossa-common.dtsi, and then you go back to SM5502 here again?

Perhaps @wonderfulShrineMaidenOfParadise can help clean this up a bit, e.g.:

  • You could derive directly from fortuna-common in coreprimeltevzw, or
  • You could follow a pattern similar to the accelerometer/sensors in fortuna-common.dtsi and define both SM5502 and SM5504 in fortuna-common.dtsi, and then enable what is there for each of the boards.

Choose a reason for hiding this comment

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

You could follow a pattern similar to the accelerometer/sensors in fortuna-common.dtsi and define both SM5502 and SM5504 in fortuna-common.dtsi, and then enable what is there for each of the boards.

Sounds better with this. I was worrying about convincing maintainers in LKML.

Choose a reason for hiding this comment

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

Done in #411


/ {
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>;
};

&blsp_i2c1 {
muic: extcon@25 {
compatible = "siliconmitus,sm5502-muic";
reg = <0x25>;
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@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>;
};
};

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

&panel {
compatible = "samsung,cprime-panel";
};
Comment on lines +63 to +65
Copy link

@wonderfulShrineMaidenOfParadise wonderfulShrineMaidenOfParadise Sep 2, 2025

Choose a reason for hiding this comment

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

Ideally we would like to have it in upstream, and the panel part could be split into another commit.


&s3fwrn5_nfc {
status = "disabled";
};
Loading