ARM64: t210: always include non-shim DTB on shim DTB
Laxman Dewangan [Tue, 25 Aug 2015 14:56:01 +0000 (19:56 +0530)]
Make the SHIM-DTB such that it includes the non-shim DTB and
SHIM override.

This way it will avoid the duplications of nodes and entries.

Change-Id: I98cf233559233c6fffd3849baa9a5bc0c9b527d8
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
(cherry picked from commit ab43f164784a67d990314bcf54eb5791c5efac8e)
Reviewed-on: http://git-master/r/790382

18 files changed:
arch/arm64/boot/dts/tegra210-hawkeye-p2290-2302-a01-00-base.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-2302-a01-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-2306-a01-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3302-a01-00-base.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3302-a01-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3303-a01-00-base.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3303-a01-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3303-a02-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3304-a03-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3306-a01-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3306-a02-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3306-a03-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3324-a03-00-base.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3324-a03-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-3326-a03-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-a00-00-base.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-a00-00.dts
arch/arm64/boot/dts/tegra210-hawkeye-p2290-a00-wifi-00.dts

index a240355..c70fd40 100644 (file)
@@ -20,8 +20,7 @@
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-a00-00-base.dts"
-#include "tegra210-platforms/tegra210-sysedp.dtsi"
+#include "tegra210-hawkeye-p2290-3302-a01-00-base.dts"
 
 / {
        nvidia,dtsfilename = __FILE__;
                        };
                };
        };
-
-       i2c@7000c400 {
-               ads1015@4a {
-                       continuous-mode {
-                               ti,adc-valid-threshold-ranges= <(-32)     32
-                                                       238    324
-                                                       980   1295
-                                                       641   860
-                                                       391   533
-                                                       1389  2047>;
-                       };
-               };
-       };
-
-       extcon {
-               extcon@1 {
-                       extcon-adc-jack,states = <0x1   (-32)       32
-                                               0x2     238      324
-                                               0x4     980     1295
-                                               0x8     641     860
-                                               0x10    391     533>;
-               };
-       };
 };
index b7b25c7..c565805 100644 (file)
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-a00-00.dts"
-#include "tegra210-platforms/tegra210-sysedp.dtsi"
+#include "tegra210-hawkeye-p2290-2302-a01-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
        nvidia,boardids = "2290:2302:A01";
        nvidia,proc-boardid = "2290:2302:A01";
-
-       pinmux@700008d4 {
-               unused_lowpower {
-                       modem-controls {
-                               status = "okay";
-                       };
-               };
-       };
-
-       i2c@7000c400 {
-               ads1015@4a {
-                       continuous-mode {
-                               ti,adc-valid-threshold-ranges= <(-32)     32
-                                                       238    324
-                                                       980   1295
-                                                       641   860
-                                                       391   533
-                                                       1389  2047>;
-                       };
-               };
-       };
-
-       extcon {
-               extcon@1 {
-                       extcon-adc-jack,states = <0x1   (-32)       32
-                                               0x2     238      324
-                                               0x4     980     1295
-                                               0x8     641     860
-                                               0x10    391     533>;
-               };
-       };
-
-       sound {
-               nvidia,digital-mic-data-input = "pdm1_di";
-       };
 };
index 1005c4b..4f7cc04 100644 (file)
@@ -20,7 +20,8 @@
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-2302-a01-00.dts"
+#include "tegra210-hawkeye-p2290-2306-a01-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
index 28e42ac..ada4982 100644 (file)
@@ -50,4 +50,8 @@
                                                0x10    391     533>;
                };
        };
+
+       sound {
+               nvidia,digital-mic-data-input = "pdm1_di";
+       };
 };
index e2ed9e3..c788b3d 100644 (file)
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-a00-00.dts"
-#include "tegra210-platforms/tegra210-sysedp.dtsi"
+#include "tegra210-hawkeye-p2290-3302-a01-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
        nvidia,boardids = "2290:3302:A01";
        nvidia,proc-boardid = "2290:3302:A01";
-
-       i2c@7000c400 {
-               ads1015@4a {
-                       continuous-mode {
-                               ti,adc-valid-threshold-ranges= <(-32)     32
-                                                       238    324
-                                                       980   1295
-                                                       641   860
-                                                       391   533
-                                                       1389  2047>;
-                       };
-               };
-       };
-
-       extcon {
-               extcon@1 {
-                       extcon-adc-jack,states = <0x1   (-32)       32
-                                               0x2     238      324
-                                               0x4     980     1295
-                                               0x8     641     860
-                                               0x10    391     533>;
-               };
-       };
-
-       sound {
-               nvidia,digital-mic-data-input = "pdm1_di";
-       };
 };
index be4d531..7f5167f 100644 (file)
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-a00-00-base.dts"
-#include "tegra210-platforms/tegra210-sysedp.dtsi"
+#include "tegra210-hawkeye-p2290-3302-a01-00-base.dts"
 
 / {
        nvidia,dtsfilename = __FILE__;
        nvidia,boardids = "2290:3303:A01";
        nvidia,proc-boardid = "2290:3303:A01";
-
-       i2c@7000c400 {
-               ads1015@4a {
-                       continuous-mode {
-                               ti,adc-valid-threshold-ranges= <(-32)     32
-                                                       238    324
-                                                       980   1295
-                                                       641   860
-                                                       391   533
-                                                       1389  2047>;
-                       };
-               };
-       };
-
-       extcon {
-               extcon@1 {
-                       extcon-adc-jack,states = <0x1   (-32)       32
-                                               0x2     238      324
-                                               0x4     980     1295
-                                               0x8     641     860
-                                               0x10    391     533>;
-               };
-       };
 };
index 26cc409..726e73e 100644 (file)
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-a00-00.dts"
-#include "tegra210-platforms/tegra210-sysedp.dtsi"
+#include "tegra210-hawkeye-p2290-3303-a01-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
        nvidia,boardids = "2290:3303:A01";
        nvidia,proc-boardid = "2290:3303:A01";
-
-       i2c@7000c400 {
-               ads1015@4a {
-                       continuous-mode {
-                               ti,adc-valid-threshold-ranges= <(-32)     32
-                                                       238    324
-                                                       980   1295
-                                                       641   860
-                                                       391   533
-                                                       1389  2047>;
-                       };
-               };
-       };
-
-       extcon {
-               extcon@1 {
-                       extcon-adc-jack,states = <0x1   (-32)       32
-                                               0x2     238      324
-                                               0x4     980     1295
-                                               0x8     641     860
-                                               0x10    391     533>;
-               };
-       };
-
-       sound {
-               nvidia,digital-mic-data-input = "pdm1_di";
-       };
 };
index b5d0efc..40d39bf 100644 (file)
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-3303-a01-00.dts"
-#include "tegra210-platforms/tegra210-hawkeye-pinmux-p2290-1100-a02.dtsi"
-#include "tegra210-platforms/tegra210-hawkeye-sensor-p2290-1100-a02.dtsi"
+#include "tegra210-hawkeye-p2290-3303-a02-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
        nvidia,boardids = "2290:3303:A02";
        nvidia,proc-boardid = "2290:3303:A02";
-
-       i2c@7000c400 {
-               tps65132@3e {
-                       tps65132_outn: outn {
-                          ti,active-discharge-gpio = <&gpio TEGRA_GPIO(A, 0) 0>;
-                          ti,active-discharge-time = <2000>; /* in us */
-                  };
-               };
-       };
 };
index 8c596f1..9c8870c 100644 (file)
@@ -20,7 +20,8 @@
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-3326-a03-00.dts"
+#include "tegra210-hawkeye-p2290-3304-a03-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
index 38ed54e..5243ebd 100644 (file)
@@ -20,7 +20,8 @@
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-3303-a01-00.dts"
+#include "tegra210-hawkeye-p2290-3306-a01-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
index d8ccccd..90262d0 100644 (file)
@@ -20,9 +20,8 @@
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-3303-a02-00.dts"
-#include "tegra210-platforms/tegra210-hawkeye-pinmux-p2290-1100-a02.dtsi"
-#include "tegra210-platforms/tegra210-hawkeye-sensor-p2290-1100-a02.dtsi"
+#include "tegra210-hawkeye-p2290-3306-a02-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
index 4388582..d0959a1 100644 (file)
@@ -20,7 +20,8 @@
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-3304-a03-00.dts"
+#include "tegra210-hawkeye-p2290-3306-a03-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
index fc03478..7b182be 100644 (file)
        nvidia,dtsfilename = __FILE__;
        nvidia,boardids = "2290:3324:A03";
        nvidia,proc-boardid = "2290:3324:A03";
+
+       sound {
+               nvidia,digital-mic-data-input = "pdm0_di";
+       };
+
+       udc@7d000000 {
+               status = "okay";
+       };
+
+       otg@7d000000 {
+               status = "okay";
+       };
 };
index 14e1f38..c1a3729 100644 (file)
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-3306-a02-00.dts"
-#include "tegra210-platforms/tegra210-hawkeye-sensor-p2290-1100-a03.dtsi"
+#include "tegra210-hawkeye-p2290-3324-a03-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
        nvidia,boardids = "2290:3324:A03";
        nvidia,proc-boardid = "2290:3324:A03";
 
-       sound {
-               nvidia,digital-mic-data-input = "pdm0_di";
-       };
 };
index f770dd3..aac43e8 100644 (file)
@@ -20,7 +20,8 @@
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-3324-a03-00.dts"
+#include "tegra210-hawkeye-p2290-3326-a03-00-base.dts"
+#include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
index 7a07763..c8c7c6c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * tegra210-hawkeye-p2290-a00-00.dts: Hawkeye P2290 A00 board.
+ * tegra210-hawkeye-p2290-a00-00-base.dts: Hawkeye P2290 A00 board.
  *
  * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
  *
        nvidia,proc-boardid = "2290:0000:A0";
 
        sysedp_batmon_calc {
-               /* non-shipping ST8 battery */
                compatible = "nvidia,tegra124-sysedp_batmon_calc";
                ocv_lut = <
-                       100 4322580
-                       80  4084489
-                       60  3913651
-                       40  3795200
-                       20  3700276
-                       0   3500000
+                       100 4322372
+                       80  4070378
+                       60  3891481
+                       40  3790013
+                       20  3730816
+                       0   3484195
                >;
                ibat_lut = <
-                       600    9000
-                       (-600) 9000
-                       (-700) 0
+                       600 9000
+                       S32_TO_U32(-200) 9000
+                       S32_TO_U32(-300) 0
                >;
                rbat_data = <
                /*      600     450     300     220     150     50      0       -100   deci Celsius */
-                       67033   67033   65082   65563   74248   101262  142941  142941  /* 100% SOC */
-                       67004   67004   65118   64381   73787   100638  142065  142065  /* 80% SOC  */
-                       67103   67103   65371   64000   70778   90388   114825  114825  /* 60% SOC  */
-                       67408   67408   65894   64533   70229   87182   104433  104433  /* 40% SOC  */
-                       68272   68272   67117   65945   71666   89842   108942  108942  /* 20% SOC  */
-                       72328   72328   71869   71538   81803   95724   118174  118174  /* 0% SOC   */
+                       56863   58039   61627   67627   78392   107716  205255  205255  /* 100% SOC */
+                       56863   58039   61627   67608   78392   130762  206304  206304  /* 80% SOC  */
+                       56863   57451   61647   68824   80784   136468  207774  207774  /* 60% SOC  */
+                       56088   59235   62824   70608   84980   154188  228354  228354  /* 40% SOC  */
+                       56863   59235   66431   76000   97549   181734  248747  248747  /* 20% SOC  */
+                       58824   60431   74196   99333   134647  197775  259098  259098  /* 0% SOC   */
                >;
                temp_axis = <600 450 300 220 150 50 0 (-100)>;
                capacity_axis = <100 80 60 40 20 0>;
index ccfd983..0100e55 100644 (file)
  * more details.
  */
 
-#include "tegra210-hawkeye-p2290-common.dtsi"
-#include "tegra210-platforms/tegra210-sysedp-670d.dtsi"
+#include "tegra210-hawkeye-p2290-a00-00-base.dts"
 #include "tegra210-hawkeye-p2290-shim.dtsi"
 
 / {
        nvidia,dtsfilename = __FILE__;
        nvidia,boardids = "2290:0000:A0";
        nvidia,proc-boardid = "2290:0000:A0";
-
-       sysedp_batmon_calc {
-               compatible = "nvidia,tegra124-sysedp_batmon_calc";
-               ocv_lut = <
-                       100 4322372
-                       80  4070378
-                       60  3891481
-                       40  3790013
-                       20  3730816
-                       0   3484195
-               >;
-               ibat_lut = <
-                       600 9000
-                       S32_TO_U32(-200) 9000
-                       S32_TO_U32(-300) 0
-               >;
-               rbat_data = <
-               /*      600     450     300     220     150     50      0       -100   deci Celsius */
-                       56863   58039   61627   67627   78392   107716  205255  205255  /* 100% SOC */
-                       56863   58039   61627   67608   78392   130762  206304  206304  /* 80% SOC  */
-                       56863   57451   61647   68824   80784   136468  207774  207774  /* 60% SOC  */
-                       56088   59235   62824   70608   84980   154188  228354  228354  /* 40% SOC  */
-                       56863   59235   66431   76000   97549   181734  248747  248747  /* 20% SOC  */
-                       58824   60431   74196   99333   134647  197775  259098  259098  /* 0% SOC   */
-               >;
-               temp_axis = <600 450 300 220 150 50 0 (-100)>;
-               capacity_axis = <100 80 60 40 20 0>;
-               power_supply = "battery";
-               r_const = <40000>;
-               vsys_min = <3000000>;
-               update_interval = <30000>;
-       };
-
-       sysedp {
-               compatible = "nvidia,tegra124-sysedp";
-               consumers {
-                       consumer8 {
-                               /* non-shipping ST8 AUO 8" display */
-                               nvidia,consumer_name = "dsi_0";
-                               nvidia,states = <0 616>;
-                       };
-               };
-       };
 };
index 53c7dc7..8bfa4ff 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * tegra210-hawkeye-p2290-a00-00.dts: For wifi sku.
+ * tegra210-hawkeye-p2290-a00-wifi-00.dts: For wifi sku.
  *
  * Copyright (c) 2014-2015, NVIDIA CORPORATION.  All rights reserved.
  *