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

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

Browse Source 
Afer the "PM / AVS: rockchip-io: make io-domains a child of the GRF",
the pmu-io-domains should be a sub-node of the pmugrf simple-mfd.

Change-Id: Iebfe9041a604580ce3e5b028d7a143fcdbbdff25
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
This commit is contained in:
Jianqun Xu
2016-12-13 17:29:34 +08:00
committed by Huang, Tao
parent 949eacf000
commit 6573833677
11 changed files with 59 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -115,13 +115,6 @@
#clock-cells = <0>;
};
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&vcc_1v8>;
};
spdif-sound {
status = "okay";
compatible = "simple-audio-card";
@@ -793,3 +786,8 @@
status = "okay";
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&vcc_1v8>;
};

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

@@ -112,13 +112,6 @@
#clock-cells = <0>;
};
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&vcc_1v8>;
};
spdif-sound {
status = "okay";
compatible = "simple-audio-card";
@@ -860,3 +853,9 @@
&pmu_pvtm {
status = "okay";
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&vcc_1v8>;
};

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

@@ -118,13 +118,6 @@
regulator-boot-on;
};
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&vcc1v8_pmu>;
};
es8316-sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
@@ -576,3 +569,9 @@
&pmu_pvtm {
status = "okay";
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&vcc1v8_pmu>;
};

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

@@ -464,13 +464,6 @@
/* END REGULATORS */
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&pp1800_pmu>; /* PMUIO2_VDD */
};
sound {
compatible = "rockchip,rockchip-audio-da7219";
rockchip,model = "audio-da7219";
@@ -946,6 +939,11 @@ ap_i2c_audio: &i2c8 {
status = "okay";
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&pp1800_pmu>; /* PMUIO2_VDD */
};
/* PINCTRL: always below everything else */
&pinctrl {

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

@@ -158,13 +158,6 @@
regulator-boot-on;
};
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&vcc_1v8>;
};
es8316-sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
@@ -1009,6 +1002,11 @@
};
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&vcc_1v8>;
};
&route_edp {
status = "okay";
};

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

@@ -146,13 +146,6 @@
regulator-boot-on;
};
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&vcc_1v8>;
};
es8316-sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
@@ -1020,3 +1013,9 @@
&pmu_pvtm {
status = "okay";
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&vcc_1v8>;
};

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

@@ -98,12 +98,6 @@
};
};
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&vcc_1v8>;
};
dw_hdmi_audio: dw-hdmi-audio {
status = "okay";
compatible = "rockchip,dw-hdmi-audio";
@@ -683,6 +677,11 @@
mali-supply = <&vdd_gpu>;
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&vcc_1v8>;
};
&pinctrl {
sdio-pwrseq {
wifi_enable_h: wifi-enable-h {

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

@@ -115,12 +115,6 @@
};
};
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&vcc_3v0>;
};
sdio_pwrseq: sdio-pwrseq {
compatible = "mmc-pwrseq-simple";
clocks = <&rk808 1>;
@@ -512,6 +506,11 @@
status = "okay";
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&vcc_3v0>;
};
&pwm0 {
status = "okay";
};

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

@@ -149,13 +149,6 @@
regulator-boot-on;
};
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&vcc_1v8>;
};
es8316-sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
@@ -796,6 +789,11 @@
status = "okay";
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&vcc_1v8>;
};
&pwm0 {
status = "okay";
};

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

@@ -134,13 +134,6 @@
regulator-boot-on;
};
pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
rockchip,grf = <&pmugrf>;
pmu1830-supply = <&vcc_1v8>;
};
es8316-sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
@@ -971,3 +964,9 @@
&pmu_pvtm {
status = "okay";
};
&pmu_io_domains {
status = "okay";
pmu1830-supply = <&vcc_1v8>;
};

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

@@ -1058,6 +1058,11 @@
compatible = "rockchip,rk3399-pmugrf", "syscon", "simple-mfd";
reg = <0x0 0xff320000 0x0 0x1000>;
pmu_io_domains: pmu-io-domains {
compatible = "rockchip,rk3399-pmu-io-voltage-domain";
status = "disabled";
};
reboot-mode {
compatible = "syscon-reboot-mode";
offset = <0x300>;