mbox

[GIT,PULL,v2] Renesas ARM-based SoC board updates for v3.10

Message ID 1363659481-5922-1-git-send-email-horms+renesas@verge.net.au
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.10

Message

Simon Horman March 19, 2013, 2:17 a.m. UTC 
Hi Arnd, Hi Olof,

The following changes since commit a9cc2c88aa9514296f868c9ea740b8addc7b8115:

  Merge branches 'soc' and 'pinmux' into boards-base (2013-03-18 21:26:33 +0900)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.10

for you to fetch changes up to 48296a13e7f411402f080d0603724623fa3eee14:

  ARM: shmobile: kzm9g: correct smsc regulator registration (2013-03-18 21:27:03 +0900)

----------------------------------------------------------------
Renesas ARM-based SoC board updates for v3.10

This is based on a merge of the following:

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-pinmux-for-v3.10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-for-v3.10

----------------------------------------------------------------
Arnd Bergmann (1):
      ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused

Guennadi Liakhovetski (6):
      ARM: shmobile: use GPIO SD-card detection on armadillo800eva
      ARM: shmobile: switch SDHI0 to GPIO regulator on armadillo800eva
      ARM: shmobile: streamline mackerel SD and MMC devices
      ARM: shmobile: parse DT and configure pinmux early on kzm9g-reference
      ARM: shmobile: SDHI and MMCIF interfaces to kzm9g-reference
      ARM: shmobile: simplify kzm9g Kconfig dependencies

Kuninori Morimoto (1):
      ARM: shmobile: marzen: Use gic_iid macro for ICCIAR / interrupt ID

Simon Horman (5):
      ARM: shmobile: marzen: Reference DT implementation
      ARM: shmobile: kzm9g: Reference DT implementation
      ARM: shmobile: kzm9g: Remove warning about SMP
      ARM: shmobile: kzm9g: Trim reference DT_MACHINE_START
      ARM: shmobile: kzm9g: correct smsc regulator registration

 arch/arm/boot/dts/Makefile                      |    2 +
 arch/arm/boot/dts/r8a7779-marzen-reference.dts  |   47 +++++++++
 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts    |   77 +++++++++++++++
 arch/arm/mach-shmobile/Kconfig                  |   27 ++++++
 arch/arm/mach-shmobile/Makefile                 |    2 +
 arch/arm/mach-shmobile/board-armadillo800eva.c  |  111 ++++++++++++++++++----
 arch/arm/mach-shmobile/board-kzm9g-reference.c  |  108 +++++++++++++++++++++
 arch/arm/mach-shmobile/board-kzm9g.c            |    4 +-
 arch/arm/mach-shmobile/board-mackerel.c         |  115 ++++++++++++-----------
 arch/arm/mach-shmobile/board-marzen-reference.c |   75 +++++++++++++++
 arch/arm/mach-shmobile/board-marzen.c           |   12 +--
 11 files changed, 496 insertions(+), 84 deletions(-)
 create mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts
 create mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
 create mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c
 create mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c

Comments

Arnd Bergmann March 21, 2013, 5:18 p.m. UTC | #1 
On Tuesday 19 March 2013, Simon Horman wrote:

> ----------------------------------------------------------------
> Renesas ARM-based SoC board updates for v3.10
> 
> This is based on a merge of the following:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-pinmux-for-v3.10
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-for-v3.10

Pulled into next/boards.

Please verify that I have pulled everything you sent me. If not, it my mistake.

Thanks,

	Arnd
Arnd Bergmann March 21, 2013, 7:22 p.m. UTC | #2 
On Thursday 21 March 2013, Arnd Bergmann wrote:
> On Tuesday 19 March 2013, Simon Horman wrote:

> Pulled into next/boards.
> 
> Please verify that I have pulled everything you sent me. If not, it my mistake.

With everything applied, I now get one build failure and a new build warning:

==> build/mackerel_defconfig/faillog <==
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c: In function 'mackerel_init':
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1476:15: error: 'GPIO_FN_MMCD0_0' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1476:15: note: each undeclared identifier is reported only once for each function it appears in
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1477:15: error: 'GPIO_FN_MMCD0_1' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1478:15: error: 'GPIO_FN_MMCD0_2' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1479:15: error: 'GPIO_FN_MMCD0_3' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1480:15: error: 'GPIO_FN_MMCD0_4' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1481:15: error: 'GPIO_FN_MMCD0_5' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1482:15: error: 'GPIO_FN_MMCD0_6' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1483:15: error: 'GPIO_FN_MMCD0_7' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1484:15: error: 'GPIO_FN_MMCCMD0' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1485:15: error: 'GPIO_FN_MMCCLK0' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1489:15: error: 'GPIO_FN_SDHICMD2' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1490:15: error: 'GPIO_FN_SDHICLK2' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1491:15: error: 'GPIO_FN_SDHID2_3' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1492:15: error: 'GPIO_FN_SDHID2_2' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1493:15: error: 'GPIO_FN_SDHID2_1' undeclared (first use in this function)
/git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1494:15: error: 'GPIO_FN_SDHID2_0' undeclared (first use in this function)
make[3]: *** [arch/arm/mach-shmobile/board-mackerel.o] Error 1
make[3]: Target `__build' not remade because of errors.
make[2]: *** [arch/arm/mach-shmobile] Error 2
make[2]: Target `_all' not remade because of errors.
make[1]: *** [sub-make] Error 2
make[1]: Target `_all' not remade because of errors.

==> build/marzen_defconfig/faillog <==
In file included from /git/arm-soc/arch/arm/mach-shmobile/setup-r8a7779.c:24:0:
/git/arm-soc/include/linux/of_platform.h:107:13: warning: 'struct of_device_id' declared inside parameter list [enabled by default]
/git/arm-soc/include/linux/of_platform.h:107:13: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
/git/arm-soc/include/linux/of_platform.h:107:13: warning: 'struct device_node' declared inside parameter list [enabled by default]


I have not tried bisecting the problems. Could you find out what is going on
and send bug fixes to apply on top?

	Arnd
Simon Horman March 22, 2013, 12:32 a.m. UTC | #3 
On Thu, Mar 21, 2013 at 07:22:56PM +0000, Arnd Bergmann wrote:
> On Thursday 21 March 2013, Arnd Bergmann wrote:
> > On Tuesday 19 March 2013, Simon Horman wrote:
> 
> > Pulled into next/boards.
> > 
> > Please verify that I have pulled everything you sent me. If not, it my mistake.
> 
> With everything applied, I now get one build failure and a new build warning:
> 
> ==> build/mackerel_defconfig/faillog <==
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c: In function 'mackerel_init':
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1476:15: error: 'GPIO_FN_MMCD0_0' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1476:15: note: each undeclared identifier is reported only once for each function it appears in
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1477:15: error: 'GPIO_FN_MMCD0_1' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1478:15: error: 'GPIO_FN_MMCD0_2' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1479:15: error: 'GPIO_FN_MMCD0_3' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1480:15: error: 'GPIO_FN_MMCD0_4' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1481:15: error: 'GPIO_FN_MMCD0_5' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1482:15: error: 'GPIO_FN_MMCD0_6' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1483:15: error: 'GPIO_FN_MMCD0_7' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1484:15: error: 'GPIO_FN_MMCCMD0' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1485:15: error: 'GPIO_FN_MMCCLK0' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1489:15: error: 'GPIO_FN_SDHICMD2' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1490:15: error: 'GPIO_FN_SDHICLK2' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1491:15: error: 'GPIO_FN_SDHID2_3' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1492:15: error: 'GPIO_FN_SDHID2_2' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1493:15: error: 'GPIO_FN_SDHID2_1' undeclared (first use in this function)
> /git/arm-soc/arch/arm/mach-shmobile/board-mackerel.c:1494:15: error: 'GPIO_FN_SDHID2_0' undeclared (first use in this function)
> make[3]: *** [arch/arm/mach-shmobile/board-mackerel.o] Error 1
> make[3]: Target `__build' not remade because of errors.
> make[2]: *** [arch/arm/mach-shmobile] Error 2
> make[2]: Target `_all' not remade because of errors.
> make[1]: *** [sub-make] Error 2
> make[1]: Target `_all' not remade because of errors.
> 
> ==> build/marzen_defconfig/faillog <==
> In file included from /git/arm-soc/arch/arm/mach-shmobile/setup-r8a7779.c:24:0:
> /git/arm-soc/include/linux/of_platform.h:107:13: warning: 'struct of_device_id' declared inside parameter list [enabled by default]
> /git/arm-soc/include/linux/of_platform.h:107:13: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
> /git/arm-soc/include/linux/of_platform.h:107:13: warning: 'struct device_node' declared inside parameter list [enabled by default]
> 
> 
> I have not tried bisecting the problems. Could you find out what is going on
> and send bug fixes to apply on top?

Thanks Arnd,

I noticed this only slightly before you did and I apologise for not catching it earlier.
I have a fix queued up and will send you a pull request shortly.