diff options
author | Ingo Molnar | 2018-01-30 15:08:27 +0100 |
---|---|---|
committer | Ingo Molnar | 2018-01-30 15:08:27 +0100 |
commit | 7e86548e2cc8d308cb75439480f428137151b0de (patch) | |
tree | fa3bcdedb64f4642a21080bc2b4ddc69ce2b2285 /arch/arm/boot/dts/r8a7792-wheat.dts | |
parent | x86/speculation: Simplify indirect_branch_prediction_barrier() (diff) | |
parent | Linux 4.15 (diff) | |
download | kernel-qcow2-linux-7e86548e2cc8d308cb75439480f428137151b0de.tar.gz kernel-qcow2-linux-7e86548e2cc8d308cb75439480f428137151b0de.tar.xz kernel-qcow2-linux-7e86548e2cc8d308cb75439480f428137151b0de.zip |
Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes
Time has come to switch PTI development over to a v4.15 base - we'll still
try to make sure that all PTI fixes backport cleanly to v4.14 and earlier.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/r8a7792-wheat.dts')
-rw-r--r-- | arch/arm/boot/dts/r8a7792-wheat.dts | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/r8a7792-wheat.dts b/arch/arm/boot/dts/r8a7792-wheat.dts index c24f26fdab1f..b9471b67b728 100644 --- a/arch/arm/boot/dts/r8a7792-wheat.dts +++ b/arch/arm/boot/dts/r8a7792-wheat.dts @@ -305,8 +305,7 @@ pinctrl-0 = <&du0_pins &du1_pins>; pinctrl-names = "default"; - clocks = <&mstp7_clks R8A7792_CLK_DU0>, <&mstp7_clks R8A7792_CLK_DU1>, - <&osc2_clk>; + clocks = <&cpg CPG_MOD 724>, <&cpg CPG_MOD 723>, <&osc2_clk>; clock-names = "du.0", "du.1", "dclkin.0"; status = "okay"; |