: arm: Kirkwood: OpenRD base board support
cover : arm: Kirkwood: OpenRD base board support
Hello again!
These two patches add board support for the OpenRD base board. They are a bit on the RFC-level, but allow me to get a prompt at least. Open issues:
- Copyright and author: As you can see, most of the work in the new files comes from Prafullas sheevaplug stuff. Perhaps Prafulla should be given as the author here as well?
- The addition to mach-type.h comes from the last entry in Linux + 1 (I don't believe this board has upstream Linux support just yet). Not sure what to do there.
// Simon
PATCH 1/2 : arm: Kirkwood: Split PHY-related initialization to a common file
Split PHY-related initialization to a common file
The mv881116 PHY initialization is split out to a common file to enable code reuse between different boards.
--- board/Marvell/common/mv881116.c | 65 +++++++++++++++++++++++++++++++++ board/Marvell/common/mv881116.h | 29 +++++++++++++++ board/Marvell/sheevaplug/Makefile | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 32 ++--------------- board/Marvell/sheevaplug/sheevaplug.h | 8 ---- 5 files changed, 98 insertions(+), 38 deletions(-) create mode 100644 board/Marvell/common/mv881116.c create mode 100644 board/Marvell/common/mv881116.h
board/Marvell/common/mv881116.c new file +65 -0
@@ -0,0 +1,65 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Simon Kagstrom <[email protected]> +* +* 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., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA +*/ +#include <common.h> +#include <miiphy.h> +#include "mv881116.h" + +/* PHY related */ +#define MV88E1116_LED_FCTRL_REG 10 +#define MV88E1116_CPRSP_CR3_REG 21 +#define MV88E1116_MAC_CTRL_REG 21 +#define MV88E1116_PGADR_REG 22 +#define MV88E1116_RGMII_TXTM_CTRL (1 << 4) +#define MV88E1116_RGMII_RXTM_CTRL (1 << 5) + +void mv881116_reset_phy (char *name) +{ +u16 reg; +u16 devadr; + +if (miiphy_set_current_dev (name)) +return ; + +/* command to read PHY dev address */ +if (miiphy_read (name,0xEE ,0xEE , (u16 *) &devadr)) { +printf ("Err..%s could not read PHY dev address\n" , + __FUNCTION__); +return ; + } + +/* +* Enable RGMII delay on Tx and Rx for CPU port +* Ref: sec 4.7.2 of chip datasheet +*/ +miiphy_write (name, devadr,MV88E1116_PGADR_REG ,2 ); +miiphy_read (name, devadr,MV88E1116_MAC_CTRL_REG , ®); + reg |= (MV88E1116_RGMII_RXTM_CTRL |MV88E1116_RGMII_TXTM_CTRL ); +miiphy_write (name, devadr,MV88E1116_MAC_CTRL_REG , reg); +miiphy_write (name, devadr,MV88E1116_PGADR_REG ,0 ); + +/* reset the phy */ +miiphy_reset (name, devadr); + +printf ("88E1116 Initialized on %s\n" , name); +}
board/Marvell/common/mv881116.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Simon Kagstrom <[email protected]> +* +* 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., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA +*/ +#ifndef __MV881116_H +#define __MV881116_H + +void mv881116_reset_phy (char *name); + +#endif /* __MV881116_H */
board/Marvell/sheevaplug/Makefile +1 -1
@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := sheevaplug.o +COBJS := sheevaplug.o ../common/mv881116.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
board/Marvell/sheevaplug/sheevaplug.c +3 -29
@@ -27,6 +27,7 @@#include <asm/arch/kirkwood.h> #include <asm/arch/mpp.h> #include "sheevaplug.h" +#include "../common/mv881116.h" DECLARE_GLOBAL_DATA_PTR ;
@@ -120,36 +121,9 @@ int dram_init(void) }#ifdef CONFIG_RESET_PHY_R -/* Configure and enable MV88E1116 PHY */ void reset_phy (void ) { -u16 reg; -u16 devadr; -char *name ="egiga0" ; - -if (miiphy_set_current_dev (name)) -return ; - -/* command to read PHY dev address */ -if (miiphy_read (name,0xEE ,0xEE , (u16 *) &devadr)) { -printf ("Err..%s could not read PHY dev address\n" , - __FUNCTION__); -return ; - } - -/* -* Enable RGMII delay on Tx and Rx for CPU port -* Ref: sec 4.7.2 of chip datasheet -*/ -miiphy_write (name, devadr,MV88E1116_PGADR_REG ,2 ); -miiphy_read (name, devadr,MV88E1116_MAC_CTRL_REG , ®); - reg |= (MV88E1116_RGMII_RXTM_CTRL |MV88E1116_RGMII_TXTM_CTRL ); -miiphy_write (name, devadr,MV88E1116_MAC_CTRL_REG , reg); -miiphy_write (name, devadr,MV88E1116_PGADR_REG ,0 ); - -/* reset the phy */ -miiphy_reset (name, devadr); - -printf ("88E1116 Initialized on %s\n" , name); +/* Configure and enable MV88E1116 PHY */ +mv881116_reset_phy ("egiga0" ); }#endif /* CONFIG_RESET_PHY_R */
board/Marvell/sheevaplug/sheevaplug.h +0 -8
@@ -30,12 +30,4 @@#define SHEEVAPLUG_OE_VAL_LOW (1 << 29)/* USB_PWEN low */ #define SHEEVAPLUG_OE_VAL_HIGH (1 << 17)/* LED pin high */ -/* PHY related */ -#define MV88E1116_LED_FCTRL_REG 10 -#define MV88E1116_CPRSP_CR3_REG 21 -#define MV88E1116_MAC_CTRL_REG 21 -#define MV88E1116_PGADR_REG 22 -#define MV88E1116_RGMII_TXTM_CTRL (1 << 4) -#define MV88E1116_RGMII_RXTM_CTRL (1 << 5) -#endif /* __SHEEVAPLUG_H */
Signature · 1 line
1.6.0.4
PATCH 1/2 : arm: Kirkwood: Split PHY-related initialization to a common file
Quoted 11 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Simon Kagstrom
Sent: Thursday, July 02, 2009 6:50 PM
To: Simon Kagstrom
Cc: U-Boot ML
Subject: [U-Boot] [PATCH/RFC 1/2]: arm: Kirkwood: Split PHY-related initialization to a common file
Quoted 4 lines
Split PHY-related initialization to a common file
The mv881116 PHY initialization is split out to a common file to enable code reuse between different boards.
Dear Simon
Thanks for your effort in this direction,
In the beginning I have already posted separate driver for mv88E1116 but since the phy framework is not in place it is on hold. Reference thread:
http://lists.denx.de/pipermail/u-boot/2009-June/053621.html
May be ben can put some more comments on this. May be we can think on supporting it in standard way.
Regards..
Prafulla . .
PATCH 1/2 : arm: Kirkwood: Split PHY-related initialization to a common file
In reply to Simon KagstromQuoted 4 lines · Simon Kagstrom
Split PHY-related initialization to a common file
The mv881116 PHY initialization is split out to a common file to enable code reuse between different boards.
please note if that will be share with non Marvell code this is not the right place to store it
Quoted 18 lines
Signed-off-by Simon Kagstrom <[email protected]>--- board/Marvell/common/mv881116.c | 65 +++++++++++++++++++++++++++++++++ board/Marvell/common/mv881116.h | 29 +++++++++++++++ board/Marvell/sheevaplug/Makefile | 2 +- board/Marvell/sheevaplug/sheevaplug.c | 32 ++--------------- board/Marvell/sheevaplug/sheevaplug.h | 8 ---- 5 files changed, 98 insertions(+), 38 deletions(-) create mode 100644 board/Marvell/common/mv881116.c create mode 100644 board/Marvell/common/mv881116.hboard/Marvell/common/mv881116.c new file +0
-0
board/Marvell/common/mv881116.c line 5
Quoted 5 lines
board/Marvell/common/mv881116.c new file +5
-0@@ -0,0 +1,65 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Simon Kagstrom <[email protected]> +*
as you just move code for an file to an other please let the original Copyright header
Quoted 3 lines
board/Marvell/common/mv881116.c new file +3
-0+* See file CREDITS for list of people who contributed to this +* project. +*
<snip>
board/Marvell/common/mv881116.h line 5
Quoted 11 lines
board/Marvell/common/mv881116.h new file +5
-0@@ -0,0 +1,29 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Simon Kagstrom <[email protected]> +*
same here
board/Marvell/sheevaplug/Makefile include $(TOPDIR)/config.mk · line 29
Quoted 10 lines
board/Marvell/sheevaplug/Makefile +1
-1@@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := sheevaplug.o +COBJS := sheevaplug.o ../common/mv881116.o
please create a common Makefile
board/Marvell/sheevaplug/sheevaplug.c line 30
Quoted 12 lines
board/Marvell/sheevaplug/Makefile +0
-0SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))board/Marvell/sheevaplug/sheevaplug.c +1
-0@@ -27,6 +27,7 @@#include <asm/arch/kirkwood.h> #include <asm/arch/mpp.h> #include "sheevaplug.h" +#include "../common/mv881116.h"
Best Regards,
J.
PATCH 1/2 : arm: Kirkwood: Split PHY-related initialization to a common file
Quoted 12 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Jean-Christophe PLAGNIOL-VILLARD
Sent: Wednesday, July 08, 2009 2:08 AM
To: Simon Kagstrom
Cc: U-Boot ML
Subject: Re: [U-Boot] [PATCH/RFC 1/2]: arm: Kirkwood: Split PHY-related initialization to a common file
Quoted 7 lines
Quoted 4 lines · Simon Kagstrom
Split PHY-related initialization to a common file
The mv881116 PHY initialization is split out to a common file to enable code reuse between different boards.
please note if that will be share with non Marvell code this is not the right place to store it
Hi Jean
Some more references for this thread
http://lists.denx.de/pipermail/u-boot/2009-July/055413.html
http://lists.denx.de/pipermail/u-boot/2009-June/053621.html
Regards..
Prafulla . .
PATCH 1/2 : arm: Kirkwood: Split PHY-related initialization to a common file
In reply to Jean-Christophe PLAGNIOL-VILLARDQuoted 4 lines · On Tue, 7 Jul 2009 22:37:53 +0200 Jean-Christophe PLAGNIOL-VILLARD…
Quoted 2 lines
+ * Written-by: Simon Kagstrom <[email protected]>
+ *as you just move code for an file to an other please let the original Copyright header
Yes, sorry about this - I created an empty file with only the headers first. I've had it corrected locally for a while.
Quoted 6 lines · On Tue, 7 Jul 2009 23:36:28 -0700 Prafulla Wadaskar <[email protected]>…
Quoted 2 lines
please note if that will be share with non Marvell code this is not the right place to store it
Hi Jean
Some more references for this thread
http://lists.denx.de/pipermail/u-boot/2009-July/055413.html
http://lists.denx.de/pipermail/u-boot/2009-June/053621.html
And here I'm a bit uncertain what to do. Obviously we can move it to drivers/net/phy, but Ben seems reluctant to accept that until there is a generic phy framework (?).
The reason I wanted to move it out of sheevaplug was to be able to reuse it for the OpenRD board, so I moved it to the Marvell/common directory.
// Simon
PATCH 1/2 : arm: Kirkwood: Split PHY-related initialization to a common file
Quoted 34 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Simon Kagstrom
Sent: Wednesday, July 08, 2009 12:14 PM
To: Jean-Christophe PLAGNIOL-VILLARD
Cc: U-Boot ML; Ben Warren
Subject: Re: [U-Boot] [PATCH/RFC 1/2]: arm: Kirkwood: Split PHY-related initialization to a common fileQuoted 3 lines · On Tue, 7 Jul 2009 22:37:53 +0200 Jean-Christophe PLAGNIOL-VILLARD…
Quoted 2 lines
+ * Written-by: Simon Kagstrom <[email protected]>
+ *as you just move code for an file to an other please let
the original
Quoted 1 line
Copyright header
Yes, sorry about this - I created an empty file with only the headers first. I've had it corrected locally for a while.
Quoted 1 line · On Tue, 7 Jul 2009 23:36:28 -0700 Prafulla Wadaskar <[email protected]>…
Quoted 1 line
please note if that will be share with non Marvell code
this is not
Quoted 5 lines
Quoted 1 line
the right place to store it
Hi Jean
Some more references for this thread
http://lists.denx.de/pipermail/u-boot/2009-July/055413.html
http://lists.denx.de/pipermail/u-boot/2009-June/053621.html
Quoted 7 lines
And here I'm a bit uncertain what to do. Obviously we can move it to
drivers/net/phy, but Ben seems reluctant to accept that until there is a generic phy framework (?).The reason I wanted to move it out of sheevaplug was to be able to reuse it for the OpenRD board, so I moved it to the Marvell/common directory.
There are two more boards with me too - that needs this reuse. Regards..
Prafulla . .
Quoted 1 line
PATCH 2/2 : arm: Kirkwood: Support for the OpenRD base board
In reply to Simon KagstromSupport for the OpenRD base board
The implementation is borrowed from the sheevaplug board and the Marvell 1.1.4 code and likely to be a bit incomplete. GPIO pins are configured, but not really tested.
--- Makefile | 3 + board/Marvell/openrd_base/Makefile | 51 ++++++++ board/Marvell/openrd_base/config.mk | 25 ++++ board/Marvell/openrd_base/openrd_base.c | 129 +++++++++++++++++++ board/Marvell/openrd_base/openrd_base.h | 42 ++++++ include/asm-arm/arch-kirkwood/mpp.h | 2 +- include/asm-arm/mach-types.h | 13 ++ include/configs/openrd_base.h | 210 +++++++++++++++++++++++++++++++ 8 files changed, 474 insertions(+), 1 deletions(-) create mode 100644 board/Marvell/openrd_base/Makefile create mode 100644 board/Marvell/openrd_base/config.mk create mode 100644 board/Marvell/openrd_base/openrd_base.c create mode 100644 board/Marvell/openrd_base/openrd_base.h create mode 100644 include/configs/openrd_base.h
Makefile +3 -0
@@ -2897,6 +2897,9 @@ omap1610h2_cs_autoboot_config: unconfig omap5912osk_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs omap5912osk NULL omap +openrd_base_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + xtract_omap730p2 = $(subst _cs0boot,,$(subst _cs3boot,, $(subst _config,,$1))) omap730p2_config \
board/Marvell/openrd_base/Makefile new file +51 -0
51 lines not on this page · raw message
board/Marvell/openrd_base/config.mk new file +25 -0
@@ -0,0 +1,25 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> +# Written-by: Prafulla Wadaskar <[email protected]> +# +# 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., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +TEXT_BASE = 0x00600000
board/Marvell/openrd_base/openrd_base.c new file +129 -0
129 lines not on this page · raw message
board/Marvell/openrd_base/openrd_base.h new file +42 -0
42 lines not on this page · raw message
include/asm-arm/arch-kirkwood/mpp.h +1 -1
@@ -289,7 +289,7 @@#define MPP48_GPIO MPP( 48, 0x0, 1, 1, 0, 0, 0, 1 )#define MPP48_TSMP12 MPP( 48, 0x1, 1, 1, 0, 0, 0, 1 ) -#define MPP48_TDM_DTX MPP( 48. 0x2, 0, 1, 0, 0, 0, 1 ) +#define MPP48_TDM_DTX MPP( 48, 0x2, 0, 1, 0, 0, 0, 1 )#define MPP49_GPIO MPP( 49, 0x0, 1, 1, 0, 0, 0, 1 )#define MPP49_TSMP9 MPP( 49, 0x1, 1, 1, 0, 0, 0, 1 )
include/asm-arm/mach-types.h +13 -0
@@ -2120,6 +2120,7 @@ extern unsigned int __machine_arch_type;#define MACH_TYPE_FMZWEBMODUL 2134#define MACH_TYPE_RD78X00_MASA 2135#define MACH_TYPE_SMALLOGGER 2136 +#define MACH_TYPE_OPENRD_BASE 2261#ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type
@@ -26949,6 +26950,18 @@ extern unsigned int __machine_arch_type;# define machine_is_sheevaplug () (0)#endif +#ifdef CONFIG_MACH_OPENRD_BASE +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_OPENRD_BASE +# endif +# define machine_is_openrd_base () (machine_arch_type == MACH_TYPE_OPENRD_BASE) +#else +# define machine_is_openrd_base () (0) +#endif +#ifdef CONFIG_MACH_AT91SAM9G20 # ifdef machine_arch_type# undef machine_arch_type
include/configs/openrd_base.h new file +210 -0
210 lines not on this page · raw message
Signature · 1 line
1.6.0.4
PATCH 2/2 : arm: Kirkwood: Support for the OpenRD base board
Quoted 17 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Simon Kagstrom
Sent: Thursday, July 02, 2009 6:50 PM
To: U-Boot ML
Subject: [U-Boot] [PATCH/RFC 2/2]: arm: Kirkwood: Support for the OpenRD base boardSupport for the OpenRD base board
The implementation is borrowed from the sheevaplug board and the Marvell
1.1.4 code and likely to be a bit incomplete. GPIO pins are configured, but not really tested.
Quoted 8 lines
Signed-off-by Simon Kagstrom <[email protected]>--- Makefile | 3 + board/Marvell/openrd_base/Makefile | 51 ++++++++ board/Marvell/openrd_base/config.mk | 25 ++++ board/Marvell/openrd_base/openrd_base.c | 129 +++++++++++++++++++ board/Marvell/openrd_base/openrd_base.h | 42 ++++++ include/asm-arm/arch-kirkwood/mpp.h | 2 +-
Please remove mpp patch, it is already accepted on arm/next
Quoted 1 line
include/asm-arm/mach-types.h | 13 ++
First register board id with armlinux and then use it.
Quoted 2 lines
include/configs/openrd_base.h | 210+++++++++++++++++++++++++++++++
Maintainer and MAKEALL entries missing , refer development guidelines
Quoted 29 lines
8 files changed, 474 insertions(+), 1 deletions(-) createboard/Marvell/openrd_base/Makefile new file +4
-0@@ -0,0 +1,51 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> # Written-by: Prafulla +Wadaskar <[email protected]> # # See file CREDITS forlist of people
board/Marvell/openrd_base/Makefile new file +8
-0+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 beuseful, # but
board/Marvell/openrd_base/Makefile new file +5
-0+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 PublicLicense #
board/Marvell/openrd_base/Makefile line 29
Quoted 9 lines
board/Marvell/openrd_base/Makefile new file +9
-0+along with this program; if not, write to the Free Software # +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA +02110-1301 USA # + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).a + +COBJS := openrd_base.o ../common/mv881116.o
This is not yet accepted driver, use it as a part of board specific code, refer sheevaplug.c
include/asm-arm/arch-kirkwood/mpp.h
Quoted 193 lines
board/Marvell/openrd_base/openrd_base.c new file +39
-0@@ -0,0 +1,129 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Simon Kagstrom <[email protected]> +* Based on sheevaplug.c written-by Prafulla Wadaskar +<[email protected]> +* +* 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., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA +*/ + +#include <common.h> +#include <miiphy.h> +#include <asm/arch/kirkwood.h> +#include <asm/arch/mpp.h> +#include "openrd_base.h" + +DECLARE_GLOBAL_DATA_PTR ; + +int board_init (void ) +{ +/* +* default gpio configuration +* There are maximum 64 gpios controlled through 2 sets of registers
board/Marvell/openrd_base/openrd_base.c new file +91
-0+* the below configuration configures mainly initial LED status +*/ +kw_config_gpio (OPENRD_OE_VAL_LOW , +OPENRD_OE_VAL_HIGH , +OPENRD_OE_LOW ,OPENRD_OE_HIGH ); + +/* Multi-Purpose Pins Functionality configuration */ +u32 kwmpp_config[] = { +MPP0_NF_IO2 , +MPP1_NF_IO3 , +MPP2_NF_IO4 , +MPP3_NF_IO5 , +MPP4_NF_IO6 , +MPP5_NF_IO7 , + MPP6_SYSRST_OUTn, +MPP7_GPO , +MPP8_TW_SDA , +MPP9_TW_SCK , +MPP10_UART0_TXD , +MPP11_UART0_RXD , +MPP12_SD_CLK , +MPP13_SD_CMD , +MPP14_SD_D0 , +MPP15_SD_D1 , +MPP16_SD_D2 , +MPP17_SD_D3 , +MPP18_NF_IO0 , +MPP19_NF_IO1 , +MPP20_GE1_0 , +MPP21_GE1_1 , +MPP22_GE1_2 , +MPP23_GE1_3 , +MPP24_GE1_4 , +MPP25_GE1_5 , +MPP26_GE1_6 , +MPP27_GE1_7 , +MPP28_GPIO , +MPP29_TSMP9 , +MPP30_GE1_10 , +MPP31_GE1_11 , +MPP32_GE1_12 , +MPP33_GE1_13 , +MPP34_GPIO , +MPP35_TDM_CH0_TX_QL , +MPP36_TDM_SPI_CS1 , +MPP37_TDM_CH2_TX_QL , +MPP38_TDM_CH2_RX_QL , +MPP39_AUDIO_I2SBCLK , +MPP40_AUDIO_I2SDO , +MPP41_AUDIO_I2SLRC , +MPP42_AUDIO_I2SMCLK , +MPP43_AUDIO_I2SDI , +MPP44_AUDIO_EXTCLK , +MPP45_TDM_PCLK , +MPP46_TDM_FS , +MPP47_TDM_DRX , +MPP48_TDM_DTX , +MPP49_TDM_CH0_RX_QL , +0 + }; +kirkwood_mpp_conf (kwmpp_config); + +/* +* arch number of board +*/ + gd->bd->bi_arch_number =MACH_TYPE_OPENRD_BASE ; + +/* adress of boot parameters */ + gd->bd->bi_boot_params =kw_sdram_bar (0 ) +0x100 ; + +return 0 ; +} + +int dram_init (void ) +{ +int i; + +for (i =0 ; i <CONFIG_NR_DRAM_BANKS ; i++) { + gd->bd->bi_dram[i].start =kw_sdram_bar (i); + gd->bd->bi_dram[i].size =kw_sdram_bs (i); + } +return 0 ; +} + +#ifdef CONFIG_RESET_PHY_R +void reset_phy (void ) +{ +/* Configure and enable MV88E1116 PHY */ +mv881116_reset_phy ("egiga0" ); +} +#endif /* CONFIG_RESET_PHY_R */ board/Marvell/openrd_base/openrd_base.h new file +43
-0@@ -0,0 +1,42 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Simon Kagstrom <[email protected]> +* Based on sheevaplug.h written-by Prafulla Wadaskar +<[email protected]> +* +* 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., 51 Franklin Street, Fifth Floor, Boston, +* MA 02110-1301 USA +*/ + +#ifndef __OPENRD_BASE_H +#define __OPENRD_BASE_H + +#define OPENRD_OE_LOW (~(1<<28)) +#define OPENRD_OE_HIGH (~(1<<2)) +#define OPENRD_OE_VAL_LOW (0) +#define OPENRD_OE_VAL_HIGH (1 << 2) + +/* PHY related */ +#define MV88E1116_LED_FCTRL_REG 10 +#define MV88E1116_CPRSP_CR3_REG 21 +#define MV88E1116_MAC_CTRL_REG 21 +#define MV88E1116_PGADR_REG 22 +#define MV88E1116_RGMII_TXTM_CTRL (1 << 4) +#define MV88E1116_RGMII_RXTM_CTRL (1 << 5) + +#endif /* __OPENRD_BASE_H */ include/asm-arm/arch-kirkwood/mpp.h +0
-0
Remove..
include/asm-arm/mach-types.h extern unsigned int __machine_arch_type; · line 2123
Quoted 9 lines
(quoted diff) +0
-0
b/include/asm-arm/mach-types.hindex 9b8485d..bbea2de 100644include/asm-arm/mach-types.h +1
-0@@ -2120,6 +2120,7 @@ extern unsigned int __machine_arch_type;#define MACH_TYPE_FMZWEBMODUL 2134#define MACH_TYPE_RD78X00_MASA 2135#define MACH_TYPE_SMALLOGGER 2136 +#define MACH_TYPE_OPENRD_BASE 2261
No changes to this file, it will be imported from linux project so register machine id there..
Quoted 16 lines
(quoted diff) +0
-0
b/include/configs/openrd_base.hnew file mode 100644 index 0000000..5bfd689include/configs/openrd_base.h new file +9
-0@@ -0,0 +1,210 @@ + +/* +* Default environment variables +*/ +#define CONFIG_BOOTCOMMAND "${x_bootcmd_kernel}; " \ + "setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ + "${x_bootcmd_usb}; bootm 0x6400000;" + +#define CONFIG_MTDPARTS "orion_nand:512k(uboot)," \
include/configs/openrd_base.h line 150
Quoted 1 line
include/configs/openrd_base.h new file +1
-0+"3m at 1m(kernel),1m at 4m(psm),13m at 5m(rootfs) rw\0"
Do psm needed in your board environment?
Regards..
Prafulla. .
cover : arm: Kirkwood: OpenRD base board support
In reply to Simon KagstromQuoted 12 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Simon Kagstrom
Sent: Thursday, July 02, 2009 6:49 PM
To: U-Boot ML
Subject: [U-Boot] [PATCH/RFC 0/2]: arm: Kirkwood: OpenRD base board supportHello again!
Quoted 8 lines
These two patches add board support for the OpenRD base board. They are a bit on the RFC-level, but allow me to get a prompt at least. Open
issues:- Copyright and author: As you can see, most of the work in the new files comes from Prafullas sheevaplug stuff. Perhaps Prafulla should be given as the author here as well?
Not necessary.... May be wolfgang can suggest better
Quoted 5 lines
- The addition to
mach-type.hcomes from the last entry in Linux + 1 (I
don't believe this board has upstream Linux support just yet). Not sure what to do there.
Do it.. or get it done first :-) this board support patch will not be accepted without this.
Regards..
Prafulla . .
cover : arm: Kirkwood: OpenRD base board support
Quoted 22 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de
[mailto:u-boot-bounces at lists.denx.de] On Behalf Of Prafulla Wadaskar
Sent: Friday, July 03, 2009 9:56 AM
To: Simon Kagstrom; U-Boot ML
Subject: Re: [U-Boot] [PATCH/RFC 0/2]: arm: Kirkwood: OpenRD base board supportQuoted 10 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Simon Kagstrom
Sent: Thursday, July 02, 2009 6:49 PM
To: U-Boot ML
Subject: [U-Boot] [PATCH/RFC 0/2]: arm: Kirkwood: OpenRD base board supportHello again!
Quoted 9 lines
Quoted 7 lines
These two patches add board support for the OpenRD base board. They are a bit on the RFC-level, but allow me to get a prompt at least. Open
issues:- Copyright and author: As you can see, most of the work in the new files comes from Prafullas sheevaplug stuff. Perhaps
Prafulla should
Quoted 1 line
be given as the author here as well?
Dear Simon
I am getting one OpenRD board next week :-)
hopefully we together can provide good u-boot support for this board Regards..
Prafulla . .
cover : arm: Kirkwood: OpenRD base board support
Quoted 2 lines · On Tue, 7 Jul 2009 01:35:54 -0700 Prafulla Wadaskar <[email protected]>…
I am getting one OpenRD board next week :-)
hopefully we together can provide good u-boot support for this board
Good to hear!
I've done a number of additional fixes around things which I'll send soon.
// Simon