| Message ID | 1294297998-26930-8-git-send-email-shawn.guo@freescale.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Jan 06, 2011 at 03:13:15PM +0800, Shawn Guo wrote: > Signed-off-by: Shawn Guo <shawn.guo@freescale.com> > --- > arch/arm/mach-mxs/mach-mx28evk.c | 28 +++++++++++++++++++++++++--- > 1 files changed, 25 insertions(+), 3 deletions(-) > > > static void __init mx28evk_init(void) > @@ -117,7 +136,10 @@ static void __init mx28evk_init(void) > mx28_add_duart(); > > mx28evk_fec_reset(); > - mx28_add_fec(0, &mx28_fec_pdata); > + mx28_add_fec(0, &mx28_fec_pdata[0]); > +#ifdef CONFIG_FEC2 > + mx28_add_fec(1, &mx28_fec_pdata[1]); > +#endif Please don't do this. If you really want to make this configurable with kconfig use a board specific option, not a driver specific option. I think this should be made unconditional though. Sascha
Hi Sascha, On Tue, Jan 11, 2011 at 11:29:09AM +0100, Sascha Hauer wrote: > On Thu, Jan 06, 2011 at 03:13:15PM +0800, Shawn Guo wrote: > > Signed-off-by: Shawn Guo <shawn.guo@freescale.com> > > --- > > arch/arm/mach-mxs/mach-mx28evk.c | 28 +++++++++++++++++++++++++--- > > 1 files changed, 25 insertions(+), 3 deletions(-) > > > > > > static void __init mx28evk_init(void) > > @@ -117,7 +136,10 @@ static void __init mx28evk_init(void) > > mx28_add_duart(); > > > > mx28evk_fec_reset(); > > - mx28_add_fec(0, &mx28_fec_pdata); > > + mx28_add_fec(0, &mx28_fec_pdata[0]); > > +#ifdef CONFIG_FEC2 > > + mx28_add_fec(1, &mx28_fec_pdata[1]); > > +#endif > > Please don't do this. If you really want to make this configurable with > kconfig use a board specific option, not a driver specific option. I > think this should be made unconditional though. > I will resend this patch as v5 than the whole patch set, if you do not mind.
On Tue, Jan 11, 2011 at 07:39:52PM +0800, Shawn Guo wrote: > Hi Sascha, > > On Tue, Jan 11, 2011 at 11:29:09AM +0100, Sascha Hauer wrote: > > On Thu, Jan 06, 2011 at 03:13:15PM +0800, Shawn Guo wrote: > > > Signed-off-by: Shawn Guo <shawn.guo@freescale.com> > > > --- > > > arch/arm/mach-mxs/mach-mx28evk.c | 28 +++++++++++++++++++++++++--- > > > 1 files changed, 25 insertions(+), 3 deletions(-) > > > > > > > > > static void __init mx28evk_init(void) > > > @@ -117,7 +136,10 @@ static void __init mx28evk_init(void) > > > mx28_add_duart(); > > > > > > mx28evk_fec_reset(); > > > - mx28_add_fec(0, &mx28_fec_pdata); > > > + mx28_add_fec(0, &mx28_fec_pdata[0]); > > > +#ifdef CONFIG_FEC2 > > > + mx28_add_fec(1, &mx28_fec_pdata[1]); > > > +#endif > > > > Please don't do this. If you really want to make this configurable with > > kconfig use a board specific option, not a driver specific option. I > > think this should be made unconditional though. > > > I will resend this patch as v5 than the whole patch set, if you > do not mind. ok Sascha
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c index d162e95..def6519 100644 --- a/arch/arm/mach-mxs/mach-mx28evk.c +++ b/arch/arm/mach-mxs/mach-mx28evk.c @@ -57,6 +57,19 @@ static const iomux_cfg_t mx28evk_pads[] __initconst = { (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP), MX28_PAD_ENET_CLK__CLKCTRL_ENET | (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP), + /* fec1 */ + MX28_PAD_ENET0_CRS__ENET1_RX_EN | + (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP), + MX28_PAD_ENET0_RXD2__ENET1_RXD0 | + (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP), + MX28_PAD_ENET0_RXD3__ENET1_RXD1 | + (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP), + MX28_PAD_ENET0_COL__ENET1_TX_EN | + (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP), + MX28_PAD_ENET0_TXD2__ENET1_TXD0 | + (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP), + MX28_PAD_ENET0_TXD3__ENET1_TXD1 | + (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP), /* phy power line */ MX28_PAD_SSP1_DATA3__GPIO_2_15 | (MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL), @@ -106,8 +119,14 @@ static void __init mx28evk_fec_reset(void) gpio_set_value(MX28EVK_FEC_PHY_RESET, 1); } -static const struct fec_platform_data mx28_fec_pdata __initconst = { - .phy = PHY_INTERFACE_MODE_RMII, +static struct fec_platform_data mx28_fec_pdata[] = { + { + /* fec0 */ + .phy = PHY_INTERFACE_MODE_RMII, + }, { + /* fec1 */ + .phy = PHY_INTERFACE_MODE_RMII, + }, }; static void __init mx28evk_init(void) @@ -117,7 +136,10 @@ static void __init mx28evk_init(void) mx28_add_duart(); mx28evk_fec_reset(); - mx28_add_fec(0, &mx28_fec_pdata); + mx28_add_fec(0, &mx28_fec_pdata[0]); +#ifdef CONFIG_FEC2 + mx28_add_fec(1, &mx28_fec_pdata[1]); +#endif } static void __init mx28evk_timer_init(void)
Signed-off-by: Shawn Guo <shawn.guo@freescale.com> --- arch/arm/mach-mxs/mach-mx28evk.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-)