On Thu, Jun 3, 2010 at 4:50 AM, Vipin KUMAR <vipin.ku...@st.com> wrote:
> From: Vipin KUMAR <vipin.ku...@st.com> > > SPEAr310 and SPEAr320 SoCs have an extra ethernet controller. The > driver for this device is already supported by u-boot, so configuring > board configuration file and defining base addresses etc to make use > of the common driver > > Signed-off-by: Vipin Kumar <vipin.ku...@st.com> > Acked-by: Ben Warren <biggerbadder...@gmail.com> > --- > arch/arm/include/asm/arch-spear/clk.h | 27 > +++++++++++++++++++++++++++ > arch/arm/include/asm/arch-spear/hardware.h | 7 +++++++ > board/spear/spear310/spear310.c | 17 +++++++++++++++++ > board/spear/spear320/spear320.c | 5 +++++ > include/configs/spear3xx.h | 13 +++++++++++++ > 5 files changed, 69 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/include/asm/arch-spear/clk.h > > diff --git a/arch/arm/include/asm/arch-spear/clk.h > b/arch/arm/include/asm/arch-spear/clk.h > new file mode 100644 > index 0000000..a45ec18 > --- /dev/null > +++ b/arch/arm/include/asm/arch-spear/clk.h > @@ -0,0 +1,27 @@ > +/* > + * (C) Copyright 2010 > + * Vipin Kumar, STMicroelectronics, <vipin.ku...@st.com> > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, > + * MA 02111-1307 USA > + */ > + > +static inline unsigned long get_macb_pclk_rate(unsigned int dev_id) > +{ > + return 83000000; > +} > diff --git a/arch/arm/include/asm/arch-spear/hardware.h > b/arch/arm/include/asm/arch-spear/hardware.h > index 39d64b6..9f1e154 100644 > --- a/arch/arm/include/asm/arch-spear/hardware.h > +++ b/arch/arm/include/asm/arch-spear/hardware.h > @@ -56,6 +56,11 @@ > #define CONFIG_SPEAR_EMIBASE (0x4F000000) > #define CONFIG_SPEAR_RASBASE (0xB4000000) > > +#define CONFIG_SYS_MACB0_BASE (0xB0000000) > +#define CONFIG_SYS_MACB1_BASE (0xB0800000) > +#define CONFIG_SYS_MACB2_BASE (0xB1000000) > +#define CONFIG_SYS_MACB3_BASE (0xB1800000) > + > #elif defined(CONFIG_SPEAR320) > #define CONFIG_SYS_I2C_BASE (0xD0180000) > #define CONFIG_SPEAR_FSMCBASE (0x4C000000) > @@ -63,5 +68,7 @@ > #define CONFIG_SPEAR_EMIBASE (0x40000000) > #define CONFIG_SPEAR_RASBASE (0xB3000000) > > +#define CONFIG_SYS_MACB0_BASE (0xAA000000) > + > #endif > #endif /* _ASM_ARCH_HARDWARE_H */ > diff --git a/board/spear/spear310/spear310.c > b/board/spear/spear310/spear310.c > index 666ed48..193fa0c 100644 > --- a/board/spear/spear310/spear310.c > +++ b/board/spear/spear310/spear310.c > @@ -66,5 +66,22 @@ int board_eth_init(bd_t *bis) > if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY) > >= 0) > ret++; > #endif > +#if defined(CONFIG_MACB) > + if (macb_eth_initialize(0, (void *)CONFIG_SYS_MACB0_BASE, > + CONFIG_MACB0_PHY) >= 0) > + ret++; > + > + if (macb_eth_initialize(1, (void *)CONFIG_SYS_MACB1_BASE, > + CONFIG_MACB1_PHY) >= 0) > + ret++; > + > + if (macb_eth_initialize(2, (void *)CONFIG_SYS_MACB2_BASE, > + CONFIG_MACB2_PHY) >= 0) > + ret++; > + > + if (macb_eth_initialize(3, (void *)CONFIG_SYS_MACB3_BASE, > + CONFIG_MACB3_PHY) >= 0) > + ret++; > +#endif > return ret; > } > diff --git a/board/spear/spear320/spear320.c > b/board/spear/spear320/spear320.c > index 89b074a..0d9eed4 100644 > --- a/board/spear/spear320/spear320.c > +++ b/board/spear/spear320/spear320.c > @@ -66,5 +66,10 @@ int board_eth_init(bd_t *bis) > if (designware_initialize(0, CONFIG_SPEAR_ETHBASE, CONFIG_DW0_PHY) > >= 0) > ret++; > #endif > +#if defined(CONFIG_MACB) > + if (macb_eth_initialize(0, (void *)CONFIG_SYS_MACB0_BASE, > + CONFIG_MACB0_PHY) >= 0) > + ret++; > +#endif > return ret; > } > diff --git a/include/configs/spear3xx.h b/include/configs/spear3xx.h > index 502c50f..689d914 100644 > --- a/include/configs/spear3xx.h > +++ b/include/configs/spear3xx.h > @@ -44,6 +44,19 @@ > /* Ethernet driver configuration */ > #define CONFIG_DW_ALTDESCRIPTOR 1 > > +#if defined(CONFIG_SPEAR310) > +#define CONFIG_MACB 1 > +#define CONFIG_MACB0_PHY 0x01 > +#define CONFIG_MACB1_PHY 0x03 > +#define CONFIG_MACB2_PHY 0x05 > +#define CONFIG_MACB3_PHY 0x07 > + > +#elif defined(CONFIG_SPEAR320) > +#define CONFIG_MACB 1 > +#define CONFIG_MACB0_PHY 0x01 > + > +#endif > + > /* Serial Configuration (PL011) */ > #define CONFIG_SYS_SERIAL0 0xD0000000 > > -- > 1.6.0.2 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot >
_______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot