Skip to contentSkip to conversation

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

PATCH In review Dhaval Vasa 3 participants 6 messages Aug 10, 2009 – Aug 19, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 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.3.3

-- 
_____________________________________________________________________
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.
_____________________________________________________________________
Tested-by on v2 1/1
#1 lore raw

Hi Dhaval!

Quoted 10 lines · On Mon, 10 Aug 2009 17:37:34 +0530 Dhaval Vasa <[email protected]>…

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

Review

Quoted 2 lines
(quoted diff) +2 -0
+static unsigned int openrd_base_mpp_config[] __initdata = {
+	MPP29_GPIO,	
                   ^^^^^

There is trailing whitespace on this line

Also, I'd suggest merging "[PATCH v2] Kirkwood: Initialise SATA for OpenRD-Base" into this one and resubmit it.

In my patch, I also called kirkwood_i2c_init (see below), which at least make the I2C bus appear (not that I've tested it very much).

// Simon

arch/arm/mach-kirkwood/openrd_base-setup.c +2 -0
index f9a2166..dc0a2fe 100644
@@ -71,6 +71,8 @@ static void __init openrd_base_init(void)
        kirkwood_ge00_init(&openrd_base_ge00_data);
        kirkwood_sata_init(&openrd_base_sata_data);
        kirkwood_sdio_init(&openrd_base_mvsdio_data);
+
+       kirkwood_i2c_init();
 }
 
 MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")
#2 lore raw
Quoted 2 lines · On Wed, 19 Aug 2009 15:18:14 +0200 Simon Kagstrom…

In my patch, I also called kirkwood_i2c_init (see below), which at least make the I2C bus appear (not that I've tested it very much).

And also from my patch, I added initialization of PCIe as well (taken from rd88f6281-setup.c). So you could perhaps also add that to your patch as well?

If needed:

// Simon

arch/arm/mach-kirkwood/openrd_base-setup.c +11 -0
index f9a2166..30f84b1 100644
@@ -71,7 +71,18 @@ static void __init openrd_base_init(void)
        kirkwood_ge00_init(&openrd_base_ge00_data);
        kirkwood_sata_init(&openrd_base_sata_data);
        kirkwood_sdio_init(&openrd_base_mvsdio_data);
+
+       kirkwood_i2c_init();
+}
+
+static int __init openrd_base_pci_init(void)
+{
+       if (machine_is_openrd_base())
+               kirkwood_pcie_init();
+
+       return 0;
 }
+subsys_initcall(openrd_base_pci_init);
 
 MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")
        /* Maintainer: Dhaval Vasa <[email protected]> */
#3 lore raw
In reply to Simon Kagstrom
Quoted 20 lines · Simon Kagstrom

Hi Dhaval!

Quoted 15 lines · On Mon, 10 Aug 2009 17:37:34 +0530 Dhaval Vasa <[email protected]>…

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 9 lines
Quoted 1 line

Review

Quoted 2 lines
(quoted diff) +2 -0
+static unsigned int openrd_base_mpp_config[] __initdata = {
+	MPP29_GPIO,	
                   ^^^^^

There is trailing whitespace on this line

Nicolas has already applied this patch on his orion tree; it would be worth generating separate one for whitespace ? Suggest.

Quoted 2 lines

Also, I'd suggest merging "[PATCH v2] Kirkwood: Initialise SATA for OpenRD-Base" into this one and resubmit it.

Nicolas has already applied this patch on his orion tree. Should I re-submit now ?

Quoted 13 lines

In my patch, I also called kirkwood_i2c_init (see below), which at least make the I2C bus appear (not that I've tested it very much).

// Simon

arch/arm/mach-kirkwood/openrd_base-setup.c +0 -0
index f9a2166..dc0a2fe 100644

arch/arm/mach-kirkwood/openrd_base-setup.c static void __init openrd_base_init(void) · line 78

Quoted 8 lines
arch/arm/mach-kirkwood/openrd_base-setup.c +2 -0
@@ -71,6 +71,8 @@ static void __init openrd_base_init(void)
        kirkwood_ge00_init(&openrd_base_ge00_data);
        kirkwood_sata_init(&openrd_base_sata_data);
        kirkwood_sdio_init(&openrd_base_mvsdio_data);
+
+       kirkwood_i2c_init();
 }
 
 MACHINE_START(OPENRD_BASE, "Marvell OpenRD Base Board")

Can you point me to your patch ?

- 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.
_____________________________________________________________________
#4 lore raw
Quoted 7 lines · On Wed, 19 Aug 2009 19:19:29 +0530 Dhaval Vasa <[email protected]>…
Quoted 5 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+static unsigned int openrd_base_mpp_config[] __initdata = {
+	MPP29_GPIO,	
                   ^^^^^

There is trailing whitespace on this line

Nicolas has already applied this patch on his orion tree; it would be worth generating separate one for whitespace ? Suggest.

Maybe not, I'm not sure what the procedure is. I didn't realise it was already there - I was looking at another git tree :-)

Quoted 5 lines
Quoted 2 lines

Also, I'd suggest merging "[PATCH v2] Kirkwood: Initialise SATA for OpenRD-Base" into this one and resubmit it.

Nicolas has already applied this patch on his orion tree. Should I re-submit now ?

Well, if it's already there I think it's fine as it is. I thought the patch was still under consideration.

Quoted 1 line

Can you point me to your patch ?

I posted it about a month ago on this list, see:

http://www.spinics.net/lists/arm-kernel/msg70680.html

I guess you can apply the patch I sent in the last mail to the Orion tree if it's acceptable - that's basically the diff between my old patch and the new one you sent.

// Simon

#5 lore raw
Quoted 10 lines · Simon Kagstrom
Quoted 7 lines · On Wed, 19 Aug 2009 19:19:29 +0530 Dhaval Vasa <[email protected]>…
Quoted 5 lines

Review

Quoted 2 lines
(quoted diff) +2 -0
+static unsigned int openrd_base_mpp_config[] __initdata = {
+	MPP29_GPIO,	
                   ^^^^^

There is trailing whitespace on this line

Nicolas has already applied this patch on his orion tree; it would be worth generating separate one for whitespace ? Suggest.

I did apply it with --whitespace=fix so no problem there.

Quoted 2 lines

Maybe not, I'm not sure what the procedure is. I didn't realise it was already there - I was looking at another git tree :-)

It is also in RMK's git tree waiting for the 2.6.32 merge window to open.

Nicolas