From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL 3/3] ARM: shmobile: lager: enable Ether
Date: Thu, 22 Aug 2013 00:16:49 +0000 [thread overview]
Message-ID: <20130822001647.GA6902@verge.net.au> (raw)
In-Reply-To: <5215115A.1010400@cogentembedded.com>
On Wed, Aug 21, 2013 at 11:13:30PM +0400, Sergei Shtylyov wrote:
> Hello.
>
> On 08/21/2013 08:01 PM, Kevin Hilman wrote:
>
> >>Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >>Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
>
> >This one is triggering a new build failure in -next:
>
> >arch/arm/mach-shmobile/board-lager.c:99:2: error: unknown field 'register_type' specified in initializer
> >arch/arm/mach-shmobile/board-lager.c:99:19: error: 'SH_ETH_REG_FAST_RCAR' undeclared here (not in a function)
>
> >>+/* Ether */
> >>+static struct sh_eth_plat_data ether_pdata __initdata = {
> >>+ .phy = 0x1,
> >>+ .edmac_endian = EDMAC_LITTLE_ENDIAN,
> >>+ .register_type = SH_ETH_REG_FAST_RCAR,
>
> >and it looks to be because this board is trying to use the register_type
> >field which was removed by:
>
> >commit 8d3214c4e8c8be6efd8ec7a172239ebbd4deb04b
> >Author: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> >Date: Sun Aug 18 03:13:26 2013 +0400
> >
> > sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data'
> >
> > Now that the 'register_type' field of the 'sh_eth' driver's platform data is not
> > used by the driver anymore, it's time to remove it and its initializers from
> > the SH platform code. Also move *enum* declaring values for this field from
> > <linux/sh_eth.h> to the local driver's header file as they're only needed
> > by the driver itself now...
> >
> > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > Signed-off-by: David S. Miller <davem@davemloft.net>
>
> Looks like in this case I had no choice since R8A7790 support for
> the 'sh_eth' driver will be added in 3.12 only, so if I merged these
> patches thru the shmobile tree, we'd have gotten an error in the
> driver...
> I guess it's too early to fix this in any particular tree except
> for linux-next itself... let me know what I can do.
This patch ("ARM: shmobile: lager: enable Ether") is also targeted at v3.12.
So it seems to me that a fix for this could go through the shmobile tree
if it is acceptable to merge net-next into the base of a pull-request.
Kevin, Olof, could you give some guidance here.
next prev parent reply other threads:[~2013-08-22 0:16 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-07 4:30 [GIT PULL 0/3] Second round of Renesas ARM-based SoC board updates for v3.12 Simon Horman
2013-08-07 4:30 ` [GIT PULL 1/3] ARM: shmobile: ape6evm: support GPIO switches Simon Horman
2013-08-07 4:30 ` [GIT PULL 2/3] ARM: shmobile: ape6evm: Add GPIO LEDs Simon Horman
2013-08-07 4:30 ` [GIT PULL 3/3] ARM: shmobile: lager: enable Ether Simon Horman
2013-08-21 16:01 ` Kevin Hilman
2013-08-21 19:13 ` Sergei Shtylyov
2013-08-22 0:16 ` Simon Horman [this message]
2013-08-22 6:53 ` Olof Johansson
2013-08-22 7:01 ` Simon Horman
2013-08-22 7:04 ` Olof Johansson
2013-08-22 7:37 ` Simon Horman
2013-09-06 21:32 ` Olof Johansson
2013-09-09 0:09 ` Simon Horman
2013-08-14 8:11 ` [GIT PULL 0/3] Second round of Renesas ARM-based SoC board updates for v3.12 Olof Johansson
2013-12-23 2:08 ` [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.13 Simon Horman
2013-12-23 2:08 ` [PATCH 1/3] ARM: shmobile: sh73a0: add FSI support via DTSI Simon Horman
2013-12-23 2:08 ` [PATCH 2/3] ARM: shmobile: kzm9g: add FSI support for DTS Simon Horman
2013-12-23 13:21 ` Sergei Shtylyov
2013-12-23 14:10 ` Sergei Shtylyov
2013-12-24 5:54 ` Simon Horman
2013-12-23 2:08 ` [PATCH 3/3] ARM: shmobile: koelsch: dts: Add gpio-keys device Simon Horman
2013-12-24 3:45 ` [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.14 Simon Horman
2013-12-29 21:21 ` Olof Johansson
2013-12-24 6:04 ` [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13 Simon Horman
2013-12-24 6:04 ` [PATCH 1/3] ARM: shmobile: armadillo: Add PWM backlight power supply Simon Horman
2013-12-24 6:05 ` [PATCH 2/3] ARM: shmobile: bockw: fixup DMA mask Simon Horman
2013-12-24 6:05 ` [PATCH 3/3] ARM: shmobile: r8a7790: fix shdi resource sizes Simon Horman
2013-12-28 23:37 ` [GIT PULL 0/3] Second Round of Renesas ARM based SoC Fixes for v3.13 Olof Johansson
2014-02-13 8:04 ` [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Simon Horman
2014-02-13 8:04 ` [PATCH 1/3] ARM: shmobile: r7s72100 dtsi: Add RSPI nodes Simon Horman
2014-02-13 8:04 ` [PATCH 2/3] ARM: shmobile: r8a7791 dtsi: Add QSPI node Simon Horman
2014-02-13 8:04 ` [PATCH 3/3] ARM: shmobile: koelsch dts: Add QSPI nodes Simon Horman
2014-02-20 9:28 ` [GIT PULL 0/3] Second Round of Renesas ARM Based SoC DT Updates for v3.15 Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130822001647.GA6902@verge.net.au \
--to=horms@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).