ARM: tegra: move charger registration to pmic DTSI file.
Laxman Dewangan [Thu, 28 Nov 2013 11:21:00 +0000 (16:21 +0530)]
The charger device mounted on the PMIC board and there is separate
dtsi file for PMIC board. Hence moving the charger registration to
PMIC dtsi file and remove from top level dts file. This will avoid
duplication for similar boards using the same PMIC.

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

arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1736-pmic.dtsi
arch/arm/boot/dts/tegra124-platforms/tegra124-tn8-e1769-pmic.dtsi
arch/arm/boot/dts/tegra124-tn8-a03-00-battery.dts
arch/arm/boot/dts/tegra124-tn8-a03-00.dts
arch/arm/boot/dts/tegra124-tn8-a03-01.dts
arch/arm/boot/dts/tegra124-tn8-battery.dts
arch/arm/boot/dts/tegra124-tn8.dts

index 63840b9..fe53f4f 100644 (file)
                        };
                };
        };
+
+       i2c@7000c000 {
+               bq2419x: bq2419x@6b {
+                       compatible = "ti,bq2419x";
+                       reg = <0x6b>;
+
+                       vbus {
+                               regulator-name = "vbus_regulator";
+                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
+                               consumers {
+                                       c1 {
+                                               regulator-consumer-supply = "usb_vbus";
+                                               regulator-consumer-device = "tegra-ehci.0";
+                                       };
+
+                                       c2 {
+                                               regulator-consumer-supply = "usb_vbus";
+                                               regulator-consumer-device = "tegra-otg";
+                                       };
+                               };
+                       };
+               };
+       };
 };
index 8b75017..d7d6480 100644 (file)
                        };
                };
        };
+
+       i2c@7000c000 {
+               bq2419x: bq2419x@6b {
+                       compatible = "ti,bq2419x";
+                       reg = <0x6b>;
+
+                       vbus {
+                               regulator-name = "vbus_regulator";
+                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
+                               consumers {
+                                       c1 {
+                                               regulator-consumer-supply = "usb_vbus";
+                                               regulator-consumer-device = "tegra-ehci.0";
+                                       };
+
+                                       c2 {
+                                               regulator-consumer-supply = "usb_vbus";
+                                               regulator-consumer-device = "tegra-otg";
+                                       };
+                               };
+                       };
+               };
+       };
 };
index 9a59aa9..0b578e5 100644 (file)
@@ -55,8 +55,6 @@
                };
 
                bq2419x: bq2419x@6b {
-                       compatible = "ti,bq2419x";
-                       reg = <0x6b>;
                        interrupt-parent = <&gpio>;
                        interrupts = <72 0x0>;
 
                                        };
                                };
                        };
-
-                       vbus {
-                               regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
-                               consumers {
-                                       c1 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-ehci.0";
-                                       };
-
-                                       c2 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-otg";
-                                       };
-                               };
-                       };
                };
 
                mpu6515@69 {
index ba61ccd..86f011c 100644 (file)
                status = "okay";
                clock-frequency = <100000>;
 
-               bq2419x: bq2419x@6b {
-                       compatible = "ti,bq2419x";
-                       reg = <0x6b>;
-
-                       vbus {
-                               regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
-                               consumers {
-                                       c1 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-ehci.0";
-                                       };
-
-                                       c2 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-otg";
-                                       };
-                               };
-                       };
-               };
-
                mpu6515@69 {
                        compatible = "invensense,mpu6515";
                        reg = <0x69>;
index 4660fed..4f9a8dc 100644 (file)
                status = "okay";
                clock-frequency = <100000>;
 
-               bq2419x: bq2419x@6b {
-                       compatible = "ti,bq2419x";
-                       reg = <0x6b>;
-
-                       vbus {
-                               regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
-                               consumers {
-                                       c1 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-ehci.0";
-                                       };
-
-                                       c2 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-otg";
-                                       };
-                               };
-                       };
-               };
-
                mpu6050@69 {
                        compatible = "invensense,mpu6050";
                        reg = <0x69>;
index e0d1c2c..fa4ef6e 100644 (file)
@@ -55,8 +55,6 @@
                };
 
                bq2419x: bq2419x@6b {
-                       compatible = "ti,bq2419x";
-                       reg = <0x6b>;
                        interrupt-parent = <&gpio>;
                        interrupts = <72 0x0>;
 
                                        };
                                };
                        };
-
-                       vbus {
-                               regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
-                               consumers {
-                                       c1 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-ehci.0";
-                                       };
-
-                                       c2 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-otg";
-                                       };
-                               };
-                       };
                };
 
                mpu6050@69 {
index 57e4eb7..a187f39 100644 (file)
                status = "okay";
                clock-frequency = <100000>;
 
-               bq2419x: bq2419x@6b {
-                       compatible = "ti,bq2419x";
-                       reg = <0x6b>;
-
-                       vbus {
-                               regulator-name = "vbus_regulator";
-                               otg-iusb-gpio = <&gpio TEGRA_GPIO(I, 4) 0>;
-                               consumers {
-                                       c1 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-ehci.0";
-                                       };
-
-                                       c2 {
-                                               regulator-consumer-supply = "usb_vbus";
-                                               regulator-consumer-device = "tegra-otg";
-                                       };
-                               };
-                       };
-               };
-
                mpu6050@69 {
                        compatible = "invensense,mpu6050";
                        reg = <0x69>;