Marvell GuruPlug Board Support
PATCH 1/1 Marvell GuruPlug Board Support
GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
Reference: http://plugcomputer.org
This patch is for GuruPlug Plus, but it supports Standard version as well.
--- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/Marvell/guruplug/Makefile | 51 +++++++++ board/Marvell/guruplug/config.mk | 28 +++++ board/Marvell/guruplug/guruplug.c | 167 +++++++++++++++++++++++++++++ board/Marvell/guruplug/guruplug.h | 39 +++++++ board/Marvell/guruplug/kwbimage.cfg | 162 ++++++++++++++++++++++++++++ include/configs/guruplug.h | 199 +++++++++++++++++++++++++++++++++++ 9 files changed, 654 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h
MAINTAINERS +4 -0
@@ -765,6 +765,10 @@ Prafulla Wadaskar <[email protected]> rd6281a ARM926EJS (Kirkwood SoC) sheevaplug ARM926EJS (Kirkwood SoC) +Siddarth Gore <[email protected]> + + guruplug ARM926EJS (Kirkwood SoC) + Richard Woodruff <[email protected]> omap2420h4 ARM1136EJS
MAKEALL +1 -0
@@ -562,6 +562,7 @@ LIST_ARM9=" \ edb9312 \ edb9315 \ edb9315a \ + guruplug \ imx27lite \ lpd7a400 \ mv88f6281gtw_ge \
Makefile +3 -0
@@ -2952,6 +2952,9 @@ davinci_dm365evm_config : unconfig davinci_dm6467evm_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci +guruplug_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + imx27lite_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27
board/Marvell/guruplug/Makefile new file +51 -0
51 lines not on this page · raw message
board/Marvell/guruplug/config.mk new file +28 -0
@@ -0,0 +1,28 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> +# Written-by: Siddarth Gore <[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 + +# Kirkwood Boot Image configuration file +KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
board/Marvell/guruplug/guruplug.c new file +167 -0
167 lines not on this page · raw message
board/Marvell/guruplug/guruplug.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 __GURUPLUG_H +#define __GURUPLUG_H + +#define GURUPLUG_OE_LOW (~(0)) +#define GURUPLUG_OE_HIGH (~(0)) +#define GURUPLUG_OE_VAL_LOW 0 +#define GURUPLUG_OE_VAL_HIGH (0xf << 16)/* LED Pins high */ + +/* PHY related */ +#define MV88E1121_MAC_CTRL2_REG 21 +#define MV88E1121_PGADR_REG 22 +#define MV88E1121_RGMII_TXTM_CTRL (1 << 4) +#define MV88E1121_RGMII_RXTM_CTRL (1 << 5) + +#endif /* __GURUPLUG_H */
board/Marvell/guruplug/kwbimage.cfg new file +162 -0
162 lines not on this page · raw message
include/configs/guruplug.h new file +199 -0
199 lines not on this page · raw message
Signature · 1 line
1.6.0.3
PATCH 1/1 Marvell GuruPlug Board Support
Quoted 9 lines
-----Original Message-----
From: Siddarth Gore [mailto:gores at marvell.com]
Sent: Monday, March 15, 2010 4:36 PM
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; Siddarth Gore
Subject: [PATCH] Marvell GuruPlug Board Support
Quoted 4 lines
GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
Reference: http://plugcomputer.org
Hi Siddarth
http://www.globalscaletechnologies.com/t-guruplugdetails.aspx
Will be better reference to explain this board
Quoted 26 lines
This patch is for GuruPlug Plus, but it supports Standard version as well.
Signed-off-by Siddarth Gore <[email protected]>--- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/Marvell/guruplug/Makefile | 51 +++++++++ board/Marvell/guruplug/config.mk | 28 +++++ board/Marvell/guruplug/guruplug.c | 167 +++++++++++++++++++++++++++++ board/Marvell/guruplug/guruplug.h | 39 +++++++ board/Marvell/guruplug/kwbimage.cfg | 162 ++++++++++++++++++++++++++++ include/configs/guruplug.h | 199 +++++++++++++++++++++++++++++++++++ 9 files changed, 654 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h
...snip...
Quoted 40 lines
+++
b/board/Marvell/guruplug/guruplug.cboard/Marvell/guruplug/guruplug.c new file +37
-0@@ -0,0 +1,167 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 "guruplug.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/guruplug/guruplug.c line 44
Quoted 7 lines
board/Marvell/guruplug/guruplug.c new file +7
-0+* the below configuration configures mainly initial LED status +*/ +kw_config_gpio (GURUPLUG_OE_VAL_LOW , +GURUPLUG_OE_VAL_HIGH , +GURUPLUG_OE_LOW ,GURUPLUG_OE_HIGH ); + +/* Multi-Purpose Pins Functionality configuration */
It will be good if you comment out for the MPPs that you are configuring
Quoted 55 lines
board/Marvell/guruplug/guruplug.c new file +55
-0+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_GE1_8 , +MPP29_GE1_9 , +MPP30_GE1_10 , +MPP31_GE1_11 , +MPP32_GE1_12 , +MPP33_GE1_13 , +MPP34_GE1_14 , +MPP35_GE1_15 , +MPP36_GPIO , +MPP37_GPIO , +MPP38_GPIO , +MPP39_GPIO , +MPP40_TDM_SPI_SCK , +MPP41_TDM_SPI_MISO , +MPP42_TDM_SPI_MOSI , +MPP43_GPIO , +MPP44_GPIO , +MPP45_GPIO , +MPP46_GPIO , +MPP47_GPIO , +MPP48_GPIO , +MPP49_GPIO , +0 + }; +kirkwood_mpp_conf (kwmpp_config); +
..snip...
Quoted 23 lines
+++
b/board/Marvell/guruplug/guruplug.hboard/Marvell/guruplug/guruplug.h new file +21
-0@@ -0,0 +1,39 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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,
board/Marvell/guruplug/guruplug.h line 31
Quoted 10 lines
board/Marvell/guruplug/guruplug.h new file +10
-0+* MA 02110-1301 USA +*/ + +#ifndef __GURUPLUG_H +#define __GURUPLUG_H + +#define GURUPLUG_OE_LOW (~(0)) +#define GURUPLUG_OE_HIGH (~(0)) +#define GURUPLUG_OE_VAL_LOW 0 +#define GURUPLUG_OE_VAL_HIGH (0xf << 16)/* LED Pins high */
Same here, pls explain the each bit and associated LED used for
...snip...
Quoted 28 lines
include/configs/guruplug.h new file +27
-0+++ b/include/configs/guruplug.h@@ -0,0 +1,199 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 _CONFIG_GURUPLUG_H +#define _CONFIG_GURUPLUG_H
...snip...
include/configs/guruplug.h line 140
Quoted 12 lines
include/configs/guruplug.h new file +6
-0+/* +* Default environment variables +*/ +#define CONFIG_BOOTCOMMAND "setenv ethact egiga0; " \ + "${x_bootcmd_ethernet}; setenv ethact egiga1; " \ + "${x_bootcmd_ethernet}; ${x_bootcmd_usb};${x_bootcmd_kernel}; "\
include/configs/guruplug.h new file +5
-0+"setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ +"bootm 0x6400000;" + +#define CONFIG_EXTRA_ENV_SETTINGS "x_bootcmd_ethernet" \ +"=ping 192.168.2.1\0" \
It's better if you shift "x_bootcmd_ethernet" to below line to make it more readable
..snip..
Quoted 3 lines
(quoted diff) +2
-0+#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ +#define CONFIG_RESET_PHY_R /* use reset_phy() to initmv8831116 PHY */
Comments need to be in lined with used PHY
Apart from above cosmetic changes, the patch looks okay to me
Regards..
Prafulla . .
PATCH 1/1 Marvell GuruPlug Board Support
Quoted 8 lines · Prafulla Wadaskar
Quoted 8 lines
-----Original Message-----
From: Siddarth Gore [mailto:gores at marvell.com]
Sent: Monday, March 15, 2010 4:36 PM
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; Siddarth Gore
Subject: [PATCH] Marvell GuruPlug Board Support
Quoted 7 lines
Quoted 4 lines
GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
Reference: http://plugcomputer.org
Hi Siddarth
Hi Prafulla
Quoted 3 lines
http://www.globalscaletechnologies.com/t-guruplugdetails.aspx
Will be better reference to explain this board
i thought this link might stop working after some time so wanted to give a more permanent link. i will add both.
Quoted 68 lines
Quoted 26 lines
This patch is for GuruPlug Plus, but it supports Standard version as well.
Signed-off-by Siddarth Gore <[email protected]>--- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/Marvell/guruplug/Makefile | 51 +++++++++ board/Marvell/guruplug/config.mk | 28 +++++ board/Marvell/guruplug/guruplug.c | 167 +++++++++++++++++++++++++++++ board/Marvell/guruplug/guruplug.h | 39 +++++++ board/Marvell/guruplug/kwbimage.cfg | 162 ++++++++++++++++++++++++++++ include/configs/guruplug.h | 199 +++++++++++++++++++++++++++++++++++ 9 files changed, 654 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h...snip...
Quoted 41 lines
+++
b/board/Marvell/guruplug/guruplug.cboard/Marvell/guruplug/guruplug.c new file +37
-0@@ -0,0 +1,167 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 "guruplug.h" + +DECLARE_GLOBAL_DATA_PTR ; + +int board_init (void ) +{ +/* +* default gpio configuration +* There are maximum 64 gpios controlled through 2 sets of registers
+ * the below configuration configures mainly initial LED status
Quoted 9 lines
board/Marvell/guruplug/guruplug.c line 44
Quoted 6 lines
board/Marvell/guruplug/guruplug.c new file +6
-0+*/ +kw_config_gpio (GURUPLUG_OE_VAL_LOW , +GURUPLUG_OE_VAL_HIGH , +GURUPLUG_OE_LOW ,GURUPLUG_OE_HIGH ); + +/* Multi-Purpose Pins Functionality configuration */ It will be good if you comment out for the MPPs that you are configuring
done
Quoted 84 lines
Quoted 55 lines
board/Marvell/guruplug/guruplug.c new file +55
-0+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_GE1_8 , +MPP29_GE1_9 , +MPP30_GE1_10 , +MPP31_GE1_11 , +MPP32_GE1_12 , +MPP33_GE1_13 , +MPP34_GE1_14 , +MPP35_GE1_15 , +MPP36_GPIO , +MPP37_GPIO , +MPP38_GPIO , +MPP39_GPIO , +MPP40_TDM_SPI_SCK , +MPP41_TDM_SPI_MISO , +MPP42_TDM_SPI_MOSI , +MPP43_GPIO , +MPP44_GPIO , +MPP45_GPIO , +MPP46_GPIO , +MPP47_GPIO , +MPP48_GPIO , +MPP49_GPIO , +0 + }; +kirkwood_mpp_conf (kwmpp_config); +..snip...
Quoted 27 lines
+++
b/board/Marvell/guruplug/guruplug.hboard/Marvell/guruplug/guruplug.h new file +25
-0@@ -0,0 +1,39 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 __GURUPLUG_H
Quoted 9 lines
board/Marvell/guruplug/guruplug.h line 31
Quoted 6 lines
board/Marvell/guruplug/guruplug.h new file +6
-0+#define __GURUPLUG_H + +#define GURUPLUG_OE_LOW (~(0)) +#define GURUPLUG_OE_HIGH (~(0)) +#define GURUPLUG_OE_VAL_LOW 0 +#define GURUPLUG_OE_VAL_HIGH (0xf << 16)/* LED Pins high */ Same here, pls explain the each bit and associated LED used for
done in the mpp config table
Quoted 31 lines
...snip...
Quoted 28 lines
+++
b/include/configs/guruplug.hinclude/configs/guruplug.h new file +26
-0@@ -0,0 +1,199 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 _CONFIG_GURUPLUG_H +#define _CONFIG_GURUPLUG_H...snip...
Quoted 15 lines
include/configs/guruplug.h line 140
Quoted 12 lines
include/configs/guruplug.h new file +6
-0+/* +* Default environment variables +*/ +#define CONFIG_BOOTCOMMAND "setenv ethact egiga0; " \ + "${x_bootcmd_ethernet}; setenv ethact egiga1; " \ + "${x_bootcmd_ethernet}; ${x_bootcmd_usb};${x_bootcmd_kernel}; "\
include/configs/guruplug.h new file +5
-0+"setenv bootargs ${x_bootargs} ${x_bootargs_root}; " \ +"bootm 0x6400000;" + +#define CONFIG_EXTRA_ENV_SETTINGS "x_bootcmd_ethernet" \ +"=ping 192.168.2.1\0" \It's better if you shift "
x_bootcmd_ethernet" to below line to make it more readable
done
Quoted 7 lines
..snip..
Quoted 3 lines
(quoted diff) +2
-0+#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */ +#define CONFIG_RESET_PHY_R /* use reset_phy() to initmv8831116 PHY */
Comments need to be in lined with used PHY
done
Quoted 2 lines
Apart from above cosmetic changes, the patch looks okay to me
i will resend the patch with the changes.
-siddarth
Quoted 2 lines
Regards..
Prafulla . .
PATCH 1/1 Marvell GuruPlug Board Support
GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
References:
http://www.globalscaletechnologies.com/t-guruplugdetails.aspx
http://plugcomputer.org
This patch is for GuruPlug Plus, but it supports Standard version as well.
--- MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/Marvell/guruplug/Makefile | 51 +++++++++ board/Marvell/guruplug/config.mk | 28 +++++ board/Marvell/guruplug/guruplug.c | 167 +++++++++++++++++++++++++++++ board/Marvell/guruplug/guruplug.h | 39 +++++++ board/Marvell/guruplug/kwbimage.cfg | 162 ++++++++++++++++++++++++++++ include/configs/guruplug.h | 199 +++++++++++++++++++++++++++++++++++ 9 files changed, 654 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h
MAINTAINERS +4 -0
@@ -765,6 +765,10 @@ Prafulla Wadaskar <[email protected]> rd6281a ARM926EJS (Kirkwood SoC) sheevaplug ARM926EJS (Kirkwood SoC) +Siddarth Gore <[email protected]> + + guruplug ARM926EJS (Kirkwood SoC) + Richard Woodruff <[email protected]> omap2420h4 ARM1136EJS
MAKEALL +1 -0
@@ -562,6 +562,7 @@ LIST_ARM9=" \ edb9312 \ edb9315 \ edb9315a \ + guruplug \ imx27lite \ lpd7a400 \ mv88f6281gtw_ge \
Makefile +3 -0
@@ -2952,6 +2952,9 @@ davinci_dm365evm_config : unconfig davinci_dm6467evm_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci +guruplug_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + imx27lite_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27
board/Marvell/guruplug/Makefile new file +51 -0
51 lines not on this page · raw message
board/Marvell/guruplug/config.mk new file +28 -0
@@ -0,0 +1,28 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> +# Written-by: Siddarth Gore <[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 + +# Kirkwood Boot Image configuration file +KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
board/Marvell/guruplug/guruplug.c new file +167 -0
167 lines not on this page · raw message
board/Marvell/guruplug/guruplug.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 __GURUPLUG_H +#define __GURUPLUG_H + +#define GURUPLUG_OE_LOW (~(0)) +#define GURUPLUG_OE_HIGH (~(0)) +#define GURUPLUG_OE_VAL_LOW 0 +#define GURUPLUG_OE_VAL_HIGH (0xf << 16)/* 4 LED Pins high */ + +/* PHY related */ +#define MV88E1121_MAC_CTRL2_REG 21 +#define MV88E1121_PGADR_REG 22 +#define MV88E1121_RGMII_TXTM_CTRL (1 << 4) +#define MV88E1121_RGMII_RXTM_CTRL (1 << 5) + +#endif /* __GURUPLUG_H */
board/Marvell/guruplug/kwbimage.cfg new file +162 -0
162 lines not on this page · raw message
include/configs/guruplug.h new file +199 -0
199 lines not on this page · raw message
Signature · 1 line
1.6.0.3
PATCH 1/1 Marvell GuruPlug Board Support
Dear Siddarth Gore,
In message <[email protected]> you wrote:
...
MAINTAINERS Prafulla Wadaskar <[email protected]> · line 772
Quoted 13 lines
MAINTAINERS +4
-0@@ -765,6 +765,10 @@ Prafulla Wadaskar <[email protected]> rd6281a ARM926EJS (Kirkwood SoC) sheevaplug ARM926EJS (Kirkwood SoC) +Siddarth Gore <[email protected]> + + guruplug ARM926EJS (Kirkwood SoC) + Richard Woodruff <[email protected]>
Please keep list of maintainers sorted by last name.
Quoted 3 lines
board/Marvell/guruplug/config.mk new file +0
-0@@ -0,0 +1,28 @@
...
board/Marvell/guruplug/config.mk line 27
Quoted 3 lines
board/Marvell/guruplug/config.mk new file +3
-0+TEXT_BASE = 0x00600000 + +# Kirkwood Boot Image configuration file
Please don't add such trailers. Move the description upto the start of the file - if you really think you need one. It's probably better just to drop this.
Quoted 156 lines
board/Marvell/guruplug/config.mk new file +1
-0+KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfgboard/Marvell/guruplug/guruplug.c new file +149
-0@@ -0,0 +1,167 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 "guruplug.h" + +DECLARE_GLOBAL_DATA_PTR ; + +int board_init (void ) +{ +/* +* default gpio configuration +* There are maximum 64 gpios controlled through 2 sets of registers +* the below configuration configures mainly initial LED status +*/ +kw_config_gpio (GURUPLUG_OE_VAL_LOW , +GURUPLUG_OE_VAL_HIGH , +GURUPLUG_OE_LOW ,GURUPLUG_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 ,/* GPIO_RST */ +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_GE1_8 , +MPP29_GE1_9 , +MPP30_GE1_10 , +MPP31_GE1_11 , +MPP32_GE1_12 , +MPP33_GE1_13 , +MPP34_GE1_14 , +MPP35_GE1_15 , +MPP36_GPIO , +MPP37_GPIO , +MPP38_GPIO , +MPP39_GPIO , +MPP40_TDM_SPI_SCK , +MPP41_TDM_SPI_MISO , +MPP42_TDM_SPI_MOSI , +MPP43_GPIO , +MPP44_GPIO , +MPP45_GPIO , +MPP46_GPIO ,/* M_RLED */ +MPP47_GPIO ,/* M_GLED */ +MPP48_GPIO ,/* B_RLED */ +MPP49_GPIO ,/* B_GLED */ +0 + }; +kirkwood_mpp_conf (kwmpp_config); + +/* +* arch number of board +*/ + gd->bd->bi_arch_number =MACH_TYPE_GURUPLUG ; + +/* 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 mv_phy_88e1121_init (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,MV88E1121_PGADR_REG ,2 ); +miiphy_read (name, devadr,MV88E1121_MAC_CTRL2_REG , ®); + reg |= (MV88E1121_RGMII_RXTM_CTRL |MV88E1121_RGMII_TXTM_CTRL ); +miiphy_write (name, devadr,MV88E1121_MAC_CTRL2_REG , reg); +miiphy_write (name, devadr,MV88E1121_PGADR_REG ,0 ); + +/* reset the phy */ +if (miiphy_read (name, devadr,PHY_BMCR , ®) !=0 ) {
board/Marvell/guruplug/guruplug.c line 159
Quoted 10 lines
board/Marvell/guruplug/guruplug.c new file +10
-0+printf ("Err..(%s) PHY status read failed\n" , __FUNCTION__); +return ; + } +if (miiphy_write (name, devadr,PHY_BMCR , reg |0x8000 ) !=0 ) { +printf ("Err..(%s) PHY reset failed\n" , __FUNCTION__); +return ; + } + +printf ("88E1121 Initialized on %s\n" , name); +}
We have pretty much identical code already in mv_phy_88e1116_init() [in "board/Marvell/rd6281a/rd6281a.c"], in reset_phy() [in "board/Marvell/openrd_base/openrd_base.c"], in reset_phy(0 [in "board/Marvell/sheevaplug/sheevaplug.c"] and I don't know where else.
I object against adding more and more copies of the same code. Please factor out the common part into a single implementation, and call this everwhere where such code is used. Thanks.
...
Quoted 3 lines
board/Marvell/guruplug/guruplug.h new file +0
-0@@ -0,0 +1,39 @@
....
board/Marvell/guruplug/guruplug.h line 29
Quoted 2 lines
board/Marvell/guruplug/guruplug.h new file +2
-0+#define GURUPLUG_OE_LOW (~(0)) +#define GURUPLUG_OE_HIGH (~(0))
Is this correct? Both LOW and HIGH use the same value??
...
board/Marvell/guruplug/guruplug.h
Quoted 3 lines
board/Marvell/guruplug/guruplug.h new file +3
-0+#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ +#include <config_cmd_default.h> +#define CONFIG_CMD_AUTOSCRIPT
CONFIG_CMD_AUTOSCRIPT has been deprecated long ago. Please fix.
Quoted 3 lines
+/*
+ * Other required minimal configurations
+ */
In which way is this "minimal" ?
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Uncertain fortune is thoroughly mastered by the equity of the calcu- lation. - Blaise Pascal
PATCH 1/1 Marvell GuruPlug Board Support
Quoted 9 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Wolfgang Denk
Sent: Monday, March 15, 2010 9:38 PM
To: Siddarth Gore
Cc: u-boot at lists.denx.de; Ashish Karkare; Prabhanjan Sarnaik
Subject: Re: [U-Boot] [PATCH] Marvell GuruPlug Board Support
...snip...
Quoted 46 lines
Quoted 20 lines
board/Marvell/guruplug/guruplug.c new file +20
-0+ +#ifdef CONFIG_RESET_PHY_R +void mv_phy_88e1121_init (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 board/Marvell/guruplug/guruplug.c
Quoted 10 lines
board/Marvell/guruplug/guruplug.c new file +10
-0+*/ +miiphy_write (name, devadr,MV88E1121_PGADR_REG ,2 ); +miiphy_read (name, devadr,MV88E1121_MAC_CTRL2_REG , ®); + reg |= (MV88E1121_RGMII_RXTM_CTRL |MV88E1121_RGMII_TXTM_CTRL ); +miiphy_write (name, devadr,MV88E1121_MAC_CTRL2_REG , reg); +miiphy_write (name, devadr,MV88E1121_PGADR_REG ,0 ); + +/* reset the phy */ +if (miiphy_read (name, devadr,PHY_BMCR , ®) !=0 ) { + printf("Err..(%s) PHY status read failed\n",
__FUNCTION__);board/Marvell/guruplug/guruplug.c line 159
Quoted 9 lines
board/Marvell/guruplug/guruplug.c new file +9
-0+return ; + } +if (miiphy_write (name, devadr,PHY_BMCR , reg |0x8000 ) !=0 ) { +printf ("Err..(%s) PHY reset failed\n" , __FUNCTION__); +return ; + } + +printf ("88E1121 Initialized on %s\n" , name); +}We have pretty much identical code already in
mv_phy_88e1116_init()[in "board/Marvell/rd6281a/rd6281a.c"], inreset_phy()[in "board/Marvell/openrd_base/openrd_base.c"], in reset_phy(0 [in "board/Marvell/sheevaplug/sheevaplug.c"] and I don't know where else.
Quoted 3 lines
I object against adding more and more copies of the same code. Please factor out the common part into a single implementation, and call this everwhere where such code is used. Thanks.
Hi Wolfgang
I agree with you.
Pls have a look at old reference http://lists.denx.de/pipermail/u-boot/2009-June/053621.html
I would be keen to do this cleanup.
Can someone make new PHY framework available,
If not I will be glad to provide Drivers for Marvell PHYs.
Regards..
Prafulla . .
PATCH 1/1 Marvell GuruPlug Board Support
In reply to Wolfgang DenkQuoted 12 lines · Wolfgang Denk
Dear Siddarth Gore,
In message <[email protected]> you wrote:
...Quoted 8 lines
MAINTAINERS +0
-0@@ -765,6 +765,10 @@ Prafulla Wadaskar <[email protected]> rd6281a ARM926EJS (Kirkwood SoC) sheevaplug ARM926EJS (Kirkwood SoC)
Quoted 8 lines
MAINTAINERS Prafulla Wadaskar <[email protected]> · line 772
Quoted 5 lines
MAINTAINERS +4
-0+Siddarth Gore <[email protected]> + + guruplug ARM926EJS (Kirkwood SoC) + Richard Woodruff <[email protected]>Please keep list of maintainers sorted by last name.
ok. done.
Quoted 4 lines
Quoted 3 lines
board/Marvell/guruplug/config.mk new file +0
-0@@ -0,0 +1,28 @@...
Quoted 8 lines
board/Marvell/guruplug/config.mk line 27
Quoted 3 lines
board/Marvell/guruplug/config.mk new file +3
-0+TEXT_BASE = 0x00600000 + +# Kirkwood Boot Image configuration filePlease don't add such trailers. Move the description upto the start of the file - if you really think you need one. It's probably better just to drop this.
ok. removed this comment.
Quoted 172 lines
Quoted 156 lines
board/Marvell/guruplug/config.mk new file +1
-0+KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfgboard/Marvell/guruplug/guruplug.c new file +149
-0@@ -0,0 +1,167 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 "guruplug.h" + +DECLARE_GLOBAL_DATA_PTR ; + +int board_init (void ) +{ +/* +* default gpio configuration +* There are maximum 64 gpios controlled through 2 sets of registers +* the below configuration configures mainly initial LED status +*/ +kw_config_gpio (GURUPLUG_OE_VAL_LOW , +GURUPLUG_OE_VAL_HIGH , +GURUPLUG_OE_LOW ,GURUPLUG_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 ,/* GPIO_RST */ +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_GE1_8 , +MPP29_GE1_9 , +MPP30_GE1_10 , +MPP31_GE1_11 , +MPP32_GE1_12 , +MPP33_GE1_13 , +MPP34_GE1_14 , +MPP35_GE1_15 , +MPP36_GPIO , +MPP37_GPIO , +MPP38_GPIO , +MPP39_GPIO , +MPP40_TDM_SPI_SCK , +MPP41_TDM_SPI_MISO , +MPP42_TDM_SPI_MOSI , +MPP43_GPIO , +MPP44_GPIO , +MPP45_GPIO , +MPP46_GPIO ,/* M_RLED */ +MPP47_GPIO ,/* M_GLED */ +MPP48_GPIO ,/* B_RLED */ +MPP49_GPIO ,/* B_GLED */ +0 + }; +kirkwood_mpp_conf (kwmpp_config); + +/* +* arch number of board +*/ + gd->bd->bi_arch_number =MACH_TYPE_GURUPLUG ; + +/* 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 mv_phy_88e1121_init (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,MV88E1121_PGADR_REG ,2 ); +miiphy_read (name, devadr,MV88E1121_MAC_CTRL2_REG , ®); + reg |= (MV88E1121_RGMII_RXTM_CTRL |MV88E1121_RGMII_TXTM_CTRL ); +miiphy_write (name, devadr,MV88E1121_MAC_CTRL2_REG , reg); +miiphy_write (name, devadr,MV88E1121_PGADR_REG ,0 ); + +/* reset the phy */ +if (miiphy_read (name, devadr,PHY_BMCR , ®) !=0 ) {board/Marvell/guruplug/guruplug.c line 159
Quoted 10 lines
board/Marvell/guruplug/guruplug.c new file +10
-0+printf ("Err..(%s) PHY status read failed\n" , __FUNCTION__); +return ; + } +if (miiphy_write (name, devadr,PHY_BMCR , reg |0x8000 ) !=0 ) { +printf ("Err..(%s) PHY reset failed\n" , __FUNCTION__); +return ; + } + +printf ("88E1121 Initialized on %s\n" , name); +}We have pretty much identical code already in
mv_phy_88e1116_init()[in "board/Marvell/rd6281a/rd6281a.c"], inreset_phy()[in "board/Marvell/openrd_base/openrd_base.c"], in reset_phy(0 [in "board/Marvell/sheevaplug/sheevaplug.c"] and I don't know where else.
Quoted 4 lines
I object against adding more and more copies of the same code. Please factor out the common part into a single implementation, and call this everwhere where such code is used. Thanks.
i can create a new file ethphy.c in board/Marvell/common and put this code there. but if we are going to move to a phy driver (as Prafulla suggested) then that wont be necessary. Please advise.
Also i think we should maintain different init functions for 1116 and 1121 as they represent different phy families, even though the code is pretty much the same right now.
Quoted 11 lines
...
Quoted 3 lines
board/Marvell/guruplug/guruplug.h new file +0
-0@@ -0,0 +1,39 @@....
board/Marvell/guruplug/guruplug.h line 29
Quoted 2 lines
board/Marvell/guruplug/guruplug.h new file +2
-0+#define GURUPLUG_OE_LOW (~(0)) +#define GURUPLUG_OE_HIGH (~(0))Is this correct? Both LOW and HIGH use the same value??
Quoted 7 lines
...
board/Marvell/guruplug/guruplug.h
Quoted 3 lines
board/Marvell/guruplug/guruplug.h new file +3
-0+#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ +#include <config_cmd_default.h> +#define CONFIG_CMD_AUTOSCRIPT
CONFIG_CMD_AUTOSCRIPThas been deprecated long ago. Please fix.
ok. removed this.
Quoted 6 lines
Quoted 3 lines
+/*
+ * Other required minimal configurations
+ */In which way is this "minimal" ?
ok. removed the word 'minimal' from the comment.
-siddarth
Quoted 11 lines
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Uncertain fortune is thoroughly mastered by the equity of the calcu-
lation. - Blaise Pascal
PATCH 1/1 Marvell GuruPlug Board Support
Quoted 9 lines
-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot-bounces at lists.denx.de] On Behalf Of Siddarth Gore
Sent: Thursday, March 18, 2010 10:59 AM
To: Wolfgang Denk
Cc: u-boot at lists.denx.de; Ashish Karkare; Prabhanjan Sarnaik
Subject: Re: [U-Boot] [PATCH] Marvell GuruPlug Board Support
...snip...
Quoted 13 lines
Quoted 5 lines
We have pretty much identical code already in
mv_phy_88e1116_init()[in "board/Marvell/rd6281a/rd6281a.c"], inreset_phy()[in "board/Marvell/openrd_base/openrd_base.c"], in reset_phy(0 [in "board/Marvell/sheevaplug/sheevaplug.c"] and I don't knowwhere else.
Quoted 2 lines
I object against adding more and more copies of the same
code. Please
Quoted 1 line
factor out the common part into a single implementation,
and call this
Quoted 2 lines
everwhere where such code is used. Thanks.
Quoted 7 lines
i can create a new file
ethphy.cin board/Marvell/common and put this code there. but if we are going to move to a phy driver (as Prafulla suggested) then that wont be necessary. Please advise.Also i think we should maintain different init functions for 1116 and 1121 as they represent different phy families, even though the code is pretty much the same right now.
Hi Siddarth
I think you keep this part as it is as of now, Once Ben suggest something, I will post the cleanup patch
Regards..
Prafulla ..
PATCH 1/1 Marvell GuruPlug Board Support
In reply to Siddarth GoreDear Siddarth Gore,
Quoted 1 line · In message <1268890125.23313.27.camel@pe-dt434> you wrote:
...
Quoted 5 lines
Quoted 5 lines
We have pretty much identical code already in
mv_phy_88e1116_init()[in "board/Marvell/rd6281a/rd6281a.c"], inreset_phy()[in "board/Marvell/openrd_base/openrd_base.c"], in reset_phy(0 [in "board/Marvell/sheevaplug/sheevaplug.c"] and I don't know where else.
Quoted 7 lines
Quoted 4 lines
I object against adding more and more copies of the same code. Please factor out the common part into a single implementation, and call this everwhere where such code is used. Thanks.
i can create a new file
ethphy.cin board/Marvell/common and put this code there. but if we are going to move to a phy driver (as Prafulla suggested) then that wont be necessary. Please advise.
Is there any actual development for a generic PHY support layer going on anywhere? I must have missed this, then. If there is such a thing, it should be used, obviously.
Quoted 3 lines
Also i think we should maintain different init functions for 1116 and 1121 as they represent different phy families, even though the code is pretty much the same right now.
If the code is the same, then duplication makes no sense to me.
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Space is big. You just won't believe how vastly, hugely, mind-
bogglingly big it is. I mean, you may think it's a long way down the
road to the drug store, but that's just peanuts to space.
-- The Hitchhiker's Guide to the GalaxyPATCH 1/1 Marvell GuruPlug Board Support
In reply to Wolfgang DenkQuoted 10 lines · Wolfgang Denk
...
Quoted 3 lines
board/Marvell/guruplug/guruplug.h new file +0
-0@@ -0,0 +1,39 @@....
board/Marvell/guruplug/guruplug.h line 29
Quoted 2 lines
board/Marvell/guruplug/guruplug.h new file +2
-0+#define GURUPLUG_OE_LOW (~(0)) +#define GURUPLUG_OE_HIGH (~(0))Is this correct? Both LOW and HIGH use the same value??
Sorry. forget to respond to this one.
Yes this is correct. LOW and HIGH does not represent logic levels here. The registers which control GPIO pins 0 though 31 are suffixed LOW and those which control the rest are suffixed HIGH.
-siddarth
PATCH v2 1/1 Marvell GuruPlug Board Support
In reply to Wolfgang DenkGuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
References:
http://www.globalscaletechnologies.com/t-guruplugdetails.aspx
http://plugcomputer.org
This patch is for GuruPlug Plus, but it supports Standard version as well.
---
Changes compared to the previous version (messaage-id:
1268660568-23022-1-git-send-email-gores at marvell.com)
- maintainers entry sorted according to last name
- removed trailing comment from board/Marvell/guruplug/config.mk
- removed CONFIG_CMD_AUTOSCRIPT from include/configs/guruplug.h
- removed word 'minimal' from comment in include/configs/guruplug.h
MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/Marvell/guruplug/Makefile | 51 +++++++++ board/Marvell/guruplug/config.mk | 27 +++++ board/Marvell/guruplug/guruplug.c | 167 +++++++++++++++++++++++++++++ board/Marvell/guruplug/guruplug.h | 39 +++++++ board/Marvell/guruplug/kwbimage.cfg | 162 ++++++++++++++++++++++++++++ include/configs/guruplug.h | 198 +++++++++++++++++++++++++++++++++++ 9 files changed, 652 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h
MAINTAINERS +4 -0
@@ -195,6 +195,10 @@ Niklaus Giger <[email protected]> MCU25 PPC405GPr HCU5 PPC440EPx +Siddarth Gore <[email protected]> + + guruplug ARM926EJS (Kirkwood SoC) + Frank Gottschling <[email protected]> MHPC MPC8xx
MAKEALL +1 -0
@@ -562,6 +562,7 @@ LIST_ARM9=" \ edb9312 \ edb9315 \ edb9315a \ + guruplug \ imx27lite \ lpd7a400 \ mv88f6281gtw_ge \
Makefile +3 -0
@@ -2952,6 +2952,9 @@ davinci_dm365evm_config : unconfig davinci_dm6467evm_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs dm6467evm davinci davinci +guruplug_config: unconfig + @$(MKCONFIG) $(@:_config=) arm arm926ejs $(@:_config=) Marvell kirkwood + imx27lite_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm926ejs imx27lite logicpd mx27
board/Marvell/guruplug/Makefile new file +51 -0
51 lines not on this page · raw message
board/Marvell/guruplug/config.mk new file +27 -0
@@ -0,0 +1,27 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> +# Written-by: Siddarth Gore <[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 + +KWD_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/kwbimage.cfg
board/Marvell/guruplug/guruplug.c new file +167 -0
167 lines not on this page · raw message
board/Marvell/guruplug/guruplug.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* (C) Copyright 2009 +* Marvell Semiconductor <www.marvell.com> +* Written-by: Siddarth Gore <[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 __GURUPLUG_H +#define __GURUPLUG_H + +#define GURUPLUG_OE_LOW (~(0)) +#define GURUPLUG_OE_HIGH (~(0)) +#define GURUPLUG_OE_VAL_LOW 0 +#define GURUPLUG_OE_VAL_HIGH (0xf << 16)/* 4 LED Pins high */ + +/* PHY related */ +#define MV88E1121_MAC_CTRL2_REG 21 +#define MV88E1121_PGADR_REG 22 +#define MV88E1121_RGMII_TXTM_CTRL (1 << 4) +#define MV88E1121_RGMII_RXTM_CTRL (1 << 5) + +#endif /* __GURUPLUG_H */
board/Marvell/guruplug/kwbimage.cfg new file +162 -0
162 lines not on this page · raw message
include/configs/guruplug.h new file +198 -0
198 lines not on this page · raw message
Signature · 1 line
1.6.0.3
PATCH v2 1/1 Marvell GuruPlug Board Support
Quoted 38 lines
-----Original Message-----
From: Siddarth Gore [mailto:gores at marvell.com]
Sent: Thursday, March 18, 2010 1:12 PM
To: u-boot at lists.denx.de
Cc: Prafulla Wadaskar; Prabhanjan Sarnaik; Ashish Karkare; Siddarth Gore
Subject: [PATCH v2] Marvell GuruPlug Board SupportGuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
References:
http://www.globalscaletechnologies.com/t-guruplugdetails.aspx
http://plugcomputer.orgThis patch is for GuruPlug Plus, but it supports Standard version as well.
Signed-off-by Siddarth Gore <[email protected]>---
Changes compared to the previous version (messaage-id:
1268660568-23022-1-git-send-email-gores at marvell.com)
- maintainers entry sorted according to last name
- removed trailing comment fromboard/Marvell/guruplug/config.mk
- removedCONFIG_CMD_AUTOSCRIPTfrominclude/configs/guruplug.h
- removed word 'minimal' from comment ininclude/configs/guruplug.hMAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/Marvell/guruplug/Makefile | 51 +++++++++ board/Marvell/guruplug/config.mk | 27 +++++ board/Marvell/guruplug/guruplug.c | 167 +++++++++++++++++++++++++++++ board/Marvell/guruplug/guruplug.h | 39 +++++++ board/Marvell/guruplug/kwbimage.cfg | 162 ++++++++++++++++++++++++++++ include/configs/guruplug.h | 198
Quoted 9 lines
+++++++++++++++++++++++++++++++++++
9 files changed, 652 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h
Looks okay to me
Regards..
Prafulla . .
PATCH v2 1/1 Marvell GuruPlug Board Support
In reply to Siddarth GoreDear Tom, dear Prafulla,
Quoted 19 lines · In message <[email protected]> you wrote:
GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
References:
http://www.globalscaletechnologies.com/t-guruplugdetails.aspx
http://plugcomputer.orgThis patch is for GuruPlug Plus, but it supports Standard version as well.
Signed-off-by Siddarth Gore <[email protected]>---
Changes compared to the previous version (messaage-id:
1268660568-23022-1-git-send-email-gores at marvell.com)
- maintainers entry sorted according to last name
- removed trailing comment fromboard/Marvell/guruplug/config.mk
- removedCONFIG_CMD_AUTOSCRIPTfrominclude/configs/guruplug.h
- removed word 'minimal' from comment ininclude/configs/guruplug.h
Quoted 16 lines
MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/Marvell/guruplug/Makefile | 51 +++++++++ board/Marvell/guruplug/config.mk | 27 +++++ board/Marvell/guruplug/guruplug.c | 167 +++++++++++++++++++++++++++++ board/Marvell/guruplug/guruplug.h | 39 +++++++ board/Marvell/guruplug/kwbimage.cfg | 162 ++++++++++++++++++++++++++++ include/configs/guruplug.h | 198 +++++++++++++++++++++++++++++++++++ 9 files changed, 652 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Every little picofarad has a nanohenry all its own. - Don Vonada
PATCH v2 1/1 Marvell GuruPlug Board Support
Quoted 53 lines
-----Original Message-----
From: Wolfgang Denk [mailto:wd at denx.de]
Sent: Monday, March 22, 2010 1:16 AM
To: Tom; Prafulla Wadaskar
Cc: Siddarth Gore; u-boot at lists.denx.de; Ashish Karkare; Prabhanjan Sarnaik
Subject: Re: [U-Boot] [PATCH v2] Marvell GuruPlug Board SupportDear Tom, dear Prafulla,
In message
Quoted 19 lines · <[email protected]> you wrote:
GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
References:
http://www.globalscaletechnologies.com/t-guruplugdetails.aspx
http://plugcomputer.orgThis patch is for GuruPlug Plus, but it supports Standard version as well.
Signed-off-by Siddarth Gore <[email protected]>---
Changes compared to the previous version (messaage-id:
1268660568-23022-1-git-send-email-gores at marvell.com)
- maintainers entry sorted according to last name
- removed trailing comment fromboard/Marvell/guruplug/config.mk
- removedCONFIG_CMD_AUTOSCRIPTfrominclude/configs/guruplug.h
- removed word 'minimal' from comment ininclude/configs/guruplug.hQuoted 6 lines
MAINTAINERS | 4 + MAKEALL | 1 + Makefile | 3 + board/Marvell/guruplug/Makefile | 51 +++++++++ board/Marvell/guruplug/config.mk | 27 +++++ board/Marvell/guruplug/guruplug.c | 167+++++++++++++++++++++++++++++
Quoted 2 lines
board/Marvell/guruplug/guruplug.h | 39 +++++++ board/Marvell/guruplug/kwbimage.cfg | 162++++++++++++++++++++++++++++
Quoted 1 line
include/configs/guruplug.h | 198+++++++++++++++++++++++++++++++++++
Quoted 7 lines
9 files changed, 652 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/guruplug/Makefile create mode 100644 board/Marvell/guruplug/config.mk create mode 100644 board/Marvell/guruplug/guruplug.c create mode 100644 board/Marvell/guruplug/guruplug.h create mode 100644 board/Marvell/guruplug/kwbimage.cfg create mode 100644 include/configs/guruplug.h
Quoted 1 line
Reviewed-by Wolfgang Denk <[email protected]>
Applied to u-boot-marvell.git master branch
Regards..
Prafulla . .
PATCH 1/1 Marvell GuruPlug Board Support
In reply to Siddarth GoreDear Siddarth Gore,
Quoted 9 lines · In message <[email protected]> you wrote:
GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot
References:
http://www.globalscaletechnologies.com/t-guruplugdetails.aspx
http://plugcomputer.orgThis patch is for GuruPlug Plus, but it supports Standard version as well.
And please: when resubmitting a (modified) patch, then mark it as such by using "[PATCH v2]" etc. in the subject, and add a description of the changes (compared to the previous version(s) of the patch) below the "---" line.
Thanks.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de If you believe that feeling bad or worrying long enough will change a past or future event, then you are residing on another planet with a different reality system.