diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2018-12-24 06:14:45 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-12-24 06:14:45 +0300 |
| commit | 12526b0d6c580df860b31e59d68e5696e16c6e5b (patch) | |
| tree | d6e351d9ea74a9026907291763f87427dc5e4984 /arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi | |
| parent | 9bbc7e4ce47ecefa142fcba55eef7754af1b0213 (diff) | |
| parent | 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 (diff) | |
| download | linux-12526b0d6c580df860b31e59d68e5696e16c6e5b.tar.xz | |
Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include elimination of legacy clock bindings use from dts
files, an 83xx watchdog handler, fixes to old dts interrupt errors, and
some minor cleanup."
Diffstat (limited to 'arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi')
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi b/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi index 88d8423f8ac5..bb7b9b9f3f5f 100644 --- a/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi @@ -70,14 +70,14 @@ cpu0: PowerPC,e6500@0 { device_type = "cpu"; reg = <0 1>; - clocks = <&mux0>; + clocks = <&clockgen 1 0>; next-level-cache = <&L2_1>; fsl,portid-mapping = <0x80000000>; }; cpu1: PowerPC,e6500@2 { device_type = "cpu"; reg = <2 3>; - clocks = <&mux0>; + clocks = <&clockgen 1 0>; next-level-cache = <&L2_1>; fsl,portid-mapping = <0x80000000>; }; |