[patch 0/4] Simtec patches for new Kirkwood based boad

[patch 0/4] Simtec patches for new Kirkwood based boad

[Ben Dooks]

A fix for the RTC driver, updates for using RnB with the Orion NAND
driver and the machine definition for the DTCOMMOD.

Is there anytone currently picking up mach-kirkwood patches or should
this go to Russell's patch tracker?

-- 
Ben (ben at fluff.org, http://www.fluff.org/)

  'a smiley only costs 4 bytes'

[patch 1/4] orion/kirkwood: add RnB line support to orion mtd driver

[Ben Dooks]

[-- Attachment #1: slinux/arm/kirkwood/mtd-ready-not-busy-support.patch --]
[-- Type: text/plain, Size: 1286 bytes --]

Add support for a board to register a callback to get the state of the
RnB line if it has it attached.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Cc: Linux MTD <linux-mtd@lists.infradead.org>

Index: linux-2.6-2.6.32.9/arch/arm/plat-orion/include/plat/orion_nand.h
===================================================================
--- linux-2.6-2.6.32.9.orig/arch/arm/plat-orion/include/plat/orion_nand.h	2010-02-23 15:38:51.%N +0000
+++ linux-2.6-2.6.32.9/arch/arm/plat-orion/include/plat/orion_nand.h	2010-03-11 13:24:27.%N +0000
@@ -14,6 +14,7 @@
  */
 struct orion_nand_data {
 	struct mtd_partition *parts;
+	int (*dev_ready)(struct mtd_info *mtd);
 	u32 nr_parts;
 	u8 ale;		/* address line number connected to ALE */
 	u8 cle;		/* address line number connected to CLE */
Index: linux-2.6-2.6.32.9/drivers/mtd/nand/orion_nand.c
===================================================================
--- linux-2.6-2.6.32.9.orig/drivers/mtd/nand/orion_nand.c	2010-02-23 15:38:51.%N +0000
+++ linux-2.6-2.6.32.9/drivers/mtd/nand/orion_nand.c	2010-03-11 13:24:27.%N +0000
@@ -114,6 +114,9 @@
 	if (board->width == 16)
 		nc->options |= NAND_BUSWIDTH_16;
 
+	if (board->dev_ready)
+		nc->dev_ready = board->dev_ready;
+
 	platform_set_drvdata(pdev, mtd);
 
 	if (nand_scan(mtd, 1)) {

[patch 1/4] orion/kirkwood: add RnB line support to orion mtd driver

[Ben Dooks]

An embedded and charset-unspecified text was scrubbed...
Name: slinux/arm/kirkwood/mtd-ready-not-busy-support.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100420/33783abf/attachment.el>

Re: [patch 1/4] orion/kirkwood: add RnB line support to orion mtd driver

[Artem Bityutskiy]

On Tue, 2010-04-20 at 10:26 +0100, Ben Dooks wrote:
> plain text document attachment (slinux)
> Add support for a board to register a callback to get the state of the
> RnB line if it has it attached.
> 
> Signed-off-by: Ben Dooks <ben@simtec.co.uk>
> Cc: Linux MTD <linux-mtd@lists.infradead.org>

Added both to l2-mtd-2.6.git / dunno

-- 
Best Regards,
Artem Bityutskiy (Артём Битюцкий)

[patch 1/4] orion/kirkwood: add RnB line support to orion mtd driver

[Artem Bityutskiy]

On Tue, 2010-04-20 at 10:26 +0100, Ben Dooks wrote:
> plain text document attachment (slinux)
> Add support for a board to register a callback to get the state of the
> RnB line if it has it attached.
> 
> Signed-off-by: Ben Dooks <ben@simtec.co.uk>
> Cc: Linux MTD <linux-mtd@lists.infradead.org>

Added both to l2-mtd-2.6.git / dunno

-- 
Best Regards,
Artem Bityutskiy (????? ????????)

[patch 2/4] kirkwood: allow machines to register RnB callback

[-- Attachment #1: slinux/arm/kirkwood/allow-mtd-ready-not-busy-registration.patch --]
[-- Type: text/plain, Size: 1855 bytes --]

Add a kirkwood_nand_init_rnb() call to allow boards which
have RnB line detection to register this instead of a
static delay.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Cc: Linux MTD <linux-mtd@lists.infradead.org>

Index: linux-2.6-2.6.32.9/arch/arm/mach-kirkwood/common.c
===================================================================
--- linux-2.6-2.6.32.9.orig/arch/arm/mach-kirkwood/common.c	2010-02-23 15:38:51.%N +0000
+++ linux-2.6-2.6.32.9/arch/arm/mach-kirkwood/common.c	2010-03-11 13:25:01.%N +0000
@@ -305,6 +305,15 @@
 	platform_device_register(&kirkwood_nand_flash);
 }
 
+void __init kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,
+				   int (*dev_ready)(struct mtd_info *))
+{
+	kirkwood_clk_ctrl |= CGC_RUNIT;
+	kirkwood_nand_data.parts = parts;
+	kirkwood_nand_data.nr_parts = nr_parts;
+	kirkwood_nand_data.dev_ready = dev_ready;
+	platform_device_register(&kirkwood_nand_flash);
+}
 
 /*****************************************************************************
  * SoC RTC
Index: linux-2.6-2.6.32.9/arch/arm/mach-kirkwood/common.h
===================================================================
--- linux-2.6-2.6.32.9.orig/arch/arm/mach-kirkwood/common.h	2010-02-23 15:38:51.%N +0000
+++ linux-2.6-2.6.32.9/arch/arm/mach-kirkwood/common.h	2010-03-11 13:25:01.%N +0000
@@ -16,6 +16,7 @@
 struct mv_sata_platform_data;
 struct mvsdio_platform_data;
 struct mtd_partition;
+struct mtd_info;
 
 /*
  * Basic Kirkwood init functions used early by machine-setup.
@@ -41,6 +42,7 @@
 void kirkwood_uart0_init(void);
 void kirkwood_uart1_init(void);
 void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);
+void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *));
 
 extern int kirkwood_tclk;
 extern struct sys_timer kirkwood_timer;

[patch 2/4] kirkwood: allow machines to register RnB callback

[Ben Dooks]

An embedded and charset-unspecified text was scrubbed...
Name: slinux/arm/kirkwood/allow-mtd-ready-not-busy-registration.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100420/51029c0f/attachment.el>

[patch 3/4] rtc-mv: Fix 12/24 hour error message

[Ben Dooks]

An embedded and charset-unspecified text was scrubbed...
Name: slinux/arm/kirkwood/fix-rtc-error-message.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100420/5325fcab/attachment.el>

[patch 4/4] ARM: kirkwood: Add Datong DTCOMMOD machine definition

[Ben Dooks]

An embedded and charset-unspecified text was scrubbed...
Name: slinux/arm/kirkwood/dtcommod-board-support.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100420/9508a69f/attachment.el>

[patch 4/4] ARM: kirkwood: Add Datong DTCOMMOD machine definition

[Nicolas Pitre]

On Tue, 20 Apr 2010, Ben Dooks wrote:

> +static void __init dtcommod_init(void)
> +{
> +	kirkwood_init();
> +	kirkwood_mpp_conf(dtcommod_mpp_config);
> +
> +	kirkwood_uart0_init();
> +	/* need to init nand, but we have RnB line */

What's the purpose of that comment there?

> +
> +	kirkwood_ge00_init(&dtcommod_ge0_data);
> +	kirkwood_ge01_init(&dtcommod_ge1_data);
> +	kirkwood_sata_init(&dtcommod_sata_data);
> +	kirkwood_sdio_init(&dtcommod_mvsdio_data);
> +
> +	i2c_register_board_info(0, dtcommod_i2c_devs,
> +				ARRAY_SIZE(dtcommod_i2c_devs));
> +
> +	gpio_request(GPIO_RNB, "NAND RnB");
> +	gpio_direction_input(GPIO_RNB);
> +
> +	gpio_request(GPIO_SDPWR, "SD Power Enable");
> +	gpio_direction_output(GPIO_SDPWR, 0);
> +
> +	kirkwood_nand_init_rnb(ARRAY_AND_SIZE(dtcommod_nand_parts),
> +			       dtcommod_nand_rnb);
> +
> +	/* add the i2c bus info */
> +
> +	kirkwood_ehci_init();
> +	kirkwood_i2c_init();

And isn't that comment misplaced too?

> +}
> +
> +static int __init dtcommod_pci_init(void)
> +{
> +	if (machine_is_dtcommod())
> +		kirkwood_pcie_init();
> +
> +	return 0;
> +}

You do have a PCIe slot/device, right?

Other than that, ACK.


Nicolas

[patch 0/4] Simtec patches for new Kirkwood based boad

[Nicolas Pitre]

On Tue, 20 Apr 2010, Ben Dooks wrote:

> Is there anytone currently picking up mach-kirkwood patches or should
> this go to Russell's patch tracker?

I usually do, and push them to git://git.marvell.com/orion.
But I don't mind if you want to push them to the patch system instead.


Nicolas

[[PATCH] 1/4] orion/kirkwood: add RnB line support to orion mtd driver

[Ben Dooks]

[-- Attachment #1: slinux/arm/kirkwood/mtd-ready-not-busy-support.patch --]
[-- Type: text/plain, Size: 1286 bytes --]

Add support for a board to register a callback to get the state of the
RnB line if it has it attached.

Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Cc: Linux MTD <linux-mtd@lists.infradead.org>

Index: linux-2.6-2.6.32.9/arch/arm/plat-orion/include/plat/orion_nand.h
===================================================================
--- linux-2.6-2.6.32.9.orig/arch/arm/plat-orion/include/plat/orion_nand.h	2010-02-23 15:38:51.%N +0000
+++ linux-2.6-2.6.32.9/arch/arm/plat-orion/include/plat/orion_nand.h	2010-03-11 13:24:27.%N +0000
@@ -14,6 +14,7 @@
  */
 struct orion_nand_data {
 	struct mtd_partition *parts;
+	int (*dev_ready)(struct mtd_info *mtd);
 	u32 nr_parts;
 	u8 ale;		/* address line number connected to ALE */
 	u8 cle;		/* address line number connected to CLE */
Index: linux-2.6-2.6.32.9/drivers/mtd/nand/orion_nand.c
===================================================================
--- linux-2.6-2.6.32.9.orig/drivers/mtd/nand/orion_nand.c	2010-02-23 15:38:51.%N +0000
+++ linux-2.6-2.6.32.9/drivers/mtd/nand/orion_nand.c	2010-03-11 13:24:27.%N +0000
@@ -114,6 +114,9 @@
 	if (board->width == 16)
 		nc->options |= NAND_BUSWIDTH_16;
 
+	if (board->dev_ready)
+		nc->dev_ready = board->dev_ready;
+
 	platform_set_drvdata(pdev, mtd);
 
 	if (nand_scan(mtd, 1)) {