forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 149
arm64: dts: qcom: msm8916-samsung-coreprimeltevzw: add device tree #409
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.
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
ChipmunkMC
wants to merge
2
commits into
msm8916-mainline:msm8916/6.12.1
Choose a base branch
from
ChipmunkMC:coreprimeltevzw-support
base: msm8916/6.12.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
arch/arm64/boot/dts/qcom/msm8916-samsung-coreprimeltevzw.dts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
|
||
/ { | ||
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 = <®_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
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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"; | ||
}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds better with this. I was worrying about convincing maintainers in LKML.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in #411