diff options
| author | Jerome Brunet <jbrunet@baylibre.com> | 2019-09-05 14:59:55 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2019-10-03 08:43:00 -0700 |
| commit | 2871626ba6e61e1ace43db491f766d39e6eacd5a (patch) | |
| tree | 8aeac91abaadf07d9b15242562f8960be7132fda | |
| parent | 9ed437d69b49bd9ad39db7b6d69b60dfc47cac69 (diff) | |
| download | linux-stable-2871626ba6e61e1ace43db491f766d39e6eacd5a.tar.gz linux-stable-2871626ba6e61e1ace43db491f766d39e6eacd5a.tar.bz2 linux-stable-2871626ba6e61e1ace43db491f766d39e6eacd5a.zip | |
arm64: dts: meson: g12: factor the power domain.
The power domain declared in the g12a and g12b dtsi are the same.
Move the declaration of these power domains in the g12 common dtsi.
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 13 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 13 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 12 |
3 files changed, 13 insertions, 25 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi index 1e30061fb2a7..ac5833781611 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12.dtsi @@ -5,3 +5,16 @@ */ #include "meson-g12-common.dtsi" +#include <dt-bindings/power/meson-g12a-power.h> + +ðmac { + power-domains = <&pwrc PWRC_G12A_ETH_ID>; +}; + +&vpu { + power-domains = <&pwrc PWRC_G12A_VPU_ID>; +}; + +&sd_emmc_a { + amlogic,dram-access-quirk; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi index 69339d69dfd4..07450c4babfc 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi @@ -4,7 +4,6 @@ */ #include "meson-g12.dtsi" -#include <dt-bindings/power/meson-g12a-power.h> / { compatible = "amlogic,g12a"; @@ -110,15 +109,3 @@ }; }; }; - -ðmac { - power-domains = <&pwrc PWRC_G12A_ETH_ID>; -}; - -&vpu { - power-domains = <&pwrc PWRC_G12A_VPU_ID>; -}; - -&sd_emmc_a { - amlogic,dram-access-quirk; -}; diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi index eefac0ef092b..a9e1db0f1158 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi @@ -5,7 +5,6 @@ */ #include "meson-g12.dtsi" -#include <dt-bindings/power/meson-g12a-power.h> / { compatible = "amlogic,g12b"; @@ -102,14 +101,3 @@ compatible = "amlogic,g12b-clkc"; }; -ðmac { - power-domains = <&pwrc PWRC_G12A_ETH_ID>; -}; - -&vpu { - power-domains = <&pwrc PWRC_G12A_VPU_ID>; -}; - -&sd_emmc_a { - amlogic,dram-access-quirk; -}; |