diff options
author | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 11:51:28 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-20 11:51:28 -0400 |
commit | aad3ae05bba3e95a9748919131760d93c4fb581b (patch) | |
tree | 525f86eade3f58b30a7ba592f601c86c4a40d50e /arch | |
parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
parent | e46b5a6470a5e2c8e1096f8f60887ac19949055b (diff) |
Merge tag 'imx-fixes-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Merge "The i.MX fixes for 4.1, 2nd round" from Shawn Guo:
- Fix i.MX27 FEC register map which overlaps the SCC (Security
Controller) register space.
- Fix i.MX27 DTB build rule which was wrongly controlled by i.MX31
option.
* tag 'imx-fixes-4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: fix imx27 dtb build rule
ARM: dts: imx27: only map 4 Kbyte for fec registers
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx27.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 86217db2937a..992736b5229b 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -223,7 +223,7 @@ dtb-$(CONFIG_SOC_IMX25) += \ | |||
223 | imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \ | 223 | imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \ |
224 | imx25-karo-tx25.dtb \ | 224 | imx25-karo-tx25.dtb \ |
225 | imx25-pdk.dtb | 225 | imx25-pdk.dtb |
226 | dtb-$(CONFIG_SOC_IMX31) += \ | 226 | dtb-$(CONFIG_SOC_IMX27) += \ |
227 | imx27-apf27.dtb \ | 227 | imx27-apf27.dtb \ |
228 | imx27-apf27dev.dtb \ | 228 | imx27-apf27dev.dtb \ |
229 | imx27-eukrea-mbimxsd27-baseboard.dtb \ | 229 | imx27-eukrea-mbimxsd27-baseboard.dtb \ |
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi index 6951b66d1ab7..bc215e4b75fd 100644 --- a/arch/arm/boot/dts/imx27.dtsi +++ b/arch/arm/boot/dts/imx27.dtsi | |||
@@ -533,7 +533,7 @@ | |||
533 | 533 | ||
534 | fec: ethernet@1002b000 { | 534 | fec: ethernet@1002b000 { |
535 | compatible = "fsl,imx27-fec"; | 535 | compatible = "fsl,imx27-fec"; |
536 | reg = <0x1002b000 0x4000>; | 536 | reg = <0x1002b000 0x1000>; |
537 | interrupts = <50>; | 537 | interrupts = <50>; |
538 | clocks = <&clks IMX27_CLK_FEC_IPG_GATE>, | 538 | clocks = <&clks IMX27_CLK_FEC_IPG_GATE>, |
539 | <&clks IMX27_CLK_FEC_AHB_GATE>; | 539 | <&clks IMX27_CLK_FEC_AHB_GATE>; |