From 949eacf000fefd4517b7cf3018b3853f5d7fccf7 Mon Sep 17 00:00:00 2001 From: Jianqun Xu Date: Fri, 9 Dec 2016 18:59:34 +0800 Subject: [PATCH] ARM64: dts: rockchip: move rk3399 io-domain nodes to the grf Afer the "PM / AVS: rockchip-io: make io-domains a child of the GRF", the io-domains should be a sub-node of the grf simple-mfd. Change-Id: Ic2a40726bccee8b795b5249e07f2537fd30b3f7b Signed-off-by: Jianqun Xu --- .../dts/rockchip/rk3399-box-808-android.dts | 19 +++++++++---------- arch/arm64/boot/dts/rockchip/rk3399-box.dtsi | 19 +++++++++---------- arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi | 19 +++++++++---------- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 19 +++++++++---------- .../rockchip/rk3399-mid-818-android-next.dts | 19 +++++++++---------- .../dts/rockchip/rk3399-mid-818-android.dts | 19 +++++++++---------- .../boot/dts/rockchip/rk3399-rv1-android.dts | 19 +++++++++---------- .../boot/dts/rockchip/rk3399-sapphire.dtsi | 19 +++++++++---------- .../boot/dts/rockchip/rk3399-tve1205g.dts | 18 ++++++++---------- .../boot/dts/rockchip/rk3399-vr-android.dts | 19 +++++++++---------- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 5 +++++ 11 files changed, 94 insertions(+), 100 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts index 3f083c50c131..ac59eb9df090 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts @@ -115,16 +115,6 @@ #clock-cells = <0>; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */ - audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */ - sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ - gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -210,6 +200,15 @@ }; }; +&io_domains { + status = "okay"; + + bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */ + audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */ + sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ + gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ +}; + &sdmmc { clock-frequency = <150000000>; clock-freq-min-max = <400000 150000000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi index 9233489191f7..cc72bf15aac5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-box.dtsi @@ -112,16 +112,6 @@ #clock-cells = <0>; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */ - audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */ - sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ - gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -817,6 +807,15 @@ status = "okay"; }; +&io_domains { + status = "okay"; + + bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */ + audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */ + sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ + gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ +}; + &pinctrl { sdio-pwrseq { wifi_enable_h: wifi-enable-h { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi index b3c714182ba0..16f02111dc36 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -118,16 +118,6 @@ regulator-boot-on; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc1v8_dvp>; - audio-supply = <&vcca1v8_codec>; - sdmmc-supply = <&vcc_sd>; - gpio1830-supply = <&vcc_3v0>; - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -395,6 +385,15 @@ }; }; +&io_domains { + status = "okay"; + + bt656-supply = <&vcc1v8_dvp>; + audio-supply = <&vcca1v8_codec>; + sdmmc-supply = <&vcc_sd>; + gpio1830-supply = <&vcc_3v0>; +}; + &pcie_phy { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index 665cbb5cc7c0..e2b5c11f4ee2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -464,16 +464,6 @@ /* END REGULATORS */ - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&pp1800_ap_io>; /* APIO2_VDD; 2a 2b */ - audio-supply = <&pp1800_audio>; /* APIO5_VDD; 3d 4a */ - sdmmc-supply = <&ppvar_sd_card_io>; /* SDMMC0_VDD; 4b */ - gpio1830-supply = <&pp3000_ap>; /* APIO4_VDD; 4c 4d */ - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -647,6 +637,15 @@ ap_i2c_audio: &i2c8 { status = "okay"; }; +&io_domains { + status = "okay"; + + bt656-supply = <&pp1800_ap_io>; /* APIO2_VDD; 2a 2b */ + audio-supply = <&pp1800_audio>; /* APIO5_VDD; 3d 4a */ + sdmmc-supply = <&ppvar_sd_card_io>; /* SDMMC0_VDD; 4b */ + gpio1830-supply = <&pp3000_ap>; /* APIO4_VDD; 4c 4d */ +}; + &pwm0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts index 99b7dbdd9d8e..9e5c0348564d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts @@ -158,16 +158,6 @@ regulator-boot-on; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc1v8_dvp>; - audio-supply = <&vcca1v8_codec>; - sdmmc-supply = <&vcc_sd>; - gpio1830-supply = <&vcc_3v0>; - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -760,6 +750,15 @@ }; }; +&io_domains { + status = "okay"; + + bt656-supply = <&vcc1v8_dvp>; + audio-supply = <&vcca1v8_codec>; + sdmmc-supply = <&vcc_sd>; + gpio1830-supply = <&vcc_3v0>; +}; + &isp0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts index 7bf26d7fb452..30c11e5c3f24 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts @@ -146,16 +146,6 @@ regulator-boot-on; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc1v8_dvp>; - audio-supply = <&vcca1v8_codec>; - sdmmc-supply = <&vcc_sd>; - gpio1830-supply = <&vcc_3v0>; - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -372,6 +362,15 @@ #sound-dai-cells = <0>; }; +&io_domains { + status = "okay"; + + bt656-supply = <&vcc1v8_dvp>; + audio-supply = <&vcca1v8_codec>; + sdmmc-supply = <&vcc_sd>; + gpio1830-supply = <&vcc_3v0>; +}; + &spdif { status = "okay"; #sound-dai-cells = <0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts index 2ec56b0a2ccb..2944593401e8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts @@ -98,16 +98,6 @@ }; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc1v8_s3>; - audio-supply = <&vcc1v8_s3>; - sdmmc-supply = <&vcc_sd>; - gpio1830-supply = <&vcc1v8_s3>; - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -517,6 +507,15 @@ }; }; +&io_domains { + status = "okay"; + + bt656-supply = <&vcc1v8_s3>; + audio-supply = <&vcc1v8_s3>; + sdmmc-supply = <&vcc_sd>; + gpio1830-supply = <&vcc1v8_s3>; +}; + &threshold { temperature = <85000>; /* millicelsius */ }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi index 64a0ca755a07..c070547250d1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi @@ -115,16 +115,6 @@ }; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc_3v0>; /* bt656_gpio2ab_ms */ - audio-supply = <&vcca1v8_codec>; /* audio_gpio3d4a_ms */ - sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ - gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -502,6 +492,15 @@ status = "okay"; }; +&io_domains { + status = "okay"; + + bt656-supply = <&vcc_3v0>; /* bt656_gpio2ab_ms */ + audio-supply = <&vcca1v8_codec>; /* audio_gpio3d4a_ms */ + sdmmc-supply = <&vcc_sd>; /* sdmmc_gpio4b_ms */ + gpio1830-supply = <&vcc_3v0>; /* gpio1833_gpio4cd_ms */ +}; + &pcie0 { assigned-clocks = <&cru SCLK_PCIEPHY_REF>; assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts index e96240e26dea..c87980ae9f02 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts @@ -149,16 +149,6 @@ regulator-boot-on; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc_3v0>; - audio-supply = <&vcca1v8_codec>; - sdmmc-supply = <&vcc_sd>; - gpio1830-supply = <&vcc_3v0>; - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -673,6 +663,14 @@ }; }; +&io_domains { + status = "okay"; + bt656-supply = <&vcc_3v0>; + audio-supply = <&vcca1v8_codec>; + sdmmc-supply = <&vcc_sd>; + gpio1830-supply = <&vcc_3v0>; +}; + &cpu_l0 { cpu-supply = <&vdd_cpu_l>; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts index d11dcc9cc86a..ebf80e191fb0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts @@ -134,16 +134,6 @@ regulator-boot-on; }; - io-domains { - compatible = "rockchip,rk3399-io-voltage-domain"; - rockchip,grf = <&grf>; - - bt656-supply = <&vcc1v8_dvp>; - audio-supply = <&vcca1v8_codec>; - sdmmc-supply = <&vcc_sd>; - gpio1830-supply = <&vcc_3v0>; - }; - pmu-io-domains { compatible = "rockchip,rk3399-pmu-io-voltage-domain"; rockchip,grf = <&pmugrf>; @@ -360,6 +350,15 @@ #sound-dai-cells = <0>; }; +&io_domains { + status = "okay"; + + bt656-supply = <&vcc1v8_dvp>; + audio-supply = <&vcca1v8_codec>; + sdmmc-supply = <&vcc_sd>; + gpio1830-supply = <&vcc_3v0>; +}; + &spdif { status = "okay"; #sound-dai-cells = <0>; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 0ac0c0a9a3d0..fb1448296be1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1331,6 +1331,11 @@ #address-cells = <1>; #size-cells = <1>; + io_domains: io-domains { + compatible = "rockchip,rk3399-io-voltage-domain"; + status = "disabled"; + }; + emmc_phy: phy@f780 { compatible = "rockchip,rk3399-emmc-phy"; reg = <0xf780 0x24>; -- 2.34.1