ARM: tegra: remove unused dts/dtsi file for ardbeg

Remove unused dts/dtsi file for ardbeg and move the older used
dts file to use the dts file which is as per DTS nomenclature.

Change-Id: I9c4578caa6118051aed0bbbe84a53495b87eabdd
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/384995

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5bc3b1088357609091493cbfe3a40e2a5ba319de..f558bffb007e2aade35d0c9cc2595ef7431a170c 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -206,9 +206,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
        tegra124-bonaire_sim.dtb \
        tegra124-bonaire.dtb \
        tegra124-ardbeg.dtb \
-       tegra124-ardbeg-battery.dtb \
        tegra124-ardbeg-a03-00.dtb \
-       tegra124-ardbeg-a03-00-battery.dtb \
        tegra124-ardbeg-e1792-1100-a00-00.dtb \
        tegra124-ardbeg-e1792-1100-a00-01.dtb \
        tegra124-ardbeg-e1780-1000-a00-00.dtb \

diff --git a/arch/arm/boot/dts/tegra124-ardbeg-a03-00-battery.dts b/arch/arm/boot/dts/tegra124-ardbeg-a03-00-battery.dts
deleted file mode 100644 (file)
index c998908..0000000
--- a/arch/arm/boot/dts/tegra124-ardbeg-a03-00-battery.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "tegra124-ardbeg-a03-00.dts"
-/ {
-       i2c@7000c400 {
-               bq20z75@0b {
-                       status = "okay";
-               };
-               bq2477x@6a {
-                       status = "okay";
-               };
-       };
-};

diff --git a/arch/arm/boot/dts/tegra124-ardbeg-a03-00.dts b/arch/arm/boot/dts/tegra124-ardbeg-a03-00.dts
index 3bc660798c4349fcf6d9f54e35839c3a300c1056..f3d027102e8a90cec6a9e6a193a67b0958c8b2c5 100644 (file)
--- a/arch/arm/boot/dts/tegra124-ardbeg-a03-00.dts
+++ b/arch/arm/boot/dts/tegra124-ardbeg-a03-00.dts
@@ -1,14 +1 @@
-/dts-v1/;
-
-#include "tegra124-ardbeg-a03.dtsi"
-#include "tegra124-platforms/tegra124-ardbeg-powermon-e1780-1000-a01.dtsi"
-#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi"
-#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi"
-
-/ {
-       model = "NVIDIA Tegra124 Ardbeg";
-       compatible = "nvidia,ardbeg", "nvidia,tegra124";
-       nvidia,boardids = "1780:1000:3:B:3";
-       nvidia,dtsfilename = __FILE__;
-};
+#include "tegra124-ardbeg-e1780-1000-a03-00.dts"

diff --git a/arch/arm/boot/dts/tegra124-ardbeg-a03.dtsi b/arch/arm/boot/dts/tegra124-ardbeg-a03.dtsi
deleted file mode 100644 (file)
index 69b8261..0000000
--- a/arch/arm/boot/dts/tegra124-ardbeg-a03.dtsi
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "tegra124-ardbeg.dtsi"
-
-/ {
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       chosen {
-               bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk";
-               linux,initrd-start = <0x85000000>;
-               linux,initrd-end = <0x851bc400>;
-       };
-
-        serial@70006000 {
-                compatible = "nvidia,tegra114-hsuart";
-                status = "okay";
-        };
-
-        serial@70006040 {
-                compatible = "nvidia,tegra114-hsuart";
-                status = "okay";
-        };
-
-        serial@70006200 {
-                compatible = "nvidia,tegra114-hsuart";
-                status = "okay";
-        };
-
-       memory@0x80000000 {
-               device_type = "memory";
-               reg = <0x0 0x80000000 0x0 0x80000000>;
-       };
-
-       i2c@7000c400 {
-               bq20z75@0b {
-                       compatible = "sbs,sbs-battery";
-                       reg = <0x0b>;
-                       status = "disabled";
-                       sbs,i2c-retry-count = <2>;
-                       sbs,poll-retry-count = <100>;
-               };
-
-               bq2477x@6a {
-                       compatible = "ti,bq2477x";
-                       reg = <0x6a>;
-                       status = "disabled";
-                       ti,dac-ichg = <2240>;
-                       ti,dac-v = <9008>;
-                       ti,dac-minsv = <4608>;
-                       ti,dac-iin = <4992>;
-                       ti,wdt-refresh-timeout = <40>;
-                       ti,charger-detect-gpio-active-low = <1>;
-                       charger-detect-gpio = <&gpio TEGRA_GPIO(J, 0) 0>;
-               };
-       };
-
-       i2c@7000d000 {
-               nvidia,bit-banging-xfer-after-shutdown;
-       };
-
-       spi@7000d400 {
-               status = "okay";
-               spi-max-frequency = <25000000>;
-       };
-
-       spi@7000da00 {
-               status = "okay";
-               spi-max-frequency = <25000000>;
-       };
-
-       pmc {
-               status = "okay";
-               nvidia,invert-interrupt;
-               nvidia,suspend-mode = <0>;
-               nvidia,cpu-pwr-good-time = <500>;
-               nvidia,cpu-pwr-off-time = <300>;
-               nvidia,core-pwr-good-time = <3845 3845>;
-               nvidia,core-pwr-off-time = <2000>;
-               nvidia,core-power-req-active-high;
-               nvidia,sys-clock-req-active-high;
-       };
-
-       stm8t143 {
-               compatible = "stm,stm8t143";
-               pout-gpio = <&gpio 190 0>;
-               tout-gpio = <&gpio 112 0>;
-       };
-
-       xusb@70090000 {
-               /* nvidia,uses_external_pmic;
-               nvidia,gpio_controls_muxed_ss_lanes; */
-               nvidia,gpio_ss1_sata = <0>;
-               nvidia,portmap = <0x703>; /* SSP0, SSP1 USB2P0, USB2P1, USBP2 */
-               nvidia,ss_portmap = <0x20>; /* SSP0 on USB2P0, SSP1 on USB2P2 */
-               nvidia,lane_owner = <6>; /* USB3P0 USB3P1 */
-               nvidia,ulpicap = <0>; /* No ulpi support. can we remove */
-               nvidia,supply_utmi_vbuses = "usb_vbus0", "usb_vbus1", "usb_vbus2";
-               nvidia,supply_s3p3v = "hvdd_usb";
-               nvidia,supply_s1p8v = "avdd_pll_utmip";
-               nvidia,supply_vddio_hsic = "vddio_hsic";
-               nvidia,supply_s1p05v = "avddio_usb";
-               /* hsic config values in order defined in structure */
-               nvidia,hsic0 = /bits/8 <0x1 0x1 0x8 0xa 0 0 1 0x22 0>;
-               status = "okay";
-       };
-};

diff --git a/arch/arm/boot/dts/tegra124-ardbeg-battery.dts b/arch/arm/boot/dts/tegra124-ardbeg-battery.dts
deleted file mode 100644 (file)
index 51c3ddf..0000000
--- a/arch/arm/boot/dts/tegra124-ardbeg-battery.dts
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "tegra124-ardbeg.dts"
-/ {
-       i2c@7000c400 {
-               bq20z75@0b {
-                       status = "okay";
-               };
-       };
-};

diff --git a/arch/arm/boot/dts/tegra124-ardbeg.dts b/arch/arm/boot/dts/tegra124-ardbeg.dts
index f9fc99bfa0709a39fb0b0f7740dc8180c47fb51c..c25cd8891912492d8e20c325676aa3de548d1ce1 100644 (file)
--- a/arch/arm/boot/dts/tegra124-ardbeg.dts
+++ b/arch/arm/boot/dts/tegra124-ardbeg.dts
@@ -1,112 +1 @@
-/dts-v1/;
-
-#include "tegra124.dtsi"
-#include "tegra124-platforms/tegra124-ardbeg-powermon-e1780-1000-a00.dtsi"
-#include "tegra124-platforms/tegra124-tn8-gpio-e1780-1100-a02.dtsi"
-#include "tegra124-platforms/tegra124-tn8-pinmux-e1780-1100-a02.dtsi"
-#include "tegra124-platforms/tegra124-tn8-keys-e1780-1100-a02.dtsi"
-#include "panel-p-wuxga-10-1.dts"
-#include "panel-s-wqxga-10-1.dts"
-
-/ {
-       model = "NVIDIA Tegra124 Ardbeg";
-       compatible = "nvidia,ardbeg", "nvidia,tegra124";
-       nvidia,dtsfilename = __FILE__;
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       chosen {
-               bootargs = "tegraid=40.0.0.00.00 vmalloc=256M video=tegrafb console=ttyS0,115200n8 earlyprintk";
-               linux,initrd-start = <0x85000000>;
-               linux,initrd-end = <0x851bc400>;
-       };
-       host1x {
-               dsi {
-                       nvidia,dsi-controller-vs = <1>;
-                       status = "okay";
-                       panel-p-wuxga-10-1 {
-                               nvidia,dsi-panel-rst-gpio = <&gpio TEGRA_GPIO(H, 3) 0>; /* PH3 */
-                               nvidia,dsi-panel-bl-pwm-gpio = <&gpio TEGRA_GPIO(H, 1) 0>; /* PH1 */
-                       };
-                       panel-s-wqxga-10-1 {
-                               nvidia,dsi-panel-rst-gpio = <&gpio TEGRA_GPIO(H, 3) 0>; /* PH3 */
-                               nvidia,dsi-panel-bl-pwm-gpio = <&gpio TEGRA_GPIO(H, 1) 0>; /* PH1 */
-                               nvidia,dsi-te-gpio = <&gpio TEGRA_GPIO(R, 6) 0>; /* PR6 */
-                       };
-               };
-       };
-        serial@70006000 {
-                compatible = "nvidia,tegra114-hsuart";
-                status = "okay";
-        };
-
-        serial@70006040 {
-                compatible = "nvidia,tegra114-hsuart";
-                status = "okay";
-        };
-
-        serial@70006200 {
-                compatible = "nvidia,tegra114-hsuart";
-                status = "okay";
-        };
-
-       memory@0x80000000 {
-               device_type = "memory";
-               reg = <0x0 0x80000000 0x0 0x80000000>;
-       };
-
-       i2c@7000c400 {
-               bq20z75@0b {
-                       compatible = "sbs,sbs-battery";
-                       reg = <0x0b>;
-                       status = "disabled";
-                       sbs,i2c-retry-count = <2>;
-                       sbs,poll-retry-count = <100>;
-               };
-       };
-
-       i2c@7000d000 {
-               nvidia,bit-banging-xfer-after-shutdown;
-       };
-
-       spi@7000d400 {
-               status = "okay";
-               spi-max-frequency = <25000000>;
-       };
-
-       spi@7000da00 {
-               status = "okay";
-               spi-max-frequency = <25000000>;
-       };
-
-       pmc {
-               status = "okay";
-               nvidia,invert-interrupt;
-               nvidia,suspend-mode = <0>;
-               nvidia,cpu-pwr-good-time = <500>;
-               nvidia,cpu-pwr-off-time = <300>;
-               nvidia,core-pwr-good-time = <3845 3845>;
-               nvidia,core-pwr-off-time = <2000>;
-               nvidia,core-power-req-active-high;
-               nvidia,sys-clock-req-active-high;
-       };
-
-       stm8t143 {
-               compatible = "stm,stm8t143";
-               pout-gpio = <&gpio 190 0>;
-               tout-gpio = <&gpio 112 0>;
-       };
-
-       xusb@70090000 {
-               /* nvidia,uses_external_pmic;
-               nvidia,gpio_controls_muxed_ss_lanes; */
-               nvidia,gpio_ss1_sata = <0>;
-               nvidia,portmap = <0x703>; /* SSP0, SSP1 USB2P0, USB2P1, USBP2 */
-               nvidia,ss_portmap = <0x20>; /* SSP0 on USB2P0, SSP1 on USB2P2 */
-               nvidia,lane_owner = <6>; /* USB3P0 USB3P1 */
-               nvidia,ulpicap = <0>; /* No ulpi support. can we remove */
-               /* hsic config values in order defined in structure */
-               nvidia,hsic0 = /bits/8 <0x1 0x1 0x8 0xa 0 0 1 0x22 0>;
-               status = "okay";
-       };
-};
+#include "tegra124-ardbeg-e1780-1000-a00-00.dts"

diff --git a/arch/arm/boot/dts/tegra124-ardbeg.dtsi b/arch/arm/boot/dts/tegra124-ardbeg.dtsi
deleted file mode 100644 (file)
index 44a6872..0000000
--- a/arch/arm/boot/dts/tegra124-ardbeg.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-#include "tegra124.dtsi"