diff options
author | Michael Turquette <mturquette@baylibre.com> | 2016-02-15 11:59:45 -0800 |
---|---|---|
committer | Michael Turquette <mturquette@baylibre.com> | 2016-02-15 11:59:45 -0800 |
commit | 70750ff2c91049beca635e0a31ac19f8b54aebee (patch) | |
tree | bd63e9999741ecda668f74bdd83d97432eac0aea /arch | |
parent | 7208d1d9c568de02ca89cc976d206e4196803140 (diff) | |
parent | 36714529f8bbd4f8eaf93b50f4a64c52a24879aa (diff) |
Merge tag 'v4.6-rockchip-clk1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next
Introduction of a factor type and a variant containing a gate
to be able to also declare factor clocks in their correct
place in the clock tree instead of having to register factor
clocks in the init callback separately. And as always some more
clock-ids and non-regression fixes for mistakes introduced in
past kernel releases.
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/rk3288-veyron.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 9fce91ffff6f..cb27a8f5a8e2 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -421,7 +421,7 @@ status = "okay"; assigned-clocks = <&cru SCLK_USBPHY480M_SRC>; - assigned-clock-parents = <&cru SCLK_OTGPHY0>; + assigned-clock-parents = <&usbphy0>; dr_mode = "host"; }; |