diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-18 15:24:18 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-18 15:24:18 -0400 |
| commit | a7a30232df01db886473324050d79c3122937c78 (patch) | |
| tree | 76323b745b44b792173575843a72a2f6baa8a6da /arch/arm/boot/dts/imx6sl.dtsi | |
| parent | f86e0add813a3cc0e338089fa6c0928f5f6dc52d (diff) | |
| parent | fce9e5bb25264153f9f002eada41757118d25ba9 (diff) | |
Merge branch 'v3.17-next/cleanup-samsung' into v3.17-next/dt-s5pv210
Diffstat (limited to 'arch/arm/boot/dts/imx6sl.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6sl.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 2d4e5285f3f3..57d4abe03a94 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi | |||
| @@ -686,7 +686,7 @@ | |||
| 686 | compatible = "fsl,imx6sl-fec", "fsl,imx25-fec"; | 686 | compatible = "fsl,imx6sl-fec", "fsl,imx25-fec"; |
| 687 | reg = <0x02188000 0x4000>; | 687 | reg = <0x02188000 0x4000>; |
| 688 | interrupts = <0 114 IRQ_TYPE_LEVEL_HIGH>; | 688 | interrupts = <0 114 IRQ_TYPE_LEVEL_HIGH>; |
| 689 | clocks = <&clks IMX6SL_CLK_ENET_REF>, | 689 | clocks = <&clks IMX6SL_CLK_ENET>, |
| 690 | <&clks IMX6SL_CLK_ENET_REF>; | 690 | <&clks IMX6SL_CLK_ENET_REF>; |
| 691 | clock-names = "ipg", "ahb"; | 691 | clock-names = "ipg", "ahb"; |
| 692 | status = "disabled"; | 692 | status = "disabled"; |