Omap updates for merge window after 2.6.30

From: Jarkko Nikula <[email protected]>

This email address is going to expire soon so update it.

Quoted 3 lines · Tony Lindgren

From: Jarkko Nikula <[email protected]>

This email address is going to expire soon so update it.

Should also be in MAINTAINERS, especially as that is being scripted to pull peoples contact information from that file (and git) automatically.

Quoted 8 lines · On Mon, 25 May 2009 10:23:50 +0100 Russell King - ARM Linux…

Quoted 3 lines · Tony Lindgren

From: Jarkko Nikula <[email protected]>

This email address is going to expire soon so update it.

Should also be in MAINTAINERS, especially as that is being scripted to pull peoples contact information from that file (and git) automatically.

My expired old address removed from cc.

Is the arch/arm/plat-omap/i2c.c so important piece that it would need own entry in MAINTAINERS? I think arch/arm/*omap* would cover well enough most of the files.

Make 770 LCD work by passing the clock from platform data. Also remove the old unused functions.

Quoted 2 lines

Make 770 LCD work by passing the clock from platform data. Also remove the old unused functions.

I don't like this - because its passing struct clk's through platform data. That's not how things are supposed to work.

The way PXA solves this problem is to have clock aliases - see clk_add_alias().

Quoting Russell King - ARM Linux <[email protected]>:

Quoted 7 lines · Tony Lindgren

Quoted 2 lines

Make 770 LCD work by passing the clock from platform data. Also remove the old unused functions.

I don't like this - because its passing struct clk's through platform data. That's not how things are supposed to work.

Quoted 2 lines

The way PXA solves this problem is to have clock aliases - see clk_add_alias().

Interesting idea - I now have a prototype patch implementing this, which I'll send when I get home (otherwise it would be an "it compiles" "test" :)

There isn't a common definition of clk_add_alias() though - that symbol is defined in arch/arm/mach-pxa/clock.c, so I had to copy it into arch/arm/plat-omap/clock.c

Quoting Andrew de Quincey <[email protected]>:

Quoted 16 lines

Quoting Russell King - ARM Linux <[email protected]>:

Quoted 9 lines · Tony Lindgren

Quoted 2 lines

Make 770 LCD work by passing the clock from platform data. Also remove the old unused functions.

I don't like this - because its passing struct clk's through platform data. That's not how things are supposed to work.

The way PXA solves this problem is to have clock aliases - see clk_add_alias().

Interesting idea - I now have a prototype patch implementing this, which I'll send when I get home (otherwise it would be an "it compiles" "test" :)

Quoted 3 lines

There isn't a common definition of clk_add_alias() though - that symbol is defined in arch/arm/mach-pxa/clock.c, so I had to copy it into arch/arm/plat-omap/clock.c

Attached is a patch implementing this method. I don't like the duplication of the clk_alias code, but I imagine that could be resolved if this method was chosen....

arch/arm/mach-omap1/board-nokia770.c +12 -0

index 8780ca6..e70fc7c 100644
@@ -33,9 +33,11 @@
 #include <mach/common.h>
 #include <mach/dsp_common.h>
 #include <mach/omapfb.h>
+#include <mach/hwa742.h>
 #include <mach/lcd_mipid.h>
 #include <mach/mmc.h>
 #include <mach/usb.h>
+#include <mach/clock.h>
 
 #define ADS7846_PENDOWN_GPIO	15
 

@@ -163,6 +165,15 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = {
 	},
 };
 
+static struct hwa742_platform_data nokia770_hwa742_platform_data = {
+	.te_connected		= 1,
+};
+
+static void hwa742_dev_init(void)
+{
+	clk_add_alias("hwa_sys_ck", NULL, "bclk", NULL);
+	omapfb_set_ctrl_platform_data(&nokia770_hwa742_platform_data);
+}
 
 /* assume no Mini-AB port */
 

@@ -371,6 +382,7 @@ static void __init omap_nokia770_init(void)
 	omap_serial_init();
 	omap_register_i2c_bus(1, 100, NULL, 0);
 	omap_dsp_init();
+	hwa742_dev_init();
 	ads7846_dev_init();
 	mipid_dev_init();
 	omap_usb_init(&nokia770_usb_config);

arch/arm/plat-omap/clock.c +19 -0

index 29efc27..862eefd 100644
@@ -24,6 +24,7 @@
 #include <linux/debugfs.h>
 #include <linux/io.h>
 
+#include <asm/clkdev.h>
 #include <mach/clock.h>
 
 static LIST_HEAD(clocks);

@@ -359,6 +360,24 @@ static int __init clk_disable_unused(void)
 late_initcall(clk_disable_unused);
 #endif
 
+int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
+	struct device *dev)
+{
+	struct clk *r = clk_get(dev, id);
+	struct clk_lookup *l;
+
+	if (!r)
+		return -ENODEV;
+
+	l = clkdev_alloc(r, alias, alias_dev_name);
+	clk_put(r);
+	if (!l)
+		return -ENODEV;
+	clkdev_add(l);
+	return 0;
+}
+EXPORT_SYMBOL(clk_add_alias);												
+
 int __init clk_init(struct clk_functions * custom_clocks)
 {
 	if (!custom_clocks) {

arch/arm/plat-omap/include/mach/clock.h +2 -0

index 073a2c5..b53b047 100644
@@ -127,12 +127,14 @@ extern void propagate_rate(struct clk *clk);
 extern void recalculate_root_clocks(void);
 extern unsigned long followparent_recalc(struct clk *clk);
 extern void clk_enable_init_clocks(void);
+extern int clk_add_alias(const char *alias, const char *alias_dev_name, char *id, struct device *dev); 	
 #ifdef CONFIG_CPU_FREQ
 extern void clk_init_cpufreq_table(struct cpufreq_frequency_table **table);
 #endif
 
 extern const struct clkops clkops_null;
 
+
 /* Clock flags */
 /* bit 0 is free */
 #define RATE_FIXED		(1 << 1)	/* Fixed clock rate */

arch/arm/plat-omap/include/mach/hwa742.h +0 -4

index 577f492..886248d 100644
@@ -2,10 +2,6 @@
 #define _HWA742_H
 
 struct hwa742_platform_data {
-	void		(*power_up)(struct device *dev);
-	void		(*power_down)(struct device *dev);
-	unsigned long	(*get_clock_rate)(struct device *dev);
-
 	unsigned	te_connected:1;
 };
 

drivers/video/omap/hwa742.c +10 -16

index 8aa6e47..5d4f348 100644
@@ -133,8 +133,7 @@ struct {
 	struct lcd_ctrl_extif	*extif;
 	struct lcd_ctrl		*int_ctrl;
 
-	void			(*power_up)(struct device *dev);
-	void			(*power_down)(struct device *dev);
+	struct clk		*sys_ck;
 } hwa742;
 
 struct lcd_ctrl hwa742_ctrl;

@@ -915,14 +914,13 @@ static void hwa742_suspend(void)
 	hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED);
 	/* Enable sleep mode */
 	hwa742_write_reg(HWA742_POWER_SAVE, 1 << 1);
-	if (hwa742.power_down != NULL)
-		hwa742.power_down(hwa742.fbdev->dev);
+	clk_disable(hwa742.sys_ck);
 }
 
 static void hwa742_resume(void)
 {
-	if (hwa742.power_up != NULL)
-		hwa742.power_up(hwa742.fbdev->dev);
+	clk_enable(hwa742.sys_ck);
+
 	/* Disable sleep mode */
 	hwa742_write_reg(HWA742_POWER_SAVE, 0);
 	while (1) {

@@ -955,14 +953,13 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
 	omapfb_conf = fbdev->dev->platform_data;
 	ctrl_conf = omapfb_conf->ctrl_platform_data;
 
-	if (ctrl_conf == NULL || ctrl_conf->get_clock_rate == NULL) {
+	if (ctrl_conf == NULL) {
 		dev_err(fbdev->dev, "HWA742: missing platform data\n");
 		r = -ENOENT;
 		goto err1;
 	}
 
-	hwa742.power_down = ctrl_conf->power_down;
-	hwa742.power_up = ctrl_conf->power_up;
+	hwa742.sys_ck = clk_get(NULL, "hwa_sys_ck");
 
 	spin_lock_init(&hwa742.req_lock);
 

@@ -972,12 +969,11 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
 	if ((r = hwa742.extif->init(fbdev)) < 0)
 		goto err2;
 
-	ext_clk = ctrl_conf->get_clock_rate(fbdev->dev);
+	ext_clk = clk_get_rate(hwa742.sys_ck);
 	if ((r = calc_extif_timings(ext_clk, &extif_mem_div)) < 0)
 		goto err3;
 	hwa742.extif->set_timings(&hwa742.reg_timings);
-	if (hwa742.power_up != NULL)
-		hwa742.power_up(fbdev->dev);
+	clk_enable(hwa742.sys_ck);
 
 	calc_hwa742_clk_rates(ext_clk, &sys_clk, &pix_clk);
 	if ((r = calc_extif_timings(sys_clk, &extif_mem_div)) < 0)

@@ -1040,8 +1036,7 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
 
 	return 0;
 err4:
-	if (hwa742.power_down != NULL)
-		hwa742.power_down(fbdev->dev);
+	clk_disable(hwa742.sys_ck);
 err3:
 	hwa742.extif->cleanup();
 err2:

@@ -1055,8 +1050,7 @@ static void hwa742_cleanup(void)
 	hwa742_set_update_mode(OMAPFB_UPDATE_DISABLED);
 	hwa742.extif->cleanup();
 	hwa742.int_ctrl->cleanup();
-	if (hwa742.power_down != NULL)
-		hwa742.power_down(hwa742.fbdev->dev);
+	clk_disable(hwa742.sys_ck);
 }
 
 struct lcd_ctrl hwa742_ctrl = {

Quoted 22 lines

Quoting Andrew de Quincey <[email protected]>:

Quoted 19 lines

Quoting Russell King - ARM Linux <[email protected]>:

Quoted 9 lines · Tony Lindgren

Quoted 2 lines

Make 770 LCD work by passing the clock from platform data. Also remove the old unused functions.

I don't like this - because its passing struct clk's through platform data. That's not how things are supposed to work.

The way PXA solves this problem is to have clock aliases - see clk_add_alias().

Interesting idea - I now have a prototype patch implementing this, which I'll send when I get home (otherwise it would be an "it compiles" "test" :)

There isn't a common definition of clk_add_alias() though - that symbol is defined in arch/arm/mach-pxa/clock.c, so I had to copy it into arch/arm/plat-omap/clock.c

Quoted 3 lines

Attached is a patch implementing this method. I don't like the duplication of the clk_alias code, but I imagine that could be resolved if this method was chosen....

Andrew, can you please reply with your Signed-off-by?

Quoting Tony Lindgren <[email protected]>:

Quoted 23 lines · Andrew de Quincey

Quoted 22 lines

Quoting Andrew de Quincey <[email protected]>:

Quoted 19 lines

Quoting Russell King - ARM Linux <[email protected]>:

Quoted 9 lines · Tony Lindgren

Quoted 2 lines

Make 770 LCD work by passing the clock from platform data. Also remove the old unused functions.

I don't like this - because its passing struct clk's through platform data. That's not how things are supposed to work.

The way PXA solves this problem is to have clock aliases - see clk_add_alias().

Interesting idea - I now have a prototype patch implementing this, which I'll send when I get home (otherwise it would be an "it compiles" "test" :)

There isn't a common definition of clk_add_alias() though - that symbol is defined in arch/arm/mach-pxa/clock.c, so I had to copy it into arch/arm/plat-omap/clock.c

Quoted 5 lines

Quoted 3 lines

Attached is a patch implementing this method. I don't like the duplication of the clk_alias code, but I imagine that could be resolved if this method was chosen....

Andrew, can you please reply with your Signed-off-by?

Sure - sorry I was holding off in case there were any comments on the method...

Signed-off-by Andrew de Quincey <[email protected]>

Quoted 31 lines · Andrew de Quincey

Quoting Tony Lindgren <[email protected]>:

Quoted 28 lines · Andrew de Quincey

Quoted 18 lines

Quoting Andrew de Quincey <[email protected]>:

Quoted 16 lines

Quoting Russell King - ARM Linux <[email protected]>:

Quoted 9 lines · Tony Lindgren

Quoted 2 lines

Make 770 LCD work by passing the clock from platform data. Also remove the old unused functions.

I don't like this - because its passing struct clk's through platform data. That's not how things are supposed to work.

The way PXA solves this problem is to have clock aliases - see clk_add_alias().

Interesting idea - I now have a prototype patch implementing this, which I'll send when I get home (otherwise it would be an "it compiles" "test" :)

Quoted 7 lines

Quoted 3 lines

There isn't a common definition of clk_add_alias() though - that symbol is defined in arch/arm/mach-pxa/clock.c, so I had to copy it into arch/arm/plat-omap/clock.c

Attached is a patch implementing this method. I don't like the duplication of the clk_alias code, but I imagine that could be resolved if this method was chosen....

Andrew, can you please reply with your Signed-off-by?

Quoted 2 lines

Sure - sorry I was holding off in case there were any comments on the method...

I added a note about maybe moving the clk_add_alias() to arch/arm/common/clkdev.c later.

Also noticed there were some whitespace errors, updated version below.

Quoted 22 lines · Andrew de Quincey

Quoting Andrew de Quincey <[email protected]>:

Quoted 19 lines

Quoting Russell King - ARM Linux <[email protected]>:

Quoted 9 lines · Tony Lindgren

Quoted 2 lines

Make 770 LCD work by passing the clock from platform data. Also remove the old unused functions.

I don't like this - because its passing struct clk's through platform data. That's not how things are supposed to work.

The way PXA solves this problem is to have clock aliases - see clk_add_alias().

Interesting idea - I now have a prototype patch implementing this, which I'll send when I get home (otherwise it would be an "it compiles" "test" :)

There isn't a common definition of clk_add_alias() though - that symbol is defined in arch/arm/mach-pxa/clock.c, so I had to copy it into arch/arm/plat-omap/clock.c

Quoted 3 lines

Attached is a patch implementing this method. I don't like the duplication of the clk_alias code, but I imagine that could be resolved if this method was chosen....

Andrew, can you please reply with your Signed-off-by?

Quoted 23 lines · Andrew de Quincey

Quoted 22 lines

Quoting Andrew de Quincey <[email protected]>:

Quoted 19 lines

Quoting Russell King - ARM Linux <[email protected]>:

Quoted 9 lines · Tony Lindgren

Quoted 2 lines

Make 770 LCD work by passing the clock from platform data. Also remove the old unused functions.

I don't like this - because its passing struct clk's through platform data. That's not how things are supposed to work.

The way PXA solves this problem is to have clock aliases - see clk_add_alias().

Interesting idea - I now have a prototype patch implementing this, which I'll send when I get home (otherwise it would be an "it compiles" "test" :)

There isn't a common definition of clk_add_alias() though - that symbol is defined in arch/arm/mach-pxa/clock.c, so I had to copy it into arch/arm/plat-omap/clock.c

Quoted 5 lines

Quoted 3 lines

Attached is a patch implementing this method. I don't like the duplication of the clk_alias code, but I imagine that could be resolved if this method was chosen....

Andrew, can you please reply with your Signed-off-by?

Actually, I'm very tempted to suggest that clk_add_alias() should go into arch/arm/common/clkdev.c if we're going to have more people use it.

Out of interest, what is the best practice way to pass platform specific GPIOs around? There are a number of other n770 related drivers I'm intending on cleaning up, several of which have GPIO numbers hardcoded in them. Should these be passed in platform structures, or is there something analogous to the clk_alias for GPIOs?

Quoted 9 lines

arch/arm/plat-omap/clock.c +9 -0

+int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
+	struct device *dev)
+{
+	struct clk *r = clk_get(dev, id);
+	struct clk_lookup *l;
+
+	if (!r)
+		return -ENODEV;
+

arch/arm/plat-omap/clock.c static int __init clk_disable_unused(void) · line 379

Quoted 8 lines

arch/arm/plat-omap/clock.c +8 -0

+	l = clkdev_alloc(r, alias, alias_dev_name);
+	clk_put(r);
+	if (!l)
+		return -ENODEV;
+	clkdev_add(l);
+	return 0;
+}
+EXPORT_SYMBOL(clk_add_alias);

Quoted 12 lines · Tony Lindgren

Quoted 12 lines

(quoted diff) +12 -0

+int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
+	struct device *dev)
+{
+	struct clk *r = clk_get(dev, id);
+	struct clk_lookup *l;
+
+	if (!r)
+		return -ENODEV;
+
+	l = clkdev_alloc(r, alias, alias_dev_name);
+	clk_put(r);
+	if (!l)

Quoted 5 lines

Review

Quoted 5 lines

(quoted diff) +5 -0

+		return -ENODEV;
+	clkdev_add(l);
+	return 0;
+}
+EXPORT_SYMBOL(clk_add_alias);

Oh, and a really good thing to do would be to fix the error checking and returning in there (why did I miss it in the original PXA version...)

Quoted 13 lines · Russell King - ARM Linux

Quoted 12 lines · Tony Lindgren

Quoted 12 lines

arch/arm/common/clkdev.c +12 -0

+int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
+	struct device *dev)
+{
+	struct clk *r = clk_get(dev, id);
+	struct clk_lookup *l;
+
+	if (!r)
+		return -ENODEV;
+
+	l = clkdev_alloc(r, alias, alias_dev_name);
+	clk_put(r);
+	if (!l)

Quoted 8 lines

Quoted 5 lines

arch/arm/common/clkdev.c struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id, · line 154

Quoted 5 lines

arch/arm/common/clkdev.c +5 -0

+		return -ENODEV;
+	clkdev_add(l);
+	return 0;
+}
+EXPORT_SYMBOL(clk_add_alias);

Oh, and a really good thing to do would be to fix the error checking and returning in there (why did I miss it in the original PXA version...)

How about this? The prototype is in clk.h now, is that OK?

Tony

From e4e651822967b0530a9d092894c04149e28efe39 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <[email protected]>
Date: Thu, 28 May 2009 13:24:12 -0700
Subject: [PATCH] ARM: Move clk_add_alias() to arch/arm/common/clkdev.c

This can be used for other arm platforms too as discussed on the linux-arm-kernel list.

Also check the return value with IS_ERR and return PTR_ERR as suggested by Russell King.

Signed-off-by Tony Lindgren <[email protected]>

arch/arm/common/clkdev.c +18 -0

index 5589444..f37afd9 100644
@@ -135,6 +135,24 @@ struct clk_lookup *clkdev_alloc(struct clk *clk, const char *con_id,
 }
 EXPORT_SYMBOL(clkdev_alloc);
 
+int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
+	struct device *dev)
+{
+	struct clk *r = clk_get(dev, id);
+	struct clk_lookup *l;
+
+	if (IS_ERR(r))
+		return PTR_ERR(r);
+
+	l = clkdev_alloc(r, alias, alias_dev_name);
+	clk_put(r);
+	if (!l)
+		return -ENODEV;
+	clkdev_add(l);
+	return 0;
+}
+EXPORT_SYMBOL(clk_add_alias);
+
 /*
  * clkdev_drop - remove a clock dynamically allocated
  */

arch/arm/mach-pxa/clock.c +0 -17

index db52d2c..49ae382 100644
@@ -86,20 +86,3 @@ void clks_register(struct clk_lookup *clks, size_t num)
 	for (i = 0; i < num; i++)
 		clkdev_add(&clks[i]);
 }
-
-int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
-	struct device *dev)
-{
-	struct clk *r = clk_get(dev, id);
-	struct clk_lookup *l;
-
-	if (!r)
-		return -ENODEV;
-
-	l = clkdev_alloc(r, alias, alias_dev_name);
-	clk_put(r);
-	if (!l)
-		return -ENODEV;
-	clkdev_add(l);
-	return 0;
-}

include/linux/clk.h +13 -0

index 1db9bbf..1d37f42 100644
@@ -142,4 +142,17 @@ struct clk *clk_get_parent(struct clk *clk);
  */
 struct clk *clk_get_sys(const char *dev_id, const char *con_id);
 
+/**
+ * clk_add_alias - add a new clock alias
+ * @alias: name for clock alias
+ * @alias_dev_name: device name
+ * @id: platform specific clock name
+ * @dev: device
+ *
+ * Allows using generic clock names for drivers by adding a new alias.
+ * Assumes clkdev, see clkdev.h for more info.
+ */
+int clk_add_alias(const char *alias, const char *alias_dev_name, char *id,
+			struct device *dev);
+
 #endif

From: Santosh Shilimkar <[email protected]>

Original OMAP DMA chaining design has chain_id as one of the callback parameters. Patch 538528de0cb256f65716ab2e9613d9e920f97fe2 broke the desing.

Change the callback to return the logical channel number and not chain_id.

-----Original Message-----
From: Russell King - ARM Linux [mailto:[email protected]]
Sent: Monday, May 25, 2009 3:04 PM
To: Tony Lindgren
Cc: [email protected]; [email protected]; Shilimkar, Santosh
Subject: Re: [PATCH 07/10] ARM: OMAP2/3: sDMA: Correct omap_request_dma_chain()

Quoted 3 lines · Tony Lindgren

From: Santosh Shilimkar <[email protected]>

Original OMAP DMA chaining design has chain_id as one of

the callback

Quoted 3 lines

parameters. Patch 538528de0cb256f65716ab2e9613d9e920f97fe2 broke the desing.

Quoted 2 lines

Change the callback to return the logical channel number and not chain_id.

This patch does not make a material change. It merely changes the name
used in a couple function pointer prototype. This has no impact on the
generated code - iow, it's cosmetic.

Quoted 20 lines

-----Original Message-----
From: Russell King - ARM Linux [mailto:[email protected]]
Sent: Monday, May 25, 2009 3:04 PM
To: Tony Lindgren
Cc: [email protected]; [email protected]; Shilimkar, Santosh
Subject: Re: [PATCH 07/10] ARM: OMAP2/3: sDMA: Correct omap_request_dma_chain()

Quoted 3 lines · Tony Lindgren

From: Santosh Shilimkar <[email protected]>

Original OMAP DMA chaining design has chain_id as one of

the callback

Quoted 5 lines

parameters. Patch 538528de0cb256f65716ab2e9613d9e920f97fe2 broke the desing.

Change the callback to return the logical channel number and not chain_id.

Quoted 5 lines

This patch does not make a material change. It merely changes the name
used in a couple function pointer prototype. This has no impact on the
generated code - iow, it's cosmetic.

Yes it does look cosmetic but if you see the API signature, it corrects the callback parameters which actually the DMA lib sends.

The current API signature is misleading for chained DMA transfers where the actual driver passes 'channel number' as one of the callback parameter instead of chain_id which was the original design.

From eb76d1e31e2da419a66e16f90504ac3f8cdb6874 Mon Sep 17 00:00:00 2001

-----Original Message-----
From: Tony Lindgren [mailto:[email protected]]
Sent: Monday, May 25, 2009 9:59 PM
To: Shilimkar, Santosh
Cc: Russell King - ARM Linux; [email protected]; [email protected]
Subject: Re: [PATCH 07/10] ARM: OMAP2/3: sDMA: Correct omap_request_dma_chain(), v2

Quoted 20 lines · Shilimkar, Santosh

Quoted 20 lines

-----Original Message-----
From: Russell King - ARM Linux [mailto:[email protected]]
Sent: Monday, May 25, 2009 3:04 PM
To: Tony Lindgren
Cc: [email protected]; [email protected]; Shilimkar, Santosh
Subject: Re: [PATCH 07/10] ARM: OMAP2/3: sDMA: Correct omap_request_dma_chain()

Quoted 3 lines · Tony Lindgren

From: Santosh Shilimkar <[email protected]>

Original OMAP DMA chaining design has chain_id as one of

the callback

Quoted 5 lines

parameters. Patch 538528de0cb256f65716ab2e9613d9e920f97fe2 broke the desing.

Change the callback to return the logical channel number and not chain_id.

Quoted 6 lines

Quoted 5 lines

This patch does not make a material change. It merely changes the name
used in a couple function pointer prototype. This has no impact on the
generated code - iow, it's cosmetic.

Yes it does look cosmetic but if you see the API signature,

it corrects the callback parameters which actually the DMA lib sends.

Quoted 2 lines

The current API signature is misleading for chained DMA

transfers where the actual driver passes 'channel number' as one of the callback parameter instead of chain_id which was the original design.

Here's this one with more descriptive comments.

(quoted diff) +2 -0

+#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
+	defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

arch/arm/mach-omap2/board-rx51-peripherals.c +6 -0

+static void __init board_onenand_init(void)
+{
+	gpmc_onenand_init(&board_onenand_data);
+}
+
+#endif
 
 void __init rx51_peripherals_init(void)
 {

arch/arm/mach-omap2/gpmc-onenand.c new file +8 -0

new file mode 100644
index 0000000..712af59
@@ -0,0 +1,340 @@
+/*
+ * linux/arch/arm/mach-omap2/gpmc-onenand.c
+ *
+ * Copyright (C) 2006 - 2009 Nokia Corporation
+ * Contacts:	Juha Yrjola
+ *		Tony Lindgren
+ *
+ * This program is free software; you can redistribute it and/or modify

arch/arm/plat-omap/include/mach/onenand.h +8 -2

+
+#define ONENAND_SYNC_READ	(1 << 0)
+#define ONENAND_SYNC_READWRITE	(1 << 1)
+
 struct omap_onenand_platform_data {
 	int			cs;
 	int			gpio_irq;

@@ -18,8 +24,27 @@ struct omap_onenand_platform_data {
 	int			nr_parts;
 	int                     (*onenand_setup)(void __iomem *, int freq);
 	int			dma_channel;
+	u8			flags;
 };
 
-int omap2_onenand_rephase(void);
-
 #define ONENAND_MAX_PARTITIONS 8
+
+#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
+	defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

arch/arm/plat-omap/include/mach/onenand.h +7 -1

+
+static inline void gpmc_onenand_init(struct omap_onenand_platform_data *d)
+{
+}
+
+#endif
+#endif
 
 
-------------------------------------------------------------------

List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
FAQ:        http://www.arm.linux.org.uk/mailinglists/faq.php
Etiquette:  http://www.arm.linux.org.uk/mailinglists/etiquette.php

Quoted 2 lines · Tony Lindgren

(quoted diff) +2 -0

+#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
+	defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

...

Quoted 10 lines

(quoted diff) +6 -0

+static void __init board_onenand_init(void)
+{
+	gpmc_onenand_init(&board_onenand_data);
+}
+
+#endif
 
 void __init rx51_peripherals_init(void)
 {

Review void __init rx51_peripherals_init(void) · line 469

Quoted 4 lines

(quoted diff) +1 -0

@@ -415,5 +466,6 @@ void __init rx51_peripherals_init(void)
 				ARRAY_SIZE(rx51_peripherals_devices));
 	rx51_i2c_init();
 	rx51_init_smc91x();
+	board_onenand_init();

This breaks without onenand support.

Quoted 14 lines

arch/arm/mach-omap2/gpmc-onenand.c new file +8 -0

new file mode 100644
index 0000000..712af59
@@ -0,0 +1,340 @@
+/*
+ * linux/arch/arm/mach-omap2/gpmc-onenand.c
+ *
+ * Copyright (C) 2006 - 2009 Nokia Corporation
+ * Contacts:	Juha Yrjola
+ *		Tony Lindgren
+ *
+ * This program is free software; you can redistribute it and/or modify

arch/arm/mach-omap2/gpmc-onenand.c line 18

Quoted 10 lines

arch/arm/mach-omap2/gpmc-onenand.c new file +10 -0

+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <asm/mach/flash.h>
+#include <linux/mtd/onenand_regs.h>
+
+#include <linux/io.h>

linux/ includes together please (without asm/ includes mixed in).

arch/arm/mach-omap2/gpmc-onenand.c line 27

Quoted 9 lines

arch/arm/mach-omap2/gpmc-onenand.c new file +9 -0

+static unsigned short omap2_onenand_readw(void __iomem *addr)
+{
+	return readw(addr);
+}
+
+static void omap2_onenand_writew(unsigned short value, void __iomem *addr)
+{
+	writew(value, addr);
+}

These two are pointless. Just use readw/writew directly.

Quoted 8 lines

arch/arm/plat-omap/include/mach/onenand.h +0 -0

index 4649d30..94cde73 100644
@@ -9,8 +9,14 @@
  * published by the Free Software Foundation.
  */
 

arch/arm/plat-omap/include/mach/onenand.h line 15

Quoted 4 lines

arch/arm/plat-omap/include/mach/onenand.h +2 -0

+#include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
+#ifndef __ASM_ARCH_OMAP_ONENAND_H__

This provides no protection against multiple includes on its own. You're missing a #define of this symbol.

Quoted 20 lines

arch/arm/plat-omap/include/mach/onenand.h +8 -2

+
+#define ONENAND_SYNC_READ	(1 << 0)
+#define ONENAND_SYNC_READWRITE	(1 << 1)
+
 struct omap_onenand_platform_data {
 	int			cs;
 	int			gpio_irq;

@@ -18,8 +24,27 @@ struct omap_onenand_platform_data {
 	int			nr_parts;
 	int                     (*onenand_setup)(void __iomem *, int freq);
 	int			dma_channel;
+	u8			flags;
 };
 
-int omap2_onenand_rephase(void);
-
 #define ONENAND_MAX_PARTITIONS 8
+
+#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
+	defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)

arch/arm/plat-omap/include/mach/onenand.h struct omap_onenand_platform_data { · line 43

Quoted 10 lines

arch/arm/plat-omap/include/mach/onenand.h +10 -0

+
+extern void gpmc_onenand_init(struct omap_onenand_platform_data *d);
+
+#else
+
+#define board_onenand_data	NULL
+
+static inline void board_onenand_init(void)
+{
+}

Eww, you put it in a different file. Disgusting. Please put it in the _same_ file as the place it's used.

arch/arm/plat-omap/include/mach/onenand.h struct omap_onenand_platform_data { · line 50

Quoted 7 lines

arch/arm/plat-omap/include/mach/onenand.h +7 -0

+
+static inline void gpmc_onenand_init(struct omap_onenand_platform_data *d)
+{
+}
+
+#endif
+#endif

From 1cea2b823fffd69d4e1d7d9686e489bc5410ae0e Mon Sep 17 00:00:00 2001

Convert the board-rx51 smc91x code to be generic and make the boards to use it. This allows future recalculation of the timings when the source clock gets scaled.

Quoted 3 lines · Tony Lindgren

Convert the board-rx51 smc91x code to be generic and make the boards to use it. This allows future recalculation of the timings when the source clock gets scaled.

Same complaint about splitting the stub function from where it's used - it's worse than wrapping the call in an ifdef itself.

From a9bf1f89964eb53ef47e64a67d090594e5202e58 Mon Sep 17 00:00:00 2001

Hi all,

This series contains omap updates for review. There will be one more series after this for omap3 specific patches.

Regards,

Tony

---

Eero Nurkkala (1):
ARM: OMAP: McBSP: Fix legacy interrupts to clear their status

Imre Deak (1):
ARM: OMAP2: 2430SDP: Add FB support to board file

Jarkko Nikula (1):
ARM: OMAP: Update contact address of I2C registration helper

Juha Yrjola (1):
ARM: OMAP2/3: Add generic onenand support when connected to GPMC

Mans Rullgard (1):
ARM: OMAP: Increase VMALLOC_END to allow 256MB RAM

Santosh Shilimkar (1):
ARM: OMAP2/3: sDMA: Correct omap_request_dma_chain()

Tomi Valkeinen (1):
ARM: OMAP2/3: DMA: implement trans copy and const fill

Tony Lindgren (3):
ARM: OMAP2/3: Add generic smc91x support when connected to GPMC
ARM: OMAP1: Make 770 LCD work
ARM: OMAP1: Misc clean-up

 arch/arm/configs/rx51_defconfig               |    2 
 arch/arm/mach-omap1/Kconfig                   |    1 
 arch/arm/mach-omap1/Makefile                  |    4 
 arch/arm/mach-omap1/board-nokia770.c          |   17 +
 arch/arm/mach-omap2/Makefile                  |    6 
 arch/arm/mach-omap2/board-2430sdp.c           |  112 ++------
 arch/arm/mach-omap2/board-3430sdp.c           |   78 ++----
 arch/arm/mach-omap2/board-rx51-peripherals.c  |  192 ++++++--------
 arch/arm/mach-omap2/gpmc-onenand.c            |  340 +++++++++++++++++++++++++
 arch/arm/mach-omap2/gpmc-smc91x.c             |  189 ++++++++++++++
 arch/arm/plat-omap/dma.c                      |   79 ++++--
 arch/arm/plat-omap/i2c.c                      |    2 
 arch/arm/plat-omap/include/mach/dma.h         |    3 
 arch/arm/plat-omap/include/mach/gpmc-smc91x.h |   46 +++
 arch/arm/plat-omap/include/mach/hwa742.h      |    5 
 arch/arm/plat-omap/include/mach/onenand.h     |   29 ++
 arch/arm/plat-omap/include/mach/vmalloc.h     |    2 
 arch/arm/plat-omap/mcbsp.c                    |   30 ++
 arch/arm/plat-omap/sram.c                     |    4 
 drivers/video/omap/hwa742.c                   |   26 +-
 20 files changed, 851 insertions(+), 316 deletions(-)
 create mode 100644 arch/arm/mach-omap2/gpmc-onenand.c
 create mode 100644 arch/arm/mach-omap2/gpmc-smc91x.c
 create mode 100644 arch/arm/plat-omap/include/mach/gpmc-smc91x.h

Signature · 5 lines

Signature
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html