Skip to content

Instantly share code, notes, and snippets.

@invisiblek

invisiblek/-

Created September 17, 2014 01:55
Show Gist options
  • Save invisiblek/a9e79d5e0a36b642d9a9 to your computer and use it in GitHub Desktop.
Save invisiblek/a9e79d5e0a36b642d9a9 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
-
diff --git a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-camera.dtsi b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-camera.dtsi
index 7139983..f91ddbc 100644
--- a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-camera.dtsi
+++ b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-camera.dtsi
@@ -22,7 +22,7 @@
qcom,cci-master = <0>;
};
- eeprom0: qcom,eeprom@a0 { //EEPROM READ
+ eeprom0: qcom,eeprom@a0 {
cell-index = <0>;
reg = <0xa0 0x0>;
qcom,eeprom-name = "imx135_eeprom";
@@ -34,55 +34,40 @@
qcom,page0 = <0 0x0 2 0x0 1 20>;
qcom,poll0 = <0 0x0 2 0x0 1 20>;
qcom,mem0 = <0x900 0x0000 2 0 1 0>; //EEPROM READ
- };
- qcom,camera_rev_a@20 {
- status = "ok";
- compatible = "qcom,imx135";
- revision = "rev_a";
- reg = <0x20 0x0>;
- qcom,slave-id = <0x20 0x0 0x0>;
- qcom,csiphy-sd-index = <0>;
- qcom,csid-sd-index = <0>;
- qcom,actuator-src = <&actuator0>;
- qcom,led-flash-src = <&led_flash0>;
- qcom,mount-angle = <90>;
- qcom,sensor-name = "imx135";
+
cam_vdig-supply = <&pm8941_l3>;
qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana", "cam_vaf";
qcom,cam-vreg-type = <0 1 0 0 >;
- // Need to be changed the AF setting value as LGIT module: 1.8V, Sony module: 2.8V
qcom,cam-vreg-min-voltage = <1225000 0 0 1800000>;
qcom,cam-vreg-max-voltage = <1225000 0 0 1800000>;
qcom,cam-vreg-op-mode = <105000 0 0 100000>;
qcom,gpio-no-mux = <0>;
- // MAIN_CAM_MCLK, Need to be set as 24MHz, 19.2MHz is set temporarily.
gpios = <&msmgpio 15 0>, // MCLK
- <&msmgpio 90 0>, // MAIN_CAM_RESET
- <&msmgpio 16 0>, // 13M_VANA_EN
- <&msmgpio 96 0>, // 13M_VIO_EN
- <&msmgpio 57 0>, // 13M_VCM_EN
+ <&msmgpio 4 0>, // MAIN_CAM_RESET
+ <&msmgpio 16 0>, // 13M_VANA_EN
+ <&msmgpio 96 0>, // 13M_VIO_EN
+ <&msmgpio 57 0>, // 13M_VCM_EN
<&msmgpio 145 0>, // OIS_LDO_EN
<&msmgpio 29 0>; // OIS_RESET
- qcom,gpio-reset = <1>; // Set gpio_90 as reset
+ qcom,gpio-reset = <1>; // Set gpio_4 as reset
qcom,gpio-vana = <2>; // Set gpio_16 as VANA
- qcom,gpio-vio = <3>; // Set gpio_96 as VIO
- qcom,gpio-vcm = <4>; // Set gpio_57 as VCM
- qcom,gpio-ois-ldo = <5>; // Set gpio_145 as OIS_LDO_EN
- qcom,gpio-ois-reset = <6>; // Set gpio_29 as OIS_RESET
+ qcom,gpio-vio = <3>; // Set gpio_96 as VIO
+ qcom,gpio-vaf = <4>; // Set gpio_57 as VCM
+ qcom,gpio-ois-ldo = <5>; // Set gpio_145 as OIS_LDO_EN
+ qcom,gpio-ois-reset = <6>; // Set gpio_29 as OIS_RESET
qcom,gpio-req-tbl-num = <0 1 2 3 4 5 6>;
qcom,gpio-req-tbl-flags = <0 0 0 0 0 0 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK", "CAM_RESET1", "MAIN_VANA_EN", "MAIN_VIO_EN", "MAIN_VCM_EN", "OIS_LDO_EN", "OIS_RESET";
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x1F>;
- qcom,sensor-position = <0>;
- qcom,sensor-mode = <0>;
- qcom,cci-master = <0>;
+
+ qcom,cam-power-seq-type = "sensor_gpio";
+ qcom,cam-power-seq-val = "sensor_gpio_vio";
+ qcom,cam-power-seq-cfg-val = <1>;
+ qcom,cam-power-seq-delay = <10>;
};
- qcom,camera_rev_b@20 {
+ qcom,camera@20 {
status = "ok";
compatible = "qcom,imx135";
- revision = "rev_b...";
reg = <0x20 0x0>;
qcom,slave-id = <0x20 0x0 0x0>;
qcom,csiphy-sd-index = <0>;
@@ -95,25 +80,23 @@
cam_vdig-supply = <&pm8941_l3>;
qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana", "cam_vaf";
qcom,cam-vreg-type = <0 1 0 0 >;
- // Need to be changed the AF setting value as LGIT module: 1.8V, Sony module: 2.8V
qcom,cam-vreg-min-voltage = <1225000 0 0 1800000>;
qcom,cam-vreg-max-voltage = <1225000 0 0 1800000>;
qcom,cam-vreg-op-mode = <105000 0 0 100000>;
qcom,gpio-no-mux = <0>;
- // MAIN_CAM_MCLK, Need to be set as 24MHz, 19.2MHz is set temporarily.
gpios = <&msmgpio 15 0>, // MCLK
<&msmgpio 4 0>, // MAIN_CAM_RESET
- <&msmgpio 16 0>, // 13M_VANA_EN
- <&msmgpio 96 0>, // 13M_VIO_EN
- <&msmgpio 57 0>, // 13M_VCM_EN
+ <&msmgpio 16 0>, // 13M_VANA_EN
+ <&msmgpio 96 0>, // 13M_VIO_EN
+ <&msmgpio 57 0>, // 13M_VCM_EN
<&msmgpio 145 0>, // OIS_LDO_EN
<&msmgpio 29 0>; // OIS_RESET
qcom,gpio-reset = <1>; // Set gpio_4 as reset
qcom,gpio-vana = <2>; // Set gpio_16 as VANA
- qcom,gpio-vio = <3>; // Set gpio_96 as VIO
- qcom,gpio-vcm = <4>; // Set gpio_57 as VCM
- qcom,gpio-ois-ldo = <5>; // Set gpio_145 as OIS_LDO_EN
- qcom,gpio-ois-reset = <6>; // Set gpio_29 as OIS_RESET
+ qcom,gpio-vio = <3>; // Set gpio_96 as VIO
+ qcom,gpio-vaf = <4>; // Set gpio_57 as VCM
+ qcom,gpio-ois-ldo = <5>; // Set gpio_145 as OIS_LDO_EN
+ qcom,gpio-ois-reset = <6>; // Set gpio_29 as OIS_RESET
qcom,gpio-req-tbl-num = <0 1 2 3 4 5 6>;
qcom,gpio-req-tbl-flags = <0 0 0 0 0 0 0>;
qcom,gpio-req-tbl-label = "CAMIF_MCLK", "CAM_RESET1", "MAIN_VANA_EN", "MAIN_VIO_EN", "MAIN_VCM_EN", "OIS_LDO_EN", "OIS_RESET";
@@ -124,46 +107,9 @@
qcom,cci-master = <0>;
};
- qcom,camera_rev_a@6c {
- status = "ok";
- compatible = "qcom,imx132";
- revision = "rev_a";
- reg = <0x6c 0x0>;
- qcom,slave-id = <0x6c 0x0 0x132>;
- qcom,csiphy-sd-index = <2>;
- qcom,csid-sd-index = <2>;
- qcom,flash-type = <0>;
- qcom,mount-angle = <270>;
- qcom,sensor-name = "imx132";
- cam_vana-supply = <&pm8941_l18>;
- cam_vio-supply = <&pm8941_lvs2>;
- qcom,cam-vreg-name = "cam_vdig", "cam_vio", "cam_vana";
- qcom,cam-vreg-type = <0 1 0>;
- qcom,cam-vreg-min-voltage = <1225000 0 2850000>;
- qcom,cam-vreg-max-voltage = <1225000 0 2850000>;
- qcom,cam-vreg-op-mode = <105000 0 80000>;
- qcom,gpio-no-mux = <0>;
- gpios = <&msmgpio 17 0>, //VT_CAM_MCLK
- <&msmgpio 18 0>, //VT_CAM_RESET
- <&msmgpio 30 0>; //VT_LDO_EN
- qcom,gpio-reset = <1>;
- qcom,gpio-vdig = <2>;
- qcom,gpio-req-tbl-num = <0 1 2>;
- qcom,gpio-req-tbl-flags = <0 0 0>;
- qcom,gpio-req-tbl-label = "CAMIF_MCLK2",
- "CAM_RESET2",
- "VT_LDO_EN";
- qcom,csi-lane-assign = <0x4320>;
- qcom,csi-lane-mask = <0x3>;
- qcom,sensor-position = <1>;
- qcom,sensor-mode = <1>;
- qcom,cci-master = <1>;
- };
-
- qcom,camera_rev_b@6c {
+ qcom,camera@6c {
status = "ok";
compatible = "qcom,imx132";
- revision = "rev_b...";
reg = <0x6c 0x0>;
qcom,slave-id = <0x6c 0x0 0x132>;
qcom,csiphy-sd-index = <2>;
diff --git a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-panel.dtsi b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-panel.dtsi
index ab83d80..2c9c1b5 100644
--- a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-panel.dtsi
+++ b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-panel.dtsi
@@ -10,29 +10,33 @@
* GNU General Public License for more details.
*/
-&soc {
- qcom,mdss_dsi_lgit_video {
- status = "disable";
- qcom,cont-splash-enabled;
- };
-
- qcom,mdss_dsi_lgit_cmd {
- status = "disable";
- lge,mdss-dsi-bit-rate = <964000000>;
- qcom,mdss-pan-dsi-t-clk = <0x1E 0x37>;
- qcom,panel-phy-timingSettings = [
- D1 4A 3D 00 65 59
- 40 4C 62 03 04 00];
+&mdss_dsi0 {
+ qcom,platform-lane-config = [00 00 00 00 00 00 00 01 c8
+ 00 00 00 00 05 00 00 01 c8
+ 00 00 00 00 0a 00 00 01 c8
+ 00 00 00 00 0f 00 00 01 c8
+ 00 c0 00 00 00 00 00 01 bb];
+ qcom,dsi-pref-prim-pan = <&mdss_dsi_g2_lgd_cmd>;
+ qcom,platform-supply-entry2 {
+ qcom,supply-enable-load = <300000>;
};
+};
- qcom,mdss_dsi_jdi_cmd {
- status = "disable";
- };
+&mdss_dsi_g2_lgd_cmd {
+ qcom,mdss-dsi-panel-clock-rate = <919000000>;
+ qcom,panel-phy-timingSettings = [
+ D5 48 3C 00 61 59
+ 3B 4A 5F 03 04 00];
+};
- qcom,mdss_dsi_jdi_video {
- status = "disable";
- };
+&mdss_dsi_g2_jdi_cmd {
+ qcom,mdss-dsi-panel-clock-rate = <919000000>;
+ qcom,panel-phy-timingSettings = [
+ D5 48 3C 00 61 59
+ 3B 4A 5F 03 04 00];
+};
+&soc {
i2c@f9967000 {
lm3630_rev_b@38 {
status = "ok";
@@ -44,17 +48,17 @@
3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
3 3 3 3 4 4 4 4 4 4 4 4 5 5 5
5 5 5 6 6 6 6 6 6 6 6 7 7 7 7
- 8 8 9 9 9 10 10 10 10 11 11 11 12 12 12 13
- 13 13 14 14 17 17 17 18 18 19 19 20 20 21 21
- 22 22 23 23 24 24 25 25 26 27 27 28 28 29 30
- 30 31 32 32 33 34 34 35 36 36 37 38 39 39 40
- 41 42 43 43 44 45 46 47 48 49 50 51 51 52 53
- 54 55 56 57 58 59 60 61 63 64 65 66 67 68 69
- 70 72 73 74 75 76 78 79 80 82 83 84 85 87 88
- 90 91 92 94 95 97 98 100 101 103 104 106 107 109 110
- 112 114 115 117 119 120 122 124 126 127 129 131 133 134 136
- 138 140 142 144 146 148 150 152 154 156 158 160 162 164 166
- 168 170 173 175 177 179 181 184 186 188 191 193 195 198 200>;
+ 8 8 9 9 9 10 10 10 10 11 11 11 12 12 12
+ 13 13 13 14 14 17 17 17 18 18 19 19 20 20 21
+ 21 22 22 23 23 24 24 25 25 26 27 27 28 28 28
+ 34 34 34 35 35 35 36 36 36 37 37 38 38 39 39
+ 40 41 42 43 43 44 45 46 47 48 49 50 51 51 52
+ 53 54 55 56 57 58 59 60 61 63 64 65 66 67 68
+ 69 70 72 73 74 75 76 78 79 80 82 83 84 85 87
+ 88 90 91 92 94 95 97 98 100 101 103 104 106 107 109
+ 110 112 114 115 117 119 120 122 124 126 127 129 131 133 134
+ 136 138 140 142 144 146 148 150 152 154 156 158 160 162 164
+ 166 168 170 173 175 177 179 181 184 186 188 191 193 195 198 200>;
revision = "...rev_a";
};
@@ -68,17 +72,17 @@
3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
3 3 3 3 4 4 4 4 4 4 4 4 5 5 5
5 5 5 6 6 6 6 6 6 6 6 7 7 7 7
- 8 8 9 9 9 10 10 10 10 11 11 11 12 12 12 13
- 13 13 14 14 17 17 17 18 18 19 19 20 20 21 21
- 22 22 23 23 24 24 25 25 26 27 27 28 28 29 30
- 30 31 32 32 33 34 34 35 36 36 37 38 39 39 40
- 41 42 43 43 44 45 46 47 48 49 50 51 51 52 53
- 54 55 56 57 58 59 60 61 63 64 65 66 67 68 69
- 70 72 73 74 75 76 78 79 80 82 83 84 85 87 88
- 90 91 92 94 95 97 98 100 101 103 104 106 107 109 110
- 112 114 115 117 119 120 122 124 126 127 129 131 133 134 136
- 138 140 142 144 146 148 150 152 154 156 158 160 162 164 166
- 168 170 173 175 177 179 181 184 186 188 191 193 195 198 200>;
+ 8 8 9 9 9 10 10 10 10 11 11 11 12 12 12
+ 13 13 13 14 14 17 17 17 18 18 19 19 20 20 21
+ 21 22 22 23 23 24 24 25 25 26 27 27 28 28 28
+ 34 34 34 35 35 35 36 36 36 37 37 38 38 39 39
+ 40 41 42 43 43 44 45 46 47 48 49 50 51 51 52
+ 53 54 55 56 57 58 59 60 61 63 64 65 66 67 68
+ 69 70 72 73 74 75 76 78 79 80 82 83 84 85 87
+ 88 90 91 92 94 95 97 98 100 101 103 104 106 107 109
+ 110 112 114 115 117 119 120 122 124 126 127 129 131 133 134
+ 136 138 140 142 144 146 148 150 152 154 156 158 160 162 164
+ 166 168 170 173 175 177 179 181 184 186 188 191 193 195 198 200>;
revision = "rev_b...";
};
};
diff --git a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-pm.dtsi b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-pm.dtsi
index b191fa8..00bba2f 100644
--- a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-pm.dtsi
+++ b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-pm.dtsi
@@ -85,6 +85,17 @@
&spmi_bus {
qcom,pm8941@0 {
+ qcom,temp-alarm@2400 {
+ spmi-dev-container;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ qcom,chg-bat-if@1200 {
+ status = "ok";
+ reg = <0x1200 0x100>;
+ interrupts = <0x0 0x12 0x0>;
+ interrupt-names = "batt-pres";
+ };
+ };
vadc@3100 {
chan@14 {
diff --git a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw.dtsi b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw.dtsi
index 7d8b9c8..a55915f 100644
--- a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw.dtsi
+++ b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw.dtsi
@@ -97,7 +97,7 @@
/* Below is SDCC2 */
sdcc2_rev_a: qcom,sdcc_rev_a@f98a4000 {
- cell-index = <2>; /* SDC2 SD card slot */
+ cell-index = <2>; /* SDC2 WLAN slot */
compatible = "qcom,msm-sdcc";
reg = <0xf98a4000 0x800>,
<0xf98a4800 0x100>,
@@ -112,7 +112,6 @@
1 &intc 0 220 0
2 &msmgpio 74 0x3>;
interrupt-names = "core_irq", "bam_irq", "wlan_oob_irq";
- qcom,wifi-control-func;
vdd-supply = <&pm8941_l21>;
vdd-io-supply = <&pm8941_l13>;
@@ -155,7 +154,7 @@
};
sdcc2_rev_b: qcom,sdcc_rev_b@f98a4000 {
- cell-index = <2>; /* SDC2 SD card slot */
+ cell-index = <2>; /* SDC2 WLAN slot */
compatible = "qcom,msm-sdcc";
reg = <0xf98a4000 0x800>,
<0xf98a4800 0x100>,
@@ -170,7 +169,6 @@
1 &intc 0 220 0
2 &msmgpio 44 0x3>;
interrupt-names = "core_irq", "bam_irq", "wlan_oob_irq";
- qcom,wifi-control-func;
vdd-supply = <&pm8941_l21>;
vdd-io-supply = <&pm8941_l13>;
@@ -213,7 +211,7 @@
};
sdcc2_rev_c: qcom,sdcc_rev_c@f98a4000 {
- cell-index = <2>; /* SDC2 SD card slot */
+ cell-index = <2>; /* SDC2 WLAN slot */
compatible = "qcom,msm-sdcc";
reg = <0xf98a4000 0x800>,
<0xf98a4800 0x100>,
@@ -228,7 +226,6 @@
1 &intc 0 220 0
2 &msmgpio 44 0x3>;
interrupt-names = "core_irq", "bam_irq", "wlan_oob_irq";
- qcom,wifi-control-func;
vdd-supply = <&pm8941_l21>;
vdd-io-supply = <&pm8941_l13>;
@@ -271,7 +268,7 @@
};
sdcc2_rev_d: qcom,sdcc_rev_d@f98a4000 {
- cell-index = <2>; /* SDC2 SD card slot */
+ cell-index = <2>; /* SDC2 WLAN slot */
compatible = "qcom,msm-sdcc";
reg = <0xf98a4000 0x800>,
<0xf98a4800 0x100>,
@@ -286,7 +283,6 @@
1 &intc 0 220 0
2 &msmgpio 44 0x3>;
interrupt-names = "core_irq", "bam_irq", "wlan_oob_irq";
- qcom,wifi-control-func;
vdd-supply = <&pm8941_l21>;
vdd-io-supply = <&pm8941_s3>;
@@ -328,19 +324,31 @@
status = "ok";
};
- qcom,ion {
- compatible = "qcom,msm-ion";
- #address-cells = <1>;
- #size-cells = <0>;
-
- qcom,ion-heap@23 { /* OTHER PIL HEAP */
- compatible = "qcom,msm-ion-reserve";
- reg = <23>;
- qcom,heap-align = <0x1000>;
- qcom,memory-fixed = <0x05d00000 0x1e00000>;
- qcom,ion-heap-type = "CARVEOUT";
- };
- };
+ memory_hole: qcom,msm-mem-hole {
+ compatible = "qcom,msm-mem-hole";
+ qcom,memblock-remove = <0x5d00000 0x7d00000
+ 0xfa00000 0x500000>; /* Address and Size of Hole */
+ };
+
+ qcom,ion {
+ compatible = "qcom,msm-ion";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ qcom,ion-heap@23 { /* OTHER PIL HEAP */
+ compatible = "qcom,msm-ion-reserve";
+ reg = <23>;
+ qcom,heap-align = <0x1000>;
+ qcom,memory-fixed = <0x05d00000 0x1e00000>;
+ qcom,ion-heap-type = "CARVEOUT";
+ };
+ };
+
+ /* needed for the old aboot */
+ qcom,mdss_dsi_lgit_video {};
+ qcom,mdss_dsi_lgit_cmd {};
+ qcom,mdss_dsi_jdi_cmd {};
+ qcom,mdss_dsi_jdi_video {};
};
&sdcc2 {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment