Patchwork ARM: imx_v4_v5_defconfig: Select SMSC911X driver by default.

login
register
mail settings
Submitter Fabio Estevam
Date Dec. 12, 2011, 1:24 p.m.
Message ID <1323696242-5902-1-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/130747/
State New
Headers show

Comments

Fabio Estevam - Dec. 12, 2011, 1:24 p.m.
Select SMSC911X driver by default.  

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 arch/arm/configs/imx_v4_v5_defconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Sascha Hauer - Dec. 12, 2011, 2:17 p.m.
Hi Fabio, Arnd,

On Mon, Dec 12, 2011 at 11:24:02AM -0200, Fabio Estevam wrote:
> Select SMSC911X driver by default.  
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>

The patch is ok.

Arnd,

On which base should I apply this patch? It needs the i.MX5 -> imx
merge which shows up in your for-next branch, but all other i.MX
topic branches in your tree seem to be empty.

Sascha

> ---
>  arch/arm/configs/imx_v4_v5_defconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
> index 11a4192..a51e282 100644
> --- a/arch/arm/configs/imx_v4_v5_defconfig
> +++ b/arch/arm/configs/imx_v4_v5_defconfig
> @@ -50,6 +50,7 @@ CONFIG_INET=y
>  CONFIG_IP_MULTICAST=y
>  CONFIG_IP_PNP=y
>  CONFIG_IP_PNP_DHCP=y
> +CONFIG_SMSC911X=y
>  # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
>  # CONFIG_INET_XFRM_MODE_TUNNEL is not set
>  # CONFIG_INET_XFRM_MODE_BEET is not set
> -- 
> 1.7.1
> 
> 
>
Arnd Bergmann - Dec. 12, 2011, 3:37 p.m.
On Monday 12 December 2011, Sascha Hauer wrote:
> On Mon, Dec 12, 2011 at 11:24:02AM -0200, Fabio Estevam wrote:
> > Select SMSC911X driver by default.  
> > 
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> 
> The patch is ok.
> 
> Arnd,
> 
> On which base should I apply this patch? It needs the i.MX5 -> imx
> merge which shows up in your for-next branch, but all other i.MX
> topic branches in your tree seem to be empty.
> 

Which tree are you looking at? I guess I should have announced when
the tree moved back to kernel.org, where there is only one branch
for imx right now.

Since I expect we will have to rebase the imx/move branch to get it
merged at the end of the 3.3 merge window, I can also fold the
new patch into "ARM i.MX: Update defconfig". If you prefer not
to rebase that branch, better apply it on top and send me an
updated pull request for imx/move or let me apply the patch on top.

	Arnd

Patch

diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 11a4192..a51e282 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -50,6 +50,7 @@  CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
+CONFIG_SMSC911X=y
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set