arm64: dts: qcom: msm8916-samsung-coreprimeltevzw: add device tree#409
arm64: dts: qcom: msm8916-samsung-coreprimeltevzw: add device tree#409chipmunkmc wants to merge 2 commits intomsm8916-mainline:msm8916/6.12.1from
Conversation
chipmunkmc
force-pushed
the
coreprimeltevzw-support
branch
from
e81b8be to
b61110f
Compare
| /* PN547 NFC instead of S3FWRN5 */ | ||
| &s3fwrn5_nfc { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &pn547_nfc { | ||
| status = "okay"; | ||
| }; |
There was a problem hiding this comment.
Does NFC exist on Verizon branded phones?
There was a problem hiding this comment.
I'm not sure. I did not see any NFC settings on stock SM-G360V Android, nor on stock SM-G360R6 (see note), however the device tree does mention that NFC controller.
Note: a system.img for SM-G360R6 apparently is larger than SM-G360V's system partition so I had to manually copy its contents to an existing system partition with rsync. Wi-Fi did not work on it, probably due to firmware signatures.
There was a problem hiding this comment.
3G variants also have PN547 in downstream device trees but the chip doesn't really exist.
The NFC antenna of fortuna and rossa is integrated into stock battery.
If the antenna is missing, then it's not NFC variant.
There was a problem hiding this comment.
3G variants also have PN547 in downstream device trees but the chip doesn't really exist. The NFC antenna of fortuna and rossa is integrated into stock battery. If the antenna is missing, then it's not NFC variant.
I do not have any stock batteries, although there were no antennas in the two replacement batteries I have. Since NFC is not mentioned in Android either, I suppose I will remove it for now.
| &panel { | ||
| compatible = "samsung,cprime-panel"; | ||
| }; |
There was a problem hiding this comment.
Ideally we would like to have it in upstream, and the panel part could be split into another commit.
arch/arm64/boot/dts/qcom/Makefile
Outdated
| dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb | ||
| dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e5.dtb | ||
| dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e7.dtb | ||
| dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-coreprimeltevzw.dtb |
There was a problem hiding this comment.
| dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb | |
| dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e5.dtb | |
| dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e7.dtb | |
| dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-coreprimeltevzw.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 |
| &blsp_i2c1 { | ||
| status = "okay"; | ||
|
|
||
| muic: extcon@25 { |
There was a problem hiding this comment.
| &blsp_i2c1 { | |
| status = "okay"; | |
| muic: extcon@25 { | |
| &blsp_i2c1 { | |
| muic: extcon@25 { |
&blsp_i2c1 is already enabled in msm8916-samsung-fortuna-common.dtsi.
|
I will make the suggested changes after some testing. |
Signed-off-by: Max McNamee <maxmcnamee@proton.me>
chipmunkmc
force-pushed
the
coreprimeltevzw-support
branch
from
b61110f to
c9745e4
Compare
|
I forgot to sign off on the panel commit, oops |
Signed-off-by: Max McNamee <maxmcnamee@proton.me>
chipmunkmc
force-pushed
the
coreprimeltevzw-support
branch
from
c9745e4 to
e4fccab
Compare
wonderfulShrineMaidenOfParadise
left a comment
wonderfulShrineMaidenOfParadise
left a comment
There was a problem hiding this comment.
Although building check using gcc is broken, the patch set looks good to me.
| #include "msm8916-samsung-rossa-common.dtsi" | ||
|
|
||
| /* SM5502 MUIC instead of SM5504 */ | ||
| /delete-node/ &muic; |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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.
3 participants
This adds a device tree for the SM-G360V/SM-G360R6 variants of the Samsung Galaxy Core Prime. Issues:
no-modemrpoc mode, and[ 26.466333] platform 7702000.sound: deferred probe pending: qcom-apq8016-sbc: MultiMedia1: error getting cpu dai namegets printed to dmesg.