Skip to contentSkip to conversation

Kirkwood: Marvell OpenRD-Base board support added to v2.6.31-rc5

PATCH Superseded Dhaval Vasa 5 participants 7 messages Aug 6, 2009 – Aug 10, 2009

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Kirkwood: Marvell OpenRD-Base board support added to v2.6.31-rc5

reference:
http://open-rd.org
http://code.google.com/p/openrd

This patch is tested for:
1. Boot from DRAM/NAND flash
2. NAND read/write/erase
3. GbE0
4. USB read/write

FIXME:
1. SD/UART1 selection
2. MPP configuration (currently, default)
3. PEX

---
 arch/arm/mach-kirkwood/Kconfig             |    5 ++
 arch/arm/mach-kirkwood/Makefile            |    1 +
 arch/arm/mach-kirkwood/openrd_base-setup.c |   79 ++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c
arch/arm/mach-kirkwood/Kconfig +5 -0
index 25100f7..f2379b3 100644
@@ -38,6 +38,11 @@ config MACH_TS219
 	  Say 'Y' here if you want your kernel to support the
 	  QNAP TS-119 and TS-219 Turbo NAS devices.
 
+config MACH_OPENRD_BASE
+	bool "Marvell OpenRD Base Board"
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  Marvell OpenRD Base Board.
 endmenu
 
 endif
arch/arm/mach-kirkwood/Makefile +1 -0
index 9dd680e..80ab0ec 100644
@@ -6,5 +6,6 @@ obj-$(CONFIG_MACH_RD88F6281)		+= rd88f6281-setup.o
 obj-$(CONFIG_MACH_MV88F6281GTW_GE)	+= mv88f6281gtw_ge-setup.o
 obj-$(CONFIG_MACH_SHEEVAPLUG)		+= sheevaplug-setup.o
 obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o
+obj-$(CONFIG_MACH_OPENRD_BASE)		+= openrd_base-setup.o
 
 obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
arch/arm/mach-kirkwood/openrd_base-setup.c new file +79 -0

79 lines not on this page · raw message

Signature · 18 lines
1.6.0.6

-- 
_____________________________________________________________________
Disclaimer: This e-mail message and all attachments transmitted with it
are intended solely for the use of the addressee and may contain legally
privileged and confidential information. If the reader of this message
is not the intended recipient, or an employee or agent responsible for
delivering this message to the intended recipient, you are hereby
notified that any dissemination, distribution, copying, or other use of
this message or its attachments is strictly prohibited. If you have
received this message in error, please notify the sender immediately by
replying to this message and please delete it from your computer. Any
views expressed in this message are those of the individual sender
unless otherwise stated.Company has taken enough precautions to prevent
the spread of viruses. However the company accepts no liability for any
damage caused by any virus transmitted by this email.
_____________________________________________________________________
#1 lore raw
Quoted 10 lines · Dhaval Vasa

reference:
http://open-rd.org
http://code.google.com/p/openrd

This patch is tested for:
1. Boot from DRAM/NAND flash
2. NAND read/write/erase
3. GbE0
4. USB read/write

Quoted 6 lines

FIXME:
1. SD/UART1 selection
2. MPP configuration (currently, default)
3. PEX

You forgot to cc: [email protected], although someone really should issue a MAINTAINERS entry for that machine directory.

Quoted 6 lines
---
 arch/arm/mach-kirkwood/Kconfig             |    5 ++
 arch/arm/mach-kirkwood/Makefile            |    1 +
 arch/arm/mach-kirkwood/openrd_base-setup.c |   79 ++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c

call this openrd.c or openrd_base.c, the -setup is redundant as these directories are suposed to have the machine setup files in them.

Quoted 137 lines
arch/arm/mach-kirkwood/Kconfig +5 -0
index 25100f7..f2379b3 100644
@@ -38,6 +38,11 @@ config MACH_TS219
 	  Say 'Y' here if you want your kernel to support the
 	  QNAP TS-119 and TS-219 Turbo NAS devices.
 
+config MACH_OPENRD_BASE
+	bool "Marvell OpenRD Base Board"
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  Marvell OpenRD Base Board.
 endmenu
 
 endif
arch/arm/mach-kirkwood/Makefile +1 -0
index 9dd680e..80ab0ec 100644
@@ -6,5 +6,6 @@ obj-$(CONFIG_MACH_RD88F6281)		+= rd88f6281-setup.o
 obj-$(CONFIG_MACH_MV88F6281GTW_GE)	+= mv88f6281gtw_ge-setup.o
 obj-$(CONFIG_MACH_SHEEVAPLUG)		+= sheevaplug-setup.o
 obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o
+obj-$(CONFIG_MACH_OPENRD_BASE)		+= openrd_base-setup.o
 
 obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
arch/arm/mach-kirkwood/openrd_base-setup.c new file +79 -0
new file mode 100644
index 0000000..26b6e58
@@ -0,0 +1,79 @@
+/*
+ * arch/arm/mach-kirkwood/openrd_base-setup.c
+ *
+ * Marvell OpenRD Base Board Setup
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/kirkwood.h>
+#include <plat/mvsdio.h>
+#include "common.h"
+#include "mpp.h"
+
+static struct mtd_partition openrd_base_nand_parts[] = {
+	{
+		.name = "u-boot",
+		.offset = 0,
+		.size = SZ_1M
+	}, {
+		.name = "uImage",
+		.offset = MTDPART_OFS_NXTBLK,
+		.size = SZ_4M
+	}, {
+		.name = "root",
+		.offset = MTDPART_OFS_NXTBLK,
+		.size = MTDPART_SIZ_FULL
+	},
+};
+
+static struct mv643xx_eth_platform_data openrd_base_ge00_data = {
+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
+};
+
+static struct mvsdio_platform_data openrd_base_mvsdio_data = {
+	.gpio_card_detect = MPP29_GPIO,	/* MPP29 used as SD card detect */
+};
+
+static unsigned int openrd_base_mpp_config[] __initdata = {
+	0
+};
+
+static void __init openrd_base_init(void)
+{
+	/*
+	 * Basic setup. Needs to be called early.
+	 */
+	kirkwood_init();
+	kirkwood_mpp_conf(openrd_base_mpp_config);
+
+	kirkwood_uart0_init();
+	kirkwood_nand_init(ARRAY_AND_SIZE(openrd_base_nand_parts), 25);
+
+	kirkwood_ehci_init();
+
+	kirkwood_ge00_init(&openrd_base_ge00_data);
+	kirkwood_sdio_init(&openrd_base_mvsdio_data);
+}
+
+MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")
+	/* Maintainer: Dhaval Vasa <[email protected]> */
+	.phys_io	= KIRKWOOD_REGS_PHYS_BASE,
+	.io_pg_offst	= ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
+	.boot_params	= 0x00000100,
+	.init_machine	= openrd_base_init,
+	.map_io		= kirkwood_map_io,
+	.init_irq	= kirkwood_init_irq,
+	.timer		= &kirkwood_timer,
+MACHINE_END
Signature · 24 lines
1.6.0.6

-- 
_____________________________________________________________________
Disclaimer: This e-mail message and all attachments transmitted with it
are intended solely for the use of the addressee and may contain legally
privileged and confidential information. If the reader of this message
is not the intended recipient, or an employee or agent responsible for
delivering this message to the intended recipient, you are hereby
notified that any dissemination, distribution, copying, or other use of
this message or its attachments is strictly prohibited. If you have
received this message in error, please notify the sender immediately by
replying to this message and please delete it from your computer. Any
views expressed in this message are those of the individual sender
unless otherwise stated.Company has taken enough precautions to prevent
the spread of viruses. However the company accepts no liability for any
damage caused by any virus transmitted by this email.
_____________________________________________________________________
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
Signature · 3 lines
Ben ([email protected], http://www.fluff.org/)

  'a smiley only costs 4 bytes'
#2 lore raw
Quoted 16 lines · Ben Dooks
Quoted 15 lines · Dhaval Vasa

reference:
http://open-rd.org
http://code.google.com/p/openrd

This patch is tested for:
1. Boot from DRAM/NAND flash
2. NAND read/write/erase
3. GbE0
4. USB read/write

FIXME:
1. SD/UART1 selection
2. MPP configuration (currently, default)
3. PEX

Quoted 5 lines
Quoted 1 line

You forgot to cc: [email protected], although someone really should issue a MAINTAINERS entry for that machine directory.

Yep, I'll take care of it.

Quoted 10 lines
Quoted 6 lines
---
 arch/arm/mach-kirkwood/Kconfig             |    5 ++
 arch/arm/mach-kirkwood/Makefile            |    1 +
 arch/arm/mach-kirkwood/openrd_base-setup.c |   79 ++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c

call this openrd.c or openrd_base.c, the -setup is redundant as these directories are suposed to have the machine setup files in them.

The *-setup.c is the existing naming sheme used for the Orion and Kirkwood architectures to contain board setup code instead of common IRQ or timer code for example. So it is fine.

Nicolas

#3 lore raw
In reply to Dhaval Vasa

[ arm-linux mailing list added to CC ]

Quoted 10 lines · Dhaval Vasa

reference:
http://open-rd.org
http://code.google.com/p/openrd

This patch is tested for:
1. Boot from DRAM/NAND flash
2. NAND read/write/erase
3. GbE0
4. USB read/write

Quoted 6 lines

FIXME:
1. SD/UART1 selection
2. MPP configuration (currently, default)
3. PEX

Comments below.

Quoted 19 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +13 -0
new file mode 100644
index 0000000..26b6e58
@@ -0,0 +1,79 @@
+/*
+ * arch/arm/mach-kirkwood/openrd_base-setup.c
+ *
+ * Marvell OpenRD Base Board Setup
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>

arch/arm/mach-kirkwood/openrd_base-setup.c line 23

Quoted 10 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +10 -0
+#include <linux/mtd/partitions.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/kirkwood.h>
+#include <plat/mvsdio.h>
+#include "common.h"
+#include "mpp.h"

The leds.h include appears to be unneeded.

Quoted 14 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +14 -0
+
+static struct mtd_partition openrd_base_nand_parts[] = {
+	{
+		.name = "u-boot",
+		.offset = 0,
+		.size = SZ_1M
+	}, {
+		.name = "uImage",
+		.offset = MTDPART_OFS_NXTBLK,
+		.size = SZ_4M
+	}, {
+		.name = "root",
+		.offset = MTDPART_OFS_NXTBLK,
+		.size = MTDPART_SIZ_FULL

arch/arm/mach-kirkwood/openrd_base-setup.c line 47

Quoted 10 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +10 -0
+	},
+};
+
+static struct mv643xx_eth_platform_data openrd_base_ge00_data = {
+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
+};
+
+static struct mvsdio_platform_data openrd_base_mvsdio_data = {
+	.gpio_card_detect = MPP29_GPIO,	/* MPP29 used as SD card detect */
+};

You should use a literal number here, like .gpio_card_detect = 29.

arch/arm/mach-kirkwood/openrd_base-setup.c line 51

Quoted 3 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +3 -0
+static unsigned int openrd_base_mpp_config[] __initdata = {
+	0
+};

Here belongs the MPP29_GPIO.

Nicolas

#4 lore raw

PATCH 1/1 Kirkwood: Initialise SATA for OpenRD-Base

---

Please include this patch in with that set also. I can confirm this enables me to boot an OpenRD-Base board from SATA with 2.6.31-rc5.

 arch/arm/mach-kirkwood/openrd_base-setup.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/mach-kirkwood/openrd_base-setup.c +6 -0
index 6e290fd..d8c846d 100644
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
+#include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
@@ -42,6 +43,10 @@ static struct mv643xx_eth_platform_data openrd_base_ge00_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
 };
 
+static struct mv_sata_platform_data openrd_base_sata_data = {
+	.n_ports	= 2,
+};
+
 static struct mvsdio_platform_data openrd_base_mvsdio_data = {
 	.gpio_card_detect = MPP29_GPIO,	/* MPP29 used as SD card detect */
 };
@@ -64,6 +69,7 @@ static void __init openrd_base_init(void)
 	kirkwood_ehci_init();
 
 	kirkwood_ge00_init(&openrd_base_ge00_data);
+	kirkwood_sata_init(&openrd_base_sata_data);
 	kirkwood_sdio_init(&openrd_base_mvsdio_data);
 }
 
Signature · 1 line
1.6.3.3
#5 lore raw

Re: [PATCH] [ARM] Kirkwood: Initialise SATA for OpenRD-Base

I am sending v2 patch for this; based on my updated base v2 patch.

- Dhaval

Quoted 40 lines · Ron

---

Please include this patch in with that set also. I can confirm this enables me to boot an OpenRD-Base board from SATA with 2.6.31-rc5.

 arch/arm/mach-kirkwood/openrd_base-setup.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/mach-kirkwood/openrd_base-setup.c +6 -0
index 6e290fd..d8c846d 100644
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
+#include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
@@ -42,6 +43,10 @@ static struct mv643xx_eth_platform_data openrd_base_ge00_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
 };
 
+static struct mv_sata_platform_data openrd_base_sata_data = {
+	.n_ports	= 2,
+};
+
 static struct mvsdio_platform_data openrd_base_mvsdio_data = {
 	.gpio_card_detect = MPP29_GPIO,	/* MPP29 used as SD card detect */
 };
@@ -64,6 +69,7 @@ static void __init openrd_base_init(void)
 	kirkwood_ehci_init();
 
 	kirkwood_ge00_init(&openrd_base_ge00_data);
+	kirkwood_sata_init(&openrd_base_sata_data);
 	kirkwood_sdio_init(&openrd_base_mvsdio_data);
 }
 
Signature · 15 lines
_____________________________________________________________________
Disclaimer: This e-mail message and all attachments transmitted with it
are intended solely for the use of the addressee and may contain legally
privileged and confidential information. If the reader of this message
is not the intended recipient, or an employee or agent responsible for
delivering this message to the intended recipient, you are hereby
notified that any dissemination, distribution, copying, or other use of
this message or its attachments is strictly prohibited. If you have
received this message in error, please notify the sender immediately by
replying to this message and please delete it from your computer. Any
views expressed in this message are those of the individual sender
unless otherwise stated.Company has taken enough precautions to prevent
the spread of viruses. However the company accepts no liability for any
damage caused by any virus transmitted by this email.
_____________________________________________________________________
#6 lore raw
In reply to Nicolas Pitre
Quoted 73 lines · Nicolas Pitre

[ arm-linux mailing list added to CC ]

Quoted 10 lines · Dhaval Vasa

reference:
http://open-rd.org
http://code.google.com/p/openrd

This patch is tested for:
1. Boot from DRAM/NAND flash
2. NAND read/write/erase
3. GbE0
4. USB read/write

Quoted 6 lines

FIXME:
1. SD/UART1 selection
2. MPP configuration (currently, default)
3. PEX

Comments below.

Quoted 19 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +13 -0
new file mode 100644
index 0000000..26b6e58
@@ -0,0 +1,79 @@
+/*
+ * arch/arm/mach-kirkwood/openrd_base-setup.c
+ *
+ * Marvell OpenRD Base Board Setup
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>

arch/arm/mach-kirkwood/openrd_base-setup.c line 23

Quoted 10 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +10 -0
+#include <linux/mtd/partitions.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/gpio.h>
+#include <linux/leds.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/kirkwood.h>
+#include <plat/mvsdio.h>
+#include "common.h"
+#include "mpp.h"

The leds.h include appears to be unneeded.

Quoted 18 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +18 -0
+
+static struct mtd_partition openrd_base_nand_parts[] = {
+	{
+		.name = "u-boot",
+		.offset = 0,
+		.size = SZ_1M
+	}, {
+		.name = "uImage",
+		.offset = MTDPART_OFS_NXTBLK,
+		.size = SZ_4M
+	}, {
+		.name = "root",
+		.offset = MTDPART_OFS_NXTBLK,
+		.size = MTDPART_SIZ_FULL
+	},
+};
+
+static struct mv643xx_eth_platform_data openrd_base_ge00_data = {
Quoted 8 lines

arch/arm/mach-kirkwood/openrd_base-setup.c line 47

Quoted 6 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +6 -0
+	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
+};
+
+static struct mvsdio_platform_data openrd_base_mvsdio_data = {
+	.gpio_card_detect = MPP29_GPIO,	/* MPP29 used as SD card detect */
+};

You should use a literal number here, like .gpio_card_detect = 29.

patch v2 will close this review comment.

Quoted 6 lines

arch/arm/mach-kirkwood/openrd_base-setup.c line 51

Quoted 4 lines
arch/arm/mach-kirkwood/openrd_base-setup.c new file +3 -0
+static unsigned int openrd_base_mpp_config[] __initdata = {
+	0
+};

Here belongs the MPP29_GPIO.

patch v2 will close this review comment.

Thanks for review.

- Dhaval

Signature · 15 lines
_____________________________________________________________________
Disclaimer: This e-mail message and all attachments transmitted with it
are intended solely for the use of the addressee and may contain legally
privileged and confidential information. If the reader of this message
is not the intended recipient, or an employee or agent responsible for
delivering this message to the intended recipient, you are hereby
notified that any dissemination, distribution, copying, or other use of
this message or its attachments is strictly prohibited. If you have
received this message in error, please notify the sender immediately by
replying to this message and please delete it from your computer. Any
views expressed in this message are those of the individual sender
unless otherwise stated.Company has taken enough precautions to prevent
the spread of viruses. However the company accepts no liability for any
damage caused by any virus transmitted by this email.
_____________________________________________________________________