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 | |
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')
6 files changed, 25 insertions, 10 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"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts index c375af4..c1d671de2 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-qds-sdk.dts @@ -68,6 +68,7 @@ ethernet@9 { compatible = "fsl,dpa-ethernet"; fsl,fman-mac = <&enet7>; + dma-coherent; }; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts index bfe2f36..f84e49b 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb-sdk.dts @@ -65,9 +65,16 @@ }; &fsldpaa { + ethernet@0 { + status = "disabled"; + }; + ethernet@1 { + status = "disabled"; + }; ethernet@9 { compatible = "fsl,dpa-ethernet"; fsl,fman-mac = <&enet7>; + dma-coherent; }; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi index dc5d7f6..9aa4483 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi @@ -523,7 +523,7 @@ #size-cells = <0>; reg = <0x0 0x2000000 0x0 0x10000>; interrupts = <0 34 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clockgen 4 3>; + clocks = <&clockgen 4 7>; status = "disabled"; }; @@ -533,7 +533,7 @@ #size-cells = <0>; reg = <0x0 0x2010000 0x0 0x10000>; interrupts = <0 34 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clockgen 4 3>; + clocks = <&clockgen 4 7>; status = "disabled"; }; @@ -543,7 +543,7 @@ #size-cells = <0>; reg = <0x0 0x2020000 0x0 0x10000>; interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clockgen 4 3>; + clocks = <&clockgen 4 7>; status = "disabled"; }; @@ -553,7 +553,7 @@ #size-cells = <0>; reg = <0x0 0x2030000 0x0 0x10000>; interrupts = <0 35 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clockgen 4 3>; + clocks = <&clockgen 4 7>; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi index 4dd400f..9bef9e1 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi @@ -689,7 +689,7 @@ reg = <0x0 0x2000000 0x0 0x10000>; interrupts = <0 34 0x4>; /* Level high type */ clock-names = "i2c"; - clocks = <&clockgen 4 3>; + clocks = <&clockgen 4 1>; }; i2c1: i2c@2010000 { @@ -700,7 +700,7 @@ reg = <0x0 0x2010000 0x0 0x10000>; interrupts = <0 34 0x4>; /* Level high type */ clock-names = "i2c"; - clocks = <&clockgen 4 3>; + clocks = <&clockgen 4 1>; }; i2c2: i2c@2020000 { @@ -711,7 +711,7 @@ reg = <0x0 0x2020000 0x0 0x10000>; interrupts = <0 35 0x4>; /* Level high type */ clock-names = "i2c"; - clocks = <&clockgen 4 3>; + clocks = <&clockgen 4 1>; }; i2c3: i2c@2030000 { @@ -722,7 +722,7 @@ reg = <0x0 0x2030000 0x0 0x10000>; interrupts = <0 35 0x4>; /* Level high type */ clock-names = "i2c"; - clocks = <&clockgen 4 3>; + clocks = <&clockgen 4 1>; }; ifc: ifc@2240000 { diff --git a/arch/arm64/boot/dts/freescale/qoriq-dpaa-eth.dtsi b/arch/arm64/boot/dts/freescale/qoriq-dpaa-eth.dtsi index eb5af91..5c6be92 100644 --- a/arch/arm64/boot/dts/freescale/qoriq-dpaa-eth.dtsi +++ b/arch/arm64/boot/dts/freescale/qoriq-dpaa-eth.dtsi @@ -37,30 +37,37 @@ fsldpaa: fsl,dpaa { ethernet@0 { compatible = "fsl,dpa-ethernet"; fsl,fman-mac = <&enet0>; + dma-coherent; }; ethernet@1 { compatible = "fsl,dpa-ethernet"; fsl,fman-mac = <&enet1>; + dma-coherent; }; ethernet@2 { compatible = "fsl,dpa-ethernet"; fsl,fman-mac = <&enet2>; + dma-coherent; }; ethernet@3 { compatible = "fsl,dpa-ethernet"; fsl,fman-mac = <&enet3>; + dma-coherent; }; ethernet@4 { compatible = "fsl,dpa-ethernet"; fsl,fman-mac = <&enet4>; + dma-coherent; }; ethernet@5 { compatible = "fsl,dpa-ethernet"; fsl,fman-mac = <&enet5>; + dma-coherent; }; ethernet@8 { compatible = "fsl,dpa-ethernet"; fsl,fman-mac = <&enet6>; + dma-coherent; }; }; |