arm64: dts: t210: clean up regulator for sensors

Clean up the consumer entries for sensors.
Add regulator with phandle correctly.

Bug 200020855
Bug 200017096
Bug 200017074

Change-Id: I533e82802c3bc2d85e19b434f2df24631e59f96e
Signed-off-by: Daniel Fu <danifu@nvidia.com>
Reviewed-on: http://git-master/r/448874
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Tested-by: Thomas Cherry <tcherry@nvidia.com>

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra132-interposer-power-tree-e2174-1101-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra132-interposer-power-tree-e2174-1101-a00.dtsi
index 8ebc63e42c8d78ddccb81b04c6ba57a73b79572b..80cf3c2420788f801f1c83edc6e620f93108dff2 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra132-interposer-power-tree-e2174-1101-a00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra132-interposer-power-tree-e2174-1101-a00.dtsi
@@ -35,6 +35,34 @@
                pca9546@71 {
                        vcc-supply = <&vdd_aux_3v3>;
                };
+
+               icm20628@69 {
+                       vlogic-supply = <&max77620_sd3>;
+                       vdd-supply = <&vdd_3v3>;
+               };
+
+               ak8963c@0d {
+                       vid-supply = <&max77620_sd3>;
+                       vdd-supply = <&vdd_3v3>;
+               };
+
+               bmp280@77 {
+                       vddio-supply = <&max77620_sd3>;
+                       vdd-supply = <&vdd_3v3>;
+               };
+
+               cm3217@10 {
+                       vdd-supply = <&vdd_3v3>;
+               };
+
+                ltr659@23 {
+                       vdd-supply = <&vdd_3v3>;
+                       vled-supply = <&vdd_3v3>;
+               };
+
+               iqs253@44 {
+                       vddhi-supply = <&vdd_3v3>;
+               };
        };
 
        xusb@70090000 {

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-fixed-e2174-1101-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-fixed-e2174-1101-a00.dtsi
index c7948fd1af4b8a34784e84a00a4866abe49ec7b2..4715f3d51edd69a93003053f89489110ff113b09 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-fixed-e2174-1101-a00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-fixed-e2174-1101-a00.dtsi
@@ -60,30 +60,6 @@
                                        regulator-consumer-supply = "vdd";
                                        regulator-consumer-device = "1-004d";
                                };
-                               c6 {
-                                       regulator-consumer-supply = "vdd";
-                                       regulator-consumer-device = "0-0069";
-                               };
-                               c7 {
-                                       regulator-consumer-supply = "vdd";
-                                       regulator-consumer-device = "0-0077";
-                               };
-                               c8 {
-                                       regulator-consumer-supply = "vdd";
-                                       regulator-consumer-device = "0-0010";
-                               };
-                               c9 {
-                                       regulator-consumer-supply = "vdd";
-                                       regulator-consumer-device = "0-0048";
-                               };
-                               c10 {
-                                       regulator-consumer-supply = "vdd";
-                                       regulator-consumer-device = "0-0044";
-                               };
-                               c11 {
-                                       regulator-consumer-supply = "vdd";
-                                       regulator-consumer-device = "0-000d";
-                               };
                        };
                };
 

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-pmic-e2174-1101-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-pmic-e2174-1101-a00.dtsi
index 45a593c3215d68ed338ca9cd03055b9476681e2e..ceeb5e60c17ac6d781e30e1ec7a5086bc263d9a3 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-pmic-e2174-1101-a00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-pmic-e2174-1101-a00.dtsi
@@ -214,18 +214,6 @@
                                                        regulator-consumer-supply = "vdd";
                                                        regulator-consumer-device = "0-004c";
                                                };
-                                               c19 {
-                                                       regulator-consumer-supply = "vlogic";
-                                                       regulator-consumer-device = "0-0069";
-                                               };
-                                               c20 {
-                                                       regulator-consumer-supply = "vid";
-                                                       regulator-consumer-device = "0-000d";
-                                               };
-                                               c21 {
-                                                       regulator-consumer-supply = "vddio";
-                                                       regulator-consumer-device = "0-0077";
-                                               };
                                        };
                                };
 

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-power-tree-e2174-1101-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-power-tree-e2174-1101-a00.dtsi
index af2710218c02438181da0504d01880eda6b2965e..a99a8b2cddc44e6af1c9023968b7cae991982522 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-power-tree-e2174-1101-a00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-power-tree-e2174-1101-a00.dtsi
@@ -36,6 +36,34 @@
                pca9546@71 {
                        vcc-supply = <&vdd_aux_3v3>;
                };
+
+               icm20628@69 {
+                       vlogic-supply = <&max77620_sd3>;
+                       vdd-supply = <&vdd_3v3>;
+               };
+
+               ak8963c@0d {
+                       vid-supply = <&max77620_sd3>;
+                       vdd-supply = <&vdd_3v3>;
+               };
+
+               bmp280@77 {
+                       vddio-supply = <&max77620_sd3>;
+                       vdd-supply = <&vdd_3v3>;
+               };
+
+               cm3217@10 {
+                       vdd-supply = <&vdd_3v3>;
+               };
+
+               ltr659@23 {
+                       vdd-supply = <&vdd_3v3>;
+                       vled-supply = <&vdd_3v3>;
+               };
+
+               iqs253@44 {
+                       vddhi-supply = <&vdd_3v3>;
+               };
        };
 
        xusb@70090000 {

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-sensor-e1934-1000-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-sensor-e1934-1000-a00.dtsi
new file mode 100644 (file)
index 0000000..d858720
--- /dev/null
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-sensor-e1934-1000-a00.dtsi
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+#include <dt-bindings/gpio/tegra-gpio.h>
+
+/ {
+       i2c@7000c000 {
+               mpu6515@69 {
+                       compatible = "invensense,mpu6515";
+                       reg = <0x69>;
+                       interrupt-parent = <&gpio>;
+                       interrupts = <144 0x01>;
+                       invensense,orientation = [01 00 00 00 01 00 00 00 01];
+               };
+
+               ak8963c@0d {
+                       compatible = "ak,ak8963";
+                       reg = <0x0d>;
+                       orientation = [ff 00 00 00 01 00 00 00 ff];
+               };
+
+               max44006@44 {
+                       compatible = "maxim,max4400x";
+                       reg = <0x44>;
+               };
+
+               ltr659@23 {
+                       compatible = "lite-on,ltr659";
+                       reg = <0x23>;
+                       threshold = <125>;
+               };
+       };
+
+       i2c@7000c400 {
+               iqs253@44 {
+                       compatible = "azoteq,iqs253";
+                       reg = <0x44>;
+                       vendor = "Azoteq";
+                       proximity,max-range = "2"; /* 2 cm */
+                       proximity,integration-time = "16000000"; /* 16 msec */
+                       proximity,power-consumed = "1.67"; /* approx mA */
+                       rdy-gpio = <&gpio TEGRA_GPIO(A, 6) GPIO_ACTIVE_LOW>;
+                       wake-gpio = <&gpio TEGRA_GPIO(Y, 0) GPIO_ACTIVE_LOW>;
+                       /* sar-gpio = <&gpio TEGRA_GPIO(I, 2) GPIO_ACTIVE_LOW>; */ /* Fix me! */
+               };
+       };
+};

diff --git a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-sensor-e2160-1000-a00.dtsi b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-sensor-e2160-1000-a00.dtsi
index f3aad9083575fb9a359a8fe59b3071d4053ee5e7..0802cefd6f777487f4ce1351bfb25eabdea031f5 100644 (file)
--- a/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-sensor-e2160-1000-a00.dtsi
+++ b/arch/arm64/boot/dts/tegra210-platforms/tegra210-ers-sensor-e2160-1000-a00.dtsi
@@ -1,62 +1,58 @@
+/*
+ * Copyright (c) 2014, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
 #include <dt-bindings/gpio/tegra-gpio.h>
 
 / {
        i2c@7000c000 {
-               mpu6515@69 {
-                       compatible = "invensense,mpu6515";
+               icm20628@69 {
+                       compatible = "invensense,mpu6xxx";
                        reg = <0x69>;
                        interrupt-parent = <&gpio>;
                        interrupts = <144 0x01>;
-                       invensense,orientation = [01 00 00 00 01 00 00 00 01];
-                       vlogic = <&max77620_sd3>;
-                       vdd = <&vdd_3v3>;
+                       invensense,orientation = [ff 00 00 00 ff 00 00 00 01];
                };
 
                ak8963c@0d {
-                       compatible = "ak,ak8963";
+                       compatible = "ak,ak89xx";
                        reg = <0x0d>;
-                       orientation = [ff 00 00 00 01 00 00 00 ff];
-                       vid = <&max77620_sd3>;
-                       vdd = <&vdd_3v3>;
+                       orientation = [ff 00 00 00 ff 00 00 00 01];
                };
 
                bmp280@77 {
-                       compatible = "bmp,bmp280";
+                       compatible = "bmp,bmpX80";
                        reg = <0x77>;
-                       vddio = <&max77620_sd3>;
-                       vdd = <&vdd_3v3>;
                };
 
                cm3217@10 {
                        compatible = "capella,cm3217";
                        reg = <0x10>;
-                       vdd = <&vdd_3v3>;
-               };
-
-               cm3218@48 {
-                       compatible = "capella,cm3218";
-                       reg = <0x48>;
-                       vdd = <&vdd_3v3>;
-               };
-
-               max44006@44 {
-                       compatible = "maxim,max44006";
-                       reg = <0x44>;
-                       vdd = <&vdd_3v3>;
                };
 
                ltr659@23 {
                        compatible = "lite-on,ltr659";
                        reg = <0x23>;
                        threshold = <125>;
-                       vdd-supply = <&vdd_3v3>;
-                       vled-supply = <&vdd_3v3>;
                };
 
                iqs253@44 {
                        compatible = "azoteq,iqs253";
                        reg = <0x44>;
-                       vddhi-supply = <&vdd_3v3>;
                        vendor = "Azoteq";
                        proximity,max-range = "2"; /* 2 cm */
                        proximity,integration-time = "16000000"; /* 16 msec */