diff options
| author | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-12-12 09:41:24 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-12-12 09:41:24 (GMT) |
| commit | 96b8b743d2b8ad69614a79a2919b466ab01bb1fe (patch) | |
| tree | 3d4ebdd3e9d053c60dfe02ed79cdc9cebca22e8f /arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | |
| parent | 708b8b8eb67124716c8579a9e259742b040d4dd3 (diff) | |
| parent | 85464a211ccb5e3874b323623a7cf2f07bce9fc1 (diff) | |
| download | linux-96b8b743d2b8ad69614a79a2919b466ab01bb1fe.tar.xz | |
Merge branch 'linux-4.9-nxp' into linux-4.9 on Dec. 12, 2017
Signed-off-by: Xiaobo Xie <xiaobo.xie@nxp.com>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi index ea56b80..071fa88 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi @@ -380,7 +380,7 @@ #size-cells = <0>; reg = <0x0 0x2180000 0x0 0x10000>; interrupts = <0 56 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clockgen 4 0>; + clocks = <&clockgen 4 3>; status = "disabled"; }; @@ -390,7 +390,7 @@ #size-cells = <0>; reg = <0x0 0x2190000 0x0 0x10000>; interrupts = <0 57 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clockgen 4 0>; + clocks = <&clockgen 4 3>; status = "disabled"; }; |