From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Fri, 6 Mar 2015 17:45:30 +0100 Subject: [PATCH v2 3/3] net: macb: remove #if defined(CONFIG_ARCH_AT91) sections In-Reply-To: <1425637442-8724-4-git-send-email-boris.brezillon@free-electrons.com> References: <1425637442-8724-1-git-send-email-boris.brezillon@free-electrons.com> <1425637442-8724-4-git-send-email-boris.brezillon@free-electrons.com> Message-ID: <54F9D9AA.5060603@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Le 06/03/2015 11:24, Boris Brezillon a ?crit : > With multi platform support those sections could lead to unexpected > behavior if both ARCH_AT91 and another ARM SoC using the MACB IP are > selected. > Add two new capabilities to encode the default MII mode and the presence > of a CLKEN bit in USRIO register. > Then define the appropriate config for IPs embedded in at91 SoCs. > > Signed-off-by: Boris Brezillon > Reviewed-by: Alexandre Belloni Acked-by: Nicolas Ferre > --- > drivers/net/ethernet/cadence/macb.c | 32 +++++++++++++++++--------------- > drivers/net/ethernet/cadence/macb.h | 2 ++ > 2 files changed, 19 insertions(+), 15 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index ad76b8e..86e915f 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -2113,6 +2113,10 @@ static const struct net_device_ops macb_netdev_ops = { > }; > > #if defined(CONFIG_OF) > +static struct macb_config at91sam9260_config = { > + .caps = MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII, > +}; > + > static struct macb_config pc302gem_config = { > .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE, > .dma_burst_length = 16, > @@ -2130,7 +2134,7 @@ static struct macb_config sama5d4_config = { > > static const struct of_device_id macb_dt_ids[] = { > { .compatible = "cdns,at32ap7000-macb" }, > - { .compatible = "cdns,at91sam9260-macb" }, > + { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config }, > { .compatible = "cdns,macb" }, > { .compatible = "cdns,pc302-gem", .data = &pc302gem_config }, > { .compatible = "cdns,gem", .data = &pc302gem_config }, > @@ -2388,21 +2392,19 @@ static int macb_probe(struct platform_device *pdev) > bp->phy_interface = err; > } > > + config = 0; > if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII) > - macb_or_gem_writel(bp, USRIO, GEM_BIT(RGMII)); > - else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII) > -#if defined(CONFIG_ARCH_AT91) > - macb_or_gem_writel(bp, USRIO, (MACB_BIT(RMII) | > - MACB_BIT(CLKEN))); > -#else > - macb_or_gem_writel(bp, USRIO, 0); > -#endif > - else > -#if defined(CONFIG_ARCH_AT91) > - macb_or_gem_writel(bp, USRIO, MACB_BIT(CLKEN)); > -#else > - macb_or_gem_writel(bp, USRIO, MACB_BIT(MII)); > -#endif > + config = GEM_BIT(RGMII); > + else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII && > + (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) > + config = MACB_BIT(RMII); > + else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) > + config = MACB_BIT(MII); > + > + if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN) > + config |= MACB_BIT(CLKEN); > + > + macb_or_gem_writel(bp, USRIO, config); > > err = register_netdev(dev); > if (err) { > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h > index 31dc080..efe0247 100644 > --- a/drivers/net/ethernet/cadence/macb.h > +++ b/drivers/net/ethernet/cadence/macb.h > @@ -389,6 +389,8 @@ > > /* Capability mask bits */ > #define MACB_CAPS_ISR_CLEAR_ON_WRITE 0x00000001 > +#define MACB_CAPS_USRIO_HAS_CLKEN 0x00000002 > +#define MACB_CAPS_USRIO_DEFAULT_IS_MII 0x00000004 > #define MACB_CAPS_FIFO_MODE 0x10000000 > #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 > #define MACB_CAPS_SG_DISABLED 0x40000000 > -- Nicolas Ferre From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nicolas Ferre Subject: Re: [PATCH v2 3/3] net: macb: remove #if defined(CONFIG_ARCH_AT91) sections Date: Fri, 6 Mar 2015 17:45:30 +0100 Message-ID: <54F9D9AA.5060603@atmel.com> References: <1425637442-8724-1-git-send-email-boris.brezillon@free-electrons.com> <1425637442-8724-4-git-send-email-boris.brezillon@free-electrons.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1425637442-8724-4-git-send-email-boris.brezillon@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org To: Boris Brezillon , "David S. Miller" , netdev@vger.kernel.org Cc: Jean-Christophe Plagniol-Villard , Alexandre Belloni , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: devicetree@vger.kernel.org Le 06/03/2015 11:24, Boris Brezillon a =E9crit : > With multi platform support those sections could lead to unexpected > behavior if both ARCH_AT91 and another ARM SoC using the MACB IP are > selected. > Add two new capabilities to encode the default MII mode and the prese= nce > of a CLKEN bit in USRIO register. > Then define the appropriate config for IPs embedded in at91 SoCs. >=20 > Signed-off-by: Boris Brezillon > Reviewed-by: Alexandre Belloni Acked-by: Nicolas Ferre > --- > drivers/net/ethernet/cadence/macb.c | 32 +++++++++++++++++----------= ----- > drivers/net/ethernet/cadence/macb.h | 2 ++ > 2 files changed, 19 insertions(+), 15 deletions(-) >=20 > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethern= et/cadence/macb.c > index ad76b8e..86e915f 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -2113,6 +2113,10 @@ static const struct net_device_ops macb_netdev= _ops =3D { > }; > =20 > #if defined(CONFIG_OF) > +static struct macb_config at91sam9260_config =3D { > + .caps =3D MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MI= I, > +}; > + > static struct macb_config pc302gem_config =3D { > .caps =3D MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE, > .dma_burst_length =3D 16, > @@ -2130,7 +2134,7 @@ static struct macb_config sama5d4_config =3D { > =20 > static const struct of_device_id macb_dt_ids[] =3D { > { .compatible =3D "cdns,at32ap7000-macb" }, > - { .compatible =3D "cdns,at91sam9260-macb" }, > + { .compatible =3D "cdns,at91sam9260-macb", .data =3D &at91sam9260_c= onfig }, > { .compatible =3D "cdns,macb" }, > { .compatible =3D "cdns,pc302-gem", .data =3D &pc302gem_config }, > { .compatible =3D "cdns,gem", .data =3D &pc302gem_config }, > @@ -2388,21 +2392,19 @@ static int macb_probe(struct platform_device = *pdev) > bp->phy_interface =3D err; > } > =20 > + config =3D 0; > if (bp->phy_interface =3D=3D PHY_INTERFACE_MODE_RGMII) > - macb_or_gem_writel(bp, USRIO, GEM_BIT(RGMII)); > - else if (bp->phy_interface =3D=3D PHY_INTERFACE_MODE_RMII) > -#if defined(CONFIG_ARCH_AT91) > - macb_or_gem_writel(bp, USRIO, (MACB_BIT(RMII) | > - MACB_BIT(CLKEN))); > -#else > - macb_or_gem_writel(bp, USRIO, 0); > -#endif > - else > -#if defined(CONFIG_ARCH_AT91) > - macb_or_gem_writel(bp, USRIO, MACB_BIT(CLKEN)); > -#else > - macb_or_gem_writel(bp, USRIO, MACB_BIT(MII)); > -#endif > + config =3D GEM_BIT(RGMII); > + else if (bp->phy_interface =3D=3D PHY_INTERFACE_MODE_RMII && > + (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) > + config =3D MACB_BIT(RMII); > + else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) > + config =3D MACB_BIT(MII); > + > + if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN) > + config |=3D MACB_BIT(CLKEN); > + > + macb_or_gem_writel(bp, USRIO, config); > =20 > err =3D register_netdev(dev); > if (err) { > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethern= et/cadence/macb.h > index 31dc080..efe0247 100644 > --- a/drivers/net/ethernet/cadence/macb.h > +++ b/drivers/net/ethernet/cadence/macb.h > @@ -389,6 +389,8 @@ > =20 > /* Capability mask bits */ > #define MACB_CAPS_ISR_CLEAR_ON_WRITE 0x00000001 > +#define MACB_CAPS_USRIO_HAS_CLKEN 0x00000002 > +#define MACB_CAPS_USRIO_DEFAULT_IS_MII 0x00000004 > #define MACB_CAPS_FIFO_MODE 0x10000000 > #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 > #define MACB_CAPS_SG_DISABLED 0x40000000 >=20 --=20 Nicolas Ferre From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756197AbbCFQpn (ORCPT ); Fri, 6 Mar 2015 11:45:43 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:53640 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751869AbbCFQpk (ORCPT ); Fri, 6 Mar 2015 11:45:40 -0500 Message-ID: <54F9D9AA.5060603@atmel.com> Date: Fri, 6 Mar 2015 17:45:30 +0100 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Boris Brezillon , "David S. Miller" , CC: Jean-Christophe Plagniol-Villard , "Alexandre Belloni" , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , "Kumar Gala" , , , Subject: Re: [PATCH v2 3/3] net: macb: remove #if defined(CONFIG_ARCH_AT91) sections References: <1425637442-8724-1-git-send-email-boris.brezillon@free-electrons.com> <1425637442-8724-4-git-send-email-boris.brezillon@free-electrons.com> In-Reply-To: <1425637442-8724-4-git-send-email-boris.brezillon@free-electrons.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 06/03/2015 11:24, Boris Brezillon a écrit : > With multi platform support those sections could lead to unexpected > behavior if both ARCH_AT91 and another ARM SoC using the MACB IP are > selected. > Add two new capabilities to encode the default MII mode and the presence > of a CLKEN bit in USRIO register. > Then define the appropriate config for IPs embedded in at91 SoCs. > > Signed-off-by: Boris Brezillon > Reviewed-by: Alexandre Belloni Acked-by: Nicolas Ferre > --- > drivers/net/ethernet/cadence/macb.c | 32 +++++++++++++++++--------------- > drivers/net/ethernet/cadence/macb.h | 2 ++ > 2 files changed, 19 insertions(+), 15 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index ad76b8e..86e915f 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -2113,6 +2113,10 @@ static const struct net_device_ops macb_netdev_ops = { > }; > > #if defined(CONFIG_OF) > +static struct macb_config at91sam9260_config = { > + .caps = MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_USRIO_DEFAULT_IS_MII, > +}; > + > static struct macb_config pc302gem_config = { > .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE, > .dma_burst_length = 16, > @@ -2130,7 +2134,7 @@ static struct macb_config sama5d4_config = { > > static const struct of_device_id macb_dt_ids[] = { > { .compatible = "cdns,at32ap7000-macb" }, > - { .compatible = "cdns,at91sam9260-macb" }, > + { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config }, > { .compatible = "cdns,macb" }, > { .compatible = "cdns,pc302-gem", .data = &pc302gem_config }, > { .compatible = "cdns,gem", .data = &pc302gem_config }, > @@ -2388,21 +2392,19 @@ static int macb_probe(struct platform_device *pdev) > bp->phy_interface = err; > } > > + config = 0; > if (bp->phy_interface == PHY_INTERFACE_MODE_RGMII) > - macb_or_gem_writel(bp, USRIO, GEM_BIT(RGMII)); > - else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII) > -#if defined(CONFIG_ARCH_AT91) > - macb_or_gem_writel(bp, USRIO, (MACB_BIT(RMII) | > - MACB_BIT(CLKEN))); > -#else > - macb_or_gem_writel(bp, USRIO, 0); > -#endif > - else > -#if defined(CONFIG_ARCH_AT91) > - macb_or_gem_writel(bp, USRIO, MACB_BIT(CLKEN)); > -#else > - macb_or_gem_writel(bp, USRIO, MACB_BIT(MII)); > -#endif > + config = GEM_BIT(RGMII); > + else if (bp->phy_interface == PHY_INTERFACE_MODE_RMII && > + (bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) > + config = MACB_BIT(RMII); > + else if (!(bp->caps & MACB_CAPS_USRIO_DEFAULT_IS_MII)) > + config = MACB_BIT(MII); > + > + if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN) > + config |= MACB_BIT(CLKEN); > + > + macb_or_gem_writel(bp, USRIO, config); > > err = register_netdev(dev); > if (err) { > diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h > index 31dc080..efe0247 100644 > --- a/drivers/net/ethernet/cadence/macb.h > +++ b/drivers/net/ethernet/cadence/macb.h > @@ -389,6 +389,8 @@ > > /* Capability mask bits */ > #define MACB_CAPS_ISR_CLEAR_ON_WRITE 0x00000001 > +#define MACB_CAPS_USRIO_HAS_CLKEN 0x00000002 > +#define MACB_CAPS_USRIO_DEFAULT_IS_MII 0x00000004 > #define MACB_CAPS_FIFO_MODE 0x10000000 > #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 > #define MACB_CAPS_SG_DISABLED 0x40000000 > -- Nicolas Ferre