shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

ARM64: dts: rockchip: move rk3399 io-domain nodes to the grf

Browse Source 
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 <jay.xu@rock-chips.com>
This commit is contained in:
Jianqun Xu
2016-12-09 18:59:34 +08:00
committed by Huang, Tao
parent 7b68923939
commit 949eacf000
11 changed files with 94 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm64/boot/dts/rockchip/rk3399-box-808-android.dts
View File

@@ -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>;

19
arch/arm64/boot/dts/rockchip/rk3399-box.dtsi
View File

@@ -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 {

19
arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi
View File

@@ -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";
};

19
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
View File

@@ -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";
};

19
arch/arm64/boot/dts/rockchip/rk3399-mid-818-android-next.dts
View File

@@ -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";
};

19
arch/arm64/boot/dts/rockchip/rk3399-mid-818-android.dts
View File

@@ -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>;

19
arch/arm64/boot/dts/rockchip/rk3399-rv1-android.dts
View File

@@ -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 */
};

19
arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
View File

@@ -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>;

18
arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts
View File

@@ -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>;
};

19
arch/arm64/boot/dts/rockchip/rk3399-vr-android.dts
View File

@@ -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>;

5
arch/arm64/boot/dts/rockchip/rk3399.dtsi
View File

@@ -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>;