ARM: dts: grouper: complete missing bindings

Clean up the tree and prepare for DM PMIC migration.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>

diff --git a/arch/arm/dts/tegra30-asus-grouper-common.dtsi b/arch/arm/dts/tegra30-asus-grouper-common.dtsi
index 4fa980f24f99447895d5ed8d97cd8752e7fc8794..fcf31e2dd096bcc7008706435dd8f967dc0c939e 100644 (file)
--- a/arch/arm/dts/tegra30-asus-grouper-common.dtsi
+++ b/arch/arm/dts/tegra30-asus-grouper-common.dtsi
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 
 #include <dt-bindings/input/input.h>
-
 #include "tegra30.dtsi"
 
 / {
@@ -62,6 +61,9 @@
                status = "okay";
                bus-width = <8>;
                non-removable;
+
+               vmmc-supply = <&vcore_emmc>;
+               vqmmc-supply = <&vdd_1v8_vio>;
        };
 
        usb1: usb@7d000000 {
@@ -150,7 +152,6 @@
                regulator-name = "vdd_5v0_bl";
                regulator-min-microvolt = <5000000>;
                regulator-max-microvolt = <5000000>;
-               regulator-boot-on;
                gpio = <&gpio TEGRA_GPIO(H, 3) GPIO_ACTIVE_HIGH>;
                enable-active-high;
        };

diff --git a/arch/arm/dts/tegra30-asus-nexus7-grouper-E1565.dts b/arch/arm/dts/tegra30-asus-nexus7-grouper-E1565.dts
index a98d3e2145561090947f7b2f191ca99428ffa871..945ae404acca7793a7c9f58e327d8c93ea25d8c1 100644 (file)
--- a/arch/arm/dts/tegra30-asus-nexus7-grouper-E1565.dts
+++ b/arch/arm/dts/tegra30-asus-nexus7-grouper-E1565.dts
@@ -22,7 +22,7 @@
                        gpio-controller;
 
                        regulators {
-                               vdd_1v8: sd2 {
+                               vdd_1v8_vio: sd2 {
                                        regulator-name = "vdd_1v8_gen";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
@@ -34,8 +34,7 @@
                                vcore_emmc: ldo3 {
                                        regulator-name = "vcore_emmc";
                                        regulator-min-microvolt = <2850000>;
-                                       regulator-max-microvolt = <3100000>;
-                                       regulator-always-on;
+                                       regulator-max-microvolt = <2850000>;
                                };
                        };
                };

diff --git a/arch/arm/dts/tegra30-asus-nexus7-grouper-PM269.dts b/arch/arm/dts/tegra30-asus-nexus7-grouper-PM269.dts
index 44ea218a47209efa7fd6753eaa8f013a96694a9f..4363bfc87d8e2230e72d0cad9cc1d55b90c242e7 100644 (file)
--- a/arch/arm/dts/tegra30-asus-nexus7-grouper-PM269.dts
+++ b/arch/arm/dts/tegra30-asus-nexus7-grouper-PM269.dts
@@ -23,12 +23,19 @@
                        gpio-controller;
 
                        regulators {
+                               vdd_1v8_vio: vddio {
+                                       regulator-name = "vdd_1v8_gen";
+                                       regulator-min-microvolt = <1800000>;
+                                       regulator-max-microvolt = <1800000>;
+                                       regulator-always-on;
+                                       regulator-boot-on;
+                               };
+
                                /* eMMC VDD */
                                vcore_emmc: ldo1 {
                                        regulator-name = "vdd_emmc_core";
-                                       regulator-min-microvolt = <1000000>;
+                                       regulator-min-microvolt = <3300000>;
                                        regulator-max-microvolt = <3300000>;
-                                       regulator-always-on;
                                };
                        };
                };

diff --git a/arch/arm/dts/tegra30-asus-nexus7-tilapia-E1565.dts b/arch/arm/dts/tegra30-asus-nexus7-tilapia-E1565.dts
index 812d5a1ba705302e623497b50b5143a529f3ad40..89348fde134353f488034671d4eb4a079e3339c4 100644 (file)
--- a/arch/arm/dts/tegra30-asus-nexus7-tilapia-E1565.dts
+++ b/arch/arm/dts/tegra30-asus-nexus7-tilapia-E1565.dts
@@ -22,7 +22,7 @@
                        gpio-controller;
 
                        regulators {
-                               vdd_1v8: sd2 {
+                               vdd_1v8_vio: sd2 {
                                        regulator-name = "vdd_1v8_gen";
                                        regulator-min-microvolt = <1800000>;
                                        regulator-max-microvolt = <1800000>;
@@ -34,8 +34,7 @@
                                vcore_emmc: ldo3 {
                                        regulator-name = "vcore_emmc";
                                        regulator-min-microvolt = <2850000>;
-                                       regulator-max-microvolt = <3100000>;
-                                       regulator-always-on;
+                                       regulator-max-microvolt = <2850000>;
                                };
                        };
                };