| Message ID | 28ae8033afa32ea4ea298ba63e1d5b2a1f4e18f9.1358983578.git.jason@lakedaemon.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Jan 23, 2013 at 11:34:21PM +0000, Jason Cooper wrote: > Signed-off-by: Jason Cooper <jason@lakedaemon.net> > --- > arch/arm/mach-kirkwood/board-nsa310.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c > index 1bd328d..0b99533 100644 > --- a/arch/arm/mach-kirkwood/board-nsa310.c > +++ b/arch/arm/mach-kirkwood/board-nsa310.c > @@ -10,11 +10,8 @@ > > #include <linux/kernel.h> > #include <linux/init.h> > -#include <linux/i2c.h> > - > -#include <asm/mach-types.h> > -#include <asm/mach/arch.h> > #include <mach/kirkwood.h> > +#include <linux/of.h> > #include "common.h" > #include "mpp.h" > > @@ -40,11 +37,7 @@ static unsigned int nsa310_mpp_config[] __initdata = { > > void __init nsa310_init(void) > { > - u32 dev, rev; > - > kirkwood_mpp_conf(nsa310_mpp_config); > - > - kirkwood_pcie_id(&dev, &rev); > } > > static int __init nsa310_pci_init(void) > -- > 1.8.1.1 > Hi Jason, Tero This board is rather unusual for a Kirkwood. It has no Ethernet interfaces. Is this correct? Thanks Andrew
On 01/24/2013 06:50 AM, Andrew Lunn wrote: > On Wed, Jan 23, 2013 at 11:34:21PM +0000, Jason Cooper wrote: >> Signed-off-by: Jason Cooper <jason@lakedaemon.net> >> --- >> arch/arm/mach-kirkwood/board-nsa310.c | 9 +-------- >> 1 file changed, 1 insertion(+), 8 deletions(-) >> >> diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c >> index 1bd328d..0b99533 100644 >> --- a/arch/arm/mach-kirkwood/board-nsa310.c >> +++ b/arch/arm/mach-kirkwood/board-nsa310.c >> @@ -10,11 +10,8 @@ >> >> #include <linux/kernel.h> >> #include <linux/init.h> >> -#include <linux/i2c.h> >> - >> -#include <asm/mach-types.h> >> -#include <asm/mach/arch.h> >> #include <mach/kirkwood.h> >> +#include <linux/of.h> >> #include "common.h" >> #include "mpp.h" >> >> @@ -40,11 +37,7 @@ static unsigned int nsa310_mpp_config[] __initdata = { >> >> void __init nsa310_init(void) >> { >> - u32 dev, rev; >> - >> kirkwood_mpp_conf(nsa310_mpp_config); >> - >> - kirkwood_pcie_id(&dev, &rev); >> } >> >> static int __init nsa310_pci_init(void) >> -- >> 1.8.1.1 >> > > Hi Jason, Tero > > This board is rather unusual for a Kirkwood. It has no Ethernet > interfaces. Is this correct? It seems like it really has an Gigabit Ethernet interface: http://www.clubic.com/disque-dur-memoire/nas/article-465814-1-zyxel-nsa-310.html (in french, but the pictures show a Gigabit Ethernet). -- Florian
On Thu, Jan 24, 2013 at 02:43:15PM +0100, Florian Fainelli wrote: > On 01/24/2013 06:50 AM, Andrew Lunn wrote: > >On Wed, Jan 23, 2013 at 11:34:21PM +0000, Jason Cooper wrote: > >>Signed-off-by: Jason Cooper <jason@lakedaemon.net> > >>--- > >> arch/arm/mach-kirkwood/board-nsa310.c | 9 +-------- > >> 1 file changed, 1 insertion(+), 8 deletions(-) > >> > >>diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c > >>index 1bd328d..0b99533 100644 > >>--- a/arch/arm/mach-kirkwood/board-nsa310.c > >>+++ b/arch/arm/mach-kirkwood/board-nsa310.c > >>@@ -10,11 +10,8 @@ > >> > >> #include <linux/kernel.h> > >> #include <linux/init.h> > >>-#include <linux/i2c.h> > >>- > >>-#include <asm/mach-types.h> > >>-#include <asm/mach/arch.h> > >> #include <mach/kirkwood.h> > >>+#include <linux/of.h> > >> #include "common.h" > >> #include "mpp.h" > >> > >>@@ -40,11 +37,7 @@ static unsigned int nsa310_mpp_config[] __initdata = { > >> > >> void __init nsa310_init(void) > >> { > >>- u32 dev, rev; > >>- > >> kirkwood_mpp_conf(nsa310_mpp_config); > >>- > >>- kirkwood_pcie_id(&dev, &rev); > >> } > >> > >> static int __init nsa310_pci_init(void) > >>-- > >>1.8.1.1 > >> > > > >Hi Jason, Tero > > > >This board is rather unusual for a Kirkwood. It has no Ethernet > >interfaces. Is this correct? > > It seems like it really has an Gigabit Ethernet interface: > http://www.clubic.com/disque-dur-memoire/nas/article-465814-1-zyxel-nsa-310.html It's easy enough to add, we just need to know the phy_addr. Does anyone have one to test? thx, Jason.
On Thu, Jan 24, 2013 at 06:50:52AM +0100, Andrew Lunn wrote: > On Wed, Jan 23, 2013 at 11:34:21PM +0000, Jason Cooper wrote: > > Signed-off-by: Jason Cooper <jason@lakedaemon.net> > > --- > > arch/arm/mach-kirkwood/board-nsa310.c | 9 +-------- > > 1 file changed, 1 insertion(+), 8 deletions(-) > > > > diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c > > index 1bd328d..0b99533 100644 > > --- a/arch/arm/mach-kirkwood/board-nsa310.c > > +++ b/arch/arm/mach-kirkwood/board-nsa310.c > > @@ -10,11 +10,8 @@ > > > > #include <linux/kernel.h> > > #include <linux/init.h> > > -#include <linux/i2c.h> > > - > > -#include <asm/mach-types.h> > > -#include <asm/mach/arch.h> > > #include <mach/kirkwood.h> > > +#include <linux/of.h> > > #include "common.h" > > #include "mpp.h" > > > > @@ -40,11 +37,7 @@ static unsigned int nsa310_mpp_config[] __initdata = { > > > > void __init nsa310_init(void) > > { > > - u32 dev, rev; > > - > > kirkwood_mpp_conf(nsa310_mpp_config); > > - > > - kirkwood_pcie_id(&dev, &rev); > > } > > > > static int __init nsa310_pci_init(void) > > -- > > 1.8.1.1 > > > > Hi Jason, Tero > > This board is rather unusual for a Kirkwood. It has no Ethernet > interfaces. Is this correct? Found this [1], it details some mpp we don't have, and a hwmon interface. No mention of ethernet, though. :-/ Apparently there's a buzzer attached to mpp44, fun. [2] for the nsa320 does initialize it. Apparently auto-negotiation in borked? thx, Jason. [1] https://github.com/peeter123/linux-nsa320/blob/master/arch/arm/mach-kirkwood/nsa310-setup.c [2] https://github.com/peeter123/linux-nsa320/blob/master/arch/arm/mach-kirkwood/nsa320-setup.c
diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c index 1bd328d..0b99533 100644 --- a/arch/arm/mach-kirkwood/board-nsa310.c +++ b/arch/arm/mach-kirkwood/board-nsa310.c @@ -10,11 +10,8 @@ #include <linux/kernel.h> #include <linux/init.h> -#include <linux/i2c.h> - -#include <asm/mach-types.h> -#include <asm/mach/arch.h> #include <mach/kirkwood.h> +#include <linux/of.h> #include "common.h" #include "mpp.h" @@ -40,11 +37,7 @@ static unsigned int nsa310_mpp_config[] __initdata = { void __init nsa310_init(void) { - u32 dev, rev; - kirkwood_mpp_conf(nsa310_mpp_config); - - kirkwood_pcie_id(&dev, &rev); } static int __init nsa310_pci_init(void)
Signed-off-by: Jason Cooper <jason@lakedaemon.net> --- arch/arm/mach-kirkwood/board-nsa310.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)