-
Notifications
You must be signed in to change notification settings - Fork 9
ARM: dts: qcom: msm8226-motorola-titan: Enable WiFi and touchscreen #21
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
base: qcom-msm8226-6.16.y
Are you sure you want to change the base?
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -84,6 +84,15 @@ | |
| regulator-boot-on; | ||
| }; | ||
|
|
||
| vdd_touch_vreg: regulator-vdd-touch { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "vdd_touch"; | ||
|
|
||
| gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; | ||
| startup-delay-us = <300>; | ||
| enable-active-high; | ||
| }; | ||
|
|
||
| reserved-memory { | ||
| #address-cells = <1>; | ||
| #size-cells = <1>; | ||
|
|
@@ -146,6 +155,40 @@ | |
| }; | ||
| }; | ||
|
|
||
| &blsp1_i2c5 { | ||
| status = "okay"; | ||
|
|
||
| touchscreen@20 { | ||
| compatible = "syna,rmi4-i2c"; | ||
| reg = <0x20>; | ||
|
|
||
| interrupt-parent = <&tlmm>; | ||
| interrupts = <17 IRQ_TYPE_NONE>; | ||
|
|
||
| vdd-supply = <&vdd_touch_vreg>; | ||
| vio-supply = <&pm8226_lvs1>; | ||
|
|
||
| pinctrl-0 = <&touch_pin>; | ||
| pinctrl-1 = <&tp_avdd_en_default_state>, <&tp_avdd_en_suspend_state>; | ||
| pinctrl-names = "default", "sleep"; | ||
|
Member
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. this looks bogus, you can't request both tp_avdd_en_default_state and tp_avdd_en_suspend_state at the same time. Just put the tp_avdd_en_suspend_state pinctrl on the regulator-fixed where it belongs, and drop the tp_avdd_en_suspend_state.
Author
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. Yes, I got confused about how to map these. I think I need to move the Then are you saying I should add
Author
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. I not sure exactly what I need to do here. I don't think that I wasn't sure how to convert the And I've deleted the It all still works, so perhaps this is OK? |
||
|
|
||
| syna,startup-delay-ms = <100>; | ||
|
|
||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| rmi4-f01@1 { | ||
| reg = <0x1>; | ||
| syna,nosleep-mode = <1>; | ||
| }; | ||
|
|
||
| rmi4-f11@11 { | ||
| reg = <0x11>; | ||
| syna,sensor-type = <1>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &pm8226_vib { | ||
| status = "okay"; | ||
| }; | ||
|
|
@@ -180,8 +223,10 @@ | |
| }; | ||
|
|
||
| pm8226_l3: l3 { | ||
| /* WCNSS */ | ||
| regulator-min-microvolt = <750000>; | ||
| regulator-max-microvolt = <1337500>; | ||
| regulator-always-on; | ||
|
Member
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.
Author
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. I've narrowed this down to just Looking at downstream, this is the (Also, it's not immediately clear to me what upstream property matches this.) |
||
| }; | ||
|
|
||
| pm8226_l4: l4 { | ||
|
|
@@ -207,8 +252,10 @@ | |
| }; | ||
|
|
||
| pm8226_l8: l8 { | ||
| /* WCNSS */ | ||
| regulator-min-microvolt = <1800000>; | ||
| regulator-max-microvolt = <1800000>; | ||
| regulator-always-on; | ||
| }; | ||
|
|
||
| pm8226_l9: l9 { | ||
|
|
@@ -354,6 +401,30 @@ | |
| v3p3-supply = <&pm8226_l20>; | ||
| }; | ||
|
|
||
| &pronto { | ||
| status = "okay"; | ||
|
Member
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. status should be last property
Author
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. After
Member
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. yeah, properties always need to be before subnodes, otherwise it doesn't build |
||
|
|
||
| vddmx-supply = <&pm8226_l3>; | ||
| vddpx-supply = <&pm8226_l6>; | ||
|
|
||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&wcnss_pin_a>; | ||
|
|
||
| iris { | ||
| compatible = "qcom,wcn3620"; | ||
| vddxo-supply = <&pm8226_l10>; | ||
| vddrfa-supply = <&pm8226_l24>; | ||
| vddpa-supply = <&pm8226_l16>; | ||
| vdddig-supply = <&pm8226_l24>; | ||
| }; | ||
|
|
||
| smd-edge { | ||
| wcnss { | ||
| status = "okay"; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &tlmm { | ||
| reg_lcd_default: reg-lcd-default-state { | ||
| pins = "gpio12", "gpio13"; | ||
|
|
@@ -363,10 +434,53 @@ | |
| output-high; | ||
| }; | ||
|
|
||
| touch_pin: touch-state { | ||
| reset-pins { | ||
| pins = "gpio16"; | ||
| function = "gpio"; | ||
|
|
||
| drive-strength = <2>; | ||
| bias-pull-up; | ||
| output-high; | ||
|
daviewales marked this conversation as resolved.
Outdated
|
||
| }; | ||
|
|
||
| int-pins { | ||
| pins = "gpio17"; | ||
| function = "gpio"; | ||
|
|
||
| drive-strength = <2>; | ||
| bias-disable; | ||
| input; | ||
|
daviewales marked this conversation as resolved.
Outdated
|
||
| }; | ||
| }; | ||
|
|
||
| sdhc2_cd_default: sdhc2-cd-default-state { | ||
| pins = "gpio38"; | ||
| function = "gpio"; | ||
| drive-strength = <2>; | ||
| bias-pull-up; | ||
| }; | ||
|
|
||
| wcnss_pin_a: wcnss-pin-active-state { | ||
| pins = "gpio40", "gpio41", "gpio42", "gpio43", "gpio44"; | ||
| function = "wlan"; | ||
| drive-strength = <2>; | ||
| bias-pull-up; | ||
| }; | ||
|
|
||
| tp_avdd_en_default_state: touch-avdd-en-pin-default-state { | ||
| pins = "gpio73"; | ||
| function = "gpio"; | ||
| drive-strength = <2>; | ||
| bias-pull-up; | ||
| output-high; | ||
| }; | ||
|
|
||
| tp_avdd_en_suspend_state: touch-avdd-en-pin-suspend-state { | ||
| pins = "gpio73"; | ||
| function = "gpio"; | ||
| drive-strength = <2>; | ||
| bias-pull-down; | ||
| input; | ||
| }; | ||
|
daviewales marked this conversation as resolved.
Outdated
|
||
| }; | ||
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.
Use
interrupts-extended = <&tlmm 17 IRQ_TYPE_*>and use properIRQ_TYPE_*definition, IRQ_TYPE_NONE is not a valid interrupt type.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.
In downstream, it has the following:
When I looked up the
IRQ_TYPE_*definitions ininclude/dt-bindings/interrupt-controller/irq.h, it defines:#define IRQ_TYPE_NONE 0So I figured that was what I needed if downstream had
0set as the interrupt type?Uh oh!
There was an error while loading. Please reload this page.
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.
IRQ_TYPE_NONE is just not a valid interrupt type, it's one of the 4 others (edge rising, edge falling, trigger high, trigger low). That's then just not specified correctly on downstream.
Try looking into what other dts files with the same compatible use as interrupt type, or just try the 4 separately to find which ones work correctly.
Also you should get a big warning on bootup if you have that NONE specified.