Commit ad040d8d authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'imx-fixes-4.10' of...

Merge tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

Pull "i.MX fixes for 4.10" from Shawn Guo:

 - A format fix for vf610-zii-dev-rev-b.dts, which has a very odd line
   due to misses a newline.
 - A fix to imx-weim bus error seen on board which doesn't actually use
   the bus.
 - A fix for imx6qdl-nitrogen6x board which has conflicting usage of
   pad NANDF_CS2.
 - A cleanup on i.MX1 machine to remove .map_io callback, which also
   fixes a compiling error for NOMMU build.
 - Fix AVIC base address in i.MX31 device tree source.  The problem was
   shadowed by the AVIC driver, which takes the correct base address
   from a SoC specific header file.

* tag 'imx-fixes-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6: Disable "weim" node in the dtsi files
  ARM: i.MX: remove map_io callback
  ARM: dts: vf610-zii-dev-rev-b: Add missing newline
  ARM: dts: imx6qdl-nitrogen6x: remove duplicate iomux entry
  ARM: dts: imx31: fix AVIC base address
parents fcf14b88 116dad7d
...@@ -31,11 +31,11 @@ cpu { ...@@ -31,11 +31,11 @@ cpu {
}; };
}; };
avic: avic-interrupt-controller@60000000 { avic: interrupt-controller@68000000 {
compatible = "fsl,imx31-avic", "fsl,avic"; compatible = "fsl,imx31-avic", "fsl,avic";
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <1>;
reg = <0x60000000 0x100000>; reg = <0x68000000 0x100000>;
}; };
soc { soc {
......
...@@ -533,7 +533,6 @@ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17071 ...@@ -533,7 +533,6 @@ MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17071
MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17071 MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17071
MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17071 MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17071
MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17071 MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17071
MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x000b0
>; >;
}; };
......
...@@ -1100,6 +1100,7 @@ weim: weim@021b8000 { ...@@ -1100,6 +1100,7 @@ weim: weim@021b8000 {
interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6QDL_CLK_EIM_SLOW>; clocks = <&clks IMX6QDL_CLK_EIM_SLOW>;
fsl,weim-cs-gpr = <&gpr>; fsl,weim-cs-gpr = <&gpr>;
status = "disabled";
}; };
ocotp: ocotp@021bc000 { ocotp: ocotp@021bc000 {
......
...@@ -900,6 +900,7 @@ weim: weim@021b8000 { ...@@ -900,6 +900,7 @@ weim: weim@021b8000 {
reg = <0x021b8000 0x4000>; reg = <0x021b8000 0x4000>;
interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
fsl,weim-cs-gpr = <&gpr>; fsl,weim-cs-gpr = <&gpr>;
status = "disabled";
}; };
ocotp: ocotp@021bc000 { ocotp: ocotp@021bc000 {
......
...@@ -977,6 +977,7 @@ weim: weim@021b8000 { ...@@ -977,6 +977,7 @@ weim: weim@021b8000 {
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SX_CLK_EIM_SLOW>; clocks = <&clks IMX6SX_CLK_EIM_SLOW>;
fsl,weim-cs-gpr = <&gpr>; fsl,weim-cs-gpr = <&gpr>;
status = "disabled";
}; };
ocotp: ocotp@021bc000 { ocotp: ocotp@021bc000 {
......
...@@ -153,7 +153,8 @@ switch0phy0: switch0phy0@0 { ...@@ -153,7 +153,8 @@ switch0phy0: switch0phy0@0 {
switch0phy1: switch1phy0@1 { switch0phy1: switch1phy0@1 {
reg = <1>; reg = <1>;
interrupt-parent = <&switch0>; interrupt-parent = <&switch0>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>; }; interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
};
switch0phy2: switch1phy0@2 { switch0phy2: switch1phy0@2 {
reg = <2>; reg = <2>;
interrupt-parent = <&switch0>; interrupt-parent = <&switch0>;
......
...@@ -37,7 +37,6 @@ static const char * const imx1_dt_board_compat[] __initconst = { ...@@ -37,7 +37,6 @@ static const char * const imx1_dt_board_compat[] __initconst = {
}; };
DT_MACHINE_START(IMX1_DT, "Freescale i.MX1 (Device Tree Support)") DT_MACHINE_START(IMX1_DT, "Freescale i.MX1 (Device Tree Support)")
.map_io = debug_ll_io_init,
.init_early = imx1_init_early, .init_early = imx1_init_early,
.init_irq = imx1_init_irq, .init_irq = imx1_init_irq,
.dt_compat = imx1_dt_board_compat, .dt_compat = imx1_dt_board_compat,
......
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