ARM: dts: rockchip: move rk3288 io-domain nodes to the
From: Heiko Stuebner <heiko@...> Date: Fri, 5 Feb 2016 21:01:40 +0100
Commit-Message
io-voltage control is actually part of the grf, so move the node under the newly available grf simple-mfd. Signed-off-by: Heiko Stuebner <heiko@...>
Patch-Comment
arch/arm/boot/dts/rk3288-firefly.dtsi | 33 ++++++++++++++++---------------- arch/arm/boot/dts/rk3288-popmetal.dts | 34 +++++++++++++++++---------------- arch/arm/boot/dts/rk3288-rock2-som.dtsi | 34 +++++++++++++++++---------------- arch/arm/boot/dts/rk3288-veyron.dtsi | 28 ++++++++++++++------------- 4 files changed, 68 insertions(+), 61 deletions(-)
Statistics
- 68 lines added
- 61 lines removed
Changes
-------------------- arch/arm/boot/dts/rk3288-firefly.dtsi ---------------------
index 98c586a4..6c5f510d 100644
@@ -63,22 +63,6 @@
clock-output-names = "ext_gmac";
};
ir: ir-receiver {
compatible = "gpio-ir-receiver";
pinctrl-names = "default";
@@ -237,6 +221,23 @@
status = "ok";
};
+&grf {
+ io_domains: io-domains {
+ compatible = "rockchip,rk3288-io-voltage-domain";
+
+ audio-supply = <&vcca_33>;
+ bb-supply = <&vcc_io>;
+ dvp-supply = <&dovdd_1v8>;
+ flash0-supply = <&vcc_flash>;
+ flash1-supply = <&vcc_lan>;
+ gpio30-supply = <&vcc_io>;
+ gpio1830-supply = <&vcc_io>;
+ lcdc-supply = <&vcc_io>;
+ sdcard-supply = <&vccio_sd>;
+ wifi-supply = <&vccio_wl>;
+ };
+};
+
&hdmi {
ddc-i2c-bus = <&i2c5>;
status = "okay";
-------------------- arch/arm/boot/dts/rk3288-popmetal.dts ---------------------
index 2ff9689..4322eaf 100644
@@ -79,22 +79,6 @@
};
};
ir: ir-receiver {
compatible = "gpio-ir-receiver";
gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
@@ -205,6 +189,24 @@
status = "ok";
};
+&grf {
+ io_domains: io-domains {
+ compatible = "rockchip,rk3288-io-voltage-domain";
+ rockchip,grf = <&grf>;
+
+ audio-supply = <&vcca_33>;
+ bb-supply = <&vcc_io>;
+ dvp-supply = <&vcc18_dvp>;
+ flash0-supply = <&vcc_flash>;
+ flash1-supply = <&vcc_lan>;
+ gpio30-supply = <&vcc_io>;
+ gpio1830-supply = <&vcc_io>;
+ lcdc-supply = <&vcc_io>;
+ sdcard-supply = <&vccio_sd>;
+ wifi-supply = <&vccio_wl>;
+ };
+};
+
&hdmi {
ddc-i2c-bus = <&i2c5>;
status = "okay";
------------------- arch/arm/boot/dts/rk3288-rock2-som.dtsi --------------------
index e1ee9f9..8660b8a 100644
@@ -61,22 +61,6 @@
clock-output-names = "ext_gmac";
};
vcc_flash: flash-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc_sys";
@@ -129,6 +113,24 @@
tx_delay = <0x30>;
};
+&grf {
+ io_domains: io-domains {
+ compatible = "rockchip,rk3288-io-voltage-domain";
+ rockchip,grf = <&grf>;
+
+ audio-supply = <&vcc_io>;
+ bb-supply = <&vcc_io>;
+ dvp-supply = <&vcc_18>;
+ flash0-supply = <&vcc_flash>;
+ flash1-supply = <&vccio_pmu>;
+ gpio30-supply = <&vccio_pmu>;
+ gpio1830 = <&vcc_io>;
+ lcdc-supply = <&vcc_io>;
+ sdcard-supply = <&vccio_sd>;
+ wifi-supply = <&vcc_18>;
+ };
+};
+
&i2c0 {
status = "okay";
--------------------- arch/arm/boot/dts/rk3288-veyron.dtsi ---------------------
index 412809c..df44735 100644
@@ -83,19 +83,6 @@
reset-gpios = <&gpio2 9 GPIO_ACTIVE_HIGH>;
};
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&rk808 RK808_CLKOUT1>;
@@ -159,6 +146,21 @@
pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus8>;
};
+&grf {
+ io_domains: io-domains {
+ compatible = "rockchip,rk3288-io-voltage-domain";
+ rockchip,grf = <&grf>;
+
+ bb-supply = <&vcc33_io>;
+ dvp-supply = <&vcc_18>;
+ flash0-supply = <&vcc18_flashio>;
+ gpio1830-supply = <&vcc33_io>;
+ gpio30-supply = <&vcc33_io>;
+ lcdc-supply = <&vcc33_lcd>;
+ wifi-supply = <&vcc18_wl>;
+ };
+};
+
&hdmi {
ddc-i2c-bus = <&i2c5>;
status = "okay";