Skip to content
This repository has been archived by the owner on Jan 12, 2024. It is now read-only.

Commit

Permalink
Merge "ARM: dts: enable gpios and mpps selectively for pm8994"
Browse files Browse the repository at this point in the history
  • Loading branch information
Linux Build Service Account authored and Gerrit - the friendly Code Review server committed Oct 8, 2014
2 parents d862d2b + 45d4de6 commit 25972f4
Show file tree
Hide file tree
Showing 6 changed files with 107 additions and 3 deletions.
29 changes: 29 additions & 0 deletions arch/arm/boot/dts/qcom/msm-pm8994.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,106 +90,127 @@
gpio@c000 {
reg = <0xc000 0x100>;
qcom,pin-num = <1>;
status = "disabled";
};

gpio@c100 {
reg = <0xc100 0x100>;
qcom,pin-num = <2>;
status = "disabled";
};

gpio@c200 {
reg = <0xc200 0x100>;
qcom,pin-num = <3>;
status = "disabled";
};

gpio@c300 {
reg = <0xc300 0x100>;
qcom,pin-num = <4>;
status = "disabled";
};

gpio@c400 {
reg = <0xc400 0x100>;
qcom,pin-num = <5>;
status = "disabled";
};

gpio@c500 {
reg = <0xc500 0x100>;
qcom,pin-num = <6>;
status = "disabled";
};

gpio@c600 {
reg = <0xc600 0x100>;
qcom,pin-num = <7>;
status = "disabled";
};

gpio@c700 {
reg = <0xc700 0x100>;
qcom,pin-num = <8>;
status = "disabled";
};

gpio@c800 {
reg = <0xc800 0x100>;
qcom,pin-num = <9>;
status = "disabled";
};

gpio@c900 {
reg = <0xc900 0x100>;
qcom,pin-num = <10>;
status = "disabled";
};

gpio@ca00 {
reg = <0xca00 0x100>;
qcom,pin-num = <11>;
status = "disabled";
};

gpio@cb00 {
reg = <0xcb00 0x100>;
qcom,pin-num = <12>;
status = "disabled";
};

gpio@cc00 {
reg = <0xcc00 0x100>;
qcom,pin-num = <13>;
status = "disabled";
};

gpio@cd00 {
reg = <0xcd00 0x100>;
qcom,pin-num = <14>;
status = "disabled";
};

gpio@ce00 {
reg = <0xce00 0x100>;
qcom,pin-num = <15>;
status = "disabled";
};

gpio@cf00 {
reg = <0xcf00 0x100>;
qcom,pin-num = <16>;
status = "disabled";
};

gpio@d000 {
reg = <0xd000 0x100>;
qcom,pin-num = <17>;
status = "disabled";
};

gpio@d100 {
reg = <0xd100 0x100>;
qcom,pin-num = <18>;
status = "disabled";
};

gpio@d200 {
reg = <0xd200 0x100>;
qcom,pin-num = <19>;
status = "disabled";
};

gpio@d300 {
reg = <0xd300 0x100>;
qcom,pin-num = <20>;
status = "disabled";
};

gpio@d500 {
reg = <0xd500 0x100>;
qcom,pin-num = <22>;
status = "disabled";
};
};

Expand All @@ -205,41 +226,49 @@
mpp@a000 {
reg = <0xa000 0x100>;
qcom,pin-num = <1>;
status = "disabled";
};

mpp@a100 {
reg = <0xa100 0x100>;
qcom,pin-num = <2>;
status = "disabled";
};

mpp@a200 {
reg = <0xa200 0x100>;
qcom,pin-num = <3>;
status = "disabled";
};

mpp@a300 {
reg = <0xa300 0x100>;
qcom,pin-num = <4>;
status = "disabled";
};

mpp@a400 {
reg = <0xa400 0x100>;
qcom,pin-num = <5>;
status = "disabled";
};

mpp@a500 {
reg = <0xa500 0x100>;
qcom,pin-num = <6>;
status = "disabled";
};

mpp@a600 {
reg = <0xa600 0x100>;
qcom,pin-num = <7>;
status = "disabled";
};

mpp@a700 {
reg = <0xa700 0x100>;
qcom,pin-num = <8>;
status = "disabled";
};
};

Expand Down
14 changes: 14 additions & 0 deletions arch/arm/boot/dts/qcom/msm-pmi8994.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,51 +39,61 @@
gpio@c000 {
reg = <0xc000 0x100>;
qcom,pin-num = <1>;
status = "disabled";
};

gpio@c100 {
reg = <0xc100 0x100>;
qcom,pin-num = <2>;
status = "disabled";
};

gpio@c200 {
reg = <0xc200 0x100>;
qcom,pin-num = <3>;
status = "disabled";
};

gpio@c300 {
reg = <0xc300 0x100>;
qcom,pin-num = <4>;
status = "disabled";
};

gpio@c400 {
reg = <0xc400 0x100>;
qcom,pin-num = <5>;
status = "disabled";
};

gpio@c500 {
reg = <0xc500 0x100>;
qcom,pin-num = <6>;
status = "disabled";
};

gpio@c600 {
reg = <0xc600 0x100>;
qcom,pin-num = <7>;
status = "disabled";
};

gpio@c700 {
reg = <0xc700 0x100>;
qcom,pin-num = <8>;
status = "disabled";
};

gpio@c800 {
reg = <0xc800 0x100>;
qcom,pin-num = <9>;
status = "disabled";
};

gpio@c900 {
reg = <0xc900 0x100>;
qcom,pin-num = <10>;
status = "disabled";
};
};

Expand All @@ -99,21 +109,25 @@
mpp@a000 {
reg = <0xa000 0x100>;
qcom,pin-num = <1>;
status = "disabled";
};

mpp@a100 {
reg = <0xa100 0x100>;
qcom,pin-num = <2>;
status = "disabled";
};

mpp@a200 {
reg = <0xa200 0x100>;
qcom,pin-num = <3>;
status = "disabled";
};

mpp@a300 {
reg = <0xa300 0x100>;
qcom,pin-num = <4>;
status = "disabled";
};
};

Expand Down
18 changes: 18 additions & 0 deletions arch/arm/boot/dts/qcom/msm8994-cdp.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,20 +506,23 @@
qcom,pull = <0>;
qcom,vin-sel = <2>;
qcom,src-sel = <0>;
status = "okay";
};

gpio@c300 { /* GPIO 4 */
qcom,mode = <0>;
qcom,pull = <0>;
qcom,vin-sel = <2>;
qcom,src-sel = <0>;
status = "okay";
};

gpio@c400 { /* GPIO 5 */
qcom,mode = <0>;
qcom,pull = <0>;
qcom,vin-sel = <2>;
qcom,src-sel = <0>;
status = "okay";
};

gpio@c600 { /* GPIO 7 */
Expand All @@ -529,6 +532,7 @@
qcom,vin-sel = <2>; /* QPNP_PIN_VIN2 */
qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */
qcom,master-en = <1>;
status = "okay";
};

gpio@c900 { /* GPIO 10 */
Expand All @@ -538,6 +542,7 @@
qcom,vin-sel = <2>; /* QPNP_PIN_VIN2 */
qcom,src-sel = <2>; /* QPNP_PIN_SEL_FUNC_1 */
qcom,master-en = <1>;
status = "okay";
};

gpio@c700 { /* GPIO 8 */
Expand All @@ -549,6 +554,7 @@
qcom,src-sel = <0>; /* Constant */
qcom,out-strength = <1>; /* Low drive strength */
qcom,master-en = <1>; /* Enable GPIO */
status = "okay";
};

gpio@c800 { /* GPIO 9 */
Expand All @@ -559,6 +565,11 @@
qcom,src-sel = <0>; /* Constant */
qcom,out-strength = <1>; /* High drive strength */
qcom,master-en = <1>; /* Enable GPIO */
status = "okay";
};

gpio@cd00 { /* GPIO 14 */
status = "okay";
};

gpio@ce00 { /* GPIO 15 */
Expand All @@ -569,6 +580,7 @@
qcom,out-strength = <1>;
qcom,src-sel = <2>;
qcom,master-en = <1>;
status = "okay";
};

gpio@d100 { /* GPIO 18 */
Expand All @@ -579,6 +591,7 @@
qcom,src-sel = <3>; /* Function 2 */
qcom,out-strength = <2>; /* Medium */
qcom,master-en = <1>; /* Enable GPIO */
status = "okay";
};

gpio@d200 { /* GPIO 19 */
Expand All @@ -588,6 +601,7 @@
qcom,src-sel = <0>; /* GPIO */
qcom,invert = <0>; /* Invert */
qcom,master-en = <1>; /* Enable GPIO */
status = "okay";
};
};

Expand All @@ -601,6 +615,7 @@
qcom,vin-sel = <2>; /* S4 1.8V */
qcom,src-sel = <0>; /* Constant */
qcom,master-en = <1>; /* Enable GPIO */
status = "okay";
};

mpp@a300 { /* MPP 4 */
Expand All @@ -611,6 +626,7 @@
qcom,src-sel = <0>; /* Constant */
qcom,master-en = <1>; /* Enable GPIO */
qcom,invert = <0>;
status = "okay";
};
};

Expand All @@ -621,11 +637,13 @@
qcom,vin-sel = <2>; /* S4 1.8V */
qcom,src-sel = <7>; /* DTEST4 */
qcom,master-en = <1>; /* Enable MPP */
status = "okay";
};
mpp@a300 { /* MPP 4 */
/* WLED FET */
qcom,mode = <1>;
qcom,master-en = <1>;
status = "okay";
};
};

Expand Down
Loading

0 comments on commit 25972f4

Please sign in to comment.