ARM: dts: rockchip: Assign RK3288 EDP_24M input centrally

The EDP 24M clock can be fed either by an SoC internal fixed clock or
from an external IC. Change the default parent to the internal clock in
the main rk3288 dtsi, to ensure (by default) it gets setup with a
non-orphaned clock (hardware defaults to the externa clock).

This prevents potential issues when the clock framework get support for
deferring on orphaned clocks, while specific boards can always change
the parent clock if an external input is preferred.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi
index 9fce91ffff6fd89b1f39ba960dfeecd71ff8ae24..5e61f07724d42a5e6c40e41d8f5f72029feec3de 100644 (file)
--- a/arch/arm/boot/dts/rk3288-veyron.dtsi
+++ b/arch/arm/boot/dts/rk3288-veyron.dtsi
@@ -340,11 +340,6 @@ &i2c5 {
        i2c-scl-rising-time-ns = <1000>;
 };
 
-&power {
-       assigned-clocks = <&cru SCLK_EDP_24M>;
-       assigned-clock-parents = <&xin24m>;
-};
-
 &pwm1 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index f0a091949f42a578efcdc03771d239ad2f7ba63f..c5d7e61c2272640efc0a0079db717e7ba3d2084e 100644 (file)
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -630,6 +630,9 @@ power: power-controller {
                        #address-cells = <1>;
                        #size-cells = <0>;
 
+                       assigned-clocks = <&cru SCLK_EDP_24M>;
+                       assigned-clock-parents = <&xin24m>;
+
                        /*
                         * Note: Although SCLK_* are the working clocks
                         * of device without including on the NOC, needed for