Commit aad3ae05 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'imx-fixes-4.1-2' of...

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
parents e2608180 e46b5a64
...@@ -223,7 +223,7 @@ dtb-$(CONFIG_SOC_IMX25) += \ ...@@ -223,7 +223,7 @@ dtb-$(CONFIG_SOC_IMX25) += \
imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \ imx25-eukrea-mbimxsd25-baseboard-dvi-vga.dtb \
imx25-karo-tx25.dtb \ imx25-karo-tx25.dtb \
imx25-pdk.dtb imx25-pdk.dtb
dtb-$(CONFIG_SOC_IMX31) += \ dtb-$(CONFIG_SOC_IMX27) += \
imx27-apf27.dtb \ imx27-apf27.dtb \
imx27-apf27dev.dtb \ imx27-apf27dev.dtb \
imx27-eukrea-mbimxsd27-baseboard.dtb \ imx27-eukrea-mbimxsd27-baseboard.dtb \
......
...@@ -533,7 +533,7 @@ iim: iim@10028000 { ...@@ -533,7 +533,7 @@ iim: iim@10028000 {
fec: ethernet@1002b000 { fec: ethernet@1002b000 {
compatible = "fsl,imx27-fec"; compatible = "fsl,imx27-fec";
reg = <0x1002b000 0x4000>; reg = <0x1002b000 0x1000>;
interrupts = <50>; interrupts = <50>;
clocks = <&clks IMX27_CLK_FEC_IPG_GATE>, clocks = <&clks IMX27_CLK_FEC_IPG_GATE>,
<&clks IMX27_CLK_FEC_AHB_GATE>; <&clks IMX27_CLK_FEC_AHB_GATE>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment