[PATCH v2] [ARM] Kirkwood: Marvell OpenRD-Base board support added to v2.6.31-rc5

[PATCH v2] [ARM] Kirkwood: Marvell OpenRD-Base board support added to v2.6.31-rc5

[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

Signed-off-by: Dhaval Vasa <dhaval.vasa@einfochips.com>
---
 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

diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 25100f7..f2379b3 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -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
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index 9dd680e..80ab0ec 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -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
diff --git a/arch/arm/mach-kirkwood/openrd_base-setup.c b/arch/arm/mach-kirkwood/openrd_base-setup.c
new file mode 100644
index 0000000..b713644
--- /dev/null
+++ b/arch/arm/mach-kirkwood/openrd_base-setup.c
@@ -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 <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 = 29,	/* MPP29 used as SD card detect */
+};
+
+static unsigned int openrd_base_mpp_config[] __initdata = {
+	MPP29_GPIO,	
+	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 <dhaval.vasa@einfochips.com> */
+	.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
-- 
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.
_____________________________________________________________________
 

Re: [PATCH v2] [ARM] Kirkwood: Marvell OpenRD-Base board support added to v2.6.31-rc5

[Simon Kagstrom]

Hi Dhaval!

On Mon, 10 Aug 2009 17:37:34 +0530
Dhaval Vasa <dhaval.vasa@einfochips.com> wrote:

> 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
> 
> Signed-off-by: Dhaval Vasa <dhaval.vasa@einfochips.com>

Tested-by: Simon Kagstrom <simon.kagstrom@netinsight.net>

> +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

diff --git a/arch/arm/mach-kirkwood/openrd_base-setup.c b/arch/arm/mach-kirkwood/openrd_base-setup.c
index f9a2166..dc0a2fe 100644
--- a/arch/arm/mach-kirkwood/openrd_base-setup.c
+++ b/arch/arm/mach-kirkwood/openrd_base-setup.c
@@ -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")

Re: [PATCH v2] [ARM] Kirkwood: Marvell OpenRD-Base board support added to v2.6.31-rc5

[Simon Kagstrom]

On Wed, 19 Aug 2009 15:18:14 +0200
Simon Kagstrom <simon.kagstrom@netinsight.net> wrote:

> 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:

Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>

// Simon

diff --git a/arch/arm/mach-kirkwood/openrd_base-setup.c b/arch/arm/mach-kirkwood/openrd_base-setup.c
index f9a2166..30f84b1 100644
--- a/arch/arm/mach-kirkwood/openrd_base-setup.c
+++ b/arch/arm/mach-kirkwood/openrd_base-setup.c
@@ -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 <dhaval.vasa@einfochips.com> */

Re: [PATCH v2] [ARM] Kirkwood: Marvell OpenRD-Base board support added to v2.6.31-rc5

[Dhaval Vasa]

Simon Kagstrom wrote:
> Hi Dhaval!
> 
> On Mon, 10 Aug 2009 17:37:34 +0530
> Dhaval Vasa <dhaval.vasa@einfochips.com> wrote:
> 
>> 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
>>
>> Signed-off-by: Dhaval Vasa <dhaval.vasa@einfochips.com>
> 
> Tested-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
> 
>> +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.

> 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 ?

> 
> 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
> 
> diff --git a/arch/arm/mach-kirkwood/openrd_base-setup.c b/arch/arm/mach-kirkwood/openrd_base-setup.c
> index f9a2166..dc0a2fe 100644
> --- a/arch/arm/mach-kirkwood/openrd_base-setup.c
> +++ b/arch/arm/mach-kirkwood/openrd_base-setup.c
> @@ -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
-- 
_____________________________________________________________________
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.
_____________________________________________________________________
 

Re: [PATCH v2] [ARM] Kirkwood: Marvell OpenRD-Base board support added to v2.6.31-rc5

[Simon Kagstrom]

On Wed, 19 Aug 2009 19:19:29 +0530
Dhaval Vasa <dhaval.vasa@einfochips.com> wrote:

> >> +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 :-)

> > 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.

> 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

Re: [PATCH v2] [ARM] Kirkwood: Marvell OpenRD-Base board support added to v2.6.31-rc5

[Nicolas Pitre]

On Wed, 19 Aug 2009, Simon Kagstrom wrote:

> On Wed, 19 Aug 2009 19:19:29 +0530
> Dhaval Vasa <dhaval.vasa@einfochips.com> wrote:
> 
> > >> +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.

> 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