[GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window

[GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window

[Tony Lindgren]

The following changes since commit f41509ad0d4c11d0911630440749d409ce2aa1aa:

  Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal (2013-10-14 11:33:07 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-removal-signed

for you to fetch changes up to f0c09b7c3b4e6b2fe501b3e888797b470de8320c:

  ARM: OMAP2+: Remove legacy support for zoom platforms (2013-10-15 17:38:21 -0700)

----------------------------------------------------------------
Changes needed to drop legacy booting support for some
omap3 boards.

Note that that these are based on a merge of the
following for the dependencies:

- v3.12-rc5 for fixes to pinctrl mask
- omap-for-v3.13/dt-signed to avoid pointless merge conflicts
- omap-for-v3.13/quirk-signed for legacy pdata handling

----------------------------------------------------------------
Aaro Koskinen (2):
      ARM: dts: add minimal DT support for Nokia N950 & N9 phones
      ARM: OMAP2: delete board-rm680

Tony Lindgren (6):
      ARM: dts: Shared file for omap GPMC connected smsc911x
      ARM: dts: Add common support for omap3-evm
      ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
      ARM: dts: Add basic support for zoom3
      ARM: OMAP2+: Remove legacy booting support for omap3 EVM
      ARM: OMAP2+: Remove legacy support for zoom platforms

 arch/arm/boot/dts/Makefile                   |   4 +
 arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi    |  52 ++
 arch/arm/boot/dts/omap-zoom-common.dtsi      |  33 ++
 arch/arm/boot/dts/omap3-evm-37xx.dts         | 146 ++++++
 arch/arm/boot/dts/omap3-evm-common.dtsi      |  96 ++++
 arch/arm/boot/dts/omap3-evm.dts              |  58 +-
 arch/arm/boot/dts/omap3-igep0020.dts         |  45 +-
 arch/arm/boot/dts/omap3-n9.dts               |  18 +
 arch/arm/boot/dts/omap3-n950-n9.dtsi         | 174 ++++++
 arch/arm/boot/dts/omap3-n950.dts             |  18 +
 arch/arm/boot/dts/omap3-zoom3.dts            | 217 ++++++++
 arch/arm/mach-omap2/Kconfig                  |  33 --
 arch/arm/mach-omap2/Makefile                 |  11 -
 arch/arm/mach-omap2/board-3630sdp.c          | 225 --------
 arch/arm/mach-omap2/board-ldp.c              |   3 +-
 arch/arm/mach-omap2/board-omap3evm.c         | 756 ---------------------------
 arch/arm/mach-omap2/board-rm680.c            | 167 ------
 arch/arm/mach-omap2/board-zoom-debugboard.c  | 139 -----
 arch/arm/mach-omap2/board-zoom-display.c     |  71 ---
 arch/arm/mach-omap2/board-zoom-peripherals.c | 360 -------------
 arch/arm/mach-omap2/board-zoom.c             | 159 ------
 arch/arm/mach-omap2/board-zoom.h             |  10 -
 22 files changed, 763 insertions(+), 2032 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi
 create mode 100644 arch/arm/boot/dts/omap-zoom-common.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-evm-37xx.dts
 create mode 100644 arch/arm/boot/dts/omap3-evm-common.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-n9.dts
 create mode 100644 arch/arm/boot/dts/omap3-n950-n9.dtsi
 create mode 100644 arch/arm/boot/dts/omap3-n950.dts
 create mode 100644 arch/arm/boot/dts/omap3-zoom3.dts
 delete mode 100644 arch/arm/mach-omap2/board-3630sdp.c
 delete mode 100644 arch/arm/mach-omap2/board-omap3evm.c
 delete mode 100644 arch/arm/mach-omap2/board-rm680.c
 delete mode 100644 arch/arm/mach-omap2/board-zoom-debugboard.c
 delete mode 100644 arch/arm/mach-omap2/board-zoom-display.c
 delete mode 100644 arch/arm/mach-omap2/board-zoom-peripherals.c
 delete mode 100644 arch/arm/mach-omap2/board-zoom.c
 delete mode 100644 arch/arm/mach-omap2/board-zoom.h

[GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window

[Kevin Hilman]

Hi Tony,

Tony Lindgren <tony@atomide.com> writes:

> The following changes since commit f41509ad0d4c11d0911630440749d409ce2aa1aa:
>
>   Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal (2013-10-14 11:33:07 -0700)
>
> are available in the git repository at:
>
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-removal-signed
>
> for you to fetch changes up to f0c09b7c3b4e6b2fe501b3e888797b470de8320c:
>
>   ARM: OMAP2+: Remove legacy support for zoom platforms (2013-10-15 17:38:21 -0700)
>
> ----------------------------------------------------------------
> Changes needed to drop legacy booting support for some
> omap3 boards.
>
> Note that that these are based on a merge of the
> following for the dependencies:
>
> - v3.12-rc5 for fixes to pinctrl mask
> - omap-for-v3.13/dt-signed to avoid pointless merge conflicts
> - omap-for-v3.13/quirk-signed for legacy pdata handling
>
> ----------------------------------------------------------------
> Aaro Koskinen (2):
>       ARM: dts: add minimal DT support for Nokia N950 & N9 phones
>       ARM: OMAP2: delete board-rm680
>
> Tony Lindgren (6):
>       ARM: dts: Shared file for omap GPMC connected smsc911x
>       ARM: dts: Add common support for omap3-evm
>       ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
>       ARM: dts: Add basic support for zoom3

This patch introduces a build failure when compiling the DTBs:

  [...]
  DTC     arch/arm/boot/dts/omap3-zoom3.dtb
ERROR (phandle_references): Reference to non-existent node or label "wl12xx_gpio"

Kevin

[GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window

[Tony Lindgren]

* Kevin Hilman <khilman@linaro.org> [131018 07:49]:
> Hi Tony,
> 
> Tony Lindgren <tony@atomide.com> writes:
> 
> > The following changes since commit f41509ad0d4c11d0911630440749d409ce2aa1aa:
> >
> >   Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal (2013-10-14 11:33:07 -0700)
> >
> > are available in the git repository at:
> >
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-removal-signed
> >
> > for you to fetch changes up to f0c09b7c3b4e6b2fe501b3e888797b470de8320c:
> >
> >   ARM: OMAP2+: Remove legacy support for zoom platforms (2013-10-15 17:38:21 -0700)
> >
> > ----------------------------------------------------------------
> > Changes needed to drop legacy booting support for some
> > omap3 boards.
> >
> > Note that that these are based on a merge of the
> > following for the dependencies:
> >
> > - v3.12-rc5 for fixes to pinctrl mask
> > - omap-for-v3.13/dt-signed to avoid pointless merge conflicts
> > - omap-for-v3.13/quirk-signed for legacy pdata handling
> >
> > ----------------------------------------------------------------
> > Aaro Koskinen (2):
> >       ARM: dts: add minimal DT support for Nokia N950 & N9 phones
> >       ARM: OMAP2: delete board-rm680
> >
> > Tony Lindgren (6):
> >       ARM: dts: Shared file for omap GPMC connected smsc911x
> >       ARM: dts: Add common support for omap3-evm
> >       ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
> >       ARM: dts: Add basic support for zoom3
> 
> This patch introduces a build failure when compiling the DTBs:
> 
>   [...]
>   DTC     arch/arm/boot/dts/omap3-zoom3.dtb
> ERROR (phandle_references): Reference to non-existent node or label "wl12xx_gpio"

Oops sorry, looks like the common support for omap3-evm has a
pinctrl entry that should be in the omap3-evm-37xx only. I guess
I did not run make dtbs after adding the omap3-evm-37xx parts.
The patch below fixes it for me.

Do you want a new pull request or just the fix below?

Regards,

Tony

8< -----------------------------------------
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 18 Oct 2013 08:16:25 -0700
Subject: [PATCH] ARM: dts: Fix build error for omap3-evm after adding common file

Commit c4856107 ((ARM: dts: Add basic support for TMDSEVM3730
(Mistral AM/DM37x EVM)) added a pinctrl entry to the common file
for evm that should be only in the omap3-evm-37xx. This causes:

ERROR (phandle_references): Reference to non-existent node or label "wl12xx_gpio"

Fix it by moving the entry to omap3-evm-37xx.

Reported-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

--- a/arch/arm/boot/dts/omap3-evm-37xx.dts
+++ b/arch/arm/boot/dts/omap3-evm-37xx.dts
@@ -19,6 +19,11 @@
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
+
+	wl12xx_vmmc: wl12xx_vmmc {
+		pinctrl-names = "default";
+		pinctrl-0 = <&wl12xx_gpio>;
+	};
 };
 
 &omap3_pmx_core {
--- a/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@ -21,8 +21,6 @@
 	};
 
 	wl12xx_vmmc: wl12xx_vmmc {
-		pinctrl-names = "default";
-		pinctrl-0 = <&wl12xx_gpio>;
 		compatible = "regulator-fixed";
 		regulator-name = "vwl1271";
 		regulator-min-microvolt = <1800000>;

[GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window

[Javier Martinez Canillas]

On Fri, Oct 18, 2013 at 5:24 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Kevin Hilman <khilman@linaro.org> [131018 07:49]:
>> Hi Tony,
>>
>> Tony Lindgren <tony@atomide.com> writes:
>>
>> > The following changes since commit f41509ad0d4c11d0911630440749d409ce2aa1aa:
>> >
>> >   Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal (2013-10-14 11:33:07 -0700)
>> >
>> > are available in the git repository at:
>> >
>> >
>> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-removal-signed
>> >
>> > for you to fetch changes up to f0c09b7c3b4e6b2fe501b3e888797b470de8320c:
>> >
>> >   ARM: OMAP2+: Remove legacy support for zoom platforms (2013-10-15 17:38:21 -0700)
>> >
>> > ----------------------------------------------------------------
>> > Changes needed to drop legacy booting support for some
>> > omap3 boards.
>> >
>> > Note that that these are based on a merge of the
>> > following for the dependencies:
>> >
>> > - v3.12-rc5 for fixes to pinctrl mask
>> > - omap-for-v3.13/dt-signed to avoid pointless merge conflicts
>> > - omap-for-v3.13/quirk-signed for legacy pdata handling
>> >
>> > ----------------------------------------------------------------
>> > Aaro Koskinen (2):
>> >       ARM: dts: add minimal DT support for Nokia N950 & N9 phones
>> >       ARM: OMAP2: delete board-rm680
>> >
>> > Tony Lindgren (6):
>> >       ARM: dts: Shared file for omap GPMC connected smsc911x
>> >       ARM: dts: Add common support for omap3-evm
>> >       ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
>> >       ARM: dts: Add basic support for zoom3
>>
>> This patch introduces a build failure when compiling the DTBs:
>>
>>   [...]
>>   DTC     arch/arm/boot/dts/omap3-zoom3.dtb
>> ERROR (phandle_references): Reference to non-existent node or label "wl12xx_gpio"
>
> Oops sorry, looks like the common support for omap3-evm has a
> pinctrl entry that should be in the omap3-evm-37xx only. I guess
> I did not run make dtbs after adding the omap3-evm-37xx parts.
> The patch below fixes it for me.
>
> Do you want a new pull request or just the fix below?
>

Hi Tony,

If you do a new pull request, it would be great if you can include:

[PATCH v2 1/1] ARM: OMAP2+: remove legacy support for IGEP boards [1]

Thanks a lot and best regards,
Javier

[1]: https://patchwork.kernel.org/patch/3068681/

[GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window

[Tony Lindgren]

* Javier Martinez Canillas <martinez.javier@gmail.com> [131018 08:46]:
> On Fri, Oct 18, 2013 at 5:24 PM, Tony Lindgren <tony@atomide.com> wrote:
> > * Kevin Hilman <khilman@linaro.org> [131018 07:49]:
> >> Hi Tony,
> >>
> >> Tony Lindgren <tony@atomide.com> writes:
> >>
> >> > The following changes since commit f41509ad0d4c11d0911630440749d409ce2aa1aa:
> >> >
> >> >   Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal (2013-10-14 11:33:07 -0700)
> >> >
> >> > are available in the git repository at:
> >> >
> >> >
> >> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-removal-signed
> >> >
> >> > for you to fetch changes up to f0c09b7c3b4e6b2fe501b3e888797b470de8320c:
> >> >
> >> >   ARM: OMAP2+: Remove legacy support for zoom platforms (2013-10-15 17:38:21 -0700)
> >> >
> >> > ----------------------------------------------------------------
> >> > Changes needed to drop legacy booting support for some
> >> > omap3 boards.
> >> >
> >> > Note that that these are based on a merge of the
> >> > following for the dependencies:
> >> >
> >> > - v3.12-rc5 for fixes to pinctrl mask
> >> > - omap-for-v3.13/dt-signed to avoid pointless merge conflicts
> >> > - omap-for-v3.13/quirk-signed for legacy pdata handling
> >> >
> >> > ----------------------------------------------------------------
> >> > Aaro Koskinen (2):
> >> >       ARM: dts: add minimal DT support for Nokia N950 & N9 phones
> >> >       ARM: OMAP2: delete board-rm680
> >> >
> >> > Tony Lindgren (6):
> >> >       ARM: dts: Shared file for omap GPMC connected smsc911x
> >> >       ARM: dts: Add common support for omap3-evm
> >> >       ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
> >> >       ARM: dts: Add basic support for zoom3
> >>
> >> This patch introduces a build failure when compiling the DTBs:
> >>
> >>   [...]
> >>   DTC     arch/arm/boot/dts/omap3-zoom3.dtb
> >> ERROR (phandle_references): Reference to non-existent node or label "wl12xx_gpio"
> >
> > Oops sorry, looks like the common support for omap3-evm has a
> > pinctrl entry that should be in the omap3-evm-37xx only. I guess
> > I did not run make dtbs after adding the omap3-evm-37xx parts.
> > The patch below fixes it for me.
> >
> > Do you want a new pull request or just the fix below?
> >
> 
> Hi Tony,
> 
> If you do a new pull request, it would be great if you can include:
> 
> [PATCH v2 1/1] ARM: OMAP2+: remove legacy support for IGEP boards [1]

Sure I can do that, let's wait and see what Kevin prefers though.

Regards,

Tony
 
> [1]: https://patchwork.kernel.org/patch/3068681/

[GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window

[Kevin Hilman]

On Fri, Oct 18, 2013 at 8:24 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Kevin Hilman <khilman@linaro.org> [131018 07:49]:
>> Hi Tony,
>>
>> Tony Lindgren <tony@atomide.com> writes:
>>
>> > The following changes since commit f41509ad0d4c11d0911630440749d409ce2aa1aa:
>> >
>> >   Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal (2013-10-14 11:33:07 -0700)
>> >
>> > are available in the git repository at:
>> >
>> >
>> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-removal-signed
>> >
>> > for you to fetch changes up to f0c09b7c3b4e6b2fe501b3e888797b470de8320c:
>> >
>> >   ARM: OMAP2+: Remove legacy support for zoom platforms (2013-10-15 17:38:21 -0700)
>> >
>> > ----------------------------------------------------------------
>> > Changes needed to drop legacy booting support for some
>> > omap3 boards.
>> >
>> > Note that that these are based on a merge of the
>> > following for the dependencies:
>> >
>> > - v3.12-rc5 for fixes to pinctrl mask
>> > - omap-for-v3.13/dt-signed to avoid pointless merge conflicts
>> > - omap-for-v3.13/quirk-signed for legacy pdata handling
>> >
>> > ----------------------------------------------------------------
>> > Aaro Koskinen (2):
>> >       ARM: dts: add minimal DT support for Nokia N950 & N9 phones
>> >       ARM: OMAP2: delete board-rm680
>> >
>> > Tony Lindgren (6):
>> >       ARM: dts: Shared file for omap GPMC connected smsc911x
>> >       ARM: dts: Add common support for omap3-evm
>> >       ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
>> >       ARM: dts: Add basic support for zoom3
>>
>> This patch introduces a build failure when compiling the DTBs:
>>
>>   [...]
>>   DTC     arch/arm/boot/dts/omap3-zoom3.dtb
>> ERROR (phandle_references): Reference to non-existent node or label "wl12xx_gpio"
>
> Oops sorry, looks like the common support for omap3-evm has a
> pinctrl entry that should be in the omap3-evm-37xx only. I guess
> I did not run make dtbs after adding the omap3-evm-37xx parts.
> The patch below fixes it for me.
>
> Do you want a new pull request or just the fix below?

Thanks for the fix.

I'd prefer a new pull req so we don't have a broken build in the
middle of the series.

Thanks,

Kevin

[GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window

[Tony Lindgren]

* Kevin Hilman <khilman@linaro.org> [131018 10:14]:
> On Fri, Oct 18, 2013 at 8:24 AM, Tony Lindgren <tony@atomide.com> wrote:
> > * Kevin Hilman <khilman@linaro.org> [131018 07:49]:
> >> Hi Tony,
> >>
> >> Tony Lindgren <tony@atomide.com> writes:
> >>
> >> > The following changes since commit f41509ad0d4c11d0911630440749d409ce2aa1aa:
> >> >
> >> >   Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal (2013-10-14 11:33:07 -0700)
> >> >
> >> > are available in the git repository at:
> >> >
> >> >
> >> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-removal-signed
> >> >
> >> > for you to fetch changes up to f0c09b7c3b4e6b2fe501b3e888797b470de8320c:
> >> >
> >> >   ARM: OMAP2+: Remove legacy support for zoom platforms (2013-10-15 17:38:21 -0700)
> >> >
> >> > ----------------------------------------------------------------
> >> > Changes needed to drop legacy booting support for some
> >> > omap3 boards.
> >> >
> >> > Note that that these are based on a merge of the
> >> > following for the dependencies:
> >> >
> >> > - v3.12-rc5 for fixes to pinctrl mask
> >> > - omap-for-v3.13/dt-signed to avoid pointless merge conflicts
> >> > - omap-for-v3.13/quirk-signed for legacy pdata handling
> >> >
> >> > ----------------------------------------------------------------
> >> > Aaro Koskinen (2):
> >> >       ARM: dts: add minimal DT support for Nokia N950 & N9 phones
> >> >       ARM: OMAP2: delete board-rm680
> >> >
> >> > Tony Lindgren (6):
> >> >       ARM: dts: Shared file for omap GPMC connected smsc911x
> >> >       ARM: dts: Add common support for omap3-evm
> >> >       ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
> >> >       ARM: dts: Add basic support for zoom3
> >>
> >> This patch introduces a build failure when compiling the DTBs:
> >>
> >>   [...]
> >>   DTC     arch/arm/boot/dts/omap3-zoom3.dtb
> >> ERROR (phandle_references): Reference to non-existent node or label "wl12xx_gpio"
> >
> > Oops sorry, looks like the common support for omap3-evm has a
> > pinctrl entry that should be in the omap3-evm-37xx only. I guess
> > I did not run make dtbs after adding the omap3-evm-37xx parts.
> > The patch below fixes it for me.
> >
> > Do you want a new pull request or just the fix below?
> 
> Thanks for the fix.
> 
> I'd prefer a new pull req so we don't have a broken build in the
> middle of the series.

OK will apply Javier's patch also and send a new pull req.

Regards,

Tony