Skip to contentSkip to conversation

ARM: lacie_kw: add support for WIRELESS_SPACE

PATCH New Albert ARIBAUD 4 participants 32 messages Aug 16, 2012 – Dec 20, 2012

Subsystems (4)
Network drivers Arm (32-bit) SPI Ethernet PHY
lore
Share & tools
lore

Albert ARIBAUD

author
#0 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

Signed-off-by Albert ARIBAUD <[email protected]>

---

This patch adds the Wireless Space to the lacie_kw sub-targets. It *should* not change a thing to the already existing sub-targets (except that each one gets its own prompt).

Owners of NETSPACE_[MAX]_V2, INETSPACE_V2, NET2BIG_V2 please test.

 board/LaCie/netspace_v2/netspace_v2.c |   42 ++----------
 board/LaCie/netspace_v2/netspace_v2.h |  121 +++++++++++++++++++++++++++++++++
 boards.cfg                            |    1 +
 drivers/net/mvgbe.c                   |   10 ++-
 include/configs/lacie_kw.h            |   38 ++++++++++-
 5 files changed, 175 insertions(+), 37 deletions(-)
board/LaCie/netspace_v2/netspace_v2.c +7 -35
index 68e8a77..084f0cf 100644
@@ -39,40 +39,7 @@ int board_early_init_f(void)
 			NETSPACE_V2_OE_LOW, NETSPACE_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
-		MPP0_SPI_SCn,
-		MPP1_SPI_MOSI,
-		MPP2_SPI_SCK,
-		MPP3_SPI_MISO,
-		MPP4_NF_IO6,
-		MPP5_NF_IO7,
-		MPP6_SYSRST_OUTn,
-		MPP7_GPO,		/* Fan speed (bit 1) */
-		MPP8_TW_SDA,
-		MPP9_TW_SCK,
-		MPP10_UART0_TXD,
-		MPP11_UART0_RXD,
-		MPP12_GPO,		/* Red led */
-		MPP14_GPIO,		/* USB fuse */
-		MPP16_GPIO,		/* SATA 0 power */
-		MPP17_GPIO,		/* SATA 1 power */
-		MPP18_NF_IO0,
-		MPP19_NF_IO1,
-		MPP20_SATA1_ACTn,
-		MPP21_SATA0_ACTn,
-		MPP22_GPIO,		/* Fan speed (bit 0) */
-		MPP23_GPIO,		/* Fan power */
-		MPP24_GPIO,		/* USB mode select */
-		MPP25_GPIO,		/* Fan rotation fail */
-		MPP26_GPIO,		/* USB vbus-in detection */
-		MPP28_GPIO,		/* USB enable vbus-out */
-		MPP29_GPIO,		/* Blue led (slow register) */
-		MPP30_GPIO,		/* Blue led (command register) */
-		MPP31_GPIO,		/* Board power off */
-		MPP32_GPIO,		/* Button (0 = Released, 1 = Pushed) */
-		MPP33_GPIO,		/* Fan speed (bit 2) */
-		0
-	};
+	u32 kwmpp_config[] = NETSPACE_V2_MPP_CONFIG;
 	kirkwood_mpp_conf(kwmpp_config, NULL);
 
 	return 0;

@@ -107,7 +74,12 @@ int misc_init_r(void)
 /* Configure and initialize PHY */
 void reset_phy(void)
 {
-	mv_phy_88e1116_init("egiga0", 8);
+#ifdef CONFIG_EGIGA0_PHY
+	mv_phy_88e1116_init("egiga0", CONFIG_EGIGA0_PHY);
+#endif
+#ifdef CONFIG_EGIGA1_PHY
+	mv_phy_88e1116_init("egiga1", CONFIG_EGIGA1_PHY);
+#endif
 }
 #endif
board/LaCie/netspace_v2/netspace_v2.h +121 -0

132 lines not on this page · raw message

boards.cfg +1 -0
index edd750c..f001b29 100644
@@ -157,6 +157,7 @@ inetspace_v2                 arm         arm926ejs   netspace_v2         LaCie
 net2big_v2                   arm         arm926ejs   net2big_v2          LaCie          kirkwood	lacie_kw:NET2BIG_V2
 netspace_max_v2              arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MAX_V2
 netspace_v2                  arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_V2
+wireless_space               arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:WIRELESS_SPACE
 dreamplug                    arm         arm926ejs   -                   Marvell        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
drivers/net/mvgbe.c +9 -1
index 47bf27c..670edb0 100644
@@ -653,6 +653,14 @@ int mvgbe_initialize(bd_t *bis)
 	struct eth_device *dev;
 	int devnum;
 	u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
+#if defined(CONFIG_MVGBE_PHY_ADRS)
+#define MVGBE_PHY_ADRS CONFIG_MVGBE_PHY_ADRS
+#elif defined(CONFIG_PHY_BASE_ADR)
+#define MVGBE_PHY_ADRS {CONFIG_PHY_BASE_ADR,CONFIG_PHY_BASE_ADR+1}
+#else
+#define MVGBE_PHY_ADRS {8,9}
+#endif
+ 	u8 used_phy_adrs[MAX_MVGBE_DEVS] = MVGBE_PHY_ADRS;
 
 	for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) {
 		/*skip if port is configured not to use */

@@ -733,7 +741,7 @@ error1:
 		miiphy_register(dev->name, smi_reg_read, smi_reg_write);
 		/* Set phy address of the port */
 		miiphy_write(dev->name, MV_PHY_ADR_REQUEST,
-				MV_PHY_ADR_REQUEST, PHY_BASE_ADR + devnum);
+				MV_PHY_ADR_REQUEST, used_phy_adrs[devnum]);
 #endif
 	}
 	return 0;
include/configs/lacie_kw.h +37 -1
index c35c2db..a979ab4 100644
@@ -33,6 +33,10 @@
 #elif defined(CONFIG_NET2BIG_V2)
 #define CONFIG_MACH_TYPE		MACH_TYPE_NET2BIG_V2
 #define CONFIG_IDENT_STRING		" 2Big v2"
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define MACH_TYPE_WIRELESS_SPACE	2500 /* is missing in mach-types.h */
+#define CONFIG_MACH_TYPE		MACH_TYPE_WIRELESS_SPACE
+#define CONFIG_IDENT_STRING		" Wireless Space"
 #else
 #error "Unknown board"
 #endif

@@ -73,6 +77,12 @@
 #define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-is2.cfg
 #endif
 
+#ifdef CONFIG_WIRELESS_SPACE
+/* No SPI but NAND */
+#undef CONFIG_CMD_SF
+#define CONFIG_CMD_NAND
+#endif
+
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros

@@ -90,8 +100,14 @@
 #define CONFIG_SYS_IDE_MAXDEVICE        1
 #if defined(CONFIG_NET2BIG_V2)
 #define CONFIG_SYS_PROMPT		"2big2> "
-#else
+#elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_SYS_PROMPT		"ns2> "
+#elif defined(CONFIG_INETSPACE_V2)
+#define CONFIG_SYS_PROMPT		"is2> "
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_SYS_PROMPT		"ws> "
+#else
+#define CONFIG_SYS_PROMPT		"lacie-kw> "
 #endif
 
 /*

@@ -99,7 +115,16 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_MISC_INIT_R /* Call misc_init_r() to initialize MAC address */
+#if defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_MVGBE_PORTS		{1, 1}	/* enable both ports only */
+#define CONFIG_EGIGA1_PHY		0x6		/* egiga1 has a PHY, egiga0 has NOT */
+#define CONFIG_MVGBE_PHY_ADRS	{0xa, 0x6}
+#define CONFIG_MII
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
+#else
 #define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
+#define CONFIG_EGIGA0_PHY		0x8
+#endif
 #define CONFIG_NETCONSOLE
 #endif
 

@@ -154,11 +179,20 @@
 /*
  * Environment variables configurations
  */
+
+#if defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB */
+#define CONFIG_ENV_SIZE			0x1000	/* 4KB */
+#define CONFIG_ENV_ADDR			0x70000
+#define CONFIG_ENV_OFFSET		0x70000	/* env starts here */
+#else
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB */
 #define CONFIG_ENV_SIZE			0x1000	/* 4KB */
 #define CONFIG_ENV_ADDR			0x70000
 #define CONFIG_ENV_OFFSET		0x70000	/* env starts here */
+#endif
 
 /*
  * Default environment variables

@@ -185,4 +219,6 @@
 	"usbload=usb start && "					\
 		"fatload usb 0:1 $loadaddr /boot/$bootfile\0"
 
+//#define DEBUG
+
 #endif /* _CONFIG_LACIE_KW_H */
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

Quoted 18 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot- bounces at lists.denx.de] On Behalf Of Albert ARIBAUD
Sent: 16 August 2012 23:39
To: u-boot at lists.denx.de
Subject: [U-Boot] [PATCH] ARM: lacie_kw: add support for WIRELESS_SPACE

Signed-off-by Albert ARIBAUD <[email protected]>

---

This patch adds the Wireless Space to the lacie_kw sub-targets. It *should* not change a thing to the already existing sub-targets (except that each one gets its own prompt).

Quoted 7 lines

Owners of NETSPACE_[MAX]_V2, INETSPACE_V2, NET2BIG_V2 please test.

 board/LaCie/netspace_v2/netspace_v2.c |   42 ++----------
 board/LaCie/netspace_v2/netspace_v2.h |  121
+++++++++++++++++++++++++++++++++
 boards.cfg                            |    1 +
 drivers/net/mvgbe.c                   |   10 ++-

It would be good if you split the patch, to me the change to above file is generic, which is your dependency.

Quoted 3 lines
 include/configs/lacie_kw.h            |   38 ++++++++++-
 5 files changed, 175 insertions(+), 37 deletions(-)

...snip...

Quoted 87 lines
include/configs/lacie_kw.h +4 -0
index c35c2db..a979ab4 100644
@@ -33,6 +33,10 @@
 #elif defined(CONFIG_NET2BIG_V2)
 #define CONFIG_MACH_TYPE		MACH_TYPE_NET2BIG_V2
 #define CONFIG_IDENT_STRING		" 2Big v2"
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define MACH_TYPE_WIRELESS_SPACE	2500 /* is missing in mach-types.h
 */
+#define CONFIG_MACH_TYPE		MACH_TYPE_WIRELESS_SPACE
+#define CONFIG_IDENT_STRING		" Wireless Space"
 #else
 #error "Unknown board"

#endif

include/configs/lacie_kw.h +0 -0
@@ -73,6 +77,12 @@
 #define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-

is2.cfg
#endif

include/configs/lacie_kw.h +13 -1
+#ifdef CONFIG_WIRELESS_SPACE
+/* No SPI but NAND */
+#undef CONFIG_CMD_SF
+#define CONFIG_CMD_NAND
+#endif
+
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros

@@ -90,8 +100,14 @@
 #define CONFIG_SYS_IDE_MAXDEVICE        1
 #if defined(CONFIG_NET2BIG_V2)
 #define CONFIG_SYS_PROMPT		"2big2> "
-#else
+#elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_SYS_PROMPT		"ns2> "
+#elif defined(CONFIG_INETSPACE_V2)
+#define CONFIG_SYS_PROMPT		"is2> "
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_SYS_PROMPT		"ws> "
+#else
+#define CONFIG_SYS_PROMPT		"lacie-kw> "
 #endif
 
 /*

@@ -99,7 +115,16 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_MISC_INIT_R /* Call misc_init_r() to initialize MAC

address */

include/configs/lacie_kw.h +3 -0
+#if defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_MVGBE_PORTS		{1, 1}	/* enable both ports only */
+#define CONFIG_EGIGA1_PHY		0x6		/* egiga1 has a PHY, egiga0

has NOT */

include/configs/lacie_kw.h +15 -0
+#define CONFIG_MVGBE_PHY_ADRS	{0xa, 0x6}
+#define CONFIG_MII
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
+#else
 #define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
+#define CONFIG_EGIGA0_PHY		0x8
+#endif
 #define CONFIG_NETCONSOLE
 #endif

@@ -154,11 +179,20 @@
 /*
  * Environment variables configurations
  */
+
+#if defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB */
+#define CONFIG_ENV_SIZE			0x1000	/* 4KB */
+#define CONFIG_ENV_ADDR			0x70000
+#define CONFIG_ENV_OFFSET		0x70000	/* env starts here */
+#else
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB */
 #define CONFIG_ENV_SIZE			0x1000	/* 4KB */
 #define CONFIG_ENV_ADDR			0x70000
 #define CONFIG_ENV_OFFSET		0x70000	/* env starts here */
+#endif
 
 /*
  * Default environment variables

include/configs/lacie_kw.h line 222

Quoted 4 lines
include/configs/lacie_kw.h +1 -0
@@ -185,4 +219,6 @@
 	"usbload=usb start && "					\
 		"fatload usb 0:1 $loadaddr /boot/$bootfile\0"
 
+//#define DEBUG

Either remove it or make it c-style comments.

Regards...
Prafulla . . .

Quoted 9 lines
include/configs/lacie_kw.h +1 -1
+
 #endif /* _CONFIG_LACIE_KW_H */
--

1.7.9.5

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

author
#2 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

Hi Prafulla,

Quoted 20 lines · Prafulla Wadaskar
Quoted 20 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot- bounces at lists.denx.de] On Behalf Of Albert ARIBAUD
Sent: 16 August 2012 23:39
To: u-boot at lists.denx.de
Subject: [U-Boot] [PATCH] ARM: lacie_kw: add support for WIRELESS_SPACE

Signed-off-by Albert ARIBAUD <[email protected]>

---

This patch adds the Wireless Space to the lacie_kw sub-targets. It *should* not change a thing to the already existing sub-targets (except that each one gets its own prompt).

Owners of NETSPACE_[MAX]_V2, INETSPACE_V2, NET2BIG_V2 please test.

Quoted 8 lines
Quoted 5 lines
 board/LaCie/netspace_v2/netspace_v2.c |   42 ++----------
 board/LaCie/netspace_v2/netspace_v2.h |  121
+++++++++++++++++++++++++++++++++
 boards.cfg                            |    1 +
 drivers/net/mvgbe.c                   |   10 ++-

It would be good if you split the patch, to me the change to above file is generic, which is your dependency.

You're correct. I'll post V2 as a two-patch series.

Quoted 96 lines
Quoted 3 lines
 include/configs/lacie_kw.h            |   38 ++++++++++-
 5 files changed, 175 insertions(+), 37 deletions(-)

...snip...

Quoted 92 lines
include/configs/lacie_kw.h +2 -0
index c35c2db..a979ab4 100644
@@ -33,6 +33,10 @@
 #elif defined(CONFIG_NET2BIG_V2)
 #define CONFIG_MACH_TYPE		MACH_TYPE_NET2BIG_V2
 #define CONFIG_IDENT_STRING		" 2Big v2"
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define MACH_TYPE_WIRELESS_SPACE	2500 /* is missing in

mach-types.h */

include/configs/lacie_kw.h +2 -0
+#define CONFIG_MACH_TYPE		MACH_TYPE_WIRELESS_SPACE
+#define CONFIG_IDENT_STRING		" Wireless Space"
 #else
 #error "Unknown board"
 #endif

@@ -73,6 +77,12 @@
 #define CONFIG_SYS_KWD_CONFIG

$(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage- is2.cfg
#endif

include/configs/lacie_kw.h +6 -0
+#ifdef CONFIG_WIRELESS_SPACE
+/* No SPI but NAND */
+#undef CONFIG_CMD_SF
+#define CONFIG_CMD_NAND
+#endif
+
 /*
  * mv-common.h should be defined after CMD configs since it used

them
* to enable certain macros

include/configs/lacie_kw.h +7 -1
@@ -90,8 +100,14 @@
 #define CONFIG_SYS_IDE_MAXDEVICE        1
 #if defined(CONFIG_NET2BIG_V2)
 #define CONFIG_SYS_PROMPT		"2big2> "
-#else
+#elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_SYS_PROMPT		"ns2> "
+#elif defined(CONFIG_INETSPACE_V2)
+#define CONFIG_SYS_PROMPT		"is2> "
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_SYS_PROMPT		"ws> "
+#else
+#define CONFIG_SYS_PROMPT		"lacie-kw> "
 #endif
 
 /*

@@ -99,7 +115,16 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_MISC_INIT_R /* Call misc_init_r() to initialize MAC

address */

include/configs/lacie_kw.h +2 -0
+#if defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_MVGBE_PORTS		{1, 1}	/* enable

both ports only */ +#define CONFIG_EGIGA1_PHY
0x6 /* egiga1 has a PHY, egiga0 has NOT */

include/configs/lacie_kw.h +4 -0
+#define CONFIG_MVGBE_PHY_ADRS	{0xa, 0x6}
+#define CONFIG_MII
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
+#else
 #define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0

only */ +#define CONFIG_EGIGA0_PHY 0x8

include/configs/lacie_kw.h +5 -0
+#endif
 #define CONFIG_NETCONSOLE
 #endif

@@ -154,11 +179,20 @@
 /*
  * Environment variables configurations
  */
+
+#if defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB
 */ +#define CONFIG_ENV_SIZE			0x1000	/*

4KB */ +#define CONFIG_ENV_ADDR 0x70000
+#define CONFIG_ENV_OFFSET 0x70000 /* env
starts here */ +#else
#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64KB
*/ #define CONFIG_ENV_SIZE 0x1000 /*
4KB */ #define CONFIG_ENV_ADDR 0x70000
#define CONFIG_ENV_OFFSET 0x70000 /* env
starts here */ +#endif

/*
* Default environment variables

include/configs/lacie_kw.h +0 -0
@@ -185,4 +219,6 @@
 	"usbload=usb start &&

" \ "fatload usb 0:1
$loadaddr /boot/$bootfile\0"

Quoted 3 lines
Quoted 1 line

+//#define DEBUG

Either remove it or make it c-style comments.

... oops... I'll remove this.

Quoted 2 lines

Regards...
Prafulla . . .

Thanks for the review.

I'll also copy Sion Guinot (maintainer for the whole lacie_kw boards) in V2.

Amicalement,

Signature · 1 line
Albert.
#3 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

In reply to Albert ARIBAUD
Quoted 1 line · Albert ARIBAUD
Signed-off-by Albert ARIBAUD <[email protected]>

[snip]

include/configs/lacie_kw.h line 110

Quoted 13 lines
include/configs/lacie_kw.h +7 -1
@@ -90,8 +100,14 @@
 #define CONFIG_SYS_IDE_MAXDEVICE        1
 #if defined(CONFIG_NET2BIG_V2)
 #define CONFIG_SYS_PROMPT		"2big2> "
-#else
+#elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_SYS_PROMPT		"ns2> "
+#elif defined(CONFIG_INETSPACE_V2)
+#define CONFIG_SYS_PROMPT		"is2> "
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_SYS_PROMPT		"ws> "
+#else
+#define CONFIG_SYS_PROMPT		"lacie-kw> "

Is this really a good thing? Over here I've been trying / hoping to get everyone to just use 'U-Boot # ' as the prompt as this makes automated testing easier and there's other run-time ways to see what we're on.

Signature · 1 line
Tom
author
#4 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

Hi Tom,

Quoted 14 lines · Tom Rini
Quoted 1 line · Albert ARIBAUD
Signed-off-by Albert ARIBAUD <[email protected]>

[snip]

Quoted 10 lines
include/configs/lacie_kw.h +4 -1
@@ -90,8 +100,14 @@
 #define CONFIG_SYS_IDE_MAXDEVICE        1
 #if defined(CONFIG_NET2BIG_V2)
 #define CONFIG_SYS_PROMPT		"2big2> "
-#else
+#elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_SYS_PROMPT		"ns2> "
+#elif defined(CONFIG_INETSPACE_V2)
+#define CONFIG_SYS_PROMPT		"is2> "
+#elif defined(CONFIG_WIRELESS_SPACE)
Quoted 8 lines

include/configs/lacie_kw.h line 110

Quoted 3 lines
include/configs/lacie_kw.h +3 -0
+#define CONFIG_SYS_PROMPT		"ws> "
+#else
+#define CONFIG_SYS_PROMPT		"lacie-kw> "

Is this really a good thing? Over here I've been trying / hoping to get everyone to just use 'U-Boot # ' as the prompt as this makes automated testing easier and there's other run-time ways to see what we're on.

I quite like prompts that identify the board I'm on, but it's not a must either. Cc:ing Simon in cas his own patches re lacie_kw would be impacted by your suggestion.

Amicalement,

Signature · 1 line
Albert.
#5 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

Quoted 11 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot- bounces at lists.denx.de] On Behalf Of Albert ARIBAUD
Sent: 18 August 2012 02:59
To: Tom Rini
Cc: u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH] ARM: lacie_kw: add support for WIRELESS_SPACE

Quoted 26 lines

Hi Tom,

Quoted 22 lines · Tom Rini
Quoted 1 line · Albert ARIBAUD
Signed-off-by Albert ARIBAUD <[email protected]>

[snip]

include/configs/lacie_kw.h line 110

Quoted 13 lines
include/configs/lacie_kw.h +7 -1
@@ -90,8 +100,14 @@
 #define CONFIG_SYS_IDE_MAXDEVICE        1
 #if defined(CONFIG_NET2BIG_V2)
 #define CONFIG_SYS_PROMPT		"2big2> "
-#else
+#elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_SYS_PROMPT		"ns2> "
+#elif defined(CONFIG_INETSPACE_V2)
+#define CONFIG_SYS_PROMPT		"is2> "
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_SYS_PROMPT		"ws> "
+#else
+#define CONFIG_SYS_PROMPT		"lacie-kw> "

Is this really a good thing? Over here I've been trying / hoping to get everyone to just use 'U-Boot # ' as the prompt as this makes automated testing easier and there's other run-time ways to see what we're on.

I personally vote to have common boot prompt 'U-boot #'.

Quoted 4 lines

I quite like prompts that identify the board I'm on, but it's not a must either. Cc:ing Simon in cas his own patches re lacie_kw would be impacted by your suggestion.

Well, we can expose a command to detect/print the board info, if needed.

Regards...
Prafulla . . .

#6 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

Quoted 38 lines · Prafulla Wadaskar
Quoted 11 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot- bounces at lists.denx.de] On Behalf Of Albert ARIBAUD
Sent: 18 August 2012 02:59
To: Tom Rini
Cc: u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH] ARM: lacie_kw: add support for WIRELESS_SPACE

Quoted 26 lines

Hi Tom,

Quoted 22 lines · Tom Rini
Quoted 1 line · Albert ARIBAUD
Signed-off-by Albert ARIBAUD <[email protected]>

[snip]

include/configs/lacie_kw.h line 110

Quoted 13 lines
include/configs/lacie_kw.h +7 -1
@@ -90,8 +100,14 @@
 #define CONFIG_SYS_IDE_MAXDEVICE        1
 #if defined(CONFIG_NET2BIG_V2)
 #define CONFIG_SYS_PROMPT		"2big2> "
-#else
+#elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_SYS_PROMPT		"ns2> "
+#elif defined(CONFIG_INETSPACE_V2)
+#define CONFIG_SYS_PROMPT		"is2> "
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_SYS_PROMPT		"ws> "
+#else
+#define CONFIG_SYS_PROMPT		"lacie-kw> "

Is this really a good thing? Over here I've been trying / hoping to get everyone to just use 'U-Boot # ' as the prompt as this makes automated testing easier and there's other run-time ways to see what we're on.

Quoted 8 lines

I personally vote to have common boot prompt 'U-boot #'.

Quoted 4 lines

I quite like prompts that identify the board I'm on, but it's not a must either. Cc:ing Simon in cas his own patches re lacie_kw would be impacted by your suggestion.

Well, we can expose a command to detect/print the board info, if needed.

The run-time command "version" already returns both the system and the machine informations. This command can be used for testing purposes. IMHO the only requirement for an U-Boot prompt is to be short enough. Everything else is a matter of taste. Mine goes for the machine name.

Regards,

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20120822/98da6dec/attachment.pgp>

author
#7 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

Hi Simon,

Quoted 49 lines · Simon Guinot
Quoted 41 lines · Prafulla Wadaskar
Quoted 11 lines

-----Original Message-----
From: u-boot-bounces at lists.denx.de [mailto:u-boot- bounces at lists.denx.de] On Behalf Of Albert ARIBAUD
Sent: 18 August 2012 02:59
To: Tom Rini
Cc: u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH] ARM: lacie_kw: add support for WIRELESS_SPACE

Quoted 26 lines

Hi Tom,

Quoted 22 lines · Tom Rini
Quoted 1 line · Albert ARIBAUD
Signed-off-by Albert ARIBAUD <[email protected]>

[snip]

include/configs/lacie_kw.h line 110

Quoted 13 lines
include/configs/lacie_kw.h +7 -1
@@ -90,8 +100,14 @@
 #define CONFIG_SYS_IDE_MAXDEVICE        1
 #if defined(CONFIG_NET2BIG_V2)
 #define CONFIG_SYS_PROMPT		"2big2> "
-#else
+#elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_SYS_PROMPT		"ns2> "
+#elif defined(CONFIG_INETSPACE_V2)
+#define CONFIG_SYS_PROMPT		"is2> "
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_SYS_PROMPT		"ws> "
+#else
+#define CONFIG_SYS_PROMPT		"lacie-kw> "

Is this really a good thing? Over here I've been trying / hoping to get everyone to just use 'U-Boot # ' as the prompt as this makes automated testing easier and there's other run-time ways to see what we're on.

I personally vote to have common boot prompt 'U-boot #'.

Quoted 1 line
Quoted 6 lines
Quoted 3 lines

I quite like prompts that identify the board I'm on, but it's not a must either. Cc:ing Simon in cas his own patches re lacie_kw would be impacted by your suggestion.

Well, we can expose a command to detect/print the board info, if needed.

Quoted 8 lines

The run-time command "version" already returns both the system and the machine informations. This command can be used for testing purposes. IMHO the only requirement for an U-Boot prompt is to be short enough. Everything else is a matter of taste. Mine goes for the machine name.

Regards,

Simon

Tom,

Can automated test cope with a general prompt of the form '.*#' ?

Amicalement,

Signature · 1 line
Albert.
#8 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 56 lines · Albert ARIBAUD

Hi Simon,

Quoted 51 lines · Simon Guinot
Quoted 36 lines · Prafulla Wadaskar
Quoted 8 lines

-----Original Message----- From: u-boot-bounces at lists.denx.de [mailto:u-boot- bounces at lists.denx.de] On Behalf Of Albert ARIBAUD Sent: 18 August 2012 02:59 To: Tom Rini Cc:
u-boot at lists.denx.de Subject: Re: [U-Boot] [PATCH] ARM:
lacie_kw: add support for WIRELESS_SPACE

Quoted 24 lines

Hi Tom,

Quoted 19 lines · Tom Rini
Quoted 2 lines · Albert ARIBAUD

Signed-off-by: Albert ARIBAUD
<[email protected]>

[snip]

Quoted 8 lines
(quoted diff) +0 -0
@@ -90,8 +100,14 @@ #define CONFIG_SYS_IDE_MAXDEVICE

1 #if defined(CONFIG_NET2BIG_V2) #define
CONFIG_SYS_PROMPT "2big2> " -#else +#elif
defined(CONFIG_NETSPACE_V2) #define CONFIG_SYS_PROMPT "ns2> " +#elif defined(CONFIG_INETSPACE_V2) +#define
CONFIG_SYS_PROMPT "is2> " +#elif
defined(CONFIG_WIRELESS_SPACE) +#define CONFIG_SYS_PROMPT
"ws> " +#else +#define CONFIG_SYS_PROMPT "lacie-kw> "

Is this really a good thing? Over here I've been trying / hoping to get everyone to just use 'U-Boot # ' as the prompt as this makes automated testing easier and there's other run-time ways to see what we're on.

I personally vote to have common boot prompt 'U-boot #'.

Quoted 1 line
Quoted 6 lines
Quoted 3 lines

I quite like prompts that identify the board I'm on, but it's not a must either. Cc:ing Simon in cas his own patches re lacie_kw would be impacted by your suggestion.

Well, we can expose a command to detect/print the board info, if needed.

The run-time command "version" already returns both the system and the machine informations. This command can be used for testing purposes. IMHO the only requirement for an U-Boot prompt is to be short enough. Everything else is a matter of taste. Mine goes for the machine name.

Quoted 7 lines
Quoted 3 lines

Regards,

Simon

Tom,

Can automated test cope with a general prompt of the form '.*#' ?

Sure, probably. It's really just something that popped into my head rather than a hard requirement or anything. It's also possible to just setup your testing framework to take the prompt as a variable, so this is just a personal preference thing.

- --
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://www.enigmail.net/

iQIcBAEBAgAGBQJQXfeOAAoJENk4IS6UOR1W0tUP/RIANji/ltjv29q/64C7Q6Vo JreBmUcXI3BcUF13WIH8SVwW80DG0J29Pa2k2t9X+UxvXwXvv2eJCdEk5Pq6Fu4u ksHS58kca/ufA5Rb+6JlvlCbLwet9kfyyk+4At5D4DfFnAX0XqbhfbkaA5Qay+U5 fccb9R8bY+HD3A5euKKLMZDP3bKij9293yJIOuaD6BIw8qVSkcy+a4Zgm4PvlPsx b6W04IGW1w1NEArej2gpDutawDGfTulFpfFzNnR1a4BnxyII+VzZxuIMdbyc7MLc /nbeSynRh35af892Xuzx6NCtpASYvN776BGws0kNLcR699pA0BcMRSCVaOKVpF3P wMkx6bUXQQ0FsvLy5OD5yJt2xSNLSxbIAV/ZiU3GsZ4AbWrmKhax53+XRcWmasPa HyhozQ0/lMaSkK4KOu6LHmRSHrSSEsUmJnVzyjWm7BOb+IY0WHntq47A+T8QoMuF foed5J0ON5XRHDzbzk34pPBdfg+qCIc4+PQ2XsiRYJe+T3DNOCZgOwByzo0sasRh EC53I2Q95fQsafhgSs0EVCw0nJIa1z0uWEnQIH0K6gyffkNGyj1UPkLPf+qva+t0 GJXqwkgRfvjO/MQIN+SFn6flMKfxgobqztcDck5tvS+8s5mMZtsoy24F6jW/znXo 2Cqs4OFBzE5Efbv1PWcC
=DhtF
-----END PGP SIGNATURE-----

author
#9 lore raw

PATCH 1/1 ARM: lacie_kw: add support for WIRELESS_SPACE

Hi Tom,

Quoted 64 lines · Tom Rini

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 60 lines · Albert ARIBAUD

Hi Simon,

Quoted 54 lines · Simon Guinot
Quoted 36 lines · Prafulla Wadaskar
Quoted 8 lines

-----Original Message----- From: u-boot-bounces at lists.denx.de [mailto:u-boot- bounces at lists.denx.de] On Behalf Of Albert ARIBAUD Sent: 18 August 2012 02:59 To: Tom Rini Cc:
u-boot at lists.denx.de Subject: Re: [U-Boot] [PATCH] ARM:
lacie_kw: add support for WIRELESS_SPACE

Quoted 24 lines

Hi Tom,

Quoted 19 lines · Tom Rini
Quoted 2 lines · Albert ARIBAUD

Signed-off-by: Albert ARIBAUD
<[email protected]>

[snip]

Quoted 8 lines
(quoted diff) +0 -0
@@ -90,8 +100,14 @@ #define CONFIG_SYS_IDE_MAXDEVICE

1 #if defined(CONFIG_NET2BIG_V2) #define
CONFIG_SYS_PROMPT "2big2> " -#else +#elif
defined(CONFIG_NETSPACE_V2) #define CONFIG_SYS_PROMPT "ns2> " +#elif defined(CONFIG_INETSPACE_V2) +#define
CONFIG_SYS_PROMPT "is2> " +#elif
defined(CONFIG_WIRELESS_SPACE) +#define CONFIG_SYS_PROMPT
"ws> " +#else +#define CONFIG_SYS_PROMPT "lacie-kw> "

Is this really a good thing? Over here I've been trying / hoping to get everyone to just use 'U-Boot # ' as the prompt as this makes automated testing easier and there's other run-time ways to see what we're on.

I personally vote to have common boot prompt 'U-boot #'.

Quoted 1 line
Quoted 6 lines
Quoted 3 lines

I quite like prompts that identify the board I'm on, but it's not a must either. Cc:ing Simon in cas his own patches re lacie_kw would be impacted by your suggestion.

Well, we can expose a command to detect/print the board info, if needed.

The run-time command "version" already returns both the system and the machine informations. This command can be used for testing purposes. IMHO the only requirement for an U-Boot prompt is to be short enough. Everything else is a matter of taste. Mine goes for the machine name.

Regards,

Simon

Quoted 8 lines
Quoted 3 lines

Tom,

Can automated test cope with a general prompt of the form '.*#' ?

Sure, probably. It's really just something that popped into my head rather than a hard requirement or anything. It's also possible to just setup your testing framework to take the prompt as a variable, so this is just a personal preference thing.

Ok, then, prompts will stay as they are in the patch.

BTW, I took a look at prompts across the whole codebase... You get all sorts. :)

Amicalement,

Signature · 1 line
Albert.
author
#10 lore raw

PATCH v2 1/2 mvgbe: allow non-sequential PHY addresses

In reply to Albert ARIBAUD
Signed-off-by Albert ARIBAUD <[email protected]>

---

 drivers/net/mvgbe.c |   10 +++++++++-
 drivers/net/mvgbe.h |    7 -------
 2 files changed, 9 insertions(+), 8 deletions(-)
drivers/net/mvgbe.c +9 -1
index 47bf27c..40b9bcf 100644
@@ -653,6 +653,14 @@ int mvgbe_initialize(bd_t *bis)
 	struct eth_device *dev;
 	int devnum;
 	u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
+#if defined(CONFIG_MVGBE_PHY_ADRS)
+#define MVGBE_PHY_ADRS CONFIG_MVGBE_PHY_ADRS
+#elif defined(CONFIG_PHY_BASE_ADR)
+#define MVGBE_PHY_ADRS {CONFIG_PHY_BASE_ADR, CONFIG_PHY_BASE_ADR+1}
+#else
+#define MVGBE_PHY_ADRS {8, 9}
+#endif
+	u8 used_phy_adrs[MAX_MVGBE_DEVS] = MVGBE_PHY_ADRS;
 
 	for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) {
 		/*skip if port is configured not to use */

@@ -733,7 +741,7 @@ error1:
 		miiphy_register(dev->name, smi_reg_read, smi_reg_write);
 		/* Set phy address of the port */
 		miiphy_write(dev->name, MV_PHY_ADR_REQUEST,
-				MV_PHY_ADR_REQUEST, PHY_BASE_ADR + devnum);
+				MV_PHY_ADR_REQUEST, used_phy_adrs[devnum]);
 #endif
 	}
 	return 0;
drivers/net/mvgbe.h +0 -7
index d8a5429..5434839 100644
@@ -28,13 +28,6 @@
 #ifndef __MVGBE_H__
 #define __MVGBE_H__
 
-/* PHY_BASE_ADR is board specific and can be configured */
-#if defined (CONFIG_PHY_BASE_ADR)
-#define PHY_BASE_ADR		CONFIG_PHY_BASE_ADR
-#else
-#define PHY_BASE_ADR		0x08	/* default phy base addr */
-#endif
-
 /* Constants */
 #define INT_CAUSE_UNMASK_ALL		0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT	0x0011ffff
Signature · 1 line
1.7.9.5
author
#11 lore raw

PATCH v2 2/2 ARM: lacie_kw: add support for WIRELESS_SPACE

Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

 board/LaCie/netspace_v2/netspace_v2.c |   44 ++----------
 board/LaCie/netspace_v2/netspace_v2.h |  121 +++++++++++++++++++++++++++++++++
 boards.cfg                            |    1 +
 include/configs/lacie_kw.h            |   42 +++++++++++-
 4 files changed, 168 insertions(+), 40 deletions(-)
board/LaCie/netspace_v2/netspace_v2.c +6 -38
index 101a80a..084f0cf 100644
@@ -39,40 +39,7 @@ int board_early_init_f(void)
 			NETSPACE_V2_OE_LOW, NETSPACE_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
-		MPP0_SPI_SCn,
-		MPP1_SPI_MOSI,
-		MPP2_SPI_SCK,
-		MPP3_SPI_MISO,
-		MPP4_NF_IO6,
-		MPP5_NF_IO7,
-		MPP6_SYSRST_OUTn,
-		MPP7_GPO,		/* Fan speed (bit 1) */
-		MPP8_TW_SDA,
-		MPP9_TW_SCK,
-		MPP10_UART0_TXD,
-		MPP11_UART0_RXD,
-		MPP12_GPO,		/* Red led */
-		MPP14_GPIO,		/* USB fuse */
-		MPP16_GPIO,		/* SATA 0 power */
-		MPP17_GPIO,		/* SATA 1 power */
-		MPP18_NF_IO0,
-		MPP19_NF_IO1,
-		MPP20_SATA1_ACTn,
-		MPP21_SATA0_ACTn,
-		MPP22_GPIO,		/* Fan speed (bit 0) */
-		MPP23_GPIO,		/* Fan power */
-		MPP24_GPIO,		/* USB mode select */
-		MPP25_GPIO,		/* Fan rotation fail */
-		MPP26_GPIO,		/* USB vbus-in detection */
-		MPP28_GPIO,		/* USB enable vbus-out */
-		MPP29_GPIO,		/* Blue led (slow register) */
-		MPP30_GPIO,		/* Blue led (command register) */
-		MPP31_GPIO,		/* Board power off */
-		MPP32_GPIO,		/* Button (0 = Released, 1 = Pushed) */
-		MPP33_GPIO,		/* Fan speed (bit 2) */
-		0
-	};
+	u32 kwmpp_config[] = NETSPACE_V2_MPP_CONFIG;
 	kirkwood_mpp_conf(kwmpp_config, NULL);
 
 	return 0;

@@ -107,10 +74,11 @@ int misc_init_r(void)
 /* Configure and initialize PHY */
 void reset_phy(void)
 {
-#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-	mv_phy_88e1318_init("egiga0", 0);
-#else
-	mv_phy_88e1116_init("egiga0", 8);
+#ifdef CONFIG_EGIGA0_PHY
+	mv_phy_88e1116_init("egiga0", CONFIG_EGIGA0_PHY);
+#endif
+#ifdef CONFIG_EGIGA1_PHY
+	mv_phy_88e1116_init("egiga1", CONFIG_EGIGA1_PHY);
 #endif
 }
 #endif
board/LaCie/netspace_v2/netspace_v2.h +121 -0

132 lines not on this page · raw message

boards.cfg +1 -0
index d467f56..3f49b18 100644
@@ -168,6 +168,7 @@ netspace_lite_v2             arm         arm926ejs   netspace_v2         LaCie
 netspace_max_v2              arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MAX_V2
 netspace_mini_v2             arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MINI_V2
 netspace_v2                  arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_V2
+wireless_space               arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:WIRELESS_SPACE
 dreamplug                    arm         arm926ejs   -                   Marvell        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
include/configs/lacie_kw.h +40 -2

80 lines not on this page · raw message

Signature · 1 line
1.7.9.5
author
#12 lore raw

PATCH v2 2/2 ARM: lacie_kw: add support for WIRELESS_SPACE

Quoted 6 lines · Albert ARIBAUD
Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

For some reason the series now breaks build for 2 lacie_kw boards and one orion5x. I'll investigate and either post a v3 or a further message to clarify.

Amicalement,

Signature · 1 line
Albert.
#13 lore raw

PATCH v2 2/2 ARM: lacie_kw: add support for WIRELESS_SPACE

In reply to Albert ARIBAUD
Quoted 7 lines · Albert ARIBAUD
Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

Quoted 5 lines
 board/LaCie/netspace_v2/netspace_v2.c |   44 ++----------
 board/LaCie/netspace_v2/netspace_v2.h |  121 +++++++++++++++++++++++++++++++++
 boards.cfg                            |    1 +
 include/configs/lacie_kw.h            |   42 +++++++++++-
 4 files changed, 168 insertions(+), 40 deletions(-)

Hi Albert,

Thank you for your work on the Wireless Space. It is nice to have this patch.

Quoted 68 lines
board/LaCie/netspace_v2/netspace_v2.c +6 -38
index 101a80a..084f0cf 100644
@@ -39,40 +39,7 @@ int board_early_init_f(void)
 			NETSPACE_V2_OE_LOW, NETSPACE_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
-		MPP0_SPI_SCn,
-		MPP1_SPI_MOSI,
-		MPP2_SPI_SCK,
-		MPP3_SPI_MISO,
-		MPP4_NF_IO6,
-		MPP5_NF_IO7,
-		MPP6_SYSRST_OUTn,
-		MPP7_GPO,		/* Fan speed (bit 1) */
-		MPP8_TW_SDA,
-		MPP9_TW_SCK,
-		MPP10_UART0_TXD,
-		MPP11_UART0_RXD,
-		MPP12_GPO,		/* Red led */
-		MPP14_GPIO,		/* USB fuse */
-		MPP16_GPIO,		/* SATA 0 power */
-		MPP17_GPIO,		/* SATA 1 power */
-		MPP18_NF_IO0,
-		MPP19_NF_IO1,
-		MPP20_SATA1_ACTn,
-		MPP21_SATA0_ACTn,
-		MPP22_GPIO,		/* Fan speed (bit 0) */
-		MPP23_GPIO,		/* Fan power */
-		MPP24_GPIO,		/* USB mode select */
-		MPP25_GPIO,		/* Fan rotation fail */
-		MPP26_GPIO,		/* USB vbus-in detection */
-		MPP28_GPIO,		/* USB enable vbus-out */
-		MPP29_GPIO,		/* Blue led (slow register) */
-		MPP30_GPIO,		/* Blue led (command register) */
-		MPP31_GPIO,		/* Board power off */
-		MPP32_GPIO,		/* Button (0 = Released, 1 = Pushed) */
-		MPP33_GPIO,		/* Fan speed (bit 2) */
-		0
-	};
+	u32 kwmpp_config[] = NETSPACE_V2_MPP_CONFIG;
 	kirkwood_mpp_conf(kwmpp_config, NULL);
 
 	return 0;

@@ -107,10 +74,11 @@ int misc_init_r(void)
 /* Configure and initialize PHY */
 void reset_phy(void)
 {
-#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-	mv_phy_88e1318_init("egiga0", 0);
-#else
-	mv_phy_88e1116_init("egiga0", 8);
+#ifdef CONFIG_EGIGA0_PHY
+	mv_phy_88e1116_init("egiga0", CONFIG_EGIGA0_PHY);
+#endif
+#ifdef CONFIG_EGIGA1_PHY
+	mv_phy_88e1116_init("egiga1", CONFIG_EGIGA1_PHY);
 #endif
 }
 #endif
board/LaCie/netspace_v2/netspace_v2.h +0 -0
index 34e492c..1f0eefd 100644

board/LaCie/netspace_v2/netspace_v2.h line 32

Quoted 9 lines
board/LaCie/netspace_v2/netspace_v2.h +6 -0
@@ -24,11 +24,132 @@
 #define NETSPACE_V2_H
 
 /* GPIO configuration */
+
+/* Net Space V2, Net Space Max V2, Internet Space V2: */
+#if defined(CONFIG_NETSPACE_MAX_V2) \
+	|| defined(CONFIG_NETSPACE_V2) \
+	|| defined(CONFIG_NET2BIG_V2) \
+	|| defined(CONFIG_INETSPACE_V2)

I think you missed here a couple of 'defined()' for the boards ns2lite and ns2mini.

Moreover, don't you think that the Wireless Space could have his own board files ? I mean, there is almost no common hardware between ws and ns2 boards. I think it is confusing to have NETSPACE_V2_ macros to designate MPP and GPIO configuration for both ns2 and ws.

Quoted 166 lines
board/LaCie/netspace_v2/netspace_v2.h +115 -0
+
 #define NETSPACE_V2_OE_LOW		0x06004000
 #define NETSPACE_V2_OE_HIGH		0x00000031
 #define NETSPACE_V2_OE_VAL_LOW		0x10030000
 #define NETSPACE_V2_OE_VAL_HIGH		0x00000000
 
+/* Wireless Space */
+
+#elif defined(CONFIG_WIRELESS_SPACE)
+
+#define NETSPACE_V2_OE_LOW		0xFF006808
+#define NETSPACE_V2_OE_HIGH		0x0000F989
+#define NETSPACE_V2_OE_VAL_LOW		0x00000000
+#define NETSPACE_V2_OE_VAL_HIGH		0x00000000
+
+#else
+
+#error Undefined or unsupported LaCie KW board variant
+
+#endif
+
 #define NETSPACE_V2_GPIO_BUTTON         32
 
+/* MPP configuration */
+
+/* Net Space V2, Net Space Max V2, Internet Space V2: */
+#if defined(CONFIG_NETSPACE_MAX_V2) \
+	|| defined(CONFIG_NETSPACE_V2) \
+	|| defined(CONFIG_NET2BIG_V2) \
+	|| defined(CONFIG_INETSPACE_V2)
+
+#define NETSPACE_V2_MPP_CONFIG	{ \
+	MPP0_SPI_SCn, \
+	MPP1_SPI_MOSI, \
+	MPP2_SPI_SCK, \
+	MPP3_SPI_MISO, \
+	MPP4_NF_IO6, \
+	MPP5_NF_IO7, \
+	MPP6_SYSRST_OUTn, \
+	MPP7_GPO,		/* Fan speed (bit 1) */ \
+	MPP8_TW_SDA, \
+	MPP9_TW_SCK, \
+	MPP10_UART0_TXD, \
+	MPP11_UART0_RXD, \
+	MPP12_GPO,		/* Red led */ \
+	MPP14_GPIO,		/* USB fuse */ \
+	MPP16_GPIO,		/* SATA 0 power */ \
+	MPP17_GPIO,		/* SATA 1 power */ \
+	MPP18_NF_IO0, \
+	MPP19_NF_IO1, \
+	MPP20_SATA1_ACTn, \
+	MPP21_SATA0_ACTn, \
+	MPP22_GPIO,		/* Fan speed (bit 0) */ \
+	MPP23_GPIO,		/* Fan power */ \
+	MPP24_GPIO,		/* USB mode select */ \
+	MPP25_GPIO,		/* Fan rotation fail */ \
+	MPP26_GPIO,		/* USB vbus-in detection */ \
+	MPP28_GPIO,		/* USB enable vbus-out */ \
+	MPP29_GPIO,		/* Blue led (slow register) */ \
+	MPP30_GPIO,		/* Blue led (command register) */ \
+	MPP31_GPIO,		/* Board power off */ \
+	MPP32_GPIO,		/* Button (0 = Released, 1 = Pushed) */ \
+	MPP33_GPIO,		/* Fan speed (bit 2) */ \
+	0 \
+	}
+
+#elif defined(CONFIG_WIRELESS_SPACE)
+
+#define NETSPACE_V2_MPP_CONFIG	{ \
+	MPP0_NF_IO2, \
+	MPP1_NF_IO3, \
+	MPP2_NF_IO4, \
+	MPP3_NF_IO5, \
+	MPP4_NF_IO6, \
+	MPP5_NF_IO7, \
+	MPP6_SYSRST_OUTn, \
+	MPP7_GPO,		/* Fan speed (bit 1) */ \
+	MPP8_TW_SDA, \
+	MPP9_TW_SCK, \
+	MPP10_UART0_TXD, \
+	MPP11_UART0_RXD, \
+	MPP13_GPIO,		/* Red led */ \
+	MPP14_GPIO,		/* USB fuse */ \
+	MPP15_SATA0_ACTn, \
+	MPP16_GPIO,		/* SATA 0 power */ \
+	MPP17_GPIO,		/* SATA 1 power */ \
+	MPP18_NF_IO0, \
+	MPP19_NF_IO1, \
+	MPP20_GE1_0,		/* Gigabit Ethernet 1 */ \
+	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,		/* Fan speed (bit 2) */ \
+	MPP37_GPIO,		/* Fan speed (bit 0) */ \
+	MPP38_GPIO,		/* Fan power */ \
+	MPP39_GPIO,		/* Fan rotation fail */ \
+	MPP40_GPIO,		/* Ethernet switch link */ \
+	MPP41_GPIO,		/* USB enable host vbus */ \
+	MPP42_GPIO,		/* LED clock control */ \
+	MPP43_GPIO,		/* WPS button (0=Pushed, 1=Released) */ \
+	MPP44_GPIO,		/* Red LED on/off */ \
+	MPP45_GPIO,		/* Red LED timer blink (on=off=100ms) */ \
+	MPP46_GPIO,		/* Green LED on/off */ \
+	MPP47_GPIO,		/* LED (blue, green) SATA activity blink */ \
+	MPP48_GPIO,		/* Blue LED on/off */ \
+	0 \
+	}
+
+#endif
+
 #endif /* NETSPACE_V2_H */
boards.cfg +1 -0
index d467f56..3f49b18 100644
@@ -168,6 +168,7 @@ netspace_lite_v2             arm         arm926ejs   netspace_v2         LaCie
 netspace_max_v2              arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MAX_V2
 netspace_mini_v2             arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MINI_V2
 netspace_v2                  arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_V2
+wireless_space               arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:WIRELESS_SPACE
 dreamplug                    arm         arm926ejs   -                   Marvell        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
include/configs/lacie_kw.h +10 -0
index 09b5798..fdbc785 100644
@@ -44,6 +44,10 @@
 #elif defined(CONFIG_NET2BIG_V2)
 #define CONFIG_MACH_TYPE		MACH_TYPE_NET2BIG_V2
 #define CONFIG_IDENT_STRING		" 2Big v2"
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define MACH_TYPE_WIRELESS_SPACE	2500 /* is missing in mach-types.h */
+#define CONFIG_MACH_TYPE		MACH_TYPE_WIRELESS_SPACE
+#define CONFIG_IDENT_STRING		" Wireless Space"
 #else
 #error "Unknown board"
 #endif

@@ -96,6 +100,12 @@
 #define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage-ns2l.cfg
 #endif
 
+#ifdef CONFIG_WIRELESS_SPACE
+/* No SPI but NAND */
+#undef CONFIG_CMD_SF
+#define CONFIG_CMD_NAND
+#endif
+
 /*
  * mv-common.h should be defined after CMD configs since it used them
  * to enable certain macros

@@ -115,8 +125,14 @@
 #define CONFIG_SYS_PROMPT		"d2v2> "
 #elif defined(CONFIG_NET2BIG_V2)

include/configs/lacie_kw.h line 135

Quoted 10 lines
include/configs/lacie_kw.h +7 -1
 #define CONFIG_SYS_PROMPT		"2big2> "
-#else
+#elif defined(CONFIG_NETSPACE_V2)
 #define CONFIG_SYS_PROMPT		"ns2> "
+#elif defined(CONFIG_INETSPACE_V2)
+#define CONFIG_SYS_PROMPT		"is2> "
+#elif defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_SYS_PROMPT		"ws> "
+#else
+#define CONFIG_SYS_PROMPT		"lacie-kw> "

Maybe you may add here the prompts for the ns2mini and ns2lite boards. Also, we could move all the prompts with the machine number definitions. This would allow to remove a couple of ifdef statements.

Quoted 35 lines
include/configs/lacie_kw.h +18 -1
 #endif
 
 /*

@@ -124,9 +140,22 @@
  */
 #ifdef CONFIG_CMD_NET
 #define CONFIG_MISC_INIT_R /* Call misc_init_r() to initialize MAC address */
+#if defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_MVGBE_PORTS		{1, 1}	/* enable both ports */
+#define CONFIG_EGIGA1_PHY		0x6	/* ONLY egiga1 has a PHY */
+#define CONFIG_MVGBE_PHY_ADRS	{0xa, 0x6}
+#define CONFIG_MII
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
+#else
 #define CONFIG_MVGBE_PORTS		{1, 0} /* enable port 0 only */
-#define CONFIG_NETCONSOLE
+#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
+#define CONFIG_EGIGA0_PHY		0x0
+#else
+#define CONFIG_EGIGA0_PHY		0x8
 #endif
+#endif /* CONFIG_WIRELESS_SPACE */
+#define CONFIG_NETCONSOLE
+#endif /* CONFIG_CMD_NET */
 
 /*
  * SATA Driver configuration

@@ -186,11 +215,20 @@
 /*
  * Environment variables configurations
  */
+
+#if defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB */

include/configs/lacie_kw.h line 231

Quoted 10 lines
include/configs/lacie_kw.h +5 -0
+#define CONFIG_ENV_SIZE			0x1000	/* 4KB */
+#define CONFIG_ENV_ADDR			0x70000
+#define CONFIG_ENV_OFFSET		0x70000	/* env starts here */
+#else
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB */
 #define CONFIG_ENV_SIZE			0x1000	/* 4KB */
 #define CONFIG_ENV_ADDR			0x70000
 #define CONFIG_ENV_OFFSET		0x70000	/* env starts here */
+#endif

There is some reason for the duplicate lines here ?

Regards,

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20121020/f60021ed/attachment.pgp>

author
#14 lore raw

PATCH v2 2/2 ARM: lacie_kw: add support for WIRELESS_SPACE

Hi Simon,

Quoted 2 lines · Simon Guinot

I think you missed here a couple of 'defined()' for the boards ns2lite and ns2mini.

Correct. However:

Quoted 4 lines

Moreover, don't you think that the Wireless Space could have his own board files ? I mean, there is almost no common hardware between ws and ns2 boards. I think it is confusing to have NETSPACE_V2_ macros to designate MPP and GPIO configuration for both ns2 and ws.

Well, I'd tried to keep as much in common as possible between lacie_kw-based boards which seem to differ only in gpio and eth settings, and in the type of FLASH they use. But I'm ok with duplicating the few functions in netspace_v2.* if you prefer.

Quoted 7 lines
Quoted 7 lines
include/configs/lacie_kw.h +7 -0
+#if defined(CONFIG_WIRELESS_SPACE)
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE		0x10000	/* 64KB */
+#define CONFIG_ENV_SIZE			0x1000	/* 4KB */
+#define CONFIG_ENV_ADDR			0x70000
+#define CONFIG_ENV_OFFSET		0x70000	/* env starts here */
+#else
Quoted 8 lines
Quoted 6 lines

#define CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_SECT_SIZE 0x10000 /* 64KB */
#define CONFIG_ENV_SIZE 0x1000 /* 4KB */
#define CONFIG_ENV_ADDR 0x70000
#define CONFIG_ENV_OFFSET 0x70000 /* env starts here */
+#endif

There is some reason for the duplicate lines here ?

Yes: overlook. :)

But this, as well as the missed defined() cases above, does not matter much, as I'll duplicate the config in V3 and the whole if/else constructs are thus going away.

Quoted 3 lines

Regards,

Simon

Thanks for your feedback!

Amicalement,

Signature · 1 line
Albert.
author
#15 lore raw

PATCH v3 1/2 mvgbe: allow non-sequential PHY addresses

In reply to Albert ARIBAUD
Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v3:
- fixed building when SoC provides only one GbE port.

 arch/arm/include/asm/arch-kirkwood/kirkwood.h |    1 -
 arch/arm/include/asm/arch-orion5x/orion5x.h   |    1 -
 drivers/net/mvgbe.c                           |   12 +++++++++++-
 drivers/net/mvgbe.h                           |    7 -------
 4 files changed, 11 insertions(+), 10 deletions(-)
arch/arm/include/asm/arch-kirkwood/kirkwood.h +0 -1
index 47771d5..503fb1e 100644
@@ -61,7 +61,6 @@
 #define KW_SATA_PORT1_OFFSET		0x4000
 
 /* Kirkwood GbE controller has two ports */
-#define MAX_MVGBE_DEVS	2
 #define MVGBE0_BASE	KW_EGIGA0_BASE
 #define MVGBE1_BASE	KW_EGIGA1_BASE
arch/arm/include/asm/arch-orion5x/orion5x.h +0 -1
index b0d3368..b32d1d3 100644
@@ -55,7 +55,6 @@
 #define ORION5X_SATA_PORT1_OFFSET		0x4000
 
 /* Orion5x GbE controller has a single port */
-#define MAX_MVGBE_DEVS	1
 #define MVGBE0_BASE	ORION5X_EGIGA_BASE
 
 /* Orion5x USB Host controller is port 1 */
drivers/net/mvgbe.c +11 -1
index 47bf27c..2533614 100644
@@ -49,6 +49,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define MAX_MVGBE_DEVS	2
+
 #define MV_PHY_ADR_REQUEST 0xee
 #define MVGBE_SMI_REG (((struct mvgbe_registers *)MVGBE0_BASE)->smi)
 

@@ -653,6 +655,14 @@ int mvgbe_initialize(bd_t *bis)
 	struct eth_device *dev;
 	int devnum;
 	u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
+#if defined(CONFIG_MVGBE_PHY_ADRS)
+#define MVGBE_PHY_ADRS CONFIG_MVGBE_PHY_ADRS
+#elif defined(CONFIG_PHY_BASE_ADR)
+#define MVGBE_PHY_ADRS {CONFIG_PHY_BASE_ADR, CONFIG_PHY_BASE_ADR+1}
+#else
+#define MVGBE_PHY_ADRS {8, 9}
+#endif
+	u8 used_phy_adrs[MAX_MVGBE_DEVS] = MVGBE_PHY_ADRS;
 
 	for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) {
 		/*skip if port is configured not to use */

@@ -733,7 +743,7 @@ error1:
 		miiphy_register(dev->name, smi_reg_read, smi_reg_write);
 		/* Set phy address of the port */
 		miiphy_write(dev->name, MV_PHY_ADR_REQUEST,
-				MV_PHY_ADR_REQUEST, PHY_BASE_ADR + devnum);
+				MV_PHY_ADR_REQUEST, used_phy_adrs[devnum]);
 #endif
 	}
 	return 0;
drivers/net/mvgbe.h +0 -7
index d8a5429..5434839 100644
@@ -28,13 +28,6 @@
 #ifndef __MVGBE_H__
 #define __MVGBE_H__
 
-/* PHY_BASE_ADR is board specific and can be configured */
-#if defined (CONFIG_PHY_BASE_ADR)
-#define PHY_BASE_ADR		CONFIG_PHY_BASE_ADR
-#else
-#define PHY_BASE_ADR		0x08	/* default phy base addr */
-#endif
-
 /* Constants */
 #define INT_CAUSE_UNMASK_ALL		0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT	0x0011ffff
Signature · 1 line
1.7.9.5
author
#16 lore raw

PATCH v3 2/2 ARM: lacie_kw: add support for WIRELESS_SPACE

Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v3:
- fix broken support for NETSPACE_(MINI|LITE)_V2

Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

 board/LaCie/netspace_v2/netspace_v2.c |   44 ++----------
 board/LaCie/netspace_v2/netspace_v2.h |  125 +++++++++++++++++++++++++++++++++
 boards.cfg                            |    1 +
 include/configs/lacie_kw.h            |   42 ++++++++++-
 4 files changed, 172 insertions(+), 40 deletions(-)
board/LaCie/netspace_v2/netspace_v2.c +6 -38
index 101a80a..084f0cf 100644
@@ -39,40 +39,7 @@ int board_early_init_f(void)
 			NETSPACE_V2_OE_LOW, NETSPACE_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
-		MPP0_SPI_SCn,
-		MPP1_SPI_MOSI,
-		MPP2_SPI_SCK,
-		MPP3_SPI_MISO,
-		MPP4_NF_IO6,
-		MPP5_NF_IO7,
-		MPP6_SYSRST_OUTn,
-		MPP7_GPO,		/* Fan speed (bit 1) */
-		MPP8_TW_SDA,
-		MPP9_TW_SCK,
-		MPP10_UART0_TXD,
-		MPP11_UART0_RXD,
-		MPP12_GPO,		/* Red led */
-		MPP14_GPIO,		/* USB fuse */
-		MPP16_GPIO,		/* SATA 0 power */
-		MPP17_GPIO,		/* SATA 1 power */
-		MPP18_NF_IO0,
-		MPP19_NF_IO1,
-		MPP20_SATA1_ACTn,
-		MPP21_SATA0_ACTn,
-		MPP22_GPIO,		/* Fan speed (bit 0) */
-		MPP23_GPIO,		/* Fan power */
-		MPP24_GPIO,		/* USB mode select */
-		MPP25_GPIO,		/* Fan rotation fail */
-		MPP26_GPIO,		/* USB vbus-in detection */
-		MPP28_GPIO,		/* USB enable vbus-out */
-		MPP29_GPIO,		/* Blue led (slow register) */
-		MPP30_GPIO,		/* Blue led (command register) */
-		MPP31_GPIO,		/* Board power off */
-		MPP32_GPIO,		/* Button (0 = Released, 1 = Pushed) */
-		MPP33_GPIO,		/* Fan speed (bit 2) */
-		0
-	};
+	u32 kwmpp_config[] = NETSPACE_V2_MPP_CONFIG;
 	kirkwood_mpp_conf(kwmpp_config, NULL);
 
 	return 0;

@@ -107,10 +74,11 @@ int misc_init_r(void)
 /* Configure and initialize PHY */
 void reset_phy(void)
 {
-#if defined(CONFIG_NETSPACE_LITE_V2) || defined(CONFIG_NETSPACE_MINI_V2)
-	mv_phy_88e1318_init("egiga0", 0);
-#else
-	mv_phy_88e1116_init("egiga0", 8);
+#ifdef CONFIG_EGIGA0_PHY
+	mv_phy_88e1116_init("egiga0", CONFIG_EGIGA0_PHY);
+#endif
+#ifdef CONFIG_EGIGA1_PHY
+	mv_phy_88e1116_init("egiga1", CONFIG_EGIGA1_PHY);
 #endif
 }
 #endif
board/LaCie/netspace_v2/netspace_v2.h +125 -0

136 lines not on this page · raw message

boards.cfg +1 -0
index d467f56..3f49b18 100644
@@ -168,6 +168,7 @@ netspace_lite_v2             arm         arm926ejs   netspace_v2         LaCie
 netspace_max_v2              arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MAX_V2
 netspace_mini_v2             arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MINI_V2
 netspace_v2                  arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_V2
+wireless_space               arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:WIRELESS_SPACE
 dreamplug                    arm         arm926ejs   -                   Marvell        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
include/configs/lacie_kw.h +40 -2

80 lines not on this page · raw message

Signature · 1 line
1.7.9.5
author
#17 lore raw

PATCH v4 1/4 mvgbe: allow non-sequential PHY addresses

Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v3:
- fixed building when SoC provides only one GbE port.

 arch/arm/include/asm/arch-kirkwood/kirkwood.h |    1 -
 arch/arm/include/asm/arch-orion5x/orion5x.h   |    1 -
 drivers/net/mvgbe.c                           |   12 +++++++++++-
 drivers/net/mvgbe.h                           |    7 -------
 4 files changed, 11 insertions(+), 10 deletions(-)
arch/arm/include/asm/arch-kirkwood/kirkwood.h +0 -1
index 47771d5..503fb1e 100644
@@ -61,7 +61,6 @@
 #define KW_SATA_PORT1_OFFSET		0x4000
 
 /* Kirkwood GbE controller has two ports */
-#define MAX_MVGBE_DEVS	2
 #define MVGBE0_BASE	KW_EGIGA0_BASE
 #define MVGBE1_BASE	KW_EGIGA1_BASE
arch/arm/include/asm/arch-orion5x/orion5x.h +0 -1
index b0d3368..b32d1d3 100644
@@ -55,7 +55,6 @@
 #define ORION5X_SATA_PORT1_OFFSET		0x4000
 
 /* Orion5x GbE controller has a single port */
-#define MAX_MVGBE_DEVS	1
 #define MVGBE0_BASE	ORION5X_EGIGA_BASE
 
 /* Orion5x USB Host controller is port 1 */
drivers/net/mvgbe.c +11 -1
index 47bf27c..2533614 100644
@@ -49,6 +49,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define MAX_MVGBE_DEVS	2
+
 #define MV_PHY_ADR_REQUEST 0xee
 #define MVGBE_SMI_REG (((struct mvgbe_registers *)MVGBE0_BASE)->smi)
 

@@ -653,6 +655,14 @@ int mvgbe_initialize(bd_t *bis)
 	struct eth_device *dev;
 	int devnum;
 	u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
+#if defined(CONFIG_MVGBE_PHY_ADRS)
+#define MVGBE_PHY_ADRS CONFIG_MVGBE_PHY_ADRS
+#elif defined(CONFIG_PHY_BASE_ADR)
+#define MVGBE_PHY_ADRS {CONFIG_PHY_BASE_ADR, CONFIG_PHY_BASE_ADR+1}
+#else
+#define MVGBE_PHY_ADRS {8, 9}
+#endif
+	u8 used_phy_adrs[MAX_MVGBE_DEVS] = MVGBE_PHY_ADRS;
 
 	for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) {
 		/*skip if port is configured not to use */

@@ -733,7 +743,7 @@ error1:
 		miiphy_register(dev->name, smi_reg_read, smi_reg_write);
 		/* Set phy address of the port */
 		miiphy_write(dev->name, MV_PHY_ADR_REQUEST,
-				MV_PHY_ADR_REQUEST, PHY_BASE_ADR + devnum);
+				MV_PHY_ADR_REQUEST, used_phy_adrs[devnum]);
 #endif
 	}
 	return 0;
drivers/net/mvgbe.h +0 -7
index d8a5429..5434839 100644
@@ -28,13 +28,6 @@
 #ifndef __MVGBE_H__
 #define __MVGBE_H__
 
-/* PHY_BASE_ADR is board specific and can be configured */
-#if defined (CONFIG_PHY_BASE_ADR)
-#define PHY_BASE_ADR		CONFIG_PHY_BASE_ADR
-#else
-#define PHY_BASE_ADR		0x08	/* default phy base addr */
-#endif
-
 /* Constants */
 #define INT_CAUSE_UNMASK_ALL		0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT	0x0011ffff
Signature · 1 line
1.7.9.5
author
#18 lore raw

PATCH v4 2/4 mv88e61xx: refactor PHY and SWITCH level-code

Signed-off-by Albert ARIBAUD <[email protected]>

---

 drivers/net/phy/mv88e61xx.c |  300 ++++++++++++++++++-------------------------
 drivers/net/phy/mv88e61xx.h |   23 ++--
 include/netdev.h            |   21 ++-
 3 files changed, 155 insertions(+), 189 deletions(-)
drivers/net/phy/mv88e61xx.c +125 -175
index 483a920..2d484ff 100644
@@ -52,7 +52,8 @@ static int mv88e61xx_busychk_multic(char *name, u32 devaddr)
 	return 0;
 }
 
-static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 data)
+static void mv88e61xx_switch_write(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 data)
 {
 	u16 mii_dev_addr;
 

@@ -70,7 +71,8 @@ static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 data)
 									 15));
 }
 
-static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 * data)
+static void mv88e61xx_switch_read(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 *data)
 {
 	u16 mii_dev_addr;
 

@@ -90,111 +92,6 @@ static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 * data)
 }
 #endif /* CONFIG_MV88E61XX_MULTICHIP_ADRMODE */
 
-static void mv88e61xx_port_vlan_config(struct mv88e61xx_config *swconfig,
-				       u32 max_prtnum, u32 ports_ofs)
-{
-	u32 prt;
-	u16 reg;
-	char *name = swconfig->name;
-	u32 cpu_port = swconfig->cpuport;
-	u32 port_mask = swconfig->ports_enabled;
-	enum mv88e61xx_cfg_vlan vlancfg = swconfig->vlancfg;
-
-	/* be sure all ports are disabled */
-	for (prt = 0; prt < max_prtnum; prt++) {
-		RD_PHY(name, ports_ofs + prt, MV88E61XX_PRT_CTRL_REG, &reg);
-		reg &= ~0x3;
-		WR_PHY(name, ports_ofs + prt, MV88E61XX_PRT_CTRL_REG, reg);
-
-		if (!(cpu_port & (1 << prt)))
-			continue;
-		/* Set CPU port VID to 0x1 */
-		RD_PHY(name, (ports_ofs + prt), MV88E61XX_PRT_VID_REG, &reg);
-		reg &= ~0xfff;
-		reg |= 0x1;
-		WR_PHY(name, (ports_ofs + prt), MV88E61XX_PRT_VID_REG, reg);
-	}
-
-	/* Setting  Port default priority for all ports to zero */
-	for (prt = 0; prt < max_prtnum; prt++) {
-		RD_PHY(name, ports_ofs + prt, MV88E61XX_PRT_VID_REG, &reg);
-		reg &= ~0xc000;
-		WR_PHY(name, ports_ofs + prt, MV88E61XX_PRT_VID_REG, reg);
-	}
-	/* Setting VID and VID map for all ports except CPU port */
-	for (prt = 0; prt < max_prtnum; prt++) {
-		/* only for enabled ports */
-		if ((1 << prt) & port_mask) {
-			/* skip CPU port */
-			if ((1 << prt) & cpu_port) {
-				/*
-				 * Set Vlan map table for cpu_port to see
-				 * all ports
-				 */
-				RD_PHY(name, (ports_ofs + prt),
-				       MV88E61XX_PRT_VMAP_REG, &reg);
-				reg &= ~((1 << max_prtnum) - 1);
-				reg |= port_mask & ~(1 << prt);
-				WR_PHY(name, (ports_ofs + prt),
-				       MV88E61XX_PRT_VMAP_REG, reg);
-			} else {
-
-				/*
-				 *  set Ports VLAN Mapping.
-				 *      port prt <--> cpu_port VLAN #prt+1.
-				 */
-				RD_PHY(name, ports_ofs + prt,
-				       MV88E61XX_PRT_VID_REG, &reg);
-				reg &= ~0x0fff;
-				reg |= (prt + 1);
-				WR_PHY(name, ports_ofs + prt,
-				       MV88E61XX_PRT_VID_REG, reg);
-
-				RD_PHY(name, ports_ofs + prt,
-				       MV88E61XX_PRT_VMAP_REG, &reg);
-				if (vlancfg == MV88E61XX_VLANCFG_DEFAULT) {
-					/*
-					 * all any port can send frames to all other ports
-					 * ref: sec 3.2.1.1 of datasheet
-					 */
-					reg |= 0x03f;
-					reg &= ~(1 << prt);
-				} else if (vlancfg == MV88E61XX_VLANCFG_ROUTER) {
-					/*
-					 * all other ports can send frames to CPU port only
-					 * ref: sec 3.2.1.2 of datasheet
-					 */
-					reg &= ~((1 << max_prtnum) - 1);
-					reg |= cpu_port;
-				}
-				WR_PHY(name, ports_ofs + prt,
-				       MV88E61XX_PRT_VMAP_REG, reg);
-			}
-		}
-	}
-
-	/*
-	 * enable only appropriate ports to forwarding mode
-	 * and disable the others
-	 */
-	for (prt = 0; prt < max_prtnum; prt++) {
-		if ((1 << prt) & port_mask) {
-			RD_PHY(name, ports_ofs + prt,
-			       MV88E61XX_PRT_CTRL_REG, &reg);
-			reg |= 0x3;
-			WR_PHY(name, ports_ofs + prt,
-			       MV88E61XX_PRT_CTRL_REG, reg);
-		} else {
-			/* Disable port */
-			RD_PHY(name, ports_ofs + prt,
-			       MV88E61XX_PRT_CTRL_REG, &reg);
-			reg &= ~0x3;
-			WR_PHY(name, ports_ofs + prt,
-			       MV88E61XX_PRT_CTRL_REG, reg);
-		}
-	}
-}
-
 /*
  * Make sure SMIBusy bit cleared before another
  * SMI operation can take place

@@ -204,7 +101,7 @@ static int mv88e61xx_busychk(char *name)
 	u16 reg = 0;
 	u32 timeout = MV88E61XX_PHY_TIMEOUT;
 	do {
-		RD_PHY(name, MV88E61XX_GLB2REG_DEVADR,
+		RD_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR,
 		       MV88E61XX_PHY_CMD, &reg);
 		if (timeout-- == 0) {
 			printf("SMI busy timeout\n");

@@ -215,33 +112,104 @@ static int mv88e61xx_busychk(char *name)
 }
 
 /*
+ * Convenience macros for switch PORT reads
+ */
+
+#define WR_SWITCH_PORT_REG(n, p, r, d) \
+	WR_SWITCH_REG(n, (MV88E61XX_PRT_OFST+p), r, d)
+#define RD_SWITCH_PORT_REG(n, p, r, d) \
+	RD_SWITCH_REG(n, (MV88E61XX_PRT_OFST+p), r, d)
+
+/*
+ * Local functions to read/write registers on the switch PHYs.
+ * NOTE! This goes through switch, not direct miiphy, writes and reads!
+ */
+
+static inline int mv88e61xx_switch_miiphy_write(char *name, u32 phy,
+	u32 reg, u16 data)
+{
+	/* write switch data reg then cmd reg then check completion */
+	WR_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA,
+		data);
+	WR_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_CMD,
+		(MV88E61XX_PHY_WRITE_CMD | (phy << 5)  | reg));
+	return mv88e61xx_busychk(name);
+}
+
+static inline int mv88e61xx_switch_miiphy_read(char *name, u32 phy,
+	u32 reg, u16 *data)
+{
+	/* write switch cmd reg, check for completion */
+	WR_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_CMD,
+		(MV88E61XX_PHY_READ_CMD | (phy << 5)  | reg));
+	if (mv88e61xx_busychk(name))
+		return -1;
+	/* read switch data reg and return success */
+	RD_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, data);
+	return 0;
+}
+
+/*
+ * Convenience macros for switch PHY reads
+ */
+
+#define WR_SWITCH_PHY_REG mv88e61xx_switch_miiphy_write
+#define RD_SWITCH_PHY_REG mv88e61xx_switch_miiphy_read
+
+static void mv88e61xx_port_vlan_config(struct mv88e61xx_config *swconfig)
+{
+	u32 prt;
+	u16 reg;
+	char *name = swconfig->name;
+	u32 port_mask = swconfig->ports_enabled;
+
+	/* be sure all ports are disabled */
+	for (prt = 0; prt < MV88E61XX_MAX_PORTS_NUM; prt++) {
+		RD_SWITCH_PORT_REG(name, prt, MV88E61XX_PRT_CTRL_REG, &reg);
+		reg &= ~0x3;
+		WR_SWITCH_PORT_REG(name, prt, MV88E61XX_PRT_CTRL_REG, reg);
+	}
+
+	/* apply internal vlan config */
+	for (prt = 0; prt < MV88E61XX_MAX_PORTS_NUM; prt++) {
+		/* only for enabled ports */
+		if ((1 << prt) & port_mask) {
+			/* take vlan map from swconfig */
+			u8 vlanmap = swconfig->vlancfg[prt];
+			/* remove disabled ports from vlan map */
+			vlanmap &= swconfig->ports_enabled;
+			/* apply vlan map to port */
+			RD_SWITCH_PORT_REG(name, prt,
+				MV88E61XX_PRT_VMAP_REG, &reg);
+			reg &= ~((1 << MV88E61XX_MAX_PORTS_NUM) - 1);
+			reg |= vlanmap;
+			WR_SWITCH_PORT_REG(name, prt,
+				MV88E61XX_PRT_VMAP_REG, reg);
+		}
+	}
+
+}
+
+/*
  * Power up the specified port and reset PHY
  */
 static int mv88361xx_powerup(struct mv88e61xx_config *swconfig, u32 prt)
 {
 	char *name = swconfig->name;
 
-	/* Write Copper Specific control reg1 (0x14) for-
+	/* Write Copper Specific control reg1 (0x10) for-
 	 * Enable Phy power up
 	 * Energy Detect on (sense&Xmit NLP Periodically
 	 * reset other settings default
 	 */
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, 0x3360);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (0x9410 | (prt << 5)));
-
-	if (mv88e61xx_busychk(name))
+	if (WR_SWITCH_PHY_REG(name, prt, 0x10, 0x3360))
 		return -1;
 
 	/* Write PHY ctrl reg (0x0) to apply
 	 * Phy reset (set bit 15 low)
 	 * reset other default values
 	 */
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, 0x1140);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (0x9400 | (prt << 5)));
-
-	if (mv88e61xx_busychk(name))
+	if (WR_SWITCH_PHY_REG(name, prt, 0x00, 0x9140))
 		return -1;
 
 	return 0;

@@ -259,45 +227,23 @@ static int mv88361xx_powerup(struct mv88e61xx_config *swconfig, u32 prt)
 static int mv88361xx_led_init(struct mv88e61xx_config *swconfig, u32 prt)
 {
 	char *name = swconfig->name;
-	u16 reg;
 
 	if (swconfig->led_init != MV88E61XX_LED_INIT_EN)
 		return 0;
 
 	/* set page address to 3 */
-	reg = 3;
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-				   1 << MV88E61XX_MODE_OFST |
-				   1 << MV88E61XX_OP_OFST |
-				   prt << MV88E61XX_ADDR_OFST | 22));
-
-	if (mv88e61xx_busychk(name))
+	if (WR_SWITCH_PHY_REG(name, prt, 0x16, 0x0003))
 		return -1;
 
-	/* set LED Func Ctrl reg */
-	reg = 1;	/* LED[0] On-Link, Blink-Activity, Off-NoLink */
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-				   1 << MV88E61XX_MODE_OFST |
-				   1 << MV88E61XX_OP_OFST |
-				   prt << MV88E61XX_ADDR_OFST | 16));
-
-	if (mv88e61xx_busychk(name))
+	/*
+	 * set LED Func Ctrl reg
+	 * value 0x0001 = LED[0] On-Link, Blink-Activity, Off-NoLink
+	 */
+	if (WR_SWITCH_PHY_REG(name, prt, 0x10, 0x0001))
 		return -1;
 
 	/* set page address to 0 */
-	reg = 0;
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-				   1 << MV88E61XX_MODE_OFST |
-				   1 << MV88E61XX_OP_OFST |
-				   prt << MV88E61XX_ADDR_OFST | 22));
-
-	if (mv88e61xx_busychk(name))
+	if (WR_SWITCH_PHY_REG(name, prt, 0x16, 0x0000))
 		return -1;
 
 	return 0;

@@ -315,20 +261,12 @@ static int mv88361xx_led_init(struct mv88e61xx_config *swconfig, u32 prt)
 static int mv88361xx_reverse_mdipn(struct mv88e61xx_config *swconfig, u32 prt)
 {
 	char *name = swconfig->name;
-	u16 reg;
 
 	if (swconfig->mdip != MV88E61XX_MDIP_REVERSE)
 		return 0;
 
-	reg = 0x0f;		/*Reverse MDIP/N[3:0] bits */
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-				   1 << MV88E61XX_MODE_OFST |
-				   1 << MV88E61XX_OP_OFST |
-				   prt << MV88E61XX_ADDR_OFST | 20));
-
-	if (mv88e61xx_busychk(name))
+	/*Reverse MDIP/N[3:0] bits */
+	if (WR_SWITCH_PHY_REG(name, prt, 0x14, 0x000f))
 		return -1;
 
 	return 0;

@@ -354,7 +292,7 @@ int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig)
 		printf("Invalid cpu port config, using default port5\n");
 	}
 
-	RD_PHY(name, MV88E61XX_PRT_OFST, MII_PHYSID2, &reg);
+	RD_SWITCH_PORT_REG(name, 0, MII_PHYSID2, &reg);
 	switch (reg &= 0xfff0) {
 	case 0x1610:
 		idstr = "88E6161";

@@ -374,45 +312,57 @@ int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig)
 	}
 
 	/* Port based VLANs configuration */
-	if ((swconfig->vlancfg == MV88E61XX_VLANCFG_DEFAULT)
-	    || (swconfig->vlancfg == MV88E61XX_VLANCFG_ROUTER))
-		mv88e61xx_port_vlan_config(swconfig, MV88E61XX_MAX_PORTS_NUM,
-					   MV88E61XX_PRT_OFST);
-	else {
-		printf("Unsupported mode %s failed\n", __FUNCTION__);
-		return -1;
-	}
+	mv88e61xx_port_vlan_config(swconfig);
 
 	if (swconfig->rgmii_delay == MV88E61XX_RGMII_DELAY_EN) {
 		/*
 		 * Enable RGMII delay on Tx and Rx for CPU port
 		 * Ref: sec 9.5 of chip datasheet-02
 		 */
-		WR_PHY(name, MV88E61XX_PRT_OFST + 5,
-		       MV88E61XX_RGMII_TIMECTRL_REG, 0x18);
-		WR_PHY(name, MV88E61XX_PRT_OFST + 4,
-		       MV88E61XX_RGMII_TIMECTRL_REG, 0xc1e7);
+		/*Force port link down */
+		WR_SWITCH_PORT_REG(name, 5, MV88E61XX_PCS_CTRL_REG, 0x10);
+		/* configure port RGMII delay */
+		WR_SWITCH_PORT_REG(name, 4,
+			MV88E61XX_RGMII_TIMECTRL_REG, 0x81e7);
+		RD_SWITCH_PORT_REG(name, 5,
+			MV88E61XX_RGMII_TIMECTRL_REG, &reg);
+		WR_SWITCH_PORT_REG(name, 5,
+			MV88E61XX_RGMII_TIMECTRL_REG, reg | 0x18);
+		WR_SWITCH_PORT_REG(name, 4,
+			MV88E61XX_RGMII_TIMECTRL_REG, 0xc1e7);
+		/* Force port to RGMII FDX 1000Base then up */
+		WR_SWITCH_PORT_REG(name, 5, MV88E61XX_PCS_CTRL_REG, 0x1e);
+		WR_SWITCH_PORT_REG(name, 5, MV88E61XX_PCS_CTRL_REG, 0x3e);
 	}
 
 	for (prt = 0; prt < MV88E61XX_MAX_PORTS_NUM; prt++) {
 		if (!((1 << prt) & swconfig->cpuport)) {
 
-			if (mv88361xx_led_init(swconfig, prt))
+			if (mv88361xx_powerup(swconfig, prt))
 				return -1;
+			WR_SWITCH_PORT_REG(name, prt, 4, 0x7f);
 			if (mv88361xx_reverse_mdipn(swconfig, prt))
 				return -1;
-			if (mv88361xx_powerup(swconfig, prt))
+			if (mv88361xx_led_init(swconfig, prt))
 				return -1;
 		}
 
 		/*Program port state */
-		RD_PHY(name, MV88E61XX_PRT_OFST + prt,
+		RD_SWITCH_PORT_REG(name, prt,
 		       MV88E61XX_PRT_CTRL_REG, &reg);
-		WR_PHY(name, MV88E61XX_PRT_OFST + prt,
+		WR_SWITCH_PORT_REG(name, prt,
 		       MV88E61XX_PRT_CTRL_REG,
 		       reg | (swconfig->portstate & 0x03));
+
 	}
 
+	/* do a sw reset */
+	RD_SWITCH_REG(name, 0x1B, 0x04, &reg);
+	reg |= 0x8000;
+	WR_SWITCH_REG(name, 0x1B, 0x04, reg);
+	/* wait for at least 2 ms */
+	udelay(2500);
+
 	printf("%s Initialized on %s\n", idstr, name);
 	return 0;
 }
drivers/net/phy/mv88e61xx.h +14 -9
index 57762b6..7595cbc 100644
@@ -28,11 +28,10 @@
 #include <miiphy.h>
 
 #define MV88E61XX_CPU_PORT		0x5
-#define MV88E61XX_MAX_PORTS_NUM		0x6
 
 #define MV88E61XX_PHY_TIMEOUT		100000
 
-#define MV88E61XX_PRT_STS_REG		0x1
+#define MV88E61XX_PCS_CTRL_REG		0x1
 #define MV88E61XX_PRT_CTRL_REG		0x4
 #define MV88E61XX_PRT_VMAP_REG		0x6
 #define MV88E61XX_PRT_VID_REG		0x7

@@ -43,20 +42,26 @@
 #define MV88E61XX_RGMII_TIMECTRL_REG	0x1A
 #define MV88E61XX_GLB2REG_DEVADR	0x1C
 
+#define MV88E61XX_PHY_WRITE_CMD		0x9400
+#define MV88E61XX_PHY_READ_CMD		0x9800
+
 #define MV88E61XX_BUSY_OFST		15
 #define MV88E61XX_MODE_OFST		12
-#define MV88E61XX_OP_OFST			10
+#define MV88E61XX_OP_OFST		10
 #define MV88E61XX_ADDR_OFST		5
 
 #ifdef CONFIG_MV88E61XX_MULTICHIP_ADRMODE
 static int mv88e61xx_busychk_multic(char *name, u32 devaddr);
-static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 data);
-static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 * data);
-#define WR_PHY mv88e61xx_wr_phy
-#define RD_PHY mv88e61xx_rd_phy
+static void mv88e61xx_switch_write(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 data);
+static void mv88e61xx_switch_read(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 *data);
+#define WR_SWITCH_REG mv88e61xx_switch_write
+#define RD_SWITCH_REG mv88e61xx_switch_read
 #else
-#define WR_PHY miiphy_write
-#define RD_PHY miiphy_read
+/* switch appears a s simple PHY and can thus use miiphy */
+#define WR_SWITCH_REG miiphy_write
+#define RD_SWITCH_REG miiphy_read
 #endif /* CONFIG_MV88E61XX_MULTICHIP_ADRMODE */
 
 #endif /* _MV88E61XX_H */
include/netdev.h +16 -5
index b8d303d..e1eb40a 100644
@@ -163,10 +163,9 @@ static inline int pci_eth_init(bd_t *bis)
  * the stuct and enums here are used to specify switch configuration params
  */
 #if defined(CONFIG_MV88E61XX_SWITCH)
-enum mv88e61xx_cfg_vlan {
-	MV88E61XX_VLANCFG_DEFAULT,
-	MV88E61XX_VLANCFG_ROUTER
-};
+
+/* constants for any 88E61xx switch */
+#define MV88E61XX_MAX_PORTS_NUM	6
 
 enum mv88e61xx_cfg_mdip {
 	MV88E61XX_MDIP_NOCHANGE,

@@ -192,7 +191,7 @@ enum mv88e61xx_cfg_prtstt {
 
 struct mv88e61xx_config {
 	char *name;
-	enum mv88e61xx_cfg_vlan vlancfg;
+	u8 vlancfg[MV88E61XX_MAX_PORTS_NUM];
 	enum mv88e61xx_cfg_rgmiid rgmii_delay;
 	enum mv88e61xx_cfg_prtstt portstate;
 	enum mv88e61xx_cfg_ledinit led_init;

@@ -201,6 +200,18 @@ struct mv88e61xx_config {
 	u8 cpuport;
 };
 
+/*
+ * Common mappings for Internal VLANs
+ * These mappings consider that all ports are useable; the driver
+ * will mask inexistent/unused ports.
+ */
+
+/* Switch mode : routes any port to any port */
+#define MV88E61XX_VLANCFG_SWITCH { 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F }
+
+/* Router mode: routes only CPU port 5 to/from non-CPU ports 0-4 */
+#define MV88E61XX_VLANCFG_ROUTER { 0x30, 0x30, 0x30, 0x30, 0x2F, 0x1F }
+
 int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig);
 #endif /* CONFIG_MV88E61XX_SWITCH */
Signature · 1 line
1.7.9.5
author
#19 lore raw

PATCH v4 3/4 kirkwood: make MPP arrays static const

This saves stack and code memory for local copy, and consumes initialized data memory. For 22 of the 29 kirkwood-based boards, this results in a global saving of about 30 bytes. For 7 of them, it results in an increase of 6 to 14 bytes.

Signed-off-by Albert ARIBAUD <[email protected]>

---

 arch/arm/cpu/arm926ejs/kirkwood/mpp.c           |    2 +-
 arch/arm/include/asm/arch-kirkwood/mpp.h        |    2 +-
 board/LaCie/net2big_v2/net2big_v2.c             |    2 +-
 board/LaCie/netspace_v2/netspace_v2.c           |    2 +-
 board/Marvell/dreamplug/dreamplug.c             |    2 +-
 board/Marvell/guruplug/guruplug.c               |    2 +-
 board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |    2 +-
 board/Marvell/openrd/openrd.c                   |    2 +-
 board/Marvell/rd6281a/rd6281a.c                 |    2 +-
 board/Marvell/sheevaplug/sheevaplug.c           |    2 +-
 board/Seagate/dockstar/dockstar.c               |    2 +-
 board/buffalo/lsxl/lsxl.c                       |    2 +-
 board/cloudengines/pogo_e02/pogo_e02.c          |    2 +-
 board/d-link/dns325/dns325.c                    |    2 +-
 board/iomega/iconnect/iconnect.c                |    2 +-
 board/karo/tk71/tk71.c                          |    2 +-
 board/keymile/km_arm/km_arm.c                   |    2 +-
 board/raidsonic/ib62x0/ib62x0.c                 |    2 +-
 drivers/spi/kirkwood_spi.c                      |   12 +++++-------
 19 files changed, 23 insertions(+), 25 deletions(-)
arch/arm/cpu/arm926ejs/kirkwood/mpp.c +1 -1
index 03eb2de..0ba6f09 100644
@@ -31,7 +31,7 @@ static u32 kirkwood_variant(void)
 #define MPP_CTRL(i)	(KW_MPP_BASE + (i* 4))
 #define MPP_NR_REGS	(1 + MPP_MAX/8)
 
-void kirkwood_mpp_conf(u32 *mpp_list, u32 *mpp_save)
+void kirkwood_mpp_conf(const u32 *mpp_list, u32 *mpp_save)
 {
 	u32 mpp_ctrl[MPP_NR_REGS];
 	unsigned int variant_mask;
arch/arm/include/asm/arch-kirkwood/mpp.h +1 -1
index 8ceea7b..48d1477 100644
@@ -312,6 +312,6 @@
 
 #define MPP_MAX			49
 
-void kirkwood_mpp_conf(u32 *mpp_list, u32 *mpp_save);
+void kirkwood_mpp_conf(const u32 *mpp_list, u32 *mpp_save);
 
 #endif
board/LaCie/net2big_v2/net2big_v2.c +1 -1
index 0e06c29..e524f35 100644
@@ -39,7 +39,7 @@ int board_early_init_f(void)
 			NET2BIG_V2_OE_LOW, NET2BIG_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/LaCie/netspace_v2/netspace_v2.c +1 -1
index 101a80a..0aa5345 100644
@@ -39,7 +39,7 @@ int board_early_init_f(void)
 			NETSPACE_V2_OE_LOW, NETSPACE_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/Marvell/dreamplug/dreamplug.c +1 -1
index d6497aa..0caf34f 100644
@@ -46,7 +46,7 @@ int board_early_init_f(void)
 			DREAMPLUG_OE_LOW, DREAMPLUG_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,		/* SPI Flash */
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/Marvell/guruplug/guruplug.c +1 -1
index f5c1c3c..3a52ab2 100644
@@ -43,7 +43,7 @@ int board_early_init_f(void)
 			GURUPLUG_OE_LOW, GURUPLUG_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c +1 -1
index 43852f6..fb57faa 100644
@@ -45,7 +45,7 @@ int board_early_init_f(void)
 			MV88F6281GTW_GE_OE_LOW, MV88F6281GTW_GE_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/Marvell/openrd/openrd.c +1 -1
index d48f05a..c59a326 100644
@@ -48,7 +48,7 @@ int board_early_init_f(void)
 			OPENRD_OE_LOW, OPENRD_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Marvell/rd6281a/rd6281a.c +1 -1
index 1fd7677..adaa6a1 100644
@@ -44,7 +44,7 @@ int board_early_init_f(void)
 			RD6281A_OE_LOW, RD6281A_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Marvell/sheevaplug/sheevaplug.c +1 -1
index 688d308..16efe64 100644
@@ -43,7 +43,7 @@ int board_early_init_f(void)
 			SHEEVAPLUG_OE_LOW, SHEEVAPLUG_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Seagate/dockstar/dockstar.c +1 -1
index fc88520..4f1f899 100644
@@ -47,7 +47,7 @@ int board_early_init_f(void)
 			DOCKSTAR_OE_LOW, DOCKSTAR_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/buffalo/lsxl/lsxl.c +1 -1
index 57776fb..f298020 100644
@@ -76,7 +76,7 @@ int board_early_init_f(void)
 	 * Multi-Purpose Pins Functionality configuration
 	 * These strappings are taken from the original vendor uboot port.
 	 */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/cloudengines/pogo_e02/pogo_e02.c +1 -1
index bac9ce5..3b1c8ec 100644
@@ -45,7 +45,7 @@ int board_early_init_f(void)
 			POGO_E02_OE_LOW, POGO_E02_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/d-link/dns325/dns325.c +1 -1
index 11260fe..4187901 100644
@@ -44,7 +44,7 @@ int board_early_init_f(void)
 			DNS325_OE_LOW, DNS325_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/iomega/iconnect/iconnect.c +1 -1
index 6ee2128..c253df5 100644
@@ -41,7 +41,7 @@ int board_early_init_f(void)
 			ICONNECT_OE_LOW, ICONNECT_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/karo/tk71/tk71.c +1 -1
index 96410d7..7a4e7b3 100644
@@ -47,7 +47,7 @@ int board_early_init_f(void)
 			TK71_OE_LOW, TK71_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/keymile/km_arm/km_arm.c +1 -1
index 0c4dddc..5fc46e6 100644
@@ -54,7 +54,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define MASK_RBI_DEFECT_16	0x01
 
 /* Multi-Purpose Pins Functionality configuration */
-u32 kwmpp_config[] = {
+static const u32 kwmpp_config[] = {
 	MPP0_NF_IO2,
 	MPP1_NF_IO3,
 	MPP2_NF_IO4,
board/raidsonic/ib62x0/ib62x0.c +1 -1
index b7e6e41..1e89b55 100644
@@ -45,7 +45,7 @@ int board_early_init_f(void)
 	/* Set SATA activity LEDs to default off */
 	writel(MVSATAHC_LED_POLARITY_CTRL, MVSATAHC_LED_CONF_REG);
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
drivers/spi/kirkwood_spi.c +5 -7
index a7cda75..de81064 100644
@@ -41,7 +41,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 {
 	struct spi_slave *slave;
 	u32 data;
-	u32 kwspi_mpp_config[] = { 0, 0 };
+	static const u32 kwspi_mpp_config[2][2] = {
+		{ MPP0_SPI_SCn, 0 }, /* if cs == 0 */
+		{ MPP7_SPI_SCn, 0 } /* if cs != 0 */
+	};
 
 	if (!spi_cs_is_valid(bus, cs))
 		return NULL;

@@ -68,12 +71,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 	writel(KWSPI_IRQMASK, &spireg->irq_mask);
 
 	/* program mpp registers to select  SPI_CSn */
-	if (cs) {
-		kwspi_mpp_config[0] = MPP7_SPI_SCn;
-	} else {
-		kwspi_mpp_config[0] = MPP0_SPI_SCn;
-	}
-	kirkwood_mpp_conf(kwspi_mpp_config, cs_spi_mpp_back);
+	kirkwood_mpp_conf(kwspi_mpp_config[cs ? 1 : 0], cs_spi_mpp_back);
 
 	return slave;
 }
Signature · 1 line
1.7.9.5
author
#20 lore raw

PATCH v4 4/4 ARM: lacie_kw: add support for WIRELESS_SPACE

Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v4:
- switched from netspace_V2-based to standalone board
- added support for mv88e61xx switch
- corrected some kwbimage.cfg values

Changes in v3:
- fix broken support for NETSPACE_(MINI|LITE)_V2

Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

 board/LaCie/wireless_space/Makefile         |   46 +++++++
 board/LaCie/wireless_space/kwbimage.cfg     |  190 +++++++++++++++++++++++++++
 board/LaCie/wireless_space/wireless_space.c |  165 +++++++++++++++++++++++
 boards.cfg                                  |    1 +
 include/configs/wireless_space.h            |  183 ++++++++++++++++++++++++++
 5 files changed, 585 insertions(+)
 create mode 100644 board/LaCie/wireless_space/Makefile
 create mode 100644 board/LaCie/wireless_space/kwbimage.cfg
 create mode 100644 board/LaCie/wireless_space/wireless_space.c
 create mode 100644 include/configs/wireless_space.h
board/LaCie/wireless_space/Makefile new file +46 -0
new file mode 100644
index 0000000..b43c3d3
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011 Simon Guinot <[email protected]>
+#
+# Based on Kirkwood support:
+# (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.
+#
+
+include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o ../common/common.o
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+SOBJS	:= $(addprefix $(obj),$(SOBJS))
+
+$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
+	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
board/LaCie/wireless_space/kwbimage.cfg new file +190 -0

190 lines not on this page · raw message

board/LaCie/wireless_space/wireless_space.c new file +165 -0

165 lines not on this page · raw message

boards.cfg +1 -0
index 25c53d4..b91cdd9 100644
@@ -168,6 +168,7 @@ netspace_lite_v2             arm         arm926ejs   netspace_v2         LaCie
 netspace_max_v2              arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MAX_V2
 netspace_mini_v2             arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MINI_V2
 netspace_v2                  arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_V2
+wireless_space               arm         arm926ejs   wireless_space      LaCie          kirkwood
 dreamplug                    arm         arm926ejs   -                   Marvell        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
include/configs/wireless_space.h new file +183 -0

183 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#21 lore raw

PATCH v4 4/4 ARM: lacie_kw: add support for WIRELESS_SPACE

Quoted 677 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: 05 November 2012 05:02
To: U-Boot
Cc: Prafulla Wadaskar; Simon Guinot; Albert ARIBAUD
Subject: [PATCH v4 4/4] ARM: lacie_kw: add support for WIRELESS_SPACE

Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v4:
- switched from netspace_V2-based to standalone board
- added support for mv88e61xx switch
- corrected some kwbimage.cfg values

Changes in v3:
- fix broken support for NETSPACE_(MINI|LITE)_V2

Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

 board/LaCie/wireless_space/Makefile         |   46 +++++++
 board/LaCie/wireless_space/kwbimage.cfg     |  190
+++++++++++++++++++++++++++
 board/LaCie/wireless_space/wireless_space.c |  165
+++++++++++++++++++++++
 boards.cfg                                  |    1 +
 include/configs/wireless_space.h            |  183
++++++++++++++++++++++++++
 5 files changed, 585 insertions(+)
 create mode 100644 board/LaCie/wireless_space/Makefile
 create mode 100644 board/LaCie/wireless_space/kwbimage.cfg
 create mode 100644 board/LaCie/wireless_space/wireless_space.c
 create mode 100644 include/configs/wireless_space.h
board/LaCie/wireless_space/Makefile new file +39 -0
new file mode 100644
index 0000000..b43c3d3
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011 Simon Guinot <[email protected]>
+#
+# Based on Kirkwood support:
+# (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.
+#
+
+include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
+
+LIB  = $(obj)lib$(BOARD).o
+
+COBJS        := $(BOARD).o ../common/common.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS        := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):      $(obj).depend $(OBJS) $(SOBJS)
+     $(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+#####################################################################

####

board/LaCie/wireless_space/Makefile new file +7 -0
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#####################################################################

####

board/LaCie/wireless_space/kwbimage.cfg new file +49 -0
new file mode 100644
index 0000000..a5b200f
@@ -0,0 +1,190 @@
+#
+# Copyright (C) 2012 Albert ARIBAUD <[email protected]>
+#
+# Based on netspace_v2 kwbimage.cfg:
+# Copyright (C) 2011 Simon Guinot <[email protected]>
+#
+# Based on Kirkwood support:
+# (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.
+#
+# Refer docs/README.kwimage for more details about how-to configure
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM    nand    # Boot from NAND flash
+
+# SOC registers configuration using bootrom header extension
+# Maximum KWBIMAGE_MAX_CONFIG configurations allowed
+
+# Configure RGMII-0 interface pad voltage to 1.8V
+DATA 0xFFD100e0 0x1B1B1B9B
+
+#Dram initalization for SINGLE x16 CL=5 @ 400MHz
+DATA 0xFFD01400 0x43000618   # DDR Configuration register
+# bit13-0:  0xa00 (2560 DDR2 clks refresh rate)
+# bit23-14: zero
+# bit24: 1= enable exit self refresh mode on DDR access
+# bit25: 1 required
+# bit29-26: zero
+# bit31-30: 01
+
+DATA 0xFFD01404 0x35143000   # DDR Controller Control Low
+# bit 4:    0=addr/cmd in smame cycle
+# bit 5:    0=clk is driven during self refresh, we don't care for

APX

board/LaCie/wireless_space/kwbimage.cfg new file +4 -0
+# bit 6:    0=use recommended falling edge of clk for addr/cmd
+# bit14:    0=input buffer always powered up
+# bit18:    1=cpu lock transaction enabled
+# bit23-20: 5=recommended value for CL=5 and STARTBURST_DEL disabled

bit31=0
+# bit27-24: 8= CL+3, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM

board/LaCie/wireless_space/kwbimage.cfg new file +72 -0
+# bit30-28: 3 required
+# bit31:    0=no additional STARTBURST delay
+
+DATA 0xFFD01408 0x11012228   # DDR Timing (Low) (active cycles value
+1)
+# bit7-4:   TRCD
+# bit11- 8: TRP
+# bit15-12: TWR
+# bit19-16: TWTR
+# bit20:    TRAS msb
+# bit23-21: 0x0
+# bit27-24: TRRD
+# bit31-28: TRTP
+
+DATA 0xFFD0140C 0x00000A19   #  DDR Timing (High)
+# bit6-0:   TRFC
+# bit8-7:   TR2R
+# bit10-9:  TR2W
+# bit12-11: TW2W
+# bit31-13: zero required
+
+DATA 0xFFD01410 0x0000CCCC   #  DDR Address Control
+# bit1-0:   00, Cs0width=x8
+# bit3-2:   11, Cs0size=1Gb
+# bit5-4:   00, Cs2width=x8
+# bit7-6:   00, Cs1size=1Gb
+# bit9-8:   00, Cs2width=x8
+# bit11-10: 00, Cs2size=1Gb
+# bit13-12: 00, Cs3width=x8
+# bit15-14: 00, Cs3size=1Gb
+# bit16:    0,  Cs0AddrSel
+# bit17:    0,  Cs1AddrSel
+# bit18:    0,  Cs2AddrSel
+# bit19:    0,  Cs3AddrSel
+# bit31-20: 0 required
+
+DATA 0xFFD01414 0x00000000   #  DDR Open Pages Control
+# bit0:    0,  OpenPage enabled
+# bit31-1: 0 required
+
+DATA 0xFFD01418 0x00000000   #  DDR Operation
+# bit3-0:   0x0, DDR cmd
+# bit31-4:  0 required
+
+DATA 0xFFD0141C 0x00000632   #  DDR Mode
+# bit2-0:   2, BurstLen=2 required
+# bit3:     0, BurstType=0 required
+# bit6-4:   4, CL=5
+# bit7:     0, TestMode=0 normal
+# bit8:     0, DLL reset=0 normal
+# bit11-9:  6, auto-precharge write recovery ????????????
+# bit12:    0, PD must be zero
+# bit31-13: 0 required
+
+DATA 0xFFD01420 0x00000004   #  DDR Extended Mode
+# bit0:    0,  DDR DLL enabled
+# bit1:    1,  DDR drive strenght reduced
+# bit2:    1,  DDR ODT control lsd enabled
+# bit5-3:  000, required
+# bit6:    1,  DDR ODT control msb, enabled
+# bit9-7:  000, required
+# bit10:   0,  differential DQS enabled
+# bit11:   0, required
+# bit12:   0, DDR output buffer enabled
+# bit31-13: 0 required
+
+DATA 0xFFD01424 0x0000F07F   #  DDR Controller Control High
+# bit2-0:  111, required
+# bit3  :  1  , MBUS Burst Chop disabled
+# bit6-4:  111, required
+# bit7  :  1  , D2P Latency enabled
+# bit8  :  1  , add writepath sample stage, must be 1 for DDR freq >=

300MHz

board/LaCie/wireless_space/kwbimage.cfg new file +44 -0
+# bit9  :  0  , no half clock cycle addition to dataout
+# bit10 :  0  , 1/4 clock cycle skew enabled for addr/ctl signals
+# bit11 :  0  , 1/4 clock cycle skew disabled for write mesh
+# bit15-12: 1111 required
+# bit31-16: 0    required
+
+DATA 0xFFD01428 0x00085520   # DDR2 ODT Read Timing (default values)
+# bit3-0:   0000, required
+# bit7-4:   0010, 2 cycle from read command to M_ODT high
+# bit11-8:  0101, 5 cycles from read command to M_ODT low
+# bit15-12: 0101, 5 cycles from read command to internal ODT high
+# bit19-16: 1000, 8 cycles from read command to internal ODT low
+# bit31-20: 0..0, required
+
+DATA 0xFFD0147C 0x00008552   # DDR2 ODT Write Timing (default values)
+# bit3-0:   0010, 2 cycle from write command to M_ODT high
+# bit7-4:   0101, 5 cycles write read command to M_ODT low
+# bit11-8:  0101, 5 cycles write read command to internal ODT high
+# bit15-12: 1000, 8 cycles write read command to internal ODT low
+# bit31-16: 0..0, required
+
+DATA 0xFFD01500 0x00000000   # CS[0]n Base address to 0x0
+DATA 0xFFD01504 0x0FFFFFF1   # CS[0]n Size
+# bit0:    1,  Window enabled
+# bit1:    0,  Write Protect disabled
+# bit3-2:  00, CS0 hit selected
+# bit23-4: ones, required
+# bit31-24: 0x07, Size (i.e. 128MB)
+
+DATA 0xFFD0150C 0x00000000   # CS[1]n Size, window disabled
+DATA 0xFFD01514 0x00000000   # CS[2]n Size, window disabled
+DATA 0xFFD0151C 0x00000000   # CS[3]n Size, window disabled
+
+DATA 0xFFD01494 0x00010000   #  DDR ODT Control (Low)
+# bit3-0:  1, ODT0Rd, MODT[0] asserted during read from DRAM CS0
+# bit19-16:1, ODT0Wr, MODT[0] asserted during write to DRAM CS0
+
+DATA 0xFFD01498 0x00000000   #  DDR ODT Control (High)
+# bit1-0:  00, ODT0 controlled by ODT Control (low) register above
+# bit3-2:  01, ODT1 active NEVER!
+# bit31-4: zero, required
+
+DATA 0xFFD0149C 0x0000E40F   # CPU ODT Control
+# bit3-0:  1, ODT0Rd, Internal ODT asserted during read from DRAM

bank0
+# bit7-4: 1, ODT0Wr, Internal ODT asserted during write to DRAM bank0

board/LaCie/wireless_space/kwbimage.cfg new file +20 -0
+# bit11-10:1, DQ_ODTSel. ODT select turned on
+
+DATA 0xFFD01480 0x00000001   # DDR Initialization Control
+#bit0=1, enable DDR init upon this register write
+
+0xFFD10000 0x01111111                # MPP control 0 register
+0xFFD10004 0x00003311                # MPP control 1 register
+0xFFD10008 0x33331100                # MPP control 2 register
+0xFFD1000C 0x33333333                # MPP control 3 register
+0xFFD10010 0x33330000                # MPP control 4 register
+0xFFD10014 0x00000000                # MPP control 5 register
+0xFFD10018 0x00000000                # MPP control 6 register
+
+0xFFD10104 0xFF006808                # GPIO LO OE
+0xFFD10100 0x00000000                # GPIO LO EN
+0xFFD10144 0x0000F989                # GPIO HI OE
+0xFFD10140 0x00000000                # GPIO HI EN
+
+# End of Header extension
+DATA 0x0 0x0
board/LaCie/wireless_space/wireless_space.c new file +110 -0
new file mode 100644
index 0000000..930d19f
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2011 Simon Guinot <[email protected]>
+ *
+ * Based on Kirkwood support:
+ * (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.
+ */
+
+#include <common.h>
+#include <command.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/kirkwood.h>
+#include <asm/arch/mpp.h>
+#include <asm/arch/gpio.h>
+
+#include "../common/common.h"
+#include "netdev.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* GPIO configuration */
+
+#define WIRELESS_SPACE_OE_LOW                0xFF006808
+#define WIRELESS_SPACE_OE_HIGH               0x0000F989
+#define WIRELESS_SPACE_OE_VAL_LOW    0x00000000
+#define WIRELESS_SPACE_OE_VAL_HIGH   0x00000000
+
+#define WIRELESS_SPACE_GPIO_BUTTON         43
+
+const 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,               /* Fan speed (bit 1) */
+     MPP8_TW_SDA,
+     MPP9_TW_SCK,
+     MPP10_UART0_TXD,
+     MPP11_UART0_RXD,
+     MPP13_GPIO,             /* Red led */
+     MPP14_GPIO,             /* USB fuse */
+     MPP15_SATA0_ACTn,
+     MPP16_GPIO,             /* SATA 0 power */
+     MPP17_GPIO,             /* SATA 1 power */
+     MPP18_NF_IO0,
+     MPP19_NF_IO1,
+     MPP20_GE1_0,            /* Gigabit Ethernet 1 */
+     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,             /* Fan speed (bit 2) */
+     MPP37_GPIO,             /* Fan speed (bit 0) */
+     MPP38_GPIO,             /* Fan power */
+     MPP39_GPIO,             /* Fan rotation fail */
+     MPP40_GPIO,             /* Ethernet switch link */
+     MPP41_GPIO,             /* USB enable host vbus */
+     MPP42_GPIO,             /* LED clock control */
+     MPP43_GPIO,             /* WPS button (0=Pushed, 1=Released) */
+     MPP44_GPIO,             /* Red LED on/off */
+     MPP45_GPIO,             /* Red LED timer blink (on=off=100ms) */
+     MPP46_GPIO,             /* Green LED on/off */
+     MPP47_GPIO,             /* LED (blue, green) SATA activity blink */
+     MPP48_GPIO,             /* Blue LED on/off */
+     0
+};
+
+struct mv88e61xx_config swcfg = {
+     .name = "egiga0",
+     .vlancfg = MV88E61XX_VLANCFG_SWITCH,
+     .rgmii_delay = MV88E61XX_RGMII_DELAY_EN,
+     .led_init = MV88E61XX_LED_INIT_DIS,
+     .mdip = MV88E61XX_MDIP_NOCHANGE,
+     .portstate = MV88E61XX_PORTSTT_FORWARDING,
+     .cpuport = 0x30,
+     .ports_enabled = 0x37,
+};
+
+int board_early_init_f(void)
+{
+     /* Gpio configuration */
+     kw_config_gpio(WIRELESS_SPACE_OE_VAL_LOW,

WIRELESS_SPACE_OE_VAL_HIGH,

board/LaCie/wireless_space/wireless_space.c new file +48 -0
+                     WIRELESS_SPACE_OE_LOW, WIRELESS_SPACE_OE_HIGH);
+
+     /* Multi-Purpose Pins Functionality configuration */
+     kirkwood_mpp_conf(kwmpp_config, NULL);
+
+     return 0;
+}
+
+int board_init(void)
+{
+     /* Machine number */
+     gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
+
+     /* Boot parameters address */
+     gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
+
+     return 0;
+}
+
+#if defined(CONFIG_MISC_INIT_R)
+int misc_init_r(void)
+{
+#if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR)
+     if (!getenv("ethaddr")) {
+             uchar mac[6];
+             if (lacie_read_mac_address(mac) == 0)
+                     eth_setenv_enetaddr("ethaddr", mac);
+     }
+#endif
+     return 0;
+}
+#endif
+
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
+/* Configure and initialize PHY */
+void reset_phy(void)
+{
+     /* configure true PHY on egiga1 */
+     mv_phy_88e1116_init("egiga1", CONFIG_EGIGA1_PHY);
+     /* configure switch on egiga0 */
+     mv88e61xx_switch_initialize(&swcfg);
+}
+#endif
+
+#if defined(CONFIG_KIRKWOOD_GPIO)
+/* Return GPIO button status */
+static int
+do_read_button(cmd_tbl_t *cmdtp, int flag, int argc, char * const

argv[])

board/LaCie/wireless_space/wireless_space.c new file +7 -0
+{
+     return kw_gpio_get_value(WIRELESS_SPACE_GPIO_BUTTON);
+}
+
+U_BOOT_CMD(button, 1, 1, do_read_button,
+        "Return GPIO button status 0=off 1=on", "");
+#endif
boards.cfg +0 -0
index 25c53d4..b91cdd9 100644
@@ -168,6 +168,7 @@ netspace_lite_v2             arm         arm926ejs

netspace_v2 LaCie

 netspace_max_v2              arm         arm926ejs   netspace_v2
LaCie          kirkwood       lacie_kw:NETSPACE_MAX_V2
 netspace_mini_v2             arm         arm926ejs   netspace_v2
LaCie          kirkwood       lacie_kw:NETSPACE_MINI_V2
 netspace_v2                  arm         arm926ejs   netspace_v2
LaCie          kirkwood       lacie_kw:NETSPACE_V2
+wireless_space               arm         arm926ejs   wireless_space

LaCie kirkwood
dreamplug arm arm926ejs -
Marvell kirkwood
guruplug arm arm926ejs -
Marvell kirkwood
mv88f6281gtw_ge arm arm926ejs -
Marvell kirkwood

include/configs/wireless_space.h new file +27 -0
new file mode 100644
index 0000000..02a8c30
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2011 Albert ARIBAUD <[email protected]>
+ *
+ * Based on the netspace_v2 code which is
+ * Copyright (C) 2011 Simon Guinot <[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.
+ */
+
+#ifndef _CONFIG_WIRELESS_SPACE_H
+#define _CONFIG_WIRELESS_SPACE_H
+
+/*
+ * Machine number definition
+ */
+#define MACH_TYPE_WIRELESS_SPACE     2500 /* is missing in mach-types.h

*/

include/configs/wireless_space.h new file +37 -0
+#define CONFIG_MACH_TYPE             MACH_TYPE_WIRELESS_SPACE
+#define CONFIG_IDENT_STRING          " Wireless Space"
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CONFIG_FEROCEON_88FR131              /* CPU Core subversion */
+#define CONFIG_KIRKWOOD                      /* SoC Family Name */
+/* SoC name */
+#define CONFIG_KW88F6281
+#define CONFIG_SKIP_LOWLEVEL_INIT    /* disable board lowlevel_init */
+
+/*
+ * Commands configuration
+ */
+#define CONFIG_SYS_NO_FLASH          /* no NOR or SPI flash */
+#include <config_cmd_default.h>
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_USB
+
+/*
+ * Core clock definition
+ */
+#define CONFIG_SYS_TCLK                      166000000 /* 166MHz */
+
+/*
+ * SDRAM configuration
+ */
+#define CONFIG_NR_DRAM_BANKS         1
+
+/*
+ * Different SDRAM configuration and size for some of the boards

derived
+ * from the Network Space v2
+ */

include/configs/wireless_space.h new file +21 -0
+
+/*
+ * mv-common.h should be defined after CMD configs since it used them
+ * to enable certain macros
+ */
+#include "mv-common.h"
+
+/* Remove or override few declarations from mv-common.h */
+#undef CONFIG_RBTREE
+#undef CONFIG_SYS_IDE_MAXBUS
+#undef CONFIG_SYS_IDE_MAXDEVICE
+#define CONFIG_SYS_IDE_MAXBUS           1
+#define CONFIG_SYS_IDE_MAXDEVICE        1
+#undef CONFIG_SYS_PROMPT
+#define CONFIG_SYS_PROMPT            "ws> "
+
+/*
+ * Ethernet Driver configuration
+ */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_MISC_INIT_R /* misc_init_r() initializes MAC address

*/

include/configs/wireless_space.h new file +3 -0
+#define CONFIG_MVGBE_PORTS   {1, 1}   /* enable both ports */
+#define CONFIG_EGIGA1_PHY    0x6      /* egiga1 has a true PHY */
+#define CONFIG_MVGBE_PHY_ADRS {0xa, 0x6} /* egiga0 has a ('false')

PHY */

include/configs/wireless_space.h new file +27 -0
+#define CONFIG_MII
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
+#define CONFIG_NETCONSOLE
+#define CONFIG_MV88E61XX_SWITCH
+#endif /* CONFIG_CMD_NET */
+
+/*
+ * SATA Driver configuration
+ */
+#ifdef CONFIG_MVSATA_IDE
+#define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
+#endif /* CONFIG_MVSATA_IDE */
+
+/*
+ * Enable GPI0 support
+ */
+#define CONFIG_KIRKWOOD_GPIO
+
+/*
+ * Enable I2C support
+ */
+#ifdef CONFIG_CMD_I2C
+/* I2C EEPROM HT24LC04 (512B - 32 pages of 16 Bytes) */
+#define CONFIG_CMD_EEPROM
+#define CONFIG_SYS_I2C_EEPROM_ADDR           0x50
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS    4 /* 16-byte page size */
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN               1 /* 8-bit device

address */

include/configs/wireless_space.h new file +57 -0
+#endif /* CONFIG_CMD_I2C */
+
+/*
+ * Partition support
+ */
+#define CONFIG_DOS_PARTITION
+#define CONFIG_EFI_PARTITION
+
+/*
+ * File systems support
+ */
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+
+/*
+ * Use the HUSH parser
+ */
+#define CONFIG_SYS_HUSH_PARSER
+
+/*
+ * Console configuration
+ */
+#define CONFIG_CONSOLE_MUX
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+
+/*
+ * Enable device tree support
+ */
+#define CONFIG_OF_LIBFDT
+
+/*
+ * Environment variables configurations
+ */
+
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE         0x10000 /* 64KB */
+#define CONFIG_ENV_SIZE                      0x1000  /* 4KB */
+#define CONFIG_ENV_ADDR                      0x70000
+#define CONFIG_ENV_OFFSET            0x70000 /* env starts here */
+
+/*
+ * Default environment variables
+ */
+#define CONFIG_BOOTARGS "console=ttyS0,115200"
+
+#define CONFIG_BOOTCOMMAND                                   \
+     "dhcp && run netconsole; "                              \
+     "if run usbload || run diskload; then bootm; fi"
+
+#define CONFIG_EXTRA_ENV_SETTINGS                            \
+     "stdin=serial\0"                                        \
+     "stdout=serial\0"                                       \
+     "stderr=serial\0"                                       \
+     "bootfile=uImage\0"                                     \
+     "loadaddr=0x800000\0"                                   \
+     "autoload=no\0"                                         \
+     "netconsole="                                           \

include/configs/wireless_space.h

Quoted 10 lines
include/configs/wireless_space.h new file +9 -1
+             "set stdin $stdin,nc; "                         \
+             "set stdout $stdout,nc; "                       \
+             "set stderr $stderr,nc;\0"                      \
+     "diskload=ide reset && "                                \
+             "ext2load ide 0:1 $loadaddr /boot/$bootfile\0"  \
+     "usbload=usb start && "                                 \
+             "fatload usb 0:1 $loadaddr /boot/$bootfile\0"
+
+#endif /* _CONFIG_WIRELESS_SPACE_H */
--

Looks okay to me.

Acked-by Prafulla Wadaskar <[email protected]>

Will pull entire patch series in next week.

Regards...
Prafulla . . .

Quoted 1 line

1.7.9.5

author
#22 lore raw

PATCH v4 4/4 ARM: lacie_kw: add support for WIRELESS_SPACE

Hi Prafulla,

Quoted 690 lines · Prafulla Wadaskar
Quoted 677 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: 05 November 2012 05:02
To: U-Boot
Cc: Prafulla Wadaskar; Simon Guinot; Albert ARIBAUD
Subject: [PATCH v4 4/4] ARM: lacie_kw: add support for WIRELESS_SPACE

Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v4:
- switched from netspace_V2-based to standalone board
- added support for mv88e61xx switch
- corrected some kwbimage.cfg values

Changes in v3:
- fix broken support for NETSPACE_(MINI|LITE)_V2

Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

 board/LaCie/wireless_space/Makefile         |   46 +++++++
 board/LaCie/wireless_space/kwbimage.cfg     |  190
+++++++++++++++++++++++++++
 board/LaCie/wireless_space/wireless_space.c |  165
+++++++++++++++++++++++
 boards.cfg                                  |    1 +
 include/configs/wireless_space.h            |  183
++++++++++++++++++++++++++
 5 files changed, 585 insertions(+)
 create mode 100644 board/LaCie/wireless_space/Makefile
 create mode 100644 board/LaCie/wireless_space/kwbimage.cfg
 create mode 100644 board/LaCie/wireless_space/wireless_space.c
 create mode 100644 include/configs/wireless_space.h
board/LaCie/wireless_space/Makefile new file +39 -0
new file mode 100644
index 0000000..b43c3d3
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011 Simon Guinot <[email protected]>
+#
+# Based on Kirkwood support:
+# (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.
+#
+
+include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
+
+LIB  = $(obj)lib$(BOARD).o
+
+COBJS        := $(BOARD).o ../common/common.o
+
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS        := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):      $(obj).depend $(OBJS) $(SOBJS)
+     $(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+#####################################################################

####

board/LaCie/wireless_space/Makefile new file +7 -0
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#####################################################################

####

board/LaCie/wireless_space/kwbimage.cfg new file +49 -0
new file mode 100644
index 0000000..a5b200f
@@ -0,0 +1,190 @@
+#
+# Copyright (C) 2012 Albert ARIBAUD <[email protected]>
+#
+# Based on netspace_v2 kwbimage.cfg:
+# Copyright (C) 2011 Simon Guinot <[email protected]>
+#
+# Based on Kirkwood support:
+# (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.
+#
+# Refer docs/README.kwimage for more details about how-to configure
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM    nand    # Boot from NAND flash
+
+# SOC registers configuration using bootrom header extension
+# Maximum KWBIMAGE_MAX_CONFIG configurations allowed
+
+# Configure RGMII-0 interface pad voltage to 1.8V
+DATA 0xFFD100e0 0x1B1B1B9B
+
+#Dram initalization for SINGLE x16 CL=5 @ 400MHz
+DATA 0xFFD01400 0x43000618   # DDR Configuration register
+# bit13-0:  0xa00 (2560 DDR2 clks refresh rate)
+# bit23-14: zero
+# bit24: 1= enable exit self refresh mode on DDR access
+# bit25: 1 required
+# bit29-26: zero
+# bit31-30: 01
+
+DATA 0xFFD01404 0x35143000   # DDR Controller Control Low
+# bit 4:    0=addr/cmd in smame cycle
+# bit 5:    0=clk is driven during self refresh, we don't care for

APX

board/LaCie/wireless_space/kwbimage.cfg new file +4 -0
+# bit 6:    0=use recommended falling edge of clk for addr/cmd
+# bit14:    0=input buffer always powered up
+# bit18:    1=cpu lock transaction enabled
+# bit23-20: 5=recommended value for CL=5 and STARTBURST_DEL disabled

bit31=0
+# bit27-24: 8= CL+3, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM

board/LaCie/wireless_space/kwbimage.cfg new file +72 -0
+# bit30-28: 3 required
+# bit31:    0=no additional STARTBURST delay
+
+DATA 0xFFD01408 0x11012228   # DDR Timing (Low) (active cycles value
+1)
+# bit7-4:   TRCD
+# bit11- 8: TRP
+# bit15-12: TWR
+# bit19-16: TWTR
+# bit20:    TRAS msb
+# bit23-21: 0x0
+# bit27-24: TRRD
+# bit31-28: TRTP
+
+DATA 0xFFD0140C 0x00000A19   #  DDR Timing (High)
+# bit6-0:   TRFC
+# bit8-7:   TR2R
+# bit10-9:  TR2W
+# bit12-11: TW2W
+# bit31-13: zero required
+
+DATA 0xFFD01410 0x0000CCCC   #  DDR Address Control
+# bit1-0:   00, Cs0width=x8
+# bit3-2:   11, Cs0size=1Gb
+# bit5-4:   00, Cs2width=x8
+# bit7-6:   00, Cs1size=1Gb
+# bit9-8:   00, Cs2width=x8
+# bit11-10: 00, Cs2size=1Gb
+# bit13-12: 00, Cs3width=x8
+# bit15-14: 00, Cs3size=1Gb
+# bit16:    0,  Cs0AddrSel
+# bit17:    0,  Cs1AddrSel
+# bit18:    0,  Cs2AddrSel
+# bit19:    0,  Cs3AddrSel
+# bit31-20: 0 required
+
+DATA 0xFFD01414 0x00000000   #  DDR Open Pages Control
+# bit0:    0,  OpenPage enabled
+# bit31-1: 0 required
+
+DATA 0xFFD01418 0x00000000   #  DDR Operation
+# bit3-0:   0x0, DDR cmd
+# bit31-4:  0 required
+
+DATA 0xFFD0141C 0x00000632   #  DDR Mode
+# bit2-0:   2, BurstLen=2 required
+# bit3:     0, BurstType=0 required
+# bit6-4:   4, CL=5
+# bit7:     0, TestMode=0 normal
+# bit8:     0, DLL reset=0 normal
+# bit11-9:  6, auto-precharge write recovery ????????????
+# bit12:    0, PD must be zero
+# bit31-13: 0 required
+
+DATA 0xFFD01420 0x00000004   #  DDR Extended Mode
+# bit0:    0,  DDR DLL enabled
+# bit1:    1,  DDR drive strenght reduced
+# bit2:    1,  DDR ODT control lsd enabled
+# bit5-3:  000, required
+# bit6:    1,  DDR ODT control msb, enabled
+# bit9-7:  000, required
+# bit10:   0,  differential DQS enabled
+# bit11:   0, required
+# bit12:   0, DDR output buffer enabled
+# bit31-13: 0 required
+
+DATA 0xFFD01424 0x0000F07F   #  DDR Controller Control High
+# bit2-0:  111, required
+# bit3  :  1  , MBUS Burst Chop disabled
+# bit6-4:  111, required
+# bit7  :  1  , D2P Latency enabled
+# bit8  :  1  , add writepath sample stage, must be 1 for DDR freq >=

300MHz

board/LaCie/wireless_space/kwbimage.cfg new file +44 -0
+# bit9  :  0  , no half clock cycle addition to dataout
+# bit10 :  0  , 1/4 clock cycle skew enabled for addr/ctl signals
+# bit11 :  0  , 1/4 clock cycle skew disabled for write mesh
+# bit15-12: 1111 required
+# bit31-16: 0    required
+
+DATA 0xFFD01428 0x00085520   # DDR2 ODT Read Timing (default values)
+# bit3-0:   0000, required
+# bit7-4:   0010, 2 cycle from read command to M_ODT high
+# bit11-8:  0101, 5 cycles from read command to M_ODT low
+# bit15-12: 0101, 5 cycles from read command to internal ODT high
+# bit19-16: 1000, 8 cycles from read command to internal ODT low
+# bit31-20: 0..0, required
+
+DATA 0xFFD0147C 0x00008552   # DDR2 ODT Write Timing (default values)
+# bit3-0:   0010, 2 cycle from write command to M_ODT high
+# bit7-4:   0101, 5 cycles write read command to M_ODT low
+# bit11-8:  0101, 5 cycles write read command to internal ODT high
+# bit15-12: 1000, 8 cycles write read command to internal ODT low
+# bit31-16: 0..0, required
+
+DATA 0xFFD01500 0x00000000   # CS[0]n Base address to 0x0
+DATA 0xFFD01504 0x0FFFFFF1   # CS[0]n Size
+# bit0:    1,  Window enabled
+# bit1:    0,  Write Protect disabled
+# bit3-2:  00, CS0 hit selected
+# bit23-4: ones, required
+# bit31-24: 0x07, Size (i.e. 128MB)
+
+DATA 0xFFD0150C 0x00000000   # CS[1]n Size, window disabled
+DATA 0xFFD01514 0x00000000   # CS[2]n Size, window disabled
+DATA 0xFFD0151C 0x00000000   # CS[3]n Size, window disabled
+
+DATA 0xFFD01494 0x00010000   #  DDR ODT Control (Low)
+# bit3-0:  1, ODT0Rd, MODT[0] asserted during read from DRAM CS0
+# bit19-16:1, ODT0Wr, MODT[0] asserted during write to DRAM CS0
+
+DATA 0xFFD01498 0x00000000   #  DDR ODT Control (High)
+# bit1-0:  00, ODT0 controlled by ODT Control (low) register above
+# bit3-2:  01, ODT1 active NEVER!
+# bit31-4: zero, required
+
+DATA 0xFFD0149C 0x0000E40F   # CPU ODT Control
+# bit3-0:  1, ODT0Rd, Internal ODT asserted during read from DRAM

bank0
+# bit7-4: 1, ODT0Wr, Internal ODT asserted during write to DRAM bank0

board/LaCie/wireless_space/kwbimage.cfg new file +20 -0
+# bit11-10:1, DQ_ODTSel. ODT select turned on
+
+DATA 0xFFD01480 0x00000001   # DDR Initialization Control
+#bit0=1, enable DDR init upon this register write
+
+0xFFD10000 0x01111111                # MPP control 0 register
+0xFFD10004 0x00003311                # MPP control 1 register
+0xFFD10008 0x33331100                # MPP control 2 register
+0xFFD1000C 0x33333333                # MPP control 3 register
+0xFFD10010 0x33330000                # MPP control 4 register
+0xFFD10014 0x00000000                # MPP control 5 register
+0xFFD10018 0x00000000                # MPP control 6 register
+
+0xFFD10104 0xFF006808                # GPIO LO OE
+0xFFD10100 0x00000000                # GPIO LO EN
+0xFFD10144 0x0000F989                # GPIO HI OE
+0xFFD10140 0x00000000                # GPIO HI EN
+
+# End of Header extension
+DATA 0x0 0x0
board/LaCie/wireless_space/wireless_space.c new file +110 -0
new file mode 100644
index 0000000..930d19f
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2011 Simon Guinot <[email protected]>
+ *
+ * Based on Kirkwood support:
+ * (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.
+ */
+
+#include <common.h>
+#include <command.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/kirkwood.h>
+#include <asm/arch/mpp.h>
+#include <asm/arch/gpio.h>
+
+#include "../common/common.h"
+#include "netdev.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* GPIO configuration */
+
+#define WIRELESS_SPACE_OE_LOW                0xFF006808
+#define WIRELESS_SPACE_OE_HIGH               0x0000F989
+#define WIRELESS_SPACE_OE_VAL_LOW    0x00000000
+#define WIRELESS_SPACE_OE_VAL_HIGH   0x00000000
+
+#define WIRELESS_SPACE_GPIO_BUTTON         43
+
+const 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,               /* Fan speed (bit 1) */
+     MPP8_TW_SDA,
+     MPP9_TW_SCK,
+     MPP10_UART0_TXD,
+     MPP11_UART0_RXD,
+     MPP13_GPIO,             /* Red led */
+     MPP14_GPIO,             /* USB fuse */
+     MPP15_SATA0_ACTn,
+     MPP16_GPIO,             /* SATA 0 power */
+     MPP17_GPIO,             /* SATA 1 power */
+     MPP18_NF_IO0,
+     MPP19_NF_IO1,
+     MPP20_GE1_0,            /* Gigabit Ethernet 1 */
+     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,             /* Fan speed (bit 2) */
+     MPP37_GPIO,             /* Fan speed (bit 0) */
+     MPP38_GPIO,             /* Fan power */
+     MPP39_GPIO,             /* Fan rotation fail */
+     MPP40_GPIO,             /* Ethernet switch link */
+     MPP41_GPIO,             /* USB enable host vbus */
+     MPP42_GPIO,             /* LED clock control */
+     MPP43_GPIO,             /* WPS button (0=Pushed, 1=Released) */
+     MPP44_GPIO,             /* Red LED on/off */
+     MPP45_GPIO,             /* Red LED timer blink (on=off=100ms) */
+     MPP46_GPIO,             /* Green LED on/off */
+     MPP47_GPIO,             /* LED (blue, green) SATA activity blink */
+     MPP48_GPIO,             /* Blue LED on/off */
+     0
+};
+
+struct mv88e61xx_config swcfg = {
+     .name = "egiga0",
+     .vlancfg = MV88E61XX_VLANCFG_SWITCH,
+     .rgmii_delay = MV88E61XX_RGMII_DELAY_EN,
+     .led_init = MV88E61XX_LED_INIT_DIS,
+     .mdip = MV88E61XX_MDIP_NOCHANGE,
+     .portstate = MV88E61XX_PORTSTT_FORWARDING,
+     .cpuport = 0x30,
+     .ports_enabled = 0x37,
+};
+
+int board_early_init_f(void)
+{
+     /* Gpio configuration */
+     kw_config_gpio(WIRELESS_SPACE_OE_VAL_LOW,

WIRELESS_SPACE_OE_VAL_HIGH,

board/LaCie/wireless_space/wireless_space.c new file +48 -0
+                     WIRELESS_SPACE_OE_LOW, WIRELESS_SPACE_OE_HIGH);
+
+     /* Multi-Purpose Pins Functionality configuration */
+     kirkwood_mpp_conf(kwmpp_config, NULL);
+
+     return 0;
+}
+
+int board_init(void)
+{
+     /* Machine number */
+     gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
+
+     /* Boot parameters address */
+     gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
+
+     return 0;
+}
+
+#if defined(CONFIG_MISC_INIT_R)
+int misc_init_r(void)
+{
+#if defined(CONFIG_CMD_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR)
+     if (!getenv("ethaddr")) {
+             uchar mac[6];
+             if (lacie_read_mac_address(mac) == 0)
+                     eth_setenv_enetaddr("ethaddr", mac);
+     }
+#endif
+     return 0;
+}
+#endif
+
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
+/* Configure and initialize PHY */
+void reset_phy(void)
+{
+     /* configure true PHY on egiga1 */
+     mv_phy_88e1116_init("egiga1", CONFIG_EGIGA1_PHY);
+     /* configure switch on egiga0 */
+     mv88e61xx_switch_initialize(&swcfg);
+}
+#endif
+
+#if defined(CONFIG_KIRKWOOD_GPIO)
+/* Return GPIO button status */
+static int
+do_read_button(cmd_tbl_t *cmdtp, int flag, int argc, char * const

argv[])

board/LaCie/wireless_space/wireless_space.c new file +7 -0
+{
+     return kw_gpio_get_value(WIRELESS_SPACE_GPIO_BUTTON);
+}
+
+U_BOOT_CMD(button, 1, 1, do_read_button,
+        "Return GPIO button status 0=off 1=on", "");
+#endif
boards.cfg +0 -0
index 25c53d4..b91cdd9 100644
@@ -168,6 +168,7 @@ netspace_lite_v2             arm         arm926ejs

netspace_v2 LaCie

 netspace_max_v2              arm         arm926ejs   netspace_v2
LaCie          kirkwood       lacie_kw:NETSPACE_MAX_V2
 netspace_mini_v2             arm         arm926ejs   netspace_v2
LaCie          kirkwood       lacie_kw:NETSPACE_MINI_V2
 netspace_v2                  arm         arm926ejs   netspace_v2
LaCie          kirkwood       lacie_kw:NETSPACE_V2
+wireless_space               arm         arm926ejs   wireless_space

LaCie kirkwood
dreamplug arm arm926ejs -
Marvell kirkwood
guruplug arm arm926ejs -
Marvell kirkwood
mv88f6281gtw_ge arm arm926ejs -
Marvell kirkwood

include/configs/wireless_space.h new file +27 -0
new file mode 100644
index 0000000..02a8c30
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2011 Albert ARIBAUD <[email protected]>
+ *
+ * Based on the netspace_v2 code which is
+ * Copyright (C) 2011 Simon Guinot <[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.
+ */
+
+#ifndef _CONFIG_WIRELESS_SPACE_H
+#define _CONFIG_WIRELESS_SPACE_H
+
+/*
+ * Machine number definition
+ */
+#define MACH_TYPE_WIRELESS_SPACE     2500 /* is missing in mach-types.h

*/

include/configs/wireless_space.h new file +37 -0
+#define CONFIG_MACH_TYPE             MACH_TYPE_WIRELESS_SPACE
+#define CONFIG_IDENT_STRING          " Wireless Space"
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CONFIG_FEROCEON_88FR131              /* CPU Core subversion */
+#define CONFIG_KIRKWOOD                      /* SoC Family Name */
+/* SoC name */
+#define CONFIG_KW88F6281
+#define CONFIG_SKIP_LOWLEVEL_INIT    /* disable board lowlevel_init */
+
+/*
+ * Commands configuration
+ */
+#define CONFIG_SYS_NO_FLASH          /* no NOR or SPI flash */
+#include <config_cmd_default.h>
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_NAND
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_USB
+
+/*
+ * Core clock definition
+ */
+#define CONFIG_SYS_TCLK                      166000000 /* 166MHz */
+
+/*
+ * SDRAM configuration
+ */
+#define CONFIG_NR_DRAM_BANKS         1
+
+/*
+ * Different SDRAM configuration and size for some of the boards

derived
+ * from the Network Space v2
+ */

include/configs/wireless_space.h new file +21 -0
+
+/*
+ * mv-common.h should be defined after CMD configs since it used them
+ * to enable certain macros
+ */
+#include "mv-common.h"
+
+/* Remove or override few declarations from mv-common.h */
+#undef CONFIG_RBTREE
+#undef CONFIG_SYS_IDE_MAXBUS
+#undef CONFIG_SYS_IDE_MAXDEVICE
+#define CONFIG_SYS_IDE_MAXBUS           1
+#define CONFIG_SYS_IDE_MAXDEVICE        1
+#undef CONFIG_SYS_PROMPT
+#define CONFIG_SYS_PROMPT            "ws> "
+
+/*
+ * Ethernet Driver configuration
+ */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_MISC_INIT_R /* misc_init_r() initializes MAC address

*/

include/configs/wireless_space.h new file +3 -0
+#define CONFIG_MVGBE_PORTS   {1, 1}   /* enable both ports */
+#define CONFIG_EGIGA1_PHY    0x6      /* egiga1 has a true PHY */
+#define CONFIG_MVGBE_PHY_ADRS {0xa, 0x6} /* egiga0 has a ('false')

PHY */

include/configs/wireless_space.h new file +27 -0
+#define CONFIG_MII
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
+#define CONFIG_NETCONSOLE
+#define CONFIG_MV88E61XX_SWITCH
+#endif /* CONFIG_CMD_NET */
+
+/*
+ * SATA Driver configuration
+ */
+#ifdef CONFIG_MVSATA_IDE
+#define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
+#endif /* CONFIG_MVSATA_IDE */
+
+/*
+ * Enable GPI0 support
+ */
+#define CONFIG_KIRKWOOD_GPIO
+
+/*
+ * Enable I2C support
+ */
+#ifdef CONFIG_CMD_I2C
+/* I2C EEPROM HT24LC04 (512B - 32 pages of 16 Bytes) */
+#define CONFIG_CMD_EEPROM
+#define CONFIG_SYS_I2C_EEPROM_ADDR           0x50
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS    4 /* 16-byte page size */
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN               1 /* 8-bit device

address */

include/configs/wireless_space.h new file +57 -0
+#endif /* CONFIG_CMD_I2C */
+
+/*
+ * Partition support
+ */
+#define CONFIG_DOS_PARTITION
+#define CONFIG_EFI_PARTITION
+
+/*
+ * File systems support
+ */
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+
+/*
+ * Use the HUSH parser
+ */
+#define CONFIG_SYS_HUSH_PARSER
+
+/*
+ * Console configuration
+ */
+#define CONFIG_CONSOLE_MUX
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+
+/*
+ * Enable device tree support
+ */
+#define CONFIG_OF_LIBFDT
+
+/*
+ * Environment variables configurations
+ */
+
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE         0x10000 /* 64KB */
+#define CONFIG_ENV_SIZE                      0x1000  /* 4KB */
+#define CONFIG_ENV_ADDR                      0x70000
+#define CONFIG_ENV_OFFSET            0x70000 /* env starts here */
+
+/*
+ * Default environment variables
+ */
+#define CONFIG_BOOTARGS "console=ttyS0,115200"
+
+#define CONFIG_BOOTCOMMAND                                   \
+     "dhcp && run netconsole; "                              \
+     "if run usbload || run diskload; then bootm; fi"
+
+#define CONFIG_EXTRA_ENV_SETTINGS                            \
+     "stdin=serial\0"                                        \
+     "stdout=serial\0"                                       \
+     "stderr=serial\0"                                       \
+     "bootfile=uImage\0"                                     \
+     "loadaddr=0x800000\0"                                   \
+     "autoload=no\0"                                         \
+     "netconsole="                                           \

include/configs/wireless_space.h

Quoted 10 lines
include/configs/wireless_space.h new file +9 -1
+             "set stdin $stdin,nc; "                         \
+             "set stdout $stdout,nc; "                       \
+             "set stderr $stderr,nc;\0"                      \
+     "diskload=ide reset && "                                \
+             "ext2load ide 0:1 $loadaddr /boot/$bootfile\0"  \
+     "usbload=usb start && "                                 \
+             "fatload usb 0:1 $loadaddr /boot/$bootfile\0"
+
+#endif /* _CONFIG_WIRELESS_SPACE_H */
--

Looks okay to me.

Quoted 2 lines
Acked-by Prafulla Wadaskar <[email protected]>

Will pull entire patch series in next week.

Hi Prafulla,

I hope you haven't pulled the series yet; there are many fixes I had to do since it went out, and I intend to make a patch v5 with these fixes.

Quoted 2 lines

Regards...
Prafulla . . .

Amicalement,

Signature · 1 line
Albert.
#23 lore raw

PATCH v4 4/4 ARM: lacie_kw: add support for WIRELESS_SPACE

Quoted 741 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: 25 November 2012 08:51
To: Prafulla Wadaskar
Cc: U-Boot; Simon Guinot
Subject: Re: [PATCH v4 4/4] ARM: lacie_kw: add support for WIRELESS_SPACE

Hi Prafulla,

Quoted 8 lines · Prafulla Wadaskar
Quoted 8 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: 05 November 2012 05:02
To: U-Boot
Cc: Prafulla Wadaskar; Simon Guinot; Albert ARIBAUD
Subject: [PATCH v4 4/4] ARM: lacie_kw: add support for

WIRELESS_SPACE

Quoted 48 lines
Quoted 48 lines
Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v4:
- switched from netspace_V2-based to standalone board
- added support for mv88e61xx switch
- corrected some kwbimage.cfg values

Changes in v3:
- fix broken support for NETSPACE_(MINI|LITE)_V2

Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

 board/LaCie/wireless_space/Makefile         |   46 +++++++
 board/LaCie/wireless_space/kwbimage.cfg     |  190
+++++++++++++++++++++++++++
 board/LaCie/wireless_space/wireless_space.c |  165
+++++++++++++++++++++++
 boards.cfg                                  |    1 +
 include/configs/wireless_space.h            |  183
++++++++++++++++++++++++++
 5 files changed, 585 insertions(+)
 create mode 100644 board/LaCie/wireless_space/Makefile
 create mode 100644 board/LaCie/wireless_space/kwbimage.cfg
 create mode 100644 board/LaCie/wireless_space/wireless_space.c
 create mode 100644 include/configs/wireless_space.h
board/LaCie/wireless_space/Makefile new file +11 -0
new file mode 100644
index 0000000..b43c3d3
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011 Simon Guinot <[email protected]>
+#
+# Based on Kirkwood support:
+# (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.
+#
Quoted 8 lines

board/LaCie/wireless_space/Makefile

Quoted 8 lines
board/LaCie/wireless_space/Makefile new file +8 -0
+# 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

Quoted 12 lines
Quoted 12 lines
board/LaCie/wireless_space/Makefile new file +12 -0
+# GNU General Public License for more details.
+#
+
+include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
+
+LIB  = $(obj)lib$(BOARD).o
+
+COBJS        := $(BOARD).o ../common/common.o
+
Quoted 8 lines

board/LaCie/wireless_space/Makefile line 38

Quoted 8 lines
board/LaCie/wireless_space/Makefile new file +7 -0
+SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS := $(addprefix $(obj),$(COBJS))
+SOBJS        := $(addprefix $(obj),$(SOBJS))
+
+$(LIB):      $(obj).depend $(OBJS) $(SOBJS)
+     $(call cmd_link_o_target, $(OBJS) $(SOBJS))
+

+#####################################################################

Quoted 8 lines

board/LaCie/wireless_space/Makefile line 45

Quoted 8 lines

####

board/LaCie/wireless_space/Makefile new file +6 -0
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+

+#####################################################################

Quoted 25 lines
Quoted 25 lines

####

board/LaCie/wireless_space/kwbimage.cfg new file +17 -0
new file mode 100644
index 0000000..a5b200f
@@ -0,0 +1,190 @@
+#
+# Copyright (C) 2012 Albert ARIBAUD <[email protected]>
+#
+# Based on netspace_v2 kwbimage.cfg:
+# Copyright (C) 2011 Simon Guinot <[email protected]>
+#
+# Based on Kirkwood support:
+# (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
Quoted 8 lines

board/LaCie/wireless_space/kwbimage.cfg line 25

Quoted 8 lines
board/LaCie/wireless_space/kwbimage.cfg new file +8 -0
+# 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.
+#
+# Refer docs/README.kwimage for more details about how-to

configure

Quoted 16 lines
Quoted 16 lines
board/LaCie/wireless_space/kwbimage.cfg new file +16 -0
+# and create kirkwood boot image
+#
+
+# Boot Media configurations
+BOOT_FROM    nand    # Boot from NAND flash
+
+# SOC registers configuration using bootrom header extension
+# Maximum KWBIMAGE_MAX_CONFIG configurations allowed
+
+# Configure RGMII-0 interface pad voltage to 1.8V
+DATA 0xFFD100e0 0x1B1B1B9B
+
+#Dram initalization for SINGLE x16 CL=5 @ 400MHz
+DATA 0xFFD01400 0x43000618   # DDR Configuration register
+# bit13-0:  0xa00 (2560 DDR2 clks refresh rate)
+# bit23-14: zero
Quoted 8 lines

board/LaCie/wireless_space/kwbimage.cfg

Quoted 8 lines
board/LaCie/wireless_space/kwbimage.cfg new file +8 -0
+# bit24: 1= enable exit self refresh mode on DDR access
+# bit25: 1 required
+# bit29-26: zero
+# bit31-30: 01
+
+DATA 0xFFD01404 0x35143000   # DDR Controller Control Low
+# bit 4:    0=addr/cmd in smame cycle
+# bit 5:    0=clk is driven during self refresh, we don't care

for

Quoted 5 lines

board/LaCie/wireless_space/kwbimage.cfg

Quoted 5 lines

APX

board/LaCie/wireless_space/kwbimage.cfg new file +4 -0
+# bit 6:    0=use recommended falling edge of clk for addr/cmd
+# bit14:    0=input buffer always powered up
+# bit18:    1=cpu lock transaction enabled
+# bit23-20: 5=recommended value for CL=5 and STARTBURST_DEL

disabled

Quoted 7 lines

board/LaCie/wireless_space/kwbimage.cfg

Quoted 7 lines

bit31=0
+# bit27-24: 8= CL+3, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM

board/LaCie/wireless_space/kwbimage.cfg new file +4 -0
+# bit30-28: 3 required
+# bit31:    0=no additional STARTBURST delay
+
+DATA 0xFFD01408 0x11012228   # DDR Timing (Low) (active cycles

value

Quoted 60 lines
Quoted 60 lines

+1)

board/LaCie/wireless_space/kwbimage.cfg new file +59 -0
+# bit7-4:   TRCD
+# bit11- 8: TRP
+# bit15-12: TWR
+# bit19-16: TWTR
+# bit20:    TRAS msb
+# bit23-21: 0x0
+# bit27-24: TRRD
+# bit31-28: TRTP
+
+DATA 0xFFD0140C 0x00000A19   #  DDR Timing (High)
+# bit6-0:   TRFC
+# bit8-7:   TR2R
+# bit10-9:  TR2W
+# bit12-11: TW2W
+# bit31-13: zero required
+
+DATA 0xFFD01410 0x0000CCCC   #  DDR Address Control
+# bit1-0:   00, Cs0width=x8
+# bit3-2:   11, Cs0size=1Gb
+# bit5-4:   00, Cs2width=x8
+# bit7-6:   00, Cs1size=1Gb
+# bit9-8:   00, Cs2width=x8
+# bit11-10: 00, Cs2size=1Gb
+# bit13-12: 00, Cs3width=x8
+# bit15-14: 00, Cs3size=1Gb
+# bit16:    0,  Cs0AddrSel
+# bit17:    0,  Cs1AddrSel
+# bit18:    0,  Cs2AddrSel
+# bit19:    0,  Cs3AddrSel
+# bit31-20: 0 required
+
+DATA 0xFFD01414 0x00000000   #  DDR Open Pages Control
+# bit0:    0,  OpenPage enabled
+# bit31-1: 0 required
+
+DATA 0xFFD01418 0x00000000   #  DDR Operation
+# bit3-0:   0x0, DDR cmd
+# bit31-4:  0 required
+
+DATA 0xFFD0141C 0x00000632   #  DDR Mode
+# bit2-0:   2, BurstLen=2 required
+# bit3:     0, BurstType=0 required
+# bit6-4:   4, CL=5
+# bit7:     0, TestMode=0 normal
+# bit8:     0, DLL reset=0 normal
+# bit11-9:  6, auto-precharge write recovery ????????????
+# bit12:    0, PD must be zero
+# bit31-13: 0 required
+
+DATA 0xFFD01420 0x00000004   #  DDR Extended Mode
+# bit0:    0,  DDR DLL enabled
+# bit1:    1,  DDR drive strenght reduced
+# bit2:    1,  DDR ODT control lsd enabled
+# bit5-3:  000, required
+# bit6:    1,  DDR ODT control msb, enabled
+# bit9-7:  000, required
+# bit10:   0,  differential DQS enabled
+# bit11:   0, required
+# bit12:   0, DDR output buffer enabled
Quoted 8 lines

board/LaCie/wireless_space/kwbimage.cfg

Quoted 8 lines
board/LaCie/wireless_space/kwbimage.cfg new file +8 -0
+# bit31-13: 0 required
+
+DATA 0xFFD01424 0x0000F07F   #  DDR Controller Control High
+# bit2-0:  111, required
+# bit3  :  1  , MBUS Burst Chop disabled
+# bit6-4:  111, required
+# bit7  :  1  , D2P Latency enabled
+# bit8  :  1  , add writepath sample stage, must be 1 for DDR

freq >=

Quoted 8 lines

board/LaCie/wireless_space/kwbimage.cfg

Quoted 8 lines

300MHz

board/LaCie/wireless_space/kwbimage.cfg new file +7 -0
+# bit9  :  0  , no half clock cycle addition to dataout
+# bit10 :  0  , 1/4 clock cycle skew enabled for addr/ctl signals
+# bit11 :  0  , 1/4 clock cycle skew disabled for write mesh
+# bit15-12: 1111 required
+# bit31-16: 0    required
+
+DATA 0xFFD01428 0x00085520   # DDR2 ODT Read Timing (default

values)

Quoted 8 lines

board/LaCie/wireless_space/kwbimage.cfg

Quoted 8 lines
board/LaCie/wireless_space/kwbimage.cfg new file +8 -0
+# bit3-0:   0000, required
+# bit7-4:   0010, 2 cycle from read command to M_ODT high
+# bit11-8:  0101, 5 cycles from read command to M_ODT low
+# bit15-12: 0101, 5 cycles from read command to internal ODT high
+# bit19-16: 1000, 8 cycles from read command to internal ODT low
+# bit31-20: 0..0, required
+
+DATA 0xFFD0147C 0x00008552   # DDR2 ODT Write Timing (default

values)

Quoted 3 lines

board/LaCie/wireless_space/kwbimage.cfg

Quoted 3 lines
board/LaCie/wireless_space/kwbimage.cfg new file +3 -0
+# bit3-0:   0010, 2 cycle from write command to M_ODT high
+# bit7-4:   0101, 5 cycles write read command to M_ODT low
+# bit11-8:  0101, 5 cycles write read command to internal ODT

high

Quoted 13 lines
Quoted 13 lines
board/LaCie/wireless_space/kwbimage.cfg new file +13 -0
+# bit15-12: 1000, 8 cycles write read command to internal ODT low
+# bit31-16: 0..0, required
+
+DATA 0xFFD01500 0x00000000   # CS[0]n Base address to 0x0
+DATA 0xFFD01504 0x0FFFFFF1   # CS[0]n Size
+# bit0:    1,  Window enabled
+# bit1:    0,  Write Protect disabled
+# bit3-2:  00, CS0 hit selected
+# bit23-4: ones, required
+# bit31-24: 0x07, Size (i.e. 128MB)
+
+DATA 0xFFD0150C 0x00000000   # CS[1]n Size, window disabled
+DATA 0xFFD01514 0x00000000   # CS[2]n Size, window disabled
Quoted 8 lines

board/LaCie/wireless_space/kwbimage.cfg

Quoted 8 lines
board/LaCie/wireless_space/kwbimage.cfg new file +8 -0
+DATA 0xFFD0151C 0x00000000   # CS[3]n Size, window disabled
+
+DATA 0xFFD01494 0x00010000   #  DDR ODT Control (Low)
+# bit3-0:  1, ODT0Rd, MODT[0] asserted during read from DRAM CS0
+# bit19-16:1, ODT0Wr, MODT[0] asserted during write to DRAM CS0
+
+DATA 0xFFD01498 0x00000000   #  DDR ODT Control (High)
+# bit1-0:  00, ODT0 controlled by ODT Control (low) register

above

Quoted 44 lines
Quoted 44 lines
board/LaCie/wireless_space/kwbimage.cfg new file +5 -0
+# bit3-2:  01, ODT1 active NEVER!
+# bit31-4: zero, required
+
+DATA 0xFFD0149C 0x0000E40F   # CPU ODT Control
+# bit3-0:  1, ODT0Rd, Internal ODT asserted during read from DRAM

bank0
+# bit7-4: 1, ODT0Wr, Internal ODT asserted during write to DRAM bank0

board/LaCie/wireless_space/kwbimage.cfg new file +20 -0
+# bit11-10:1, DQ_ODTSel. ODT select turned on
+
+DATA 0xFFD01480 0x00000001   # DDR Initialization Control
+#bit0=1, enable DDR init upon this register write
+
+0xFFD10000 0x01111111                # MPP control 0 register
+0xFFD10004 0x00003311                # MPP control 1 register
+0xFFD10008 0x33331100                # MPP control 2 register
+0xFFD1000C 0x33333333                # MPP control 3 register
+0xFFD10010 0x33330000                # MPP control 4 register
+0xFFD10014 0x00000000                # MPP control 5 register
+0xFFD10018 0x00000000                # MPP control 6 register
+
+0xFFD10104 0xFF006808                # GPIO LO OE
+0xFFD10100 0x00000000                # GPIO LO EN
+0xFFD10144 0x0000F989                # GPIO HI OE
+0xFFD10140 0x00000000                # GPIO HI EN
+
+# End of Header extension
+DATA 0x0 0x0
board/LaCie/wireless_space/wireless_space.c new file +9 -0
new file mode 100644
index 0000000..930d19f
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2011 Simon Guinot <[email protected]>
+ *
+ * Based on Kirkwood support:
+ * (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
Quoted 8 lines

board/LaCie/wireless_space/wireless_space.c

Quoted 8 lines
board/LaCie/wireless_space/wireless_space.c new file +8 -0
+ * 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,

Quoted 62 lines
Quoted 62 lines
board/LaCie/wireless_space/wireless_space.c new file +62 -0
+ * 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.
+ */
+
+#include <common.h>
+#include <command.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/kirkwood.h>
+#include <asm/arch/mpp.h>
+#include <asm/arch/gpio.h>
+
+#include "../common/common.h"
+#include "netdev.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+/* GPIO configuration */
+
+#define WIRELESS_SPACE_OE_LOW                0xFF006808
+#define WIRELESS_SPACE_OE_HIGH               0x0000F989
+#define WIRELESS_SPACE_OE_VAL_LOW    0x00000000
+#define WIRELESS_SPACE_OE_VAL_HIGH   0x00000000
+
+#define WIRELESS_SPACE_GPIO_BUTTON         43
+
+const 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,               /* Fan speed (bit 1) */
+     MPP8_TW_SDA,
+     MPP9_TW_SCK,
+     MPP10_UART0_TXD,
+     MPP11_UART0_RXD,
+     MPP13_GPIO,             /* Red led */
+     MPP14_GPIO,             /* USB fuse */
+     MPP15_SATA0_ACTn,
+     MPP16_GPIO,             /* SATA 0 power */
+     MPP17_GPIO,             /* SATA 1 power */
+     MPP18_NF_IO0,
+     MPP19_NF_IO1,
+     MPP20_GE1_0,            /* Gigabit Ethernet 1 */
+     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,
Quoted 8 lines

board/LaCie/wireless_space/wireless_space.c

Quoted 8 lines
board/LaCie/wireless_space/wireless_space.c new file +8 -0
+     MPP36_GPIO,             /* Fan speed (bit 2) */
+     MPP37_GPIO,             /* Fan speed (bit 0) */
+     MPP38_GPIO,             /* Fan power */
+     MPP39_GPIO,             /* Fan rotation fail */
+     MPP40_GPIO,             /* Ethernet switch link */
+     MPP41_GPIO,             /* USB enable host vbus */
+     MPP42_GPIO,             /* LED clock control */
+     MPP43_GPIO,             /* WPS button (0=Pushed, 1=Released)

*/

Quoted 2 lines

board/LaCie/wireless_space/wireless_space.c line 89

Quoted 2 lines
board/LaCie/wireless_space/wireless_space.c new file +2 -0
+     MPP44_GPIO,             /* Red LED on/off */
+     MPP45_GPIO,             /* Red LED timer blink

(on=off=100ms) */

Quoted 2 lines

board/LaCie/wireless_space/wireless_space.c line 91

Quoted 2 lines
board/LaCie/wireless_space/wireless_space.c new file +2 -0
+     MPP46_GPIO,             /* Green LED on/off */
+     MPP47_GPIO,             /* LED (blue, green) SATA activity

blink */

Quoted 13 lines
Quoted 13 lines
board/LaCie/wireless_space/wireless_space.c new file +13 -0
+     MPP48_GPIO,             /* Blue LED on/off */
+     0
+};
+
+struct mv88e61xx_config swcfg = {
+     .name = "egiga0",
+     .vlancfg = MV88E61XX_VLANCFG_SWITCH,
+     .rgmii_delay = MV88E61XX_RGMII_DELAY_EN,
+     .led_init = MV88E61XX_LED_INIT_DIS,
+     .mdip = MV88E61XX_MDIP_NOCHANGE,
+     .portstate = MV88E61XX_PORTSTT_FORWARDING,
+     .cpuport = 0x30,
+     .ports_enabled = 0x37,
Quoted 8 lines
Quoted 8 lines
board/LaCie/wireless_space/wireless_space.c new file +6 -0
+};
+
+int board_early_init_f(void)
+{
+     /* Gpio configuration */
+     kw_config_gpio(WIRELESS_SPACE_OE_VAL_LOW,

WIRELESS_SPACE_OE_VAL_HIGH,
+ WIRELESS_SPACE_OE_LOW,

WIRELESS_SPACE_OE_HIGH);

Quoted 14 lines
Quoted 14 lines
board/LaCie/wireless_space/wireless_space.c new file +14 -0
+
+     /* Multi-Purpose Pins Functionality configuration */
+     kirkwood_mpp_conf(kwmpp_config, NULL);
+
+     return 0;
+}
+
+int board_init(void)
+{
+     /* Machine number */
+     gd->bd->bi_arch_number = CONFIG_MACH_TYPE;
+
+     /* Boot parameters address */
+     gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100;
Quoted 8 lines

board/LaCie/wireless_space/wireless_space.c

Quoted 8 lines
board/LaCie/wireless_space/wireless_space.c new file +8 -0
+
+     return 0;
+}
+
+#if defined(CONFIG_MISC_INIT_R)
+int misc_init_r(void)
+{
+#if defined(CONFIG_CMD_I2C) &&

defined(CONFIG_SYS_I2C_EEPROM_ADDR)

Quoted 30 lines
Quoted 30 lines
board/LaCie/wireless_space/wireless_space.c new file +25 -0
+     if (!getenv("ethaddr")) {
+             uchar mac[6];
+             if (lacie_read_mac_address(mac) == 0)
+                     eth_setenv_enetaddr("ethaddr", mac);
+     }
+#endif
+     return 0;
+}
+#endif
+
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)
+/* Configure and initialize PHY */
+void reset_phy(void)
+{
+     /* configure true PHY on egiga1 */
+     mv_phy_88e1116_init("egiga1", CONFIG_EGIGA1_PHY);
+     /* configure switch on egiga0 */
+     mv88e61xx_switch_initialize(&swcfg);
+}
+#endif
+
+#if defined(CONFIG_KIRKWOOD_GPIO)
+/* Return GPIO button status */
+static int
+do_read_button(cmd_tbl_t *cmdtp, int flag, int argc, char * const

argv[])

board/LaCie/wireless_space/wireless_space.c new file +4 -0
+{
+     return kw_gpio_get_value(WIRELESS_SPACE_GPIO_BUTTON);
+}
+
Quoted 8 lines

boards.cfg netspace_lite_v2 arm

Quoted 8 lines
board/LaCie/wireless_space/wireless_space.c new file +3 -0
+U_BOOT_CMD(button, 1, 1, do_read_button,
+        "Return GPIO button status 0=off 1=on", "");
+#endif
boards.cfg +0 -0
index 25c53d4..b91cdd9 100644
@@ -168,6 +168,7 @@ netspace_lite_v2             arm

arm926ejs

Quoted 8 lines
Quoted 8 lines

netspace_v2 LaCie

 netspace_max_v2              arm         arm926ejs   netspace_v2
LaCie          kirkwood       lacie_kw:NETSPACE_MAX_V2
 netspace_mini_v2             arm         arm926ejs   netspace_v2
LaCie          kirkwood       lacie_kw:NETSPACE_MINI_V2
 netspace_v2                  arm         arm926ejs   netspace_v2
LaCie          kirkwood       lacie_kw:NETSPACE_V2
+wireless_space               arm         arm926ejs

wireless_space

Quoted 21 lines
Quoted 21 lines

LaCie kirkwood
dreamplug arm arm926ejs -
Marvell kirkwood
guruplug arm arm926ejs -
Marvell kirkwood
mv88f6281gtw_ge arm arm926ejs -
Marvell kirkwood

include/configs/wireless_space.h new file +7 -0
new file mode 100644
index 0000000..02a8c30
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2011 Albert ARIBAUD <[email protected]>
+ *
+ * Based on the netspace_v2 code which is
+ * Copyright (C) 2011 Simon Guinot <[email protected]>
+ *
+ * See file CREDITS for list of people who contributed to this
Quoted 8 lines

include/configs/wireless_space.h line 15

Quoted 8 lines
include/configs/wireless_space.h new file +8 -0
+ * 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,

Quoted 4 lines
Quoted 4 lines
include/configs/wireless_space.h new file +4 -0
+ * 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.
+ */
Quoted 8 lines

include/configs/wireless_space.h

Quoted 8 lines
include/configs/wireless_space.h new file +8 -0
+
+#ifndef _CONFIG_WIRELESS_SPACE_H
+#define _CONFIG_WIRELESS_SPACE_H
+
+/*
+ * Machine number definition
+ */
+#define MACH_TYPE_WIRELESS_SPACE     2500 /* is missing in mach-

types.h

Quoted 8 lines

include/configs/wireless_space.h

Quoted 8 lines

*/

include/configs/wireless_space.h new file +7 -0
+#define CONFIG_MACH_TYPE             MACH_TYPE_WIRELESS_SPACE
+#define CONFIG_IDENT_STRING          " Wireless Space"
+
+/*
+ * High Level Configuration Options (easy to change)
+ */
+#define CONFIG_FEROCEON_88FR131              /* CPU Core

subversion */

Quoted 1 line
Quoted 1 line

+#define CONFIG_KIRKWOOD /* SoC Family Name

*/

Quoted 3 lines

include/configs/wireless_space.h

Quoted 3 lines
include/configs/wireless_space.h new file +3 -0
+/* SoC name */
+#define CONFIG_KW88F6281
+#define CONFIG_SKIP_LOWLEVEL_INIT    /* disable board

lowlevel_init */

Quoted 10 lines
Quoted 10 lines
include/configs/wireless_space.h new file +10 -0
+
+/*
+ * Commands configuration
+ */
+#define CONFIG_SYS_NO_FLASH          /* no NOR or SPI flash */
+#include <config_cmd_default.h>
+#define CONFIG_CMD_ENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_NAND
Quoted 8 lines

include/configs/wireless_space.h

Quoted 8 lines
include/configs/wireless_space.h new file +8 -0
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_USB
+
+/*
+ * Core clock definition
+ */
+#define CONFIG_SYS_TCLK                      166000000 /* 166MHz

*/

Quoted 6 lines
Quoted 6 lines
include/configs/wireless_space.h new file +6 -0
+
+/*
+ * SDRAM configuration
+ */
+#define CONFIG_NR_DRAM_BANKS         1
+
Quoted 8 lines

include/configs/wireless_space.h

Quoted 8 lines

+/*
+ * Different SDRAM configuration and size for some of the boards derived
+ * from the Network Space v2
+ */

include/configs/wireless_space.h new file +3 -0
+
+/*
+ * mv-common.h should be defined after CMD configs since it used

them

Quoted 10 lines
Quoted 10 lines

+ * to enable certain macros
+ */

include/configs/wireless_space.h new file +8 -0
+#include "mv-common.h"
+
+/* Remove or override few declarations from mv-common.h */
+#undef CONFIG_RBTREE
+#undef CONFIG_SYS_IDE_MAXBUS
+#undef CONFIG_SYS_IDE_MAXDEVICE
+#define CONFIG_SYS_IDE_MAXBUS           1
+#define CONFIG_SYS_IDE_MAXDEVICE        1
Quoted 8 lines

include/configs/wireless_space.h

Quoted 8 lines
include/configs/wireless_space.h new file +8 -0
+#undef CONFIG_SYS_PROMPT
+#define CONFIG_SYS_PROMPT            "ws> "
+
+/*
+ * Ethernet Driver configuration
+ */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_MISC_INIT_R /* misc_init_r() initializes MAC

address

Quoted 4 lines

include/configs/wireless_space.h

Quoted 4 lines

*/

include/configs/wireless_space.h new file +3 -0
+#define CONFIG_MVGBE_PORTS   {1, 1}   /* enable both ports */
+#define CONFIG_EGIGA1_PHY    0x6      /* egiga1 has a true PHY */
+#define CONFIG_MVGBE_PHY_ADRS {0xa, 0x6} /* egiga0 has a

('false')

Quoted 19 lines
Quoted 19 lines

PHY */

include/configs/wireless_space.h new file +18 -0
+#define CONFIG_MII
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
+#define CONFIG_NETCONSOLE
+#define CONFIG_MV88E61XX_SWITCH
+#endif /* CONFIG_CMD_NET */
+
+/*
+ * SATA Driver configuration
+ */
+#ifdef CONFIG_MVSATA_IDE
+#define CONFIG_SYS_ATA_IDE0_OFFSET      MV_SATA_PORT0_OFFSET
+#endif /* CONFIG_MVSATA_IDE */
+
+/*
+ * Enable GPI0 support
+ */
+#define CONFIG_KIRKWOOD_GPIO
+
Quoted 8 lines

include/configs/wireless_space.h

Quoted 8 lines
include/configs/wireless_space.h new file +8 -0
+/*
+ * Enable I2C support
+ */
+#ifdef CONFIG_CMD_I2C
+/* I2C EEPROM HT24LC04 (512B - 32 pages of 16 Bytes) */
+#define CONFIG_CMD_EEPROM
+#define CONFIG_SYS_I2C_EEPROM_ADDR           0x50
+#define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS    4 /* 16-byte page

size */

Quoted 1 line
Quoted 1 line

+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 /* 8-bit

device

Quoted 32 lines
Quoted 32 lines

address */

include/configs/wireless_space.h new file +31 -0
+#endif /* CONFIG_CMD_I2C */
+
+/*
+ * Partition support
+ */
+#define CONFIG_DOS_PARTITION
+#define CONFIG_EFI_PARTITION
+
+/*
+ * File systems support
+ */
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+
+/*
+ * Use the HUSH parser
+ */
+#define CONFIG_SYS_HUSH_PARSER
+
+/*
+ * Console configuration
+ */
+#define CONFIG_CONSOLE_MUX
+#define CONFIG_SYS_CONSOLE_IS_IN_ENV
+
+/*
+ * Enable device tree support
+ */
+#define CONFIG_OF_LIBFDT
+
+/*
Quoted 8 lines

include/configs/wireless_space.h

Quoted 8 lines

+ * Environment variables configurations
+ */

include/configs/wireless_space.h new file +6 -0
+
+#define CONFIG_ENV_IS_IN_NAND
+#define CONFIG_ENV_SECT_SIZE         0x10000 /* 64KB */
+#define CONFIG_ENV_SIZE                      0x1000  /* 4KB */
+#define CONFIG_ENV_ADDR                      0x70000
+#define CONFIG_ENV_OFFSET            0x70000 /* env starts here

*/

Quoted 31 lines
Quoted 18 lines
include/configs/wireless_space.h new file +18 -0
+
+/*
+ * Default environment variables
+ */
+#define CONFIG_BOOTARGS "console=ttyS0,115200"
+
+#define CONFIG_BOOTCOMMAND                                   \
+     "dhcp && run netconsole; "                              \
+     "if run usbload || run diskload; then bootm; fi"
+
+#define CONFIG_EXTRA_ENV_SETTINGS                            \
+     "stdin=serial\0"                                        \
+     "stdout=serial\0"                                       \
+     "stderr=serial\0"                                       \
+     "bootfile=uImage\0"                                     \
+     "loadaddr=0x800000\0"                                   \
+     "autoload=no\0"                                         \
+     "netconsole="                                           \

include/configs/wireless_space.h

Quoted 10 lines
include/configs/wireless_space.h new file +9 -1
+             "set stdin $stdin,nc; "                         \
+             "set stdout $stdout,nc; "                       \
+             "set stderr $stderr,nc;\0"                      \
+     "diskload=ide reset && "                                \
+             "ext2load ide 0:1 $loadaddr /boot/$bootfile\0"  \
+     "usbload=usb start && "                                 \
+             "fatload usb 0:1 $loadaddr /boot/$bootfile\0"
+
+#endif /* _CONFIG_WIRELESS_SPACE_H */
--

Looks okay to me.

Quoted 2 lines
Acked-by Prafulla Wadaskar <[email protected]>

Will pull entire patch series in next week.

Quoted 7 lines

Hi Prafulla,

I hope you haven't pulled the series yet; there are many fixes I had to
do since it went out, and I intend to make a patch v5 with these fixes.

Hi albert

I have not pulled it yet,
You may post v5 for the same.

Regards...
Prafulla . . .

#24 lore raw

PATCH v4 3/4 kirkwood: make MPP arrays static const

In reply to Albert ARIBAUD
Quoted 9 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: 05 November 2012 05:02
To: U-Boot
Cc: Prafulla Wadaskar; Simon Guinot; Albert ARIBAUD
Subject: [PATCH v4 3/4] kirkwood: make MPP arrays static const

Quoted 5 lines

This saves stack and code memory for local copy, and consumes initialized data memory. For 22 of the 29 kirkwood-based boards, this results in a global saving of about 30 bytes. For 7 of them, it results in an increase of 6 to 14 bytes.

First of all Thanks for this patch.

Quoted 305 lines
Signed-off-by Albert ARIBAUD <[email protected]>

---

 arch/arm/cpu/arm926ejs/kirkwood/mpp.c           |    2 +-
 arch/arm/include/asm/arch-kirkwood/mpp.h        |    2 +-
 board/LaCie/net2big_v2/net2big_v2.c             |    2 +-
 board/LaCie/netspace_v2/netspace_v2.c           |    2 +-
 board/Marvell/dreamplug/dreamplug.c             |    2 +-
 board/Marvell/guruplug/guruplug.c               |    2 +-
 board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |    2 +-
 board/Marvell/openrd/openrd.c                   |    2 +-
 board/Marvell/rd6281a/rd6281a.c                 |    2 +-
 board/Marvell/sheevaplug/sheevaplug.c           |    2 +-
 board/Seagate/dockstar/dockstar.c               |    2 +-
 board/buffalo/lsxl/lsxl.c                       |    2 +-
 board/cloudengines/pogo_e02/pogo_e02.c          |    2 +-
 board/d-link/dns325/dns325.c                    |    2 +-
 board/iomega/iconnect/iconnect.c                |    2 +-
 board/karo/tk71/tk71.c                          |    2 +-
 board/keymile/km_arm/km_arm.c                   |    2 +-
 board/raidsonic/ib62x0/ib62x0.c                 |    2 +-
 drivers/spi/kirkwood_spi.c                      |   12 +++++-------
 19 files changed, 23 insertions(+), 25 deletions(-)
arch/arm/cpu/arm926ejs/kirkwood/mpp.c +1 -1
index 03eb2de..0ba6f09 100644
@@ -31,7 +31,7 @@ static u32 kirkwood_variant(void)
 #define MPP_CTRL(i)	(KW_MPP_BASE + (i* 4))
 #define MPP_NR_REGS	(1 + MPP_MAX/8)
 
-void kirkwood_mpp_conf(u32 *mpp_list, u32 *mpp_save)
+void kirkwood_mpp_conf(const u32 *mpp_list, u32 *mpp_save)
 {
 	u32 mpp_ctrl[MPP_NR_REGS];
 	unsigned int variant_mask;
arch/arm/include/asm/arch-kirkwood/mpp.h +1 -1
index 8ceea7b..48d1477 100644
@@ -312,6 +312,6 @@
 
 #define MPP_MAX			49
 
-void kirkwood_mpp_conf(u32 *mpp_list, u32 *mpp_save);
+void kirkwood_mpp_conf(const u32 *mpp_list, u32 *mpp_save);
 
 #endif
board/LaCie/net2big_v2/net2big_v2.c +1 -1
index 0e06c29..e524f35 100644
@@ -39,7 +39,7 @@ int board_early_init_f(void)
 			NET2BIG_V2_OE_LOW, NET2BIG_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/LaCie/netspace_v2/netspace_v2.c +1 -1
index 101a80a..0aa5345 100644
@@ -39,7 +39,7 @@ int board_early_init_f(void)
 			NETSPACE_V2_OE_LOW, NETSPACE_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/Marvell/dreamplug/dreamplug.c +1 -1
index d6497aa..0caf34f 100644
@@ -46,7 +46,7 @@ int board_early_init_f(void)
 			DREAMPLUG_OE_LOW, DREAMPLUG_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,		/* SPI Flash */
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/Marvell/guruplug/guruplug.c +1 -1
index f5c1c3c..3a52ab2 100644
@@ -43,7 +43,7 @@ int board_early_init_f(void)
 			GURUPLUG_OE_LOW, GURUPLUG_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c +1 -1
index 43852f6..fb57faa 100644
@@ -45,7 +45,7 @@ int board_early_init_f(void)
 			MV88F6281GTW_GE_OE_LOW, MV88F6281GTW_GE_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/Marvell/openrd/openrd.c +1 -1
index d48f05a..c59a326 100644
@@ -48,7 +48,7 @@ int board_early_init_f(void)
 			OPENRD_OE_LOW, OPENRD_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Marvell/rd6281a/rd6281a.c +1 -1
index 1fd7677..adaa6a1 100644
@@ -44,7 +44,7 @@ int board_early_init_f(void)
 			RD6281A_OE_LOW, RD6281A_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Marvell/sheevaplug/sheevaplug.c +1 -1
index 688d308..16efe64 100644
@@ -43,7 +43,7 @@ int board_early_init_f(void)
 			SHEEVAPLUG_OE_LOW, SHEEVAPLUG_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Seagate/dockstar/dockstar.c +1 -1
index fc88520..4f1f899 100644
@@ -47,7 +47,7 @@ int board_early_init_f(void)
 			DOCKSTAR_OE_LOW, DOCKSTAR_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/buffalo/lsxl/lsxl.c +1 -1
index 57776fb..f298020 100644
@@ -76,7 +76,7 @@ int board_early_init_f(void)
 	 * Multi-Purpose Pins Functionality configuration
 	 * These strappings are taken from the original vendor uboot port.
 	 */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/cloudengines/pogo_e02/pogo_e02.c +1 -1
index bac9ce5..3b1c8ec 100644
@@ -45,7 +45,7 @@ int board_early_init_f(void)
 			POGO_E02_OE_LOW, POGO_E02_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/d- renamed from board/d-link/dns325/dns325.c +0 -0

link/dns325/dns325.c
index 11260fe..4187901 100644

board/d-link/dns325/dns325.c +1 -1
@@ -44,7 +44,7 @@ int board_early_init_f(void)
 			DNS325_OE_LOW, DNS325_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/iomega/iconnect/iconnect.c +1 -1
index 6ee2128..c253df5 100644
@@ -41,7 +41,7 @@ int board_early_init_f(void)
 			ICONNECT_OE_LOW, ICONNECT_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/karo/tk71/tk71.c +1 -1
index 96410d7..7a4e7b3 100644
@@ -47,7 +47,7 @@ int board_early_init_f(void)
 			TK71_OE_LOW, TK71_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/keymile/km_arm/km_arm.c +1 -1
index 0c4dddc..5fc46e6 100644
@@ -54,7 +54,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define MASK_RBI_DEFECT_16	0x01
 
 /* Multi-Purpose Pins Functionality configuration */
-u32 kwmpp_config[] = {
+static const u32 kwmpp_config[] = {
 	MPP0_NF_IO2,
 	MPP1_NF_IO3,
 	MPP2_NF_IO4,
board/raidsonic/ib62x0/ib62x0.c +1 -1
index b7e6e41..1e89b55 100644
@@ -45,7 +45,7 @@ int board_early_init_f(void)
 	/* Set SATA activity LEDs to default off */
 	writel(MVSATAHC_LED_POLARITY_CTRL, MVSATAHC_LED_CONF_REG);
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
drivers/spi/kirkwood_spi.c +4 -1
index a7cda75..de81064 100644
@@ -41,7 +41,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
 unsigned int cs,
 {
 	struct spi_slave *slave;
 	u32 data;
-	u32 kwspi_mpp_config[] = { 0, 0 };
+	static const u32 kwspi_mpp_config[2][2] = {
+		{ MPP0_SPI_SCn, 0 }, /* if cs == 0 */
+		{ MPP7_SPI_SCn, 0 } /* if cs != 0 */
+	};
 
 	if (!spi_cs_is_valid(bus, cs))
drivers/spi/kirkwood_spi.c +1 -6
 		return NULL;

@@ -68,12 +71,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus,
 unsigned int cs,
 	writel(KWSPI_IRQMASK, &spireg->irq_mask);
 
 	/* program mpp registers to select  SPI_CSn */
-	if (cs) {
-		kwspi_mpp_config[0] = MPP7_SPI_SCn;
-	} else {
-		kwspi_mpp_config[0] = MPP0_SPI_SCn;
-	}
-	kirkwood_mpp_conf(kwspi_mpp_config, cs_spi_mpp_back);
+	kirkwood_mpp_conf(kwspi_mpp_config[cs ? 1 : 0], cs_spi_mpp_back);
 
 	return slave;
Quoted 2 lines

}
--

Acked-by Prafulla Wadaskar <[email protected]>

Regards...
Prafulla . . .

#25 lore raw

PATCH v4 2/4 mv88e61xx: refactor PHY and SWITCH level-code

In reply to Albert ARIBAUD
Quoted 560 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: 05 November 2012 05:02
To: U-Boot
Cc: Prafulla Wadaskar; Simon Guinot; Albert ARIBAUD; joe.hershberger at gmail.com
Subject: [PATCH v4 2/4] mv88e61xx: refactor PHY and SWITCH level-code

Signed-off-by Albert ARIBAUD <[email protected]>

---

 drivers/net/phy/mv88e61xx.c |  300 ++++++++++++++++++----------------
---------
 drivers/net/phy/mv88e61xx.h |   23 ++--
 include/netdev.h            |   21 ++-
 3 files changed, 155 insertions(+), 189 deletions(-)
drivers/net/phy/mv88e61xx.c +2 -1
index 483a920..2d484ff 100644
@@ -52,7 +52,8 @@ static int mv88e61xx_busychk_multic(char *name, u32
 devaddr)
      return 0;
 }
 
-static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs,
 u16 data)
+static void mv88e61xx_switch_write(char *name, u32 phy_adr,
+     u32 reg_ofs, u16 data)
 {

      u16 mii_dev_addr;
drivers/net/phy/mv88e61xx.c +2 -1
@@ -70,7 +71,8 @@ static void mv88e61xx_wr_phy(char *name, u32
 phy_adr, u32 reg_ofs, u16 data)
                                                                       15));
 }
 
-static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs,
 u16 * data)
+static void mv88e61xx_switch_read(char *name, u32 phy_adr,
+     u32 reg_ofs, u16 *data)
 {

      u16 mii_dev_addr;
drivers/net/phy/mv88e61xx.c +0 -65
@@ -90,111 +92,6 @@ static void mv88e61xx_rd_phy(char *name, u32
 phy_adr, u32 reg_ofs, u16 * data)
 }
 #endif /* CONFIG_MV88E61XX_MULTICHIP_ADRMODE */
 
-static void mv88e61xx_port_vlan_config(struct mv88e61xx_config
 *swconfig,
-                                    u32 max_prtnum, u32 ports_ofs)
-{
-     u32 prt;
-     u16 reg;
-     char *name = swconfig->name;
-     u32 cpu_port = swconfig->cpuport;
-     u32 port_mask = swconfig->ports_enabled;
-     enum mv88e61xx_cfg_vlan vlancfg = swconfig->vlancfg;
-
-     /* be sure all ports are disabled */
-     for (prt = 0; prt < max_prtnum; prt++) {
-             RD_PHY(name, ports_ofs + prt, MV88E61XX_PRT_CTRL_REG, &reg);
-             reg &= ~0x3;
-             WR_PHY(name, ports_ofs + prt, MV88E61XX_PRT_CTRL_REG, reg);
-
-             if (!(cpu_port & (1 << prt)))
-                     continue;
-             /* Set CPU port VID to 0x1 */
-             RD_PHY(name, (ports_ofs + prt), MV88E61XX_PRT_VID_REG, &reg);
-             reg &= ~0xfff;
-             reg |= 0x1;
-             WR_PHY(name, (ports_ofs + prt), MV88E61XX_PRT_VID_REG, reg);
-     }
-
-     /* Setting  Port default priority for all ports to zero */
-     for (prt = 0; prt < max_prtnum; prt++) {
-             RD_PHY(name, ports_ofs + prt, MV88E61XX_PRT_VID_REG, &reg);
-             reg &= ~0xc000;
-             WR_PHY(name, ports_ofs + prt, MV88E61XX_PRT_VID_REG, reg);
-     }
-     /* Setting VID and VID map for all ports except CPU port */
-     for (prt = 0; prt < max_prtnum; prt++) {
-             /* only for enabled ports */
-             if ((1 << prt) & port_mask) {
-                     /* skip CPU port */
-                     if ((1 << prt) & cpu_port) {
-                             /*
-                              * Set Vlan map table for cpu_port to see
-                              * all ports
-                              */
-                             RD_PHY(name, (ports_ofs + prt),
-                                    MV88E61XX_PRT_VMAP_REG, &reg);
-                             reg &= ~((1 << max_prtnum) - 1);
-                             reg |= port_mask & ~(1 << prt);
-                             WR_PHY(name, (ports_ofs + prt),
-                                    MV88E61XX_PRT_VMAP_REG, reg);
-                     } else {
-
-                             /*
-                              *  set Ports VLAN Mapping.
-                              *      port prt <--> cpu_port VLAN #prt+1.
-                              */
-                             RD_PHY(name, ports_ofs + prt,
-                                    MV88E61XX_PRT_VID_REG, &reg);
-                             reg &= ~0x0fff;
-                             reg |= (prt + 1);
-                             WR_PHY(name, ports_ofs + prt,
-                                    MV88E61XX_PRT_VID_REG, reg);
-
-                             RD_PHY(name, ports_ofs + prt,
-                                    MV88E61XX_PRT_VMAP_REG, &reg);
-                             if (vlancfg == MV88E61XX_VLANCFG_DEFAULT) {
-                                     /*
-                                      * all any port can send frames to all other

ports

drivers/net/phy/mv88e61xx.c +0 -7
-                                      * ref: sec 3.2.1.1 of datasheet
-                                      */
-                                     reg |= 0x03f;
-                                     reg &= ~(1 << prt);
-                             } else if (vlancfg == MV88E61XX_VLANCFG_ROUTER) {
-                                     /*
-                                      * all other ports can send frames to CPU port

only

drivers/net/phy/mv88e61xx.c +12 -34
-                                      * ref: sec 3.2.1.2 of datasheet
-                                      */
-                                     reg &= ~((1 << max_prtnum) - 1);
-                                     reg |= cpu_port;
-                             }
-                             WR_PHY(name, ports_ofs + prt,
-                                    MV88E61XX_PRT_VMAP_REG, reg);
-                     }
-             }
-     }
-
-     /*
-      * enable only appropriate ports to forwarding mode
-      * and disable the others
-      */
-     for (prt = 0; prt < max_prtnum; prt++) {
-             if ((1 << prt) & port_mask) {
-                     RD_PHY(name, ports_ofs + prt,
-                            MV88E61XX_PRT_CTRL_REG, &reg);
-                     reg |= 0x3;
-                     WR_PHY(name, ports_ofs + prt,
-                            MV88E61XX_PRT_CTRL_REG, reg);
-             } else {
-                     /* Disable port */
-                     RD_PHY(name, ports_ofs + prt,
-                            MV88E61XX_PRT_CTRL_REG, &reg);
-                     reg &= ~0x3;
-                     WR_PHY(name, ports_ofs + prt,
-                            MV88E61XX_PRT_CTRL_REG, reg);
-             }
-     }
-}
-
 /*
  * Make sure SMIBusy bit cleared before another
  * SMI operation can take place

@@ -204,7 +101,7 @@ static int mv88e61xx_busychk(char *name)
      u16 reg = 0;
      u32 timeout = MV88E61XX_PHY_TIMEOUT;
      do {
-             RD_PHY(name, MV88E61XX_GLB2REG_DEVADR,
+             RD_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR,
                     MV88E61XX_PHY_CMD, &reg);
              if (timeout-- == 0) {
                      printf("SMI busy timeout\n");

@@ -215,33 +112,104 @@ static int mv88e61xx_busychk(char *name)
 }
 
 /*
+ * Convenience macros for switch PORT reads
+ */
+
+#define WR_SWITCH_PORT_REG(n, p, r, d) \
+     WR_SWITCH_REG(n, (MV88E61XX_PRT_OFST+p), r, d)
+#define RD_SWITCH_PORT_REG(n, p, r, d) \
+     RD_SWITCH_REG(n, (MV88E61XX_PRT_OFST+p), r, d)
+
+/*
+ * Local functions to read/write registers on the switch PHYs.
+ * NOTE! This goes through switch, not direct miiphy, writes and

reads!
+ */

drivers/net/phy/mv88e61xx.c +22 -0
+
+static inline int mv88e61xx_switch_miiphy_write(char *name, u32 phy,
+     u32 reg, u16 data)
+{
+     /* write switch data reg then cmd reg then check completion */
+     WR_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA,
+             data);
+     WR_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_CMD,
+             (MV88E61XX_PHY_WRITE_CMD | (phy << 5)  | reg));
+     return mv88e61xx_busychk(name);
+}
+
+static inline int mv88e61xx_switch_miiphy_read(char *name, u32 phy,
+     u32 reg, u16 *data)
+{
+     /* write switch cmd reg, check for completion */
+     WR_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_CMD,
+             (MV88E61XX_PHY_READ_CMD | (phy << 5)  | reg));
+     if (mv88e61xx_busychk(name))
+             return -1;
+     /* read switch data reg and return success */
+     RD_SWITCH_REG(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA,

data);

drivers/net/phy/mv88e61xx.c +11 -0
+     return 0;
+}
+
+/*
+ * Convenience macros for switch PHY reads
+ */
+
+#define WR_SWITCH_PHY_REG mv88e61xx_switch_miiphy_write
+#define RD_SWITCH_PHY_REG mv88e61xx_switch_miiphy_read
+
+static void mv88e61xx_port_vlan_config(struct mv88e61xx_config

*swconfig)

drivers/net/phy/mv88e61xx.c +34 -0
+{
+     u32 prt;
+     u16 reg;
+     char *name = swconfig->name;
+     u32 port_mask = swconfig->ports_enabled;
+
+     /* be sure all ports are disabled */
+     for (prt = 0; prt < MV88E61XX_MAX_PORTS_NUM; prt++) {
+             RD_SWITCH_PORT_REG(name, prt, MV88E61XX_PRT_CTRL_REG, &reg);
+             reg &= ~0x3;
+             WR_SWITCH_PORT_REG(name, prt, MV88E61XX_PRT_CTRL_REG, reg);
+     }
+
+     /* apply internal vlan config */
+     for (prt = 0; prt < MV88E61XX_MAX_PORTS_NUM; prt++) {
+             /* only for enabled ports */
+             if ((1 << prt) & port_mask) {
+                     /* take vlan map from swconfig */
+                     u8 vlanmap = swconfig->vlancfg[prt];
+                     /* remove disabled ports from vlan map */
+                     vlanmap &= swconfig->ports_enabled;
+                     /* apply vlan map to port */
+                     RD_SWITCH_PORT_REG(name, prt,
+                             MV88E61XX_PRT_VMAP_REG, &reg);
+                     reg &= ~((1 << MV88E61XX_MAX_PORTS_NUM) - 1);
+                     reg |= vlanmap;
+                     WR_SWITCH_PORT_REG(name, prt,
+                             MV88E61XX_PRT_VMAP_REG, reg);
+             }
+     }
+
+}
+
+/*
  * Power up the specified port and reset PHY
  */
 static int mv88361xx_powerup(struct mv88e61xx_config *swconfig, u32

prt)

 {
      char *name = swconfig->name;
drivers/net/phy/mv88e61xx.c +1 -2
-     /* Write Copper Specific control reg1 (0x14) for-
+     /* Write Copper Specific control reg1 (0x10) for-
       * Enable Phy power up
       * Energy Detect on (sense&Xmit NLP Periodically
       * reset other settings default
       */
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA,

0x3360);

drivers/net/phy/mv88e61xx.c +1 -5
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-            MV88E61XX_PHY_CMD, (0x9410 | (prt << 5)));
-
-     if (mv88e61xx_busychk(name))
+     if (WR_SWITCH_PHY_REG(name, prt, 0x10, 0x3360))
              return -1;
 
      /* Write PHY ctrl reg (0x0) to apply
       * Phy reset (set bit 15 low)
       * reset other default values
       */
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA,

0x1140);

drivers/net/phy/mv88e61xx.c +8 -33
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-            MV88E61XX_PHY_CMD, (0x9400 | (prt << 5)));
-
-     if (mv88e61xx_busychk(name))
+     if (WR_SWITCH_PHY_REG(name, prt, 0x00, 0x9140))
              return -1;
 
      return 0;

@@ -259,45 +227,23 @@ static int mv88361xx_powerup(struct
 mv88e61xx_config *swconfig, u32 prt)
 static int mv88361xx_led_init(struct mv88e61xx_config *swconfig, u32
 prt)
 {
      char *name = swconfig->name;
-     u16 reg;
 
      if (swconfig->led_init != MV88E61XX_LED_INIT_EN)
              return 0;
 
      /* set page address to 3 */
-     reg = 3;
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-            MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-                                1 << MV88E61XX_MODE_OFST |
-                                1 << MV88E61XX_OP_OFST |
-                                prt << MV88E61XX_ADDR_OFST | 22));
-
-     if (mv88e61xx_busychk(name))
+     if (WR_SWITCH_PHY_REG(name, prt, 0x16, 0x0003))
              return -1;
 
-     /* set LED Func Ctrl reg */
-     reg = 1;        /* LED[0] On-Link, Blink-Activity, Off-NoLink */
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-            MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-                                1 << MV88E61XX_MODE_OFST |
-                                1 << MV88E61XX_OP_OFST |
-                                prt << MV88E61XX_ADDR_OFST | 16));
-
-     if (mv88e61xx_busychk(name))
+     /*
+      * set LED Func Ctrl reg
+      * value 0x0001 = LED[0] On-Link, Blink-Activity, Off-NoLink
+      */
+     if (WR_SWITCH_PHY_REG(name, prt, 0x10, 0x0001))
              return -1;
 
      /* set page address to 0 */
-     reg = 0;
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-            MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-                                1 << MV88E61XX_MODE_OFST |
-                                1 << MV88E61XX_OP_OFST |
-                                prt << MV88E61XX_ADDR_OFST | 22));
-
-     if (mv88e61xx_busychk(name))
+     if (WR_SWITCH_PHY_REG(name, prt, 0x16, 0x0000))
              return -1;

      return 0;
drivers/net/phy/mv88e61xx.c +2 -10
@@ -315,20 +261,12 @@ static int mv88361xx_led_init(struct
 mv88e61xx_config *swconfig, u32 prt)
 static int mv88361xx_reverse_mdipn(struct mv88e61xx_config *swconfig,
 u32 prt)
 {
      char *name = swconfig->name;
-     u16 reg;
 
      if (swconfig->mdip != MV88E61XX_MDIP_REVERSE)
              return 0;
 
-     reg = 0x0f;             /*Reverse MDIP/N[3:0] bits */
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-     WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-            MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-                                1 << MV88E61XX_MODE_OFST |
-                                1 << MV88E61XX_OP_OFST |
-                                prt << MV88E61XX_ADDR_OFST | 20));
-
-     if (mv88e61xx_busychk(name))
+     /*Reverse MDIP/N[3:0] bits */
+     if (WR_SWITCH_PHY_REG(name, prt, 0x14, 0x000f))
              return -1;

      return 0;
drivers/net/phy/mv88e61xx.c +1 -1
@@ -354,7 +292,7 @@ int mv88e61xx_switch_initialize(struct
 mv88e61xx_config *swconfig)
              printf("Invalid cpu port config, using default port5\n");
      }
 
-     RD_PHY(name, MV88E61XX_PRT_OFST, MII_PHYSID2, &reg);
+     RD_SWITCH_PORT_REG(name, 0, MII_PHYSID2, &reg);
      switch (reg &= 0xfff0) {
      case 0x1610:

              idstr = "88E6161";
drivers/net/phy/mv88e61xx.c +28 -16
@@ -374,45 +312,57 @@ int mv88e61xx_switch_initialize(struct
 mv88e61xx_config *swconfig)
      }
 
      /* Port based VLANs configuration */
-     if ((swconfig->vlancfg == MV88E61XX_VLANCFG_DEFAULT)
-         || (swconfig->vlancfg == MV88E61XX_VLANCFG_ROUTER))
-             mv88e61xx_port_vlan_config(swconfig, MV88E61XX_MAX_PORTS_NUM,
-                                        MV88E61XX_PRT_OFST);
-     else {
-             printf("Unsupported mode %s failed\n", __FUNCTION__);
-             return -1;
-     }
+     mv88e61xx_port_vlan_config(swconfig);
 
      if (swconfig->rgmii_delay == MV88E61XX_RGMII_DELAY_EN) {
              /*
               * Enable RGMII delay on Tx and Rx for CPU port
               * Ref: sec 9.5 of chip datasheet-02
               */
-             WR_PHY(name, MV88E61XX_PRT_OFST + 5,
-                    MV88E61XX_RGMII_TIMECTRL_REG, 0x18);
-             WR_PHY(name, MV88E61XX_PRT_OFST + 4,
-                    MV88E61XX_RGMII_TIMECTRL_REG, 0xc1e7);
+             /*Force port link down */
+             WR_SWITCH_PORT_REG(name, 5, MV88E61XX_PCS_CTRL_REG, 0x10);
+             /* configure port RGMII delay */
+             WR_SWITCH_PORT_REG(name, 4,
+                     MV88E61XX_RGMII_TIMECTRL_REG, 0x81e7);
+             RD_SWITCH_PORT_REG(name, 5,
+                     MV88E61XX_RGMII_TIMECTRL_REG, &reg);
+             WR_SWITCH_PORT_REG(name, 5,
+                     MV88E61XX_RGMII_TIMECTRL_REG, reg | 0x18);
+             WR_SWITCH_PORT_REG(name, 4,
+                     MV88E61XX_RGMII_TIMECTRL_REG, 0xc1e7);
+             /* Force port to RGMII FDX 1000Base then up */
+             WR_SWITCH_PORT_REG(name, 5, MV88E61XX_PCS_CTRL_REG, 0x1e);
+             WR_SWITCH_PORT_REG(name, 5, MV88E61XX_PCS_CTRL_REG, 0x3e);
      }
 
      for (prt = 0; prt < MV88E61XX_MAX_PORTS_NUM; prt++) {
              if (!((1 << prt) & swconfig->cpuport)) {
 
-                     if (mv88361xx_led_init(swconfig, prt))
+                     if (mv88361xx_powerup(swconfig, prt))
                              return -1;
+                     WR_SWITCH_PORT_REG(name, prt, 4, 0x7f);
                      if (mv88361xx_reverse_mdipn(swconfig, prt))
                              return -1;
-                     if (mv88361xx_powerup(swconfig, prt))
+                     if (mv88361xx_led_init(swconfig, prt))
                              return -1;
              }
 
              /*Program port state */
-             RD_PHY(name, MV88E61XX_PRT_OFST + prt,
+             RD_SWITCH_PORT_REG(name, prt,
                     MV88E61XX_PRT_CTRL_REG, &reg);
-             WR_PHY(name, MV88E61XX_PRT_OFST + prt,
+             WR_SWITCH_PORT_REG(name, prt,
                     MV88E61XX_PRT_CTRL_REG,
                     reg | (swconfig->portstate & 0x03));
+
      }
 
+     /* do a sw reset */
+     RD_SWITCH_REG(name, 0x1B, 0x04, &reg);
+     reg |= 0x8000;
+     WR_SWITCH_REG(name, 0x1B, 0x04, reg);
+     /* wait for at least 2 ms */
+     udelay(2500);
+
      printf("%s Initialized on %s\n", idstr, name);
      return 0;

}

drivers/net/phy/mv88e61xx.h +14 -9
index 57762b6..7595cbc 100644
@@ -28,11 +28,10 @@
 #include <miiphy.h>
 
 #define MV88E61XX_CPU_PORT           0x5
-#define MV88E61XX_MAX_PORTS_NUM              0x6
 
 #define MV88E61XX_PHY_TIMEOUT                100000
 
-#define MV88E61XX_PRT_STS_REG                0x1
+#define MV88E61XX_PCS_CTRL_REG               0x1
 #define MV88E61XX_PRT_CTRL_REG               0x4
 #define MV88E61XX_PRT_VMAP_REG               0x6
 #define MV88E61XX_PRT_VID_REG                0x7

@@ -43,20 +42,26 @@
 #define MV88E61XX_RGMII_TIMECTRL_REG 0x1A
 #define MV88E61XX_GLB2REG_DEVADR     0x1C
 
+#define MV88E61XX_PHY_WRITE_CMD              0x9400
+#define MV88E61XX_PHY_READ_CMD               0x9800
+
 #define MV88E61XX_BUSY_OFST          15
 #define MV88E61XX_MODE_OFST          12
-#define MV88E61XX_OP_OFST                    10
+#define MV88E61XX_OP_OFST            10
 #define MV88E61XX_ADDR_OFST          5
 
 #ifdef CONFIG_MV88E61XX_MULTICHIP_ADRMODE
 static int mv88e61xx_busychk_multic(char *name, u32 devaddr);
-static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs,
 u16 data);
-static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs,
 u16 * data);
-#define WR_PHY mv88e61xx_wr_phy
-#define RD_PHY mv88e61xx_rd_phy
+static void mv88e61xx_switch_write(char *name, u32 phy_adr,
+     u32 reg_ofs, u16 data);
+static void mv88e61xx_switch_read(char *name, u32 phy_adr,
+     u32 reg_ofs, u16 *data);
+#define WR_SWITCH_REG mv88e61xx_switch_write
+#define RD_SWITCH_REG mv88e61xx_switch_read
 #else
-#define WR_PHY miiphy_write
-#define RD_PHY miiphy_read
+/* switch appears a s simple PHY and can thus use miiphy */
+#define WR_SWITCH_REG miiphy_write
+#define RD_SWITCH_REG miiphy_read
 #endif /* CONFIG_MV88E61XX_MULTICHIP_ADRMODE */

#endif /* _MV88E61XX_H */

include/netdev.h +0 -0
index b8d303d..e1eb40a 100644
@@ -163,10 +163,9 @@ static inline int pci_eth_init(bd_t *bis)
  * the stuct and enums here are used to specify switch configuration

params
*/
#if defined(CONFIG_MV88E61XX_SWITCH)

include/netdev.h +16 -5
-enum mv88e61xx_cfg_vlan {
-     MV88E61XX_VLANCFG_DEFAULT,
-     MV88E61XX_VLANCFG_ROUTER
-};
+
+/* constants for any 88E61xx switch */
+#define MV88E61XX_MAX_PORTS_NUM      6
 
 enum mv88e61xx_cfg_mdip {
      MV88E61XX_MDIP_NOCHANGE,

@@ -192,7 +191,7 @@ enum mv88e61xx_cfg_prtstt {
 
 struct mv88e61xx_config {
      char *name;
-     enum mv88e61xx_cfg_vlan vlancfg;
+     u8 vlancfg[MV88E61XX_MAX_PORTS_NUM];
      enum mv88e61xx_cfg_rgmiid rgmii_delay;
      enum mv88e61xx_cfg_prtstt portstate;
      enum mv88e61xx_cfg_ledinit led_init;

@@ -201,6 +200,18 @@ struct mv88e61xx_config {
      u8 cpuport;
 };
 
+/*
+ * Common mappings for Internal VLANs
+ * These mappings consider that all ports are useable; the driver
+ * will mask inexistent/unused ports.
+ */
+
+/* Switch mode : routes any port to any port */
+#define MV88E61XX_VLANCFG_SWITCH { 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F
 }
+
+/* Router mode: routes only CPU port 5 to/from non-CPU ports 0-4 */
+#define MV88E61XX_VLANCFG_ROUTER { 0x30, 0x30, 0x30, 0x30, 0x2F, 0x1F
 }
+
 int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig);
Quoted 2 lines

#endif /* CONFIG_MV88E61XX_SWITCH */

Entire patch looks good, but I would like to try it on the board (may be in the next week) just to confirm the functionality is not broken.

Othwerwise,

Acked-by Prafulla Wadaskar <[email protected]>

Regards...
Prafulla . . .

#26 lore raw

PATCH v4 1/4 mvgbe: allow non-sequential PHY addresses

In reply to Albert ARIBAUD
Quoted 92 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: 05 November 2012 05:02
To: U-Boot
Cc: Prafulla Wadaskar; Simon Guinot; Albert ARIBAUD
Subject: [PATCH v4 1/4] mvgbe: allow non-sequential PHY addresses

Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v3:
- fixed building when SoC provides only one GbE port.

 arch/arm/include/asm/arch-kirkwood/kirkwood.h |    1 -
 arch/arm/include/asm/arch-orion5x/orion5x.h   |    1 -
 drivers/net/mvgbe.c                           |   12 +++++++++++-
 drivers/net/mvgbe.h                           |    7 -------
 4 files changed, 11 insertions(+), 10 deletions(-)
arch/arm/include/asm/arch-kirkwood/kirkwood.h +0 -1
index 47771d5..503fb1e 100644
@@ -61,7 +61,6 @@
 #define KW_SATA_PORT1_OFFSET		0x4000
 
 /* Kirkwood GbE controller has two ports */
-#define MAX_MVGBE_DEVS	2
 #define MVGBE0_BASE	KW_EGIGA0_BASE
 #define MVGBE1_BASE	KW_EGIGA1_BASE
arch/arm/include/asm/arch-orion5x/orion5x.h +0 -1
index b0d3368..b32d1d3 100644
@@ -55,7 +55,6 @@
 #define ORION5X_SATA_PORT1_OFFSET		0x4000
 
 /* Orion5x GbE controller has a single port */
-#define MAX_MVGBE_DEVS	1
 #define MVGBE0_BASE	ORION5X_EGIGA_BASE
 
 /* Orion5x USB Host controller is port 1 */
drivers/net/mvgbe.c +11 -1
index 47bf27c..2533614 100644
@@ -49,6 +49,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define MAX_MVGBE_DEVS	2
+
 #define MV_PHY_ADR_REQUEST 0xee
 #define MVGBE_SMI_REG (((struct mvgbe_registers *)MVGBE0_BASE)->smi)
 

@@ -653,6 +655,14 @@ int mvgbe_initialize(bd_t *bis)
 	struct eth_device *dev;
 	int devnum;
 	u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
+#if defined(CONFIG_MVGBE_PHY_ADRS)
+#define MVGBE_PHY_ADRS CONFIG_MVGBE_PHY_ADRS
+#elif defined(CONFIG_PHY_BASE_ADR)
+#define MVGBE_PHY_ADRS {CONFIG_PHY_BASE_ADR, CONFIG_PHY_BASE_ADR+1}
+#else
+#define MVGBE_PHY_ADRS {8, 9}
+#endif
+	u8 used_phy_adrs[MAX_MVGBE_DEVS] = MVGBE_PHY_ADRS;
 
 	for (devnum = 0; devnum < MAX_MVGBE_DEVS; devnum++) {
 		/*skip if port is configured not to use */

@@ -733,7 +743,7 @@ error1:
 		miiphy_register(dev->name, smi_reg_read, smi_reg_write);
 		/* Set phy address of the port */
 		miiphy_write(dev->name, MV_PHY_ADR_REQUEST,
-				MV_PHY_ADR_REQUEST, PHY_BASE_ADR + devnum);
+				MV_PHY_ADR_REQUEST, used_phy_adrs[devnum]);
 #endif
 	}
 	return 0;
drivers/net/mvgbe.h +0 -1
index d8a5429..5434839 100644
@@ -28,13 +28,6 @@
 #ifndef __MVGBE_H__
 #define __MVGBE_H__
 
-/* PHY_BASE_ADR is board specific and can be configured */

drivers/net/mvgbe.h

Quoted 10 lines
drivers/net/mvgbe.h +0 -7
-#if defined (CONFIG_PHY_BASE_ADR)
-#define PHY_BASE_ADR		CONFIG_PHY_BASE_ADR
-#else
-#define PHY_BASE_ADR		0x08	/* default phy base addr */
-#endif
-
 /* Constants */
 #define INT_CAUSE_UNMASK_ALL		0x0007ffff
 #define INT_CAUSE_UNMASK_ALL_EXT	0x0011ffff
--
Acked-by Prafulla Wadaskar <[email protected]>

Regards...
Prafulla . . .

author
#27 lore raw

v5 cover Add support for the LaCie Wireless Space

In reply to Albert ARIBAUD

This series adds support to the LaCie Wireless Space, a Marvell Kirkwood-based product featuring USB, SATA, Ethernet and an integrated mv88e6161 Ethernet switch.

Note 1: up to v4, this series had changes to mvgbe for supporting non-sequential PHY addresses on egiga0 and egiga1. This proved unneeded for switch support, and was dropped in v5.

Note 2: up to v3, this series made the Wireless Space a variant of the Net Space V2. Starting from v4, the Wireless Space is not based on Net Space V2 any more and the changes to Net Space V2 related code have been dropped.

Changes in v5:
- Fixes to the initialization sequence
- Added a configurable read/write command
- made fan, usb, HDD powered on at boot
- fixed NAND env and Ethernet configs
- general "ws" command with support for buttons
- made netconsole accessible before boot delay

Changes in v4:
- switched from netspace_V2-based to standalone board
- added support for mv88e61xx switch
- corrected some kwbimage.cfg values

Changes in v3:
- fix broken support for NETSPACE_(MINI|LITE)_V2

Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

Albert ARIBAUD (3):
mv88e61xx: refactor PHY and SWITCH level-code
kirkwood: make MPP arrays static const
ARM: lacie_kw: add support for WIRELESS_SPACE

 arch/arm/cpu/arm926ejs/kirkwood/mpp.c           |    2 +-
 arch/arm/include/asm/arch-kirkwood/mpp.h        |    2 +-
 board/LaCie/net2big_v2/net2big_v2.c             |    2 +-
 board/LaCie/netspace_v2/netspace_v2.c           |    2 +-
 board/LaCie/wireless_space/Makefile             |   46 +++
 board/LaCie/wireless_space/kwbimage.cfg         |   82 ++++
 board/LaCie/wireless_space/wireless_space.c     |  176 ++++++++
 board/Marvell/dreamplug/dreamplug.c             |    2 +-
 board/Marvell/guruplug/guruplug.c               |    2 +-
 board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |    2 +-
 board/Marvell/openrd/openrd.c                   |    2 +-
 board/Marvell/rd6281a/rd6281a.c                 |    2 +-
 board/Marvell/sheevaplug/sheevaplug.c           |    2 +-
 board/Seagate/dockstar/dockstar.c               |    2 +-
 board/buffalo/lsxl/lsxl.c                       |    2 +-
 board/cloudengines/pogo_e02/pogo_e02.c          |    2 +-
 board/d-link/dns325/dns325.c                    |    2 +-
 board/iomega/iconnect/iconnect.c                |    2 +-
 board/karo/tk71/tk71.c                          |    2 +-
 board/keymile/km_arm/km_arm.c                   |    2 +-
 board/raidsonic/ib62x0/ib62x0.c                 |    2 +-
 boards.cfg                                      |    1 +
 drivers/net/phy/mv88e61xx.c                     |  495 ++++++++++++++---------
 drivers/net/phy/mv88e61xx.h                     |   39 +-
 drivers/spi/kirkwood_spi.c                      |   12 +-
 include/configs/wireless_space.h                |  194 +++++++++
 include/netdev.h                                |   21 +-
 27 files changed, 880 insertions(+), 222 deletions(-)
 create mode 100644 board/LaCie/wireless_space/Makefile
 create mode 100644 board/LaCie/wireless_space/kwbimage.cfg
 create mode 100644 board/LaCie/wireless_space/wireless_space.c
 create mode 100644 include/configs/wireless_space.h
Signature · 1 line
1.7.10.4
author
#28 lore raw

PATCH v5 1/3 mv88e61xx: refactor PHY and SWITCH level-code

Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v5:
- Fixes to the initialization sequence
- Added a configurable read/write command

 drivers/net/phy/mv88e61xx.c |  495 +++++++++++++++++++++++++++----------------
 drivers/net/phy/mv88e61xx.h |   39 ++--
 include/netdev.h            |   21 +-
 3 files changed, 358 insertions(+), 197 deletions(-)
drivers/net/phy/mv88e61xx.c +315 -180
index 483a920..e8da66d 100644
@@ -26,6 +26,14 @@
 #include <netdev.h>
 #include "mv88e61xx.h"
 
+/*
+ * Uncomment either of the following line for local debug control;
+ * otherwise global debug control will apply.
+ */
+
+/* #undef DEBUG */
+/* #define DEBUG */
+
 #ifdef CONFIG_MV88E61XX_MULTICHIP_ADRMODE
 /* Chip Address mode
  * The Switch support two modes of operation

@@ -52,7 +60,8 @@ static int mv88e61xx_busychk_multic(char *name, u32 devaddr)
 	return 0;
 }
 
-static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 data)
+static void mv88e61xx_switch_write(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 data)
 {
 	u16 mii_dev_addr;
 

@@ -70,7 +79,8 @@ static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 data)
 									 15));
 }
 
-static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 * data)
+static void mv88e61xx_switch_read(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 *data)
 {
 	u16 mii_dev_addr;
 

@@ -90,110 +100,51 @@ static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 * data)
 }
 #endif /* CONFIG_MV88E61XX_MULTICHIP_ADRMODE */
 
-static void mv88e61xx_port_vlan_config(struct mv88e61xx_config *swconfig,
-				       u32 max_prtnum, u32 ports_ofs)
-{
-	u32 prt;
-	u16 reg;
-	char *name = swconfig->name;
-	u32 cpu_port = swconfig->cpuport;
-	u32 port_mask = swconfig->ports_enabled;
-	enum mv88e61xx_cfg_vlan vlancfg = swconfig->vlancfg;
-
-	/* be sure all ports are disabled */
-	for (prt = 0; prt < max_prtnum; prt++) {
-		RD_PHY(name, ports_ofs + prt, MV88E61XX_PRT_CTRL_REG, &reg);
-		reg &= ~0x3;
-		WR_PHY(name, ports_ofs + prt, MV88E61XX_PRT_CTRL_REG, reg);
-
-		if (!(cpu_port & (1 << prt)))
-			continue;
-		/* Set CPU port VID to 0x1 */
-		RD_PHY(name, (ports_ofs + prt), MV88E61XX_PRT_VID_REG, &reg);
-		reg &= ~0xfff;
-		reg |= 0x1;
-		WR_PHY(name, (ports_ofs + prt), MV88E61XX_PRT_VID_REG, reg);
-	}
-
-	/* Setting  Port default priority for all ports to zero */
-	for (prt = 0; prt < max_prtnum; prt++) {
-		RD_PHY(name, ports_ofs + prt, MV88E61XX_PRT_VID_REG, &reg);
-		reg &= ~0xc000;
-		WR_PHY(name, ports_ofs + prt, MV88E61XX_PRT_VID_REG, reg);
-	}
-	/* Setting VID and VID map for all ports except CPU port */
-	for (prt = 0; prt < max_prtnum; prt++) {
-		/* only for enabled ports */
-		if ((1 << prt) & port_mask) {
-			/* skip CPU port */
-			if ((1 << prt) & cpu_port) {
-				/*
-				 * Set Vlan map table for cpu_port to see
-				 * all ports
-				 */
-				RD_PHY(name, (ports_ofs + prt),
-				       MV88E61XX_PRT_VMAP_REG, &reg);
-				reg &= ~((1 << max_prtnum) - 1);
-				reg |= port_mask & ~(1 << prt);
-				WR_PHY(name, (ports_ofs + prt),
-				       MV88E61XX_PRT_VMAP_REG, reg);
-			} else {
-
-				/*
-				 *  set Ports VLAN Mapping.
-				 *      port prt <--> cpu_port VLAN #prt+1.
-				 */
-				RD_PHY(name, ports_ofs + prt,
-				       MV88E61XX_PRT_VID_REG, &reg);
-				reg &= ~0x0fff;
-				reg |= (prt + 1);
-				WR_PHY(name, ports_ofs + prt,
-				       MV88E61XX_PRT_VID_REG, reg);
-
-				RD_PHY(name, ports_ofs + prt,
-				       MV88E61XX_PRT_VMAP_REG, &reg);
-				if (vlancfg == MV88E61XX_VLANCFG_DEFAULT) {
-					/*
-					 * all any port can send frames to all other ports
-					 * ref: sec 3.2.1.1 of datasheet
-					 */
-					reg |= 0x03f;
-					reg &= ~(1 << prt);
-				} else if (vlancfg == MV88E61XX_VLANCFG_ROUTER) {
-					/*
-					 * all other ports can send frames to CPU port only
-					 * ref: sec 3.2.1.2 of datasheet
-					 */
-					reg &= ~((1 << max_prtnum) - 1);
-					reg |= cpu_port;
-				}
-				WR_PHY(name, ports_ofs + prt,
-				       MV88E61XX_PRT_VMAP_REG, reg);
-			}
-		}
-	}
+/*
+ * Convenience macros for switch device/port reads/writes
+ * These macros output valid 'mv88e61xx' U_BOOT_CMDs
+ */
 
-	/*
-	 * enable only appropriate ports to forwarding mode
-	 * and disable the others
-	 */
-	for (prt = 0; prt < max_prtnum; prt++) {
-		if ((1 << prt) & port_mask) {
-			RD_PHY(name, ports_ofs + prt,
-			       MV88E61XX_PRT_CTRL_REG, &reg);
-			reg |= 0x3;
-			WR_PHY(name, ports_ofs + prt,
-			       MV88E61XX_PRT_CTRL_REG, reg);
-		} else {
-			/* Disable port */
-			RD_PHY(name, ports_ofs + prt,
-			       MV88E61XX_PRT_CTRL_REG, &reg);
-			reg &= ~0x3;
-			WR_PHY(name, ports_ofs + prt,
-			       MV88E61XX_PRT_CTRL_REG, reg);
-		}
-	}
+#ifndef DEBUG
+#define WR_SWITCH_REG wr_switch_reg
+#define RD_SWITCH_REG rd_switch_reg
+#define WR_SWITCH_PORT_REG(n, p, r, d) \
+	WR_SWITCH_REG(n, (MV88E61XX_PRT_OFST+p), r, d)
+#define RD_SWITCH_PORT_REG(n, p, r, d) \
+	RD_SWITCH_REG(n, (MV88E61XX_PRT_OFST+p), r, d)
+#else
+static void WR_SWITCH_REG(char *name, u32 dev_adr, u32 reg_ofs, u16 data)
+{
+	printf("mv88e61xx %s dev %02x reg %02x write %04x\n",
+		name, dev_adr, reg_ofs, data);
+	wr_switch_reg(name, dev_adr, reg_ofs, data);
 }
+static void RD_SWITCH_REG(char *name, u32 dev_adr, u32 reg_ofs, u16 *data)
+{
+	rd_switch_reg(name, dev_adr, reg_ofs, data);
+	printf("mv88e61xx %s dev %02x reg %02x read %04x\n",
+		name, dev_adr, reg_ofs, *data);
+}
+static void WR_SWITCH_PORT_REG(char *name, u32 prt_adr, u32 reg_ofs,
+	u16 data)
+{
+	printf("mv88e61xx %s port %02x reg %02x write %04x\n",
+		name, prt_adr, reg_ofs, data);
+	wr_switch_reg(name, (MV88E61XX_PRT_OFST+prt_adr), reg_ofs, data);
+}
+static void RD_SWITCH_PORT_REG(char *name, u32 prt_adr, u32 reg_ofs,
+	u16 *data)
+{
+	rd_switch_reg(name, (MV88E61XX_PRT_OFST+prt_adr), reg_ofs, data);
+	printf("mv88e61xx %s port %02x reg %02x read %04x\n",
+		name, prt_adr, reg_ofs, *data);
+}
+#endif
+
+/*
+ * Local functions to read/write registers on the switch PHYs.
+ * NOTE! This goes through switch, not direct miiphy, writes and reads!
+ */
 
 /*
  * Make sure SMIBusy bit cleared before another

@@ -204,7 +155,7 @@ static int mv88e61xx_busychk(char *name)
 	u16 reg = 0;
 	u32 timeout = MV88E61XX_PHY_TIMEOUT;
 	do {
-		RD_PHY(name, MV88E61XX_GLB2REG_DEVADR,
+		rd_switch_reg(name, MV88E61XX_GLB2REG_DEVADR,
 		       MV88E61XX_PHY_CMD, &reg);
 		if (timeout-- == 0) {
 			printf("SMI busy timeout\n");

@@ -214,34 +165,110 @@ static int mv88e61xx_busychk(char *name)
 	return 0;
 }
 
+static inline int mv88e61xx_switch_miiphy_write(char *name, u32 phy,
+	u32 reg, u16 data)
+{
+	/* write switch data reg then cmd reg then check completion */
+	wr_switch_reg(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA,
+		data);
+	wr_switch_reg(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_CMD,
+		(MV88E61XX_PHY_WRITE_CMD | (phy << 5)  | reg));
+	return mv88e61xx_busychk(name);
+}
+
+static inline int mv88e61xx_switch_miiphy_read(char *name, u32 phy,
+	u32 reg, u16 *data)
+{
+	/* write switch cmd reg, check for completion */
+	wr_switch_reg(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_CMD,
+		(MV88E61XX_PHY_READ_CMD | (phy << 5)  | reg));
+	if (mv88e61xx_busychk(name))
+		return -1;
+	/* read switch data reg and return success */
+	rd_switch_reg(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, data);
+	return 0;
+}
+
+/*
+ * Convenience macros for switch PHY reads/writes
+ */
+
+#ifndef DEBUG
+#define WR_SWITCH_PHY_REG mv88e61xx_switch_miiphy_write
+#define RD_SWITCH_PHY_REG mv88e61xx_switch_miiphy_read
+#else
+static inline int WR_SWITCH_PHY_REG(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 data)
+{
+	int r = mv88e61xx_switch_miiphy_write(name, phy_adr, reg_ofs, data);
+	if (r)
+		printf("** ERROR writing mv88e61xx %s phy %02x reg %02x\n",
+			name, phy_adr, reg_ofs);
+	else
+		printf("mv88e61xx %s phy %02x reg %02x write %04x\n",
+			name, phy_adr, reg_ofs, data);
+	return r;
+}
+static inline int RD_SWITCH_PHY_REG(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 *data)
+{
+	int r = mv88e61xx_switch_miiphy_read(name, phy_adr, reg_ofs, data);
+	if (r)
+		printf("** ERROR reading mv88e61xx %s phy %02x reg %02x\n",
+			name, phy_adr, reg_ofs);
+	else
+		printf("mv88e61xx %s phy %02x reg %02x read %04x\n",
+			name, phy_adr, reg_ofs, *data);
+	return r;
+}
+#endif
+
+static void mv88e61xx_port_vlan_config(struct mv88e61xx_config *swconfig)
+{
+	u32 prt;
+	u16 reg;
+	char *name = swconfig->name;
+	u32 port_mask = swconfig->ports_enabled;
+
+	/* apply internal vlan config */
+	for (prt = 0; prt < MV88E61XX_MAX_PORTS_NUM; prt++) {
+		/* only for enabled ports */
+		if ((1 << prt) & port_mask) {
+			/* take vlan map from swconfig */
+			u8 vlanmap = swconfig->vlancfg[prt];
+			/* remove disabled ports from vlan map */
+			vlanmap &= swconfig->ports_enabled;
+			/* apply vlan map to port */
+			RD_SWITCH_PORT_REG(name, prt,
+				MV88E61XX_PRT_VMAP_REG, &reg);
+			reg &= ~((1 << MV88E61XX_MAX_PORTS_NUM) - 1);
+			reg |= vlanmap;
+			WR_SWITCH_PORT_REG(name, prt,
+				MV88E61XX_PRT_VMAP_REG, reg);
+		}
+	}
+}
+
 /*
  * Power up the specified port and reset PHY
  */
-static int mv88361xx_powerup(struct mv88e61xx_config *swconfig, u32 prt)
+static int mv88361xx_powerup(struct mv88e61xx_config *swconfig, u32 phy)
 {
 	char *name = swconfig->name;
 
-	/* Write Copper Specific control reg1 (0x14) for-
+	/* Write Copper Specific control reg1 (0x10) for-
 	 * Enable Phy power up
 	 * Energy Detect on (sense&Xmit NLP Periodically
 	 * reset other settings default
 	 */
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, 0x3360);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (0x9410 | (prt << 5)));
-
-	if (mv88e61xx_busychk(name))
+	if (WR_SWITCH_PHY_REG(name, phy, 0x10, 0x3360))
 		return -1;
 
 	/* Write PHY ctrl reg (0x0) to apply
 	 * Phy reset (set bit 15 low)
 	 * reset other default values
 	 */
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, 0x1140);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (0x9400 | (prt << 5)));
-
-	if (mv88e61xx_busychk(name))
+	if (WR_SWITCH_PHY_REG(name, phy, 0x00, 0x9140))
 		return -1;
 
 	return 0;

@@ -256,48 +283,26 @@ static int mv88361xx_powerup(struct mv88e61xx_config *swconfig, u32 prt)
  * to setup PHY LEDs default configuration to detect 10/100/1000Mb/s
  * Link status
  */
-static int mv88361xx_led_init(struct mv88e61xx_config *swconfig, u32 prt)
+static int mv88361xx_led_init(struct mv88e61xx_config *swconfig, u32 phy)
 {
 	char *name = swconfig->name;
-	u16 reg;
 
 	if (swconfig->led_init != MV88E61XX_LED_INIT_EN)
 		return 0;
 
 	/* set page address to 3 */
-	reg = 3;
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-				   1 << MV88E61XX_MODE_OFST |
-				   1 << MV88E61XX_OP_OFST |
-				   prt << MV88E61XX_ADDR_OFST | 22));
-
-	if (mv88e61xx_busychk(name))
+	if (WR_SWITCH_PHY_REG(name, phy, 0x16, 0x0003))
 		return -1;
 
-	/* set LED Func Ctrl reg */
-	reg = 1;	/* LED[0] On-Link, Blink-Activity, Off-NoLink */
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-				   1 << MV88E61XX_MODE_OFST |
-				   1 << MV88E61XX_OP_OFST |
-				   prt << MV88E61XX_ADDR_OFST | 16));
-
-	if (mv88e61xx_busychk(name))
+	/*
+	 * set LED Func Ctrl reg
+	 * value 0x0001 = LED[0] On-Link, Blink-Activity, Off-NoLink
+	 */
+	if (WR_SWITCH_PHY_REG(name, phy, 0x10, 0x0001))
 		return -1;
 
 	/* set page address to 0 */
-	reg = 0;
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-				   1 << MV88E61XX_MODE_OFST |
-				   1 << MV88E61XX_OP_OFST |
-				   prt << MV88E61XX_ADDR_OFST | 22));
-
-	if (mv88e61xx_busychk(name))
+	if (WR_SWITCH_PHY_REG(name, phy, 0x16, 0x0000))
 		return -1;
 
 	return 0;

@@ -312,23 +317,15 @@ static int mv88361xx_led_init(struct mv88e61xx_config *swconfig, u32 prt)
  * This is optional settings may be needed on some boards
  * for PHY<->magnetics h/w tuning
  */
-static int mv88361xx_reverse_mdipn(struct mv88e61xx_config *swconfig, u32 prt)
+static int mv88361xx_reverse_mdipn(struct mv88e61xx_config *swconfig, u32 phy)
 {
 	char *name = swconfig->name;
-	u16 reg;
 
 	if (swconfig->mdip != MV88E61XX_MDIP_REVERSE)
 		return 0;
 
-	reg = 0x0f;		/*Reverse MDIP/N[3:0] bits */
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR, MV88E61XX_PHY_DATA, reg);
-	WR_PHY(name, MV88E61XX_GLB2REG_DEVADR,
-	       MV88E61XX_PHY_CMD, (1 << MV88E61XX_BUSY_OFST |
-				   1 << MV88E61XX_MODE_OFST |
-				   1 << MV88E61XX_OP_OFST |
-				   prt << MV88E61XX_ADDR_OFST | 20));
-
-	if (mv88e61xx_busychk(name))
+	/*Reverse MDIP/N[3:0] bits */
+	if (WR_SWITCH_PHY_REG(name, phy, 0x14, 0x000f))
 		return -1;
 
 	return 0;

@@ -343,6 +340,7 @@ int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig)
 	u16 reg;
 	char *idstr;
 	char *name = swconfig->name;
+	int time;
 
 	if (miiphy_set_current_dev(name)) {
 		printf("%s failed\n", __FUNCTION__);

@@ -354,7 +352,7 @@ int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig)
 		printf("Invalid cpu port config, using default port5\n");
 	}
 
-	RD_PHY(name, MV88E61XX_PRT_OFST, MII_PHYSID2, &reg);
+	RD_SWITCH_PORT_REG(name, 0, MII_PHYSID2, &reg);
 	switch (reg &= 0xfff0) {
 	case 0x1610:
 		idstr = "88E6161";

@@ -373,46 +371,183 @@ int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig)
 		break;
 	}
 
-	/* Port based VLANs configuration */
-	if ((swconfig->vlancfg == MV88E61XX_VLANCFG_DEFAULT)
-	    || (swconfig->vlancfg == MV88E61XX_VLANCFG_ROUTER))
-		mv88e61xx_port_vlan_config(swconfig, MV88E61XX_MAX_PORTS_NUM,
-					   MV88E61XX_PRT_OFST);
-	else {
-		printf("Unsupported mode %s failed\n", __FUNCTION__);
-		return -1;
+	/* be sure all ports are disabled */
+	for (prt = 0; prt < MV88E61XX_MAX_PORTS_NUM; prt++) {
+		RD_SWITCH_PORT_REG(name, prt, MV88E61XX_PRT_CTRL_REG, &reg);
+		reg &= ~0x3;
+		WR_SWITCH_PORT_REG(name, prt, MV88E61XX_PRT_CTRL_REG, reg);
 	}
 
+	/* wait 2 ms for queues to drain */
+	udelay(2000);
+
+	/* reset switch */
+	RD_SWITCH_REG(name, MV88E61XX_GLBREG_DEVADR, MV88E61XX_SGCR, &reg);
+	reg |= 0x8000;
+	WR_SWITCH_REG(name, MV88E61XX_GLBREG_DEVADR, MV88E61XX_SGCR, reg);
+
+	/* wait up to 1 second for switch reset complete */
+	for (time = 1000; time; time--) {
+		RD_SWITCH_REG(name, MV88E61XX_GLBREG_DEVADR, MV88E61XX_SGSR,
+			&reg);
+		if ((reg & 0xc800) == 0xc800)
+			break;
+		udelay(1000);
+	}
+	if (!time)
+		return -1;
+
+	/* Port based VLANs configuration */
+	mv88e61xx_port_vlan_config(swconfig);
+
 	if (swconfig->rgmii_delay == MV88E61XX_RGMII_DELAY_EN) {
 		/*
 		 * Enable RGMII delay on Tx and Rx for CPU port
 		 * Ref: sec 9.5 of chip datasheet-02
 		 */
-		WR_PHY(name, MV88E61XX_PRT_OFST + 5,
-		       MV88E61XX_RGMII_TIMECTRL_REG, 0x18);
-		WR_PHY(name, MV88E61XX_PRT_OFST + 4,
-		       MV88E61XX_RGMII_TIMECTRL_REG, 0xc1e7);
+		/*Force port link down */
+		WR_SWITCH_PORT_REG(name, 5, MV88E61XX_PCS_CTRL_REG, 0x10);
+		/* configure port RGMII delay */
+		WR_SWITCH_PORT_REG(name, 4,
+			MV88E61XX_RGMII_TIMECTRL_REG, 0x81e7);
+		RD_SWITCH_PORT_REG(name, 5,
+			MV88E61XX_RGMII_TIMECTRL_REG, &reg);
+		WR_SWITCH_PORT_REG(name, 5,
+			MV88E61XX_RGMII_TIMECTRL_REG, reg | 0x18);
+		WR_SWITCH_PORT_REG(name, 4,
+			MV88E61XX_RGMII_TIMECTRL_REG, 0xc1e7);
+		/* Force port to RGMII FDX 1000Base then up */
+		WR_SWITCH_PORT_REG(name, 5, MV88E61XX_PCS_CTRL_REG, 0x1e);
+		WR_SWITCH_PORT_REG(name, 5, MV88E61XX_PCS_CTRL_REG, 0x3e);
 	}
 
 	for (prt = 0; prt < MV88E61XX_MAX_PORTS_NUM; prt++) {
-		if (!((1 << prt) & swconfig->cpuport)) {
 
-			if (mv88361xx_led_init(swconfig, prt))
+		/* configure port's PHY */
+		if (!((1 << prt) & swconfig->cpuport)) {
+			/* port 4 has phy 6, not 4 */
+			int phy = (prt == 4) ? 6 : prt;
+			if (mv88361xx_powerup(swconfig, phy))
 				return -1;
-			if (mv88361xx_reverse_mdipn(swconfig, prt))
+			if (mv88361xx_reverse_mdipn(swconfig, phy))
 				return -1;
-			if (mv88361xx_powerup(swconfig, prt))
+			if (mv88361xx_led_init(swconfig, phy))
 				return -1;
 		}
 
+		/* set port VID to port+1 except for cpu port */
+		if (!((1 << prt) & swconfig->cpuport)) {
+			RD_SWITCH_PORT_REG(name, prt,
+				MV88E61XX_PRT_VID_REG, &reg);
+			WR_SWITCH_PORT_REG(name, prt,
+				MV88E61XX_PRT_VID_REG,
+				(reg & ~1023) | (prt+1));
+		}
+
 		/*Program port state */
-		RD_PHY(name, MV88E61XX_PRT_OFST + prt,
-		       MV88E61XX_PRT_CTRL_REG, &reg);
-		WR_PHY(name, MV88E61XX_PRT_OFST + prt,
-		       MV88E61XX_PRT_CTRL_REG,
-		       reg | (swconfig->portstate & 0x03));
+		RD_SWITCH_PORT_REG(name, prt,
+			MV88E61XX_PRT_CTRL_REG, &reg);
+		WR_SWITCH_PORT_REG(name, prt,
+			MV88E61XX_PRT_CTRL_REG,
+			reg | (swconfig->portstate & 0x03));
+
 	}
 
 	printf("%s Initialized on %s\n", idstr, name);
 	return 0;
 }
+
+#ifdef CONFIG_MV88E61XX_CMD
+static int
+do_switch(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	char *name, *endp;
+	int write = 0;
+	enum { dev, prt, phy } target = dev;
+	u32 addrlo, addrhi, addr;
+	u32 reglo, reghi, reg;
+	u16 data, rdata;
+
+	if (argc < 7)
+		return -1;
+
+	name = argv[1];
+
+	if (strcmp(argv[2], "phy") == 0)
+		target = phy;
+	else if (strcmp(argv[2], "port") == 0)
+		target = prt;
+	else if (strcmp(argv[2], "dev") != 0)
+		return 1;
+
+	addrlo = simple_strtoul(argv[3], &endp, 16);
+
+	if (!*endp) {
+		addrhi = addrlo;
+	} else {
+		while (*endp < '0' || *endp > '9')
+			endp++;
+		addrhi = simple_strtoul(endp, NULL, 16);
+	}
+
+	reglo = simple_strtoul(argv[5], &endp, 16);
+	if (!*endp) {
+		reghi = reglo;
+	} else {
+		while (*endp < '0' || *endp > '9')
+			endp++;
+		reghi = simple_strtoul(endp, NULL, 16);
+	}
+
+	if (strcmp(argv[6], "write") == 0)
+		write = 1;
+	else if (strcmp(argv[6], "read") != 0)
+		return 1;
+
+	data = simple_strtoul(argv[7], NULL, 16);
+
+	for (addr = addrlo; addr <= addrhi; addr++) {
+		for (reg = reglo; reg <= reghi; reg++) {
+			if (write) {
+				if (target == phy)
+					mv88e61xx_switch_miiphy_write(
+						name, addr, reg, data);
+				else if (target == prt)
+					wr_switch_reg(name,
+						addr+MV88E61XX_PRT_OFST,
+						reg, data);
+				else
+					wr_switch_reg(name, addr, reg, data);
+			} else {
+				if (target == phy)
+					mv88e61xx_switch_miiphy_read(
+						name, addr, reg, &rdata);
+				else if (target == prt)
+					rd_switch_reg(name,
+						addr+MV88E61XX_PRT_OFST,
+						reg, &rdata);
+				else
+					rd_switch_reg(name, addr, reg, &rdata);
+				printf("%s %s %s %02x %s %02x %s %04x\n",
+					argv[0], argv[1], argv[2], addr,
+					argv[4], reg, argv[6], rdata);
+				if (write && argc == 7 && rdata != data)
+					return 1;
+			}
+		}
+	}
+	return 0;
+}
+
+U_BOOT_CMD(mv88e61xx, 8, 0, do_switch,
+	"Read or write mv88e61xx switch registers",
+	"<ethdevice> dev|port|phy <addr> reg <reg> write <data>\n"
+	"<ethdevice> dev|port|phy <addr> reg <reg> read [<data>]\n"
+	"    - read/write switch device, port or phy at (addr,reg)\n"
+	"      addr=0..0x1C for dev, 0..5 for port or phy.\n"
+	"      reg=0..0x1F.\n"
+	"      data=0..0xFFFF (tested if present against actual read).\n"
+	"      All numeric parameters are assumed to be hex.\n"
+	"      <addr> and <<reg> arguments can be ranges (x..y)"
+);
+#endif /* CONFIG_MV88E61XX_CMD */
drivers/net/phy/mv88e61xx.h +27 -12
index 57762b6..55ded7e 100644
@@ -28,35 +28,50 @@
 #include <miiphy.h>
 
 #define MV88E61XX_CPU_PORT		0x5
-#define MV88E61XX_MAX_PORTS_NUM		0x6
 
 #define MV88E61XX_PHY_TIMEOUT		100000
 
-#define MV88E61XX_PRT_STS_REG		0x1
+/* port dev-addr (= port + 0x10) */
+#define MV88E61XX_PRT_OFST		0x10
+/* port registers */
+#define MV88E61XX_PCS_CTRL_REG		0x1
 #define MV88E61XX_PRT_CTRL_REG		0x4
 #define MV88E61XX_PRT_VMAP_REG		0x6
 #define MV88E61XX_PRT_VID_REG		0x7
+#define MV88E61XX_RGMII_TIMECTRL_REG	0x1A
 
-#define MV88E61XX_PRT_OFST		0x10
+/* global registers dev-addr */
+#define MV88E61XX_GLBREG_DEVADR	0x1B
+/* global registers */
+#define MV88E61XX_SGSR			0x00
+#define MV88E61XX_SGCR			0x04
+
+/* global 2 registers dev-addr */
+#define MV88E61XX_GLB2REG_DEVADR	0x1C
+/* global 2 registers */
 #define MV88E61XX_PHY_CMD		0x18
 #define MV88E61XX_PHY_DATA		0x19
-#define MV88E61XX_RGMII_TIMECTRL_REG	0x1A
-#define MV88E61XX_GLB2REG_DEVADR	0x1C
+/* global 2 phy commands */
+#define MV88E61XX_PHY_WRITE_CMD		0x9400
+#define MV88E61XX_PHY_READ_CMD		0x9800
 
 #define MV88E61XX_BUSY_OFST		15
 #define MV88E61XX_MODE_OFST		12
-#define MV88E61XX_OP_OFST			10
+#define MV88E61XX_OP_OFST		10
 #define MV88E61XX_ADDR_OFST		5
 
 #ifdef CONFIG_MV88E61XX_MULTICHIP_ADRMODE
 static int mv88e61xx_busychk_multic(char *name, u32 devaddr);
-static void mv88e61xx_wr_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 data);
-static void mv88e61xx_rd_phy(char *name, u32 phy_adr, u32 reg_ofs, u16 * data);
-#define WR_PHY mv88e61xx_wr_phy
-#define RD_PHY mv88e61xx_rd_phy
+static void mv88e61xx_switch_write(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 data);
+static void mv88e61xx_switch_read(char *name, u32 phy_adr,
+	u32 reg_ofs, u16 *data);
+#define wr_switch_reg mv88e61xx_switch_write
+#define rd_switch_reg mv88e61xx_switch_read
 #else
-#define WR_PHY miiphy_write
-#define RD_PHY miiphy_read
+/* switch appears a s simple PHY and can thus use miiphy */
+#define wr_switch_reg miiphy_write
+#define rd_switch_reg miiphy_read
 #endif /* CONFIG_MV88E61XX_MULTICHIP_ADRMODE */
 
 #endif /* _MV88E61XX_H */
include/netdev.h +16 -5
index b8d303d..7f158d4 100644
@@ -163,10 +163,9 @@ static inline int pci_eth_init(bd_t *bis)
  * the stuct and enums here are used to specify switch configuration params
  */
 #if defined(CONFIG_MV88E61XX_SWITCH)
-enum mv88e61xx_cfg_vlan {
-	MV88E61XX_VLANCFG_DEFAULT,
-	MV88E61XX_VLANCFG_ROUTER
-};
+
+/* constants for any 88E61xx switch */
+#define MV88E61XX_MAX_PORTS_NUM	6
 
 enum mv88e61xx_cfg_mdip {
 	MV88E61XX_MDIP_NOCHANGE,

@@ -192,7 +191,7 @@ enum mv88e61xx_cfg_prtstt {
 
 struct mv88e61xx_config {
 	char *name;
-	enum mv88e61xx_cfg_vlan vlancfg;
+	u8 vlancfg[MV88E61XX_MAX_PORTS_NUM];
 	enum mv88e61xx_cfg_rgmiid rgmii_delay;
 	enum mv88e61xx_cfg_prtstt portstate;
 	enum mv88e61xx_cfg_ledinit led_init;

@@ -201,6 +200,18 @@ struct mv88e61xx_config {
 	u8 cpuport;
 };
 
+/*
+ * Common mappings for Internal VLANs
+ * These mappings consider that all ports are useable; the driver
+ * will mask inexistent/unused ports.
+ */
+
+/* Switch mode : routes any port to any port */
+#define MV88E61XX_VLANCFG_SWITCH { 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F }
+
+/* Router mode: routes only CPU port 5 to/from non-CPU ports 0-4 */
+#define MV88E61XX_VLANCFG_ROUTER { 0x20, 0x20, 0x20, 0x20, 0x20, 0x1F }
+
 int mv88e61xx_switch_initialize(struct mv88e61xx_config *swconfig);
 #endif /* CONFIG_MV88E61XX_SWITCH */
Signature · 1 line
1.7.10.4
author
#29 lore raw

PATCH v5 2/3 kirkwood: make MPP arrays static const

This saves stack and code memory for local copy, and consumes initialized data memory. For 22 of the 29 kirkwood-based boards, this results in a global saving of about 30 bytes. For 7 of them, it results in an increase of 6 to 14 bytes.

Signed-off-by Albert ARIBAUD <[email protected]>

---

 arch/arm/cpu/arm926ejs/kirkwood/mpp.c           |    2 +-
 arch/arm/include/asm/arch-kirkwood/mpp.h        |    2 +-
 board/LaCie/net2big_v2/net2big_v2.c             |    2 +-
 board/LaCie/netspace_v2/netspace_v2.c           |    2 +-
 board/Marvell/dreamplug/dreamplug.c             |    2 +-
 board/Marvell/guruplug/guruplug.c               |    2 +-
 board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |    2 +-
 board/Marvell/openrd/openrd.c                   |    2 +-
 board/Marvell/rd6281a/rd6281a.c                 |    2 +-
 board/Marvell/sheevaplug/sheevaplug.c           |    2 +-
 board/Seagate/dockstar/dockstar.c               |    2 +-
 board/buffalo/lsxl/lsxl.c                       |    2 +-
 board/cloudengines/pogo_e02/pogo_e02.c          |    2 +-
 board/d-link/dns325/dns325.c                    |    2 +-
 board/iomega/iconnect/iconnect.c                |    2 +-
 board/karo/tk71/tk71.c                          |    2 +-
 board/keymile/km_arm/km_arm.c                   |    2 +-
 board/raidsonic/ib62x0/ib62x0.c                 |    2 +-
 drivers/spi/kirkwood_spi.c                      |   12 +++++-------
 19 files changed, 23 insertions(+), 25 deletions(-)
arch/arm/cpu/arm926ejs/kirkwood/mpp.c +1 -1
index 03eb2de..0ba6f09 100644
@@ -31,7 +31,7 @@ static u32 kirkwood_variant(void)
 #define MPP_CTRL(i)	(KW_MPP_BASE + (i* 4))
 #define MPP_NR_REGS	(1 + MPP_MAX/8)
 
-void kirkwood_mpp_conf(u32 *mpp_list, u32 *mpp_save)
+void kirkwood_mpp_conf(const u32 *mpp_list, u32 *mpp_save)
 {
 	u32 mpp_ctrl[MPP_NR_REGS];
 	unsigned int variant_mask;
arch/arm/include/asm/arch-kirkwood/mpp.h +1 -1
index 8ceea7b..48d1477 100644
@@ -312,6 +312,6 @@
 
 #define MPP_MAX			49
 
-void kirkwood_mpp_conf(u32 *mpp_list, u32 *mpp_save);
+void kirkwood_mpp_conf(const u32 *mpp_list, u32 *mpp_save);
 
 #endif
board/LaCie/net2big_v2/net2big_v2.c +1 -1
index 0e06c29..e524f35 100644
@@ -39,7 +39,7 @@ int board_early_init_f(void)
 			NET2BIG_V2_OE_LOW, NET2BIG_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/LaCie/netspace_v2/netspace_v2.c +1 -1
index 101a80a..0aa5345 100644
@@ -39,7 +39,7 @@ int board_early_init_f(void)
 			NETSPACE_V2_OE_LOW, NETSPACE_V2_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/Marvell/dreamplug/dreamplug.c +1 -1
index d6497aa..0caf34f 100644
@@ -46,7 +46,7 @@ int board_early_init_f(void)
 			DREAMPLUG_OE_LOW, DREAMPLUG_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,		/* SPI Flash */
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/Marvell/guruplug/guruplug.c +1 -1
index f5c1c3c..3a52ab2 100644
@@ -43,7 +43,7 @@ int board_early_init_f(void)
 			GURUPLUG_OE_LOW, GURUPLUG_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c +1 -1
index 43852f6..fb57faa 100644
@@ -45,7 +45,7 @@ int board_early_init_f(void)
 			MV88F6281GTW_GE_OE_LOW, MV88F6281GTW_GE_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/Marvell/openrd/openrd.c +1 -1
index d48f05a..c59a326 100644
@@ -48,7 +48,7 @@ int board_early_init_f(void)
 			OPENRD_OE_LOW, OPENRD_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Marvell/rd6281a/rd6281a.c +1 -1
index 1fd7677..adaa6a1 100644
@@ -44,7 +44,7 @@ int board_early_init_f(void)
 			RD6281A_OE_LOW, RD6281A_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Marvell/sheevaplug/sheevaplug.c +1 -1
index 688d308..16efe64 100644
@@ -43,7 +43,7 @@ int board_early_init_f(void)
 			SHEEVAPLUG_OE_LOW, SHEEVAPLUG_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/Seagate/dockstar/dockstar.c +1 -1
index fc88520..4f1f899 100644
@@ -47,7 +47,7 @@ int board_early_init_f(void)
 			DOCKSTAR_OE_LOW, DOCKSTAR_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/buffalo/lsxl/lsxl.c +1 -1
index 57776fb..f298020 100644
@@ -76,7 +76,7 @@ int board_early_init_f(void)
 	 * Multi-Purpose Pins Functionality configuration
 	 * These strappings are taken from the original vendor uboot port.
 	 */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_SPI_SCn,
 		MPP1_SPI_MOSI,
 		MPP2_SPI_SCK,
board/cloudengines/pogo_e02/pogo_e02.c +1 -1
index bac9ce5..3b1c8ec 100644
@@ -45,7 +45,7 @@ int board_early_init_f(void)
 			POGO_E02_OE_LOW, POGO_E02_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/d-link/dns325/dns325.c +1 -1
index 11260fe..4187901 100644
@@ -44,7 +44,7 @@ int board_early_init_f(void)
 			DNS325_OE_LOW, DNS325_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/iomega/iconnect/iconnect.c +1 -1
index 6ee2128..c253df5 100644
@@ -41,7 +41,7 @@ int board_early_init_f(void)
 			ICONNECT_OE_LOW, ICONNECT_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/karo/tk71/tk71.c +1 -1
index 96410d7..7a4e7b3 100644
@@ -47,7 +47,7 @@ int board_early_init_f(void)
 			TK71_OE_LOW, TK71_OE_HIGH);
 
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
board/keymile/km_arm/km_arm.c +1 -1
index 0c4dddc..5fc46e6 100644
@@ -54,7 +54,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #define MASK_RBI_DEFECT_16	0x01
 
 /* Multi-Purpose Pins Functionality configuration */
-u32 kwmpp_config[] = {
+static const u32 kwmpp_config[] = {
 	MPP0_NF_IO2,
 	MPP1_NF_IO3,
 	MPP2_NF_IO4,
board/raidsonic/ib62x0/ib62x0.c +1 -1
index b7e6e41..1e89b55 100644
@@ -45,7 +45,7 @@ int board_early_init_f(void)
 	/* Set SATA activity LEDs to default off */
 	writel(MVSATAHC_LED_POLARITY_CTRL, MVSATAHC_LED_CONF_REG);
 	/* Multi-Purpose Pins Functionality configuration */
-	u32 kwmpp_config[] = {
+	static const u32 kwmpp_config[] = {
 		MPP0_NF_IO2,
 		MPP1_NF_IO3,
 		MPP2_NF_IO4,
drivers/spi/kirkwood_spi.c +5 -7
index a7cda75..de81064 100644
@@ -41,7 +41,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 {
 	struct spi_slave *slave;
 	u32 data;
-	u32 kwspi_mpp_config[] = { 0, 0 };
+	static const u32 kwspi_mpp_config[2][2] = {
+		{ MPP0_SPI_SCn, 0 }, /* if cs == 0 */
+		{ MPP7_SPI_SCn, 0 } /* if cs != 0 */
+	};
 
 	if (!spi_cs_is_valid(bus, cs))
 		return NULL;

@@ -68,12 +71,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
 	writel(KWSPI_IRQMASK, &spireg->irq_mask);
 
 	/* program mpp registers to select  SPI_CSn */
-	if (cs) {
-		kwspi_mpp_config[0] = MPP7_SPI_SCn;
-	} else {
-		kwspi_mpp_config[0] = MPP0_SPI_SCn;
-	}
-	kirkwood_mpp_conf(kwspi_mpp_config, cs_spi_mpp_back);
+	kirkwood_mpp_conf(kwspi_mpp_config[cs ? 1 : 0], cs_spi_mpp_back);
 
 	return slave;
 }
Signature · 1 line
1.7.10.4
author
#30 lore raw

PATCH v5 3/3 ARM: lacie_kw: add support for WIRELESS_SPACE

Signed-off-by Albert ARIBAUD <[email protected]>

---
Changes in v5:
- made fan, usb, HDD powered on at boot
- fixed NAND env and Ethernet configs
- general "ws" command with support for buttons
- made netconsole accessible before boot delay

Changes in v4:
- switched from netspace_V2-based to standalone board
- added support for mv88e61xx switch
- corrected some kwbimage.cfg values

Changes in v3:
- fix broken support for NETSPACE_(MINI|LITE)_V2

Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

 board/LaCie/wireless_space/Makefile         |   46 +++++++
 board/LaCie/wireless_space/kwbimage.cfg     |   82 +++++++++++
 board/LaCie/wireless_space/wireless_space.c |  176 ++++++++++++++++++++++++
 boards.cfg                                  |    1 +
 include/configs/wireless_space.h            |  194 +++++++++++++++++++++++++++
 5 files changed, 499 insertions(+)
 create mode 100644 board/LaCie/wireless_space/Makefile
 create mode 100644 board/LaCie/wireless_space/kwbimage.cfg
 create mode 100644 board/LaCie/wireless_space/wireless_space.c
 create mode 100644 include/configs/wireless_space.h
board/LaCie/wireless_space/Makefile new file +46 -0
new file mode 100644
index 0000000..b43c3d3
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2011 Simon Guinot <[email protected]>
+#
+# Based on Kirkwood support:
+# (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.
+#
+
+include $(TOPDIR)/config.mk
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o ../common/common.o
+
+SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+SOBJS	:= $(addprefix $(obj),$(SOBJS))
+
+$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
+	$(call cmd_link_o_target, $(OBJS) $(SOBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
board/LaCie/wireless_space/kwbimage.cfg new file +82 -0

82 lines not on this page · raw message

board/LaCie/wireless_space/wireless_space.c new file +176 -0

176 lines not on this page · raw message

boards.cfg +1 -0
index 6f21af0..18e42a1 100644
@@ -170,6 +170,7 @@ netspace_lite_v2             arm         arm926ejs   netspace_v2         LaCie
 netspace_max_v2              arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MAX_V2
 netspace_mini_v2             arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_MINI_V2
 netspace_v2                  arm         arm926ejs   netspace_v2         LaCie          kirkwood	lacie_kw:NETSPACE_V2
+wireless_space               arm         arm926ejs   wireless_space      LaCie          kirkwood
 dreamplug                    arm         arm926ejs   -                   Marvell        kirkwood
 guruplug                     arm         arm926ejs   -                   Marvell        kirkwood
 mv88f6281gtw_ge              arm         arm926ejs   -                   Marvell        kirkwood
include/configs/wireless_space.h new file +194 -0

194 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#31 lore raw

v5 cover Add support for the LaCie Wireless Space

In reply to Albert ARIBAUD
Quoted 84 lines

-----Original Message-----
From: Albert ARIBAUD [mailto:albert.u.boot at aribaud.net]
Sent: 27 November 2012 02:58
To: U-Boot
Cc: Prafulla Wadaskar; Simon Guinot; Albert ARIBAUD
Subject: [PATCH v5 0/3] Add support for the LaCie Wireless Space

This series adds support to the LaCie Wireless Space, a Marvell Kirkwood-based product featuring USB, SATA, Ethernet and an integrated mv88e6161 Ethernet switch.

Note 1: up to v4, this series had changes to mvgbe for supporting non-sequential PHY addresses on egiga0 and egiga1. This proved unneeded for switch support, and was dropped in v5.

Note 2: up to v3, this series made the Wireless Space a variant of the Net Space V2. Starting from v4, the Wireless Space is not based on Net Space V2 any more and the changes to Net Space V2 related code have been dropped.

Changes in v5:
- Fixes to the initialization sequence
- Added a configurable read/write command
- made fan, usb, HDD powered on at boot
- fixed NAND env and Ethernet configs
- general "ws" command with support for buttons
- made netconsole accessible before boot delay

Changes in v4:
- switched from netspace_V2-based to standalone board
- added support for mv88e61xx switch
- corrected some kwbimage.cfg values

Changes in v3:
- fix broken support for NETSPACE_(MINI|LITE)_V2

Changes in v2:
- split the patch in two: mvgbe phy/port changes and WS support.
- removed spurious DEBUG define
- fixed various checkpatch errors/warnings/typos

Albert ARIBAUD (3):
mv88e61xx: refactor PHY and SWITCH level-code
kirkwood: make MPP arrays static const
ARM: lacie_kw: add support for WIRELESS_SPACE

 arch/arm/cpu/arm926ejs/kirkwood/mpp.c           |    2 +-
 arch/arm/include/asm/arch-kirkwood/mpp.h        |    2 +-
 board/LaCie/net2big_v2/net2big_v2.c             |    2 +-
 board/LaCie/netspace_v2/netspace_v2.c           |    2 +-
 board/LaCie/wireless_space/Makefile             |   46 +++
 board/LaCie/wireless_space/kwbimage.cfg         |   82 ++++
 board/LaCie/wireless_space/wireless_space.c     |  176 ++++++++
 board/Marvell/dreamplug/dreamplug.c             |    2 +-
 board/Marvell/guruplug/guruplug.c               |    2 +-
 board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |    2 +-
 board/Marvell/openrd/openrd.c                   |    2 +-
 board/Marvell/rd6281a/rd6281a.c                 |    2 +-
 board/Marvell/sheevaplug/sheevaplug.c           |    2 +-
 board/Seagate/dockstar/dockstar.c               |    2 +-
 board/buffalo/lsxl/lsxl.c                       |    2 +-
 board/cloudengines/pogo_e02/pogo_e02.c          |    2 +-
 board/d-link/dns325/dns325.c                    |    2 +-
 board/iomega/iconnect/iconnect.c                |    2 +-
 board/karo/tk71/tk71.c                          |    2 +-
 board/keymile/km_arm/km_arm.c                   |    2 +-
 board/raidsonic/ib62x0/ib62x0.c                 |    2 +-
 boards.cfg                                      |    1 +
 drivers/net/phy/mv88e61xx.c                     |  495
++++++++++++++---------
 drivers/net/phy/mv88e61xx.h                     |   39 +-
 drivers/spi/kirkwood_spi.c                      |   12 +-
 include/configs/wireless_space.h                |  194 +++++++++
 include/netdev.h                                |   21 +-
 27 files changed, 880 insertions(+), 222 deletions(-)
 create mode 100644 board/LaCie/wireless_space/Makefile
 create mode 100644 board/LaCie/wireless_space/kwbimage.cfg
 create mode 100644 board/LaCie/wireless_space/wireless_space.c
 create mode 100644 include/configs/wireless_space.h
Quoted 2 lines

--
1.7.10.4

Applied this patch series to u-boot-marvell.git master branch

Regards...
Prafulla . . .