[PATCH 0/2] Fix omap builds

[PATCH 0/2] Fix omap builds

[Tony Lindgren]

Hi,

Here are two patches to fix omap builds.

Regards,

Tony

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[Tony Lindgren]

Include irqs.h or cpu.h directly as needed to fix
omap builds.

Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index 7de7c69..2fcdad1 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 
+#include <mach/irqs.h>
 #include <mach/dma.h>
 #include <mach/mux.h>
 #include <mach/cpu.h>
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index cae3ebe..6549656 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 
+#include <mach/irqs.h>
 #include <mach/dma.h>
 #include <mach/mux.h>
 #include <mach/cpu.h>
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index 89a6ab0..467531e 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/arch/arm/plat-omap/i2c.c
@@ -26,6 +26,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
+#include <mach/irqs.h>
 #include <mach/mux.h>
 
 #define OMAP_I2C_SIZE		0x3f
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
index b59c385..18179ac 100644
--- a/drivers/mfd/twl4030-core.c
+++ b/drivers/mfd/twl4030-core.c
@@ -38,6 +38,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c/twl4030.h>
 
+#include <mach/cpu.h>
 
 /*
  * The TWL4030 "Triton 2" is one of a family of a multi-function "Power

[PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls

[Tony Lindgren]

From: Jarkko Nikula <jarkko.nikula@nokia.com>
Date: Wed, 7 Jan 2009 12:54:34 +0200
Subject: [PATCH] ARM: OMAP: Fix gpio by switching to generic gpio calls

Fix compile by removing remaining omap specific gpio
calls. Based on earlier patches by Jarkko Nikula.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 8171fe0..09a2422 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -423,9 +423,9 @@ static void __init omap_sx1_init(void)
 
 	/* turn on USB power */
 	/* sx1_setusbpower(1); cant do it here because i2c is not ready */
-	omap_request_gpio(1);	/* A_IRDA_OFF */
-	omap_request_gpio(11);	/* A_SWITCH */
-	omap_request_gpio(15);	/* A_USB_ON */
+	gpio_request(1, "A_IRDA_OFF");
+	gpio_request(11, "A_SWITCH");
+	gpio_request(15, "A_USB_ON");
 	gpio_direction_output(1, 1);	/*A_IRDA_OFF = 1 */
 	gpio_direction_output(11, 0);	/*A_SWITCH = 0 */
 	gpio_direction_output(15, 0);	/*A_USB_ON = 0 */
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index bf1e5d3..a328fcc 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -126,8 +126,8 @@ static struct resource apollon_smc91x_resources[] = {
 		.flags  = IORESOURCE_MEM,
 	},
 	[1] = {
-		.start	= OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ),
-		.end	= OMAP_GPIO_IRQ(APOLLON_ETHR_GPIO_IRQ),
+		.start	= gpio_to_irq(APOLLON_ETHR_GPIO_IRQ),
+		.end	= gpio_to_irq(APOLLON_ETHR_GPIO_IRQ),
 		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
 	},
 };
@@ -282,31 +282,28 @@ static void __init apollon_led_init(void)
 {
 	/* LED0 - AA10 */
 	omap_cfg_reg(AA10_242X_GPIO13);
-	omap_request_gpio(LED0_GPIO13);
-	omap_set_gpio_direction(LED0_GPIO13, 0);
-	omap_set_gpio_dataout(LED0_GPIO13, 0);
+	gpio_request(LED0_GPIO13, "LED0");
+	gpio_direction_output(LED0_GPIO13, 0);
 	/* LED1  - AA6 */
 	omap_cfg_reg(AA6_242X_GPIO14);
-	omap_request_gpio(LED1_GPIO14);
-	omap_set_gpio_direction(LED1_GPIO14, 0);
-	omap_set_gpio_dataout(LED1_GPIO14, 0);
+	gpio_request(LED1_GPIO14, "LED1");
+	gpio_direction_output(LED1_GPIO14, 0);
 	/* LED2  - AA4 */
 	omap_cfg_reg(AA4_242X_GPIO15);
-	omap_request_gpio(LED2_GPIO15);
-	omap_set_gpio_direction(LED2_GPIO15, 0);
-	omap_set_gpio_dataout(LED2_GPIO15, 0);
+	gpio_request(LED2_GPIO15, "LED2");
+	gpio_direction_output(LED2_GPIO15, 0);
 }
 
 static irqreturn_t apollon_sw_interrupt(int irq, void *ignored)
 {
 	static unsigned int led0, led1, led2;
 
-	if (irq == OMAP_GPIO_IRQ(SW_ENTER_GPIO16))
-		omap_set_gpio_dataout(LED0_GPIO13, led0 ^= 1);
-	else if (irq == OMAP_GPIO_IRQ(SW_UP_GPIO17))
-		omap_set_gpio_dataout(LED1_GPIO14, led1 ^= 1);
-	else if (irq == OMAP_GPIO_IRQ(SW_DOWN_GPIO58))
-		omap_set_gpio_dataout(LED2_GPIO15, led2 ^= 1);
+	if (irq == gpio_to_irq(SW_ENTER_GPIO16))
+		gpio_set_value(LED0_GPIO13, led0 ^= 1);
+	else if (irq == gpio_to_irq(SW_UP_GPIO17))
+		gpio_set_value(LED1_GPIO14, led1 ^= 1);
+	else if (irq == gpio_to_irq(SW_DOWN_GPIO58))
+		gpio_set_value(LED2_GPIO15, led2 ^= 1);
 
 	return IRQ_HANDLED;
 }
@@ -315,29 +312,29 @@ static void __init apollon_sw_init(void)
 {
 	/* Enter SW - Y11 */
 	omap_cfg_reg(Y11_242X_GPIO16);
-	omap_request_gpio(SW_ENTER_GPIO16);
+	gpio_request(SW_ENTER_GPIO16, "Enter SW");
 	gpio_direction_input(SW_ENTER_GPIO16);
 	/* Up SW - AA12 */
 	omap_cfg_reg(AA12_242X_GPIO17);
-	omap_request_gpio(SW_UP_GPIO17);
+	gpio_request(SW_UP_GPIO17, "Up SW");
 	gpio_direction_input(SW_UP_GPIO17);
 	/* Down SW - AA8 */
 	omap_cfg_reg(AA8_242X_GPIO58);
-	omap_request_gpio(SW_DOWN_GPIO58);
+	gpio_request(SW_DOWN_GPIO58, "Down SW");
 	gpio_direction_input(SW_DOWN_GPIO58);
 
-	set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
-	if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
+	set_irq_type(gpio_to_irq(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
+	if (request_irq(gpio_to_irq(SW_ENTER_GPIO16), &apollon_sw_interrupt,
 				IRQF_SHARED, "enter sw",
 				&apollon_sw_interrupt))
 		return;
-	set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQ_TYPE_EDGE_RISING);
-	if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &apollon_sw_interrupt,
+	set_irq_type(gpio_to_irq(SW_UP_GPIO17), IRQ_TYPE_EDGE_RISING);
+	if (request_irq(gpio_to_irq(SW_UP_GPIO17), &apollon_sw_interrupt,
 				IRQF_SHARED, "up sw",
 				&apollon_sw_interrupt))
 		return;
-	set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQ_TYPE_EDGE_RISING);
-	if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &apollon_sw_interrupt,
+	set_irq_type(gpio_to_irq(SW_DOWN_GPIO58), IRQ_TYPE_EDGE_RISING);
+	if (request_irq(gpio_to_irq(SW_DOWN_GPIO58), &apollon_sw_interrupt,
 				IRQF_SHARED, "down sw",
 				&apollon_sw_interrupt))
 		return;
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index aa69727..f6a1345 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -88,7 +88,7 @@ static inline void __init ldp_init_smc911x(void)
 
 	ldp_smc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
 
-	if (omap_request_gpio(eth_gpio) < 0) {
+	if (gpio_request(eth_gpio, "smc911x irq") < 0) {
 		printk(KERN_ERR "Failed to request GPIO%d for smc911x IRQ\n",
 				eth_gpio);
 		return;
diff --git a/arch/arm/plat-omap/include/mach/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h
index 04e68e8..8d9dfe3 100644
--- a/arch/arm/plat-omap/include/mach/gpio.h
+++ b/arch/arm/plat-omap/include/mach/gpio.h
@@ -87,16 +87,6 @@ extern void omap_set_gpio_debounce_time(int gpio, int enable);
 #include <linux/errno.h>
 #include <asm-generic/gpio.h>
 
-static inline int omap_request_gpio(int gpio)
-{
-	return gpio_request(gpio, "FIXME");
-}
-
-static inline void omap_free_gpio(int gpio)
-{
-	gpio_free(gpio);
-}
-
 static inline int gpio_get_value(unsigned gpio)
 {
 	return __gpio_get_value(gpio);
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 96ecc17..77a4f14 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -629,7 +629,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 	}
 
 	if (c->gpio_irq) {
-		if ((r = omap_request_gpio(c->gpio_irq)) < 0) {
+		if ((r = gpio_request(c->gpio_irq, "OneNAND irq")) < 0) {
 			dev_err(&pdev->dev,  "Failed to request GPIO%d for "
 				"OneNAND\n", c->gpio_irq);
 			goto err_iounmap;
@@ -726,7 +726,7 @@ err_release_dma:
 		free_irq(gpio_to_irq(c->gpio_irq), c);
 err_release_gpio:
 	if (c->gpio_irq)
-		omap_free_gpio(c->gpio_irq);
+		gpio_free(c->gpio_irq);
 err_iounmap:
 	iounmap(c->onenand.base);
 err_release_mem_region:
@@ -761,7 +761,7 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
 	platform_set_drvdata(pdev, NULL);
 	if (c->gpio_irq) {
 		free_irq(gpio_to_irq(c->gpio_irq), c);
-		omap_free_gpio(c->gpio_irq);
+		gpio_free(c->gpio_irq);
 	}
 	iounmap(c->onenand.base);
 	release_mem_region(c->phys_base, ONENAND_IO_SIZE);

git pull request for omap compile fixes, mailbox and hsmmc for current merge window

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [090107 13:14]:
> Hi,
> 
> Here are two patches to fix omap builds.

Russell, here's the pull request for few misc omap patches
for the current merge window:

- These two build fixes

- The hsmmc driver posted earlier and acked by Pierre [1]

- Mailbox updates for omap3 posted earlier by Hiroshi [2]

Regards,

Tony

[1] http://lists.arm.linux.org.uk/lurker/thread/20081207.215139.ba39f495.en.html#20081207.215139.ba39f495
[2] http://lists.arm.linux.org.uk/lurker/thread/20090107.111220.eb4aadfb.en.html#20090107.111220.eb4aadfb


The following changes since commit ede6f5aea054d3fb67c78857f7abdee602302043:
  Linus Torvalds (1):
        Fix up 64-bit byte swaps for most 32-bit architectures

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-misc-for-rmk

Hiroshi DOYU (10):
      omap mailbox: cleanup omap2 register definition with macro
      omap mailbox: add initial omap3 support
      omap mailbox: print hardware revision at startup
      omap mailbox: fix empty struct device for omap_mbox
      omap mailbox: fix empty struct device for omap1
      omap mailbox: fix empty struct device for omap2
      omap mailbox: add save_/restore_ctx() for PM
      omap mailbox: move mailbox.h into mailbox.c
      omap mailbox: convert sequence bit checking to module paramter
      omap mailbox: remove unnecessary header file inclusion

Jarkko Nikula (1):
      ARM: OMAP: Fix gpio by switching to generic gpio calls

Madhusudhan Chikkature (1):
      omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3

Tony Lindgren (1):
      ARM: OMAP: Fix missing includes

 arch/arm/mach-omap1/board-sx1.c            |    6 +-
 arch/arm/mach-omap1/devices.c              |    2 +-
 arch/arm/mach-omap1/mailbox.c              |   31 +-
 arch/arm/mach-omap1/mcbsp.c                |    1 +
 arch/arm/mach-omap2/board-apollon.c        |   49 +-
 arch/arm/mach-omap2/board-ldp.c            |    2 +-
 arch/arm/mach-omap2/devices.c              |   38 +-
 arch/arm/mach-omap2/mailbox.c              |  195 +++--
 arch/arm/mach-omap2/mcbsp.c                |    1 +
 arch/arm/plat-omap/Kconfig                 |    8 +
 arch/arm/plat-omap/i2c.c                   |    1 +
 arch/arm/plat-omap/include/mach/gpio.h     |   10 -
 arch/arm/plat-omap/include/mach/mailbox.h  |   27 +-
 arch/arm/plat-omap/include/mach/omap34xx.h |    1 +
 arch/arm/plat-omap/mailbox.c               |  152 +++-
 arch/arm/plat-omap/mailbox.h               |  100 ---
 drivers/mfd/twl4030-core.c                 |    1 +
 drivers/mmc/host/Kconfig                   |   10 +
 drivers/mmc/host/Makefile                  |    1 +
 drivers/mmc/host/omap_hsmmc.c              | 1242 ++++++++++++++++++++++++++++
 drivers/mtd/onenand/omap2.c                |    6 +-
 21 files changed, 1598 insertions(+), 286 deletions(-)
 delete mode 100644 arch/arm/plat-omap/mailbox.h
 create mode 100644 drivers/mmc/host/omap_hsmmc.c

Re: [PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls

[Jarkko Nikula]

On Wed, 7 Jan 2009 13:17:45 +0200
"ext Tony Lindgren" <tony@atomide.com> wrote:

> From: Jarkko Nikula <jarkko.nikula@nokia.com>
> Date: Wed, 7 Jan 2009 12:54:34 +0200
> Subject: [PATCH] ARM: OMAP: Fix gpio by switching to generic gpio calls
> 
> Fix compile by removing remaining omap specific gpio
> calls. Based on earlier patches by Jarkko Nikula.
> 
Thanks Tony!

> diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
> index 96ecc17..77a4f14 100644
> --- a/drivers/mtd/onenand/omap2.c
> +++ b/drivers/mtd/onenand/omap2.c
>
I think this was already handed over to mtd list by Adrian?


Jarkko

Re: [PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls

[Tony Lindgren]

* Jarkko Nikula <jarkko.nikula@nokia.com> [090107 13:38]:
> On Wed, 7 Jan 2009 13:17:45 +0200
> "ext Tony Lindgren" <tony@atomide.com> wrote:
> 
> > From: Jarkko Nikula <jarkko.nikula@nokia.com>
> > Date: Wed, 7 Jan 2009 12:54:34 +0200
> > Subject: [PATCH] ARM: OMAP: Fix gpio by switching to generic gpio calls
> > 
> > Fix compile by removing remaining omap specific gpio
> > calls. Based on earlier patches by Jarkko Nikula.
> > 
> Thanks Tony!
> 
> > diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
> > index 96ecc17..77a4f14 100644
> > --- a/drivers/mtd/onenand/omap2.c
> > +++ b/drivers/mtd/onenand/omap2.c
> >
> I think this was already handed over to mtd list by Adrian?

Oops, sorry. Adrian, do you want me to drop the compile fix for onenand?

Regards,

Tony

Re: [PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls

[Tony Lindgren]

* Adrian Hunter <ext-adrian.hunter@nokia.com> [090107 15:15]:
> Tony Lindgren wrote:
>> * Jarkko Nikula <jarkko.nikula@nokia.com> [090107 13:38]:
>>> On Wed, 7 Jan 2009 13:17:45 +0200
>>> "ext Tony Lindgren" <tony@atomide.com> wrote:
>>>
>>>> From: Jarkko Nikula <jarkko.nikula@nokia.com>
>>>> Date: Wed, 7 Jan 2009 12:54:34 +0200
>>>> Subject: [PATCH] ARM: OMAP: Fix gpio by switching to generic gpio calls
>>>>
>>>> Fix compile by removing remaining omap specific gpio
>>>> calls. Based on earlier patches by Jarkko Nikula.
>>>>
>>> Thanks Tony!
>>>
>>>> diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
>>>> index 96ecc17..77a4f14 100644
>>>> --- a/drivers/mtd/onenand/omap2.c
>>>> +++ b/drivers/mtd/onenand/omap2.c
>>>>
>>> I think this was already handed over to mtd list by Adrian?
>>
>> Oops, sorry. Adrian, do you want me to drop the compile fix for onenand?
>>
>> Regards,
>>
>> Tony
>>
>
> No, those changes have not been sent to mainline before.
> Please go ahead.

OK, thanks. Keeping the onenand change so the pull request is still
valid.

Tony

Re: [PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls

[Adrian Hunter]

Tony Lindgren wrote:
> * Jarkko Nikula <jarkko.nikula@nokia.com> [090107 13:38]:
>> On Wed, 7 Jan 2009 13:17:45 +0200
>> "ext Tony Lindgren" <tony@atomide.com> wrote:
>>
>>> From: Jarkko Nikula <jarkko.nikula@nokia.com>
>>> Date: Wed, 7 Jan 2009 12:54:34 +0200
>>> Subject: [PATCH] ARM: OMAP: Fix gpio by switching to generic gpio calls
>>>
>>> Fix compile by removing remaining omap specific gpio
>>> calls. Based on earlier patches by Jarkko Nikula.
>>>
>> Thanks Tony!
>>
>>> diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
>>> index 96ecc17..77a4f14 100644
>>> --- a/drivers/mtd/onenand/omap2.c
>>> +++ b/drivers/mtd/onenand/omap2.c
>>>
>> I think this was already handed over to mtd list by Adrian?
> 
> Oops, sorry. Adrian, do you want me to drop the compile fix for onenand?
> 
> Regards,
> 
> Tony
> 

No, those changes have not been sent to mainline before.
Please go ahead.

Re: [PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls

[Russell King - ARM Linux]

On Wed, Jan 07, 2009 at 01:17:45PM +0200, Tony Lindgren wrote:
> -	set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
> -	if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
> +	set_irq_type(gpio_to_irq(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
> +	if (request_irq(gpio_to_irq(SW_ENTER_GPIO16), &apollon_sw_interrupt,

NAK.  I wonder how the f*** this got anywhere near the mainline kernel.
No no no no no.  set_irq_type + request_irq is utter crap and should be
rejected whenever its seen.  There's absolutely no need for it -
request_irq is sufficient.  Get rid of this set_irq_type usage from
everywhere please.

Re: [PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls, v2

[Tony Lindgren]

[-- Attachment #1: Type: text/plain, Size: 1054 bytes --]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [090107 18:18]:
> On Wed, Jan 07, 2009 at 01:17:45PM +0200, Tony Lindgren wrote:
> > -	set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
> > -	if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
> > +	set_irq_type(gpio_to_irq(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
> > +	if (request_irq(gpio_to_irq(SW_ENTER_GPIO16), &apollon_sw_interrupt,
> 
> NAK.  I wonder how the f*** this got anywhere near the mainline kernel.
> No no no no no.  set_irq_type + request_irq is utter crap and should be
> rejected whenever its seen.  There's absolutely no need for it -
> request_irq is sufficient.  Get rid of this set_irq_type usage from
> everywhere please.

Blind search and replace? :) I've removed the GPIO key code as there's
already a patch to do that cleaner with gpio_keys.

Looks like there are still few places where gpio_request() and then
set_irq_type() is called in the board-*.c files, and then the irq is
passed to the driver which does request_irq().

Tony

[-- Attachment #2: fix-gpio-v2.patch --]
[-- Type: text/x-diff, Size: 6401 bytes --]

>From 4afb512f6a37d9ca87fb3e8d2f423ce3eaf7e407 Mon Sep 17 00:00:00 2001
From: Jarkko Nikula <jarkko.nikula@nokia.com>
Date: Wed, 7 Jan 2009 12:54:34 +0200
Subject: [PATCH] ARM: OMAP: Fix gpio by switching to generic gpio calls, v2

Fix compile by removing remaining omap specific gpio
calls. Based on earlier patches by Jarkko Nikula.

Also remove old GPIO key code, there is already a patch
to do this with gpio_keys.

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index 8171fe0..09a2422 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -423,9 +423,9 @@ static void __init omap_sx1_init(void)
 
 	/* turn on USB power */
 	/* sx1_setusbpower(1); cant do it here because i2c is not ready */
-	omap_request_gpio(1);	/* A_IRDA_OFF */
-	omap_request_gpio(11);	/* A_SWITCH */
-	omap_request_gpio(15);	/* A_USB_ON */
+	gpio_request(1, "A_IRDA_OFF");
+	gpio_request(11, "A_SWITCH");
+	gpio_request(15, "A_USB_ON");
 	gpio_direction_output(1, 1);	/*A_IRDA_OFF = 1 */
 	gpio_direction_output(11, 0);	/*A_SWITCH = 0 */
 	gpio_direction_output(15, 0);	/*A_USB_ON = 0 */
diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index bf1e5d3..0a7b24b 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -22,8 +22,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/onenand.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/leds.h>
 #include <linux/err.h>
@@ -282,65 +280,16 @@ static void __init apollon_led_init(void)
 {
 	/* LED0 - AA10 */
 	omap_cfg_reg(AA10_242X_GPIO13);
-	omap_request_gpio(LED0_GPIO13);
-	omap_set_gpio_direction(LED0_GPIO13, 0);
-	omap_set_gpio_dataout(LED0_GPIO13, 0);
+	gpio_request(LED0_GPIO13, "LED0");
+	gpio_direction_output(LED0_GPIO13, 0);
 	/* LED1  - AA6 */
 	omap_cfg_reg(AA6_242X_GPIO14);
-	omap_request_gpio(LED1_GPIO14);
-	omap_set_gpio_direction(LED1_GPIO14, 0);
-	omap_set_gpio_dataout(LED1_GPIO14, 0);
+	gpio_request(LED1_GPIO14, "LED1");
+	gpio_direction_output(LED1_GPIO14, 0);
 	/* LED2  - AA4 */
 	omap_cfg_reg(AA4_242X_GPIO15);
-	omap_request_gpio(LED2_GPIO15);
-	omap_set_gpio_direction(LED2_GPIO15, 0);
-	omap_set_gpio_dataout(LED2_GPIO15, 0);
-}
-
-static irqreturn_t apollon_sw_interrupt(int irq, void *ignored)
-{
-	static unsigned int led0, led1, led2;
-
-	if (irq == OMAP_GPIO_IRQ(SW_ENTER_GPIO16))
-		omap_set_gpio_dataout(LED0_GPIO13, led0 ^= 1);
-	else if (irq == OMAP_GPIO_IRQ(SW_UP_GPIO17))
-		omap_set_gpio_dataout(LED1_GPIO14, led1 ^= 1);
-	else if (irq == OMAP_GPIO_IRQ(SW_DOWN_GPIO58))
-		omap_set_gpio_dataout(LED2_GPIO15, led2 ^= 1);
-
-	return IRQ_HANDLED;
-}
-
-static void __init apollon_sw_init(void)
-{
-	/* Enter SW - Y11 */
-	omap_cfg_reg(Y11_242X_GPIO16);
-	omap_request_gpio(SW_ENTER_GPIO16);
-	gpio_direction_input(SW_ENTER_GPIO16);
-	/* Up SW - AA12 */
-	omap_cfg_reg(AA12_242X_GPIO17);
-	omap_request_gpio(SW_UP_GPIO17);
-	gpio_direction_input(SW_UP_GPIO17);
-	/* Down SW - AA8 */
-	omap_cfg_reg(AA8_242X_GPIO58);
-	omap_request_gpio(SW_DOWN_GPIO58);
-	gpio_direction_input(SW_DOWN_GPIO58);
-
-	set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
-	if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
-				IRQF_SHARED, "enter sw",
-				&apollon_sw_interrupt))
-		return;
-	set_irq_type(OMAP_GPIO_IRQ(SW_UP_GPIO17), IRQ_TYPE_EDGE_RISING);
-	if (request_irq(OMAP_GPIO_IRQ(SW_UP_GPIO17), &apollon_sw_interrupt,
-				IRQF_SHARED, "up sw",
-				&apollon_sw_interrupt))
-		return;
-	set_irq_type(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), IRQ_TYPE_EDGE_RISING);
-	if (request_irq(OMAP_GPIO_IRQ(SW_DOWN_GPIO58), &apollon_sw_interrupt,
-				IRQF_SHARED, "down sw",
-				&apollon_sw_interrupt))
-		return;
+	gpio_request(LED2_GPIO15, "LED2");
+	gpio_direction_output(LED2_GPIO15, 0);
 }
 
 static void __init apollon_usb_init(void)
@@ -357,7 +306,6 @@ static void __init omap_apollon_init(void)
 	u32 v;
 
 	apollon_led_init();
-	apollon_sw_init();
 	apollon_flash_init();
 	apollon_usb_init();
 
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index aa69727..f6a1345 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -88,7 +88,7 @@ static inline void __init ldp_init_smc911x(void)
 
 	ldp_smc911x_resources[1].start = OMAP_GPIO_IRQ(eth_gpio);
 
-	if (omap_request_gpio(eth_gpio) < 0) {
+	if (gpio_request(eth_gpio, "smc911x irq") < 0) {
 		printk(KERN_ERR "Failed to request GPIO%d for smc911x IRQ\n",
 				eth_gpio);
 		return;
diff --git a/arch/arm/plat-omap/include/mach/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h
index 04e68e8..8d9dfe3 100644
--- a/arch/arm/plat-omap/include/mach/gpio.h
+++ b/arch/arm/plat-omap/include/mach/gpio.h
@@ -87,16 +87,6 @@ extern void omap_set_gpio_debounce_time(int gpio, int enable);
 #include <linux/errno.h>
 #include <asm-generic/gpio.h>
 
-static inline int omap_request_gpio(int gpio)
-{
-	return gpio_request(gpio, "FIXME");
-}
-
-static inline void omap_free_gpio(int gpio)
-{
-	gpio_free(gpio);
-}
-
 static inline int gpio_get_value(unsigned gpio)
 {
 	return __gpio_get_value(gpio);
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 96ecc17..77a4f14 100644
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -629,7 +629,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
 	}
 
 	if (c->gpio_irq) {
-		if ((r = omap_request_gpio(c->gpio_irq)) < 0) {
+		if ((r = gpio_request(c->gpio_irq, "OneNAND irq")) < 0) {
 			dev_err(&pdev->dev,  "Failed to request GPIO%d for "
 				"OneNAND\n", c->gpio_irq);
 			goto err_iounmap;
@@ -726,7 +726,7 @@ err_release_dma:
 		free_irq(gpio_to_irq(c->gpio_irq), c);
 err_release_gpio:
 	if (c->gpio_irq)
-		omap_free_gpio(c->gpio_irq);
+		gpio_free(c->gpio_irq);
 err_iounmap:
 	iounmap(c->onenand.base);
 err_release_mem_region:
@@ -761,7 +761,7 @@ static int __devexit omap2_onenand_remove(struct platform_device *pdev)
 	platform_set_drvdata(pdev, NULL);
 	if (c->gpio_irq) {
 		free_irq(gpio_to_irq(c->gpio_irq), c);
-		omap_free_gpio(c->gpio_irq);
+		gpio_free(c->gpio_irq);
 	}
 	iounmap(c->onenand.base);
 	release_mem_region(c->phys_base, ONENAND_IO_SIZE);

Re: [PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls, v2

[Russell King - ARM Linux]

On Wed, Jan 07, 2009 at 07:50:21PM +0200, Tony Lindgren wrote:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [090107 18:18]:
> > On Wed, Jan 07, 2009 at 01:17:45PM +0200, Tony Lindgren wrote:
> > > -	set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
> > > -	if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
> > > +	set_irq_type(gpio_to_irq(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
> > > +	if (request_irq(gpio_to_irq(SW_ENTER_GPIO16), &apollon_sw_interrupt,
> > 
> > NAK.  I wonder how the f*** this got anywhere near the mainline kernel.
> > No no no no no.  set_irq_type + request_irq is utter crap and should be
> > rejected whenever its seen.  There's absolutely no need for it -
> > request_irq is sufficient.  Get rid of this set_irq_type usage from
> > everywhere please.
> 
> Blind search and replace? :) I've removed the GPIO key code as there's
> already a patch to do that cleaner with gpio_keys.

Revised patch is fine.

updated git pull request for omap compile fixes, mailbox and hsmmc

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [090108 00:01]:
> On Wed, Jan 07, 2009 at 07:50:21PM +0200, Tony Lindgren wrote:
> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [090107 18:18]:
> > > On Wed, Jan 07, 2009 at 01:17:45PM +0200, Tony Lindgren wrote:
> > > > -	set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
> > > > -	if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
> > > > +	set_irq_type(gpio_to_irq(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
> > > > +	if (request_irq(gpio_to_irq(SW_ENTER_GPIO16), &apollon_sw_interrupt,
> > > 
> > > NAK.  I wonder how the f*** this got anywhere near the mainline kernel.
> > > No no no no no.  set_irq_type + request_irq is utter crap and should be
> > > rejected whenever its seen.  There's absolutely no need for it -
> > > request_irq is sufficient.  Get rid of this set_irq_type usage from
> > > everywhere please.
> > 
> > Blind search and replace? :) I've removed the GPIO key code as there's
> > already a patch to do that cleaner with gpio_keys.
> 
> Revised patch is fine.

OK, here's the pull request again:

The following changes since commit ede6f5aea054d3fb67c78857f7abdee602302043:
  Linus Torvalds (1):
        Fix up 64-bit byte swaps for most 32-bit architectures

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-misc-for-rmk

Hiroshi DOYU (10):
      omap mailbox: cleanup omap2 register definition with macro
      omap mailbox: add initial omap3 support
      omap mailbox: print hardware revision at startup
      omap mailbox: fix empty struct device for omap_mbox
      omap mailbox: fix empty struct device for omap1
      omap mailbox: fix empty struct device for omap2
      omap mailbox: add save_/restore_ctx() for PM
      omap mailbox: move mailbox.h into mailbox.c
      omap mailbox: convert sequence bit checking to module paramter
      omap mailbox: remove unnecessary header file inclusion

Jarkko Nikula (1):
      ARM: OMAP: Fix gpio by switching to generic gpio calls, v2

Madhusudhan Chikkature (1):
      omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3

Tony Lindgren (1):
      ARM: OMAP: Fix missing includes

 arch/arm/mach-omap1/board-sx1.c            |    6 +-
 arch/arm/mach-omap1/devices.c              |    2 +-
 arch/arm/mach-omap1/mailbox.c              |   31 +-
 arch/arm/mach-omap1/mcbsp.c                |    1 +
 arch/arm/mach-omap2/board-apollon.c        |   64 +--
 arch/arm/mach-omap2/board-ldp.c            |    2 +-
 arch/arm/mach-omap2/devices.c              |   38 +-
 arch/arm/mach-omap2/mailbox.c              |  195 +++--
 arch/arm/mach-omap2/mcbsp.c                |    1 +
 arch/arm/plat-omap/Kconfig                 |    8 +
 arch/arm/plat-omap/i2c.c                   |    1 +
 arch/arm/plat-omap/include/mach/gpio.h     |   10 -
 arch/arm/plat-omap/include/mach/mailbox.h  |   27 +-
 arch/arm/plat-omap/include/mach/omap34xx.h |    1 +
 arch/arm/plat-omap/mailbox.c               |  152 +++-
 arch/arm/plat-omap/mailbox.h               |  100 ---
 drivers/mfd/twl4030-core.c                 |    1 +
 drivers/mmc/host/Kconfig                   |   10 +
 drivers/mmc/host/Makefile                  |    1 +
 drivers/mmc/host/omap_hsmmc.c              | 1242 ++++++++++++++++++++++++++++
 drivers/mtd/onenand/omap2.c                |    6 +-
 21 files changed, 1581 insertions(+), 318 deletions(-)
 delete mode 100644 arch/arm/plat-omap/mailbox.h
 create mode 100644 drivers/mmc/host/omap_hsmmc.c

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[Russell King - ARM Linux]

On Wed, Jan 07, 2009 at 01:16:15PM +0200, Tony Lindgren wrote:
> diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
> index b59c385..18179ac 100644
> --- a/drivers/mfd/twl4030-core.c
> +++ b/drivers/mfd/twl4030-core.c
> @@ -38,6 +38,7 @@
>  #include <linux/i2c.h>
>  #include <linux/i2c/twl4030.h>
>  
> +#include <mach/cpu.h>

This really needs the clock API usage fixing, rather than fixing it
like this.  I want to see the OMAP clock API getting fixed ASAP.
For the time being, I'm going to add a comment about it into this file.

Re: [PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls

[Russell King - ARM Linux]

On Wed, Jan 07, 2009 at 01:17:45PM +0200, Tony Lindgren wrote:
> From: Jarkko Nikula <jarkko.nikula@nokia.com>
> Date: Wed, 7 Jan 2009 12:54:34 +0200
> Subject: [PATCH] ARM: OMAP: Fix gpio by switching to generic gpio calls
> 
> Fix compile by removing remaining omap specific gpio
> calls. Based on earlier patches by Jarkko Nikula.

This isn't the whole story... There's another build error related to
the OMAP GPIO changes which remain unaddressed:

arch/arm/plat-omap/gpio.c:1792: error: 'struct gpio_bank' has no member named 'suspend_wakeup'

and there's also the unrelated:

arch/arm/mach-omap1/board-palmte.c:198: error: variable 'palmte_mmc_config' has initializer but incomplete type

Re: updated git pull request for omap compile fixes, mailbox and hsmmc

[Russell King - ARM Linux]

On Thu, Jan 08, 2009 at 09:36:12AM +0200, Tony Lindgren wrote:
> OK, here's the pull request again:
> 
> The following changes since commit ede6f5aea054d3fb67c78857f7abdee602302043:
>   Linus Torvalds (1):
>         Fix up 64-bit byte swaps for most 32-bit architectures
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-misc-for-rmk
> 
> Hiroshi DOYU (10):
>       omap mailbox: cleanup omap2 register definition with macro
>       omap mailbox: add initial omap3 support
>       omap mailbox: print hardware revision at startup
>       omap mailbox: fix empty struct device for omap_mbox
>       omap mailbox: fix empty struct device for omap1
>       omap mailbox: fix empty struct device for omap2
>       omap mailbox: add save_/restore_ctx() for PM
>       omap mailbox: move mailbox.h into mailbox.c
>       omap mailbox: convert sequence bit checking to module paramter
>       omap mailbox: remove unnecessary header file inclusion

I'd rather avoid adding new stuff this late in the merge window - it's
had no exposure in linux-next, etc.

> Jarkko Nikula (1):
>       ARM: OMAP: Fix gpio by switching to generic gpio calls, v2
> 
> Madhusudhan Chikkature (1):
>       omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3

This I'd argue falls into the same category, but since its well known
between us and Pierre who's acked it, I think it has sufficiently low
impact that it can be accepted.

> Tony Lindgren (1):
>       ARM: OMAP: Fix missing includes

The vast majority of this one is already in via a wider ranging change.

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[Samuel Ortiz]

Hi Tony,

On Wed, Jan 07, 2009 at 01:16:15PM +0200, Tony Lindgren wrote:
> diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
> index b59c385..18179ac 100644
> --- a/drivers/mfd/twl4030-core.c
> +++ b/drivers/mfd/twl4030-core.c
> @@ -38,6 +38,7 @@
>  #include <linux/i2c.h>
>  #include <linux/i2c/twl4030.h>
>  
> +#include <mach/cpu.h>
That will break the build on !ARM for this driver.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[Russell King - ARM Linux]

On Sat, Jan 10, 2009 at 04:56:12PM +0100, Samuel Ortiz wrote:
> Hi Tony,
> 
> On Wed, Jan 07, 2009 at 01:16:15PM +0200, Tony Lindgren wrote:
> > diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
> > index b59c385..18179ac 100644
> > --- a/drivers/mfd/twl4030-core.c
> > +++ b/drivers/mfd/twl4030-core.c
> > @@ -38,6 +38,7 @@
> >  #include <linux/i2c.h>
> >  #include <linux/i2c/twl4030.h>
> >  
> > +#include <mach/cpu.h>
> That will break the build on !ARM for this driver.

... which in itself is an argument for making it use the clk API
properly so that these kinds of CPU specific dependencies are kept
out of the driver.

In other words:

        if (cpu_is_omap2430())
                osc = clk_get(NULL, "osc_ck");
        else
                osc = clk_get(NULL, "osc_sys_ck");

becomes:

        osc = clk_get(dev, "hfclk");

since "hfclk" is the name of the input on the device, or it should be
NULL if it is the only input on the device (iow, you don't want to
distinguish it from the 32kHz clock.)

And that eliminates the need for any platform specific includes (which
is the whole point of the clk API - giving drivers a _generic_ way to
get at clock information without resorting to platform specific crap.)

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[Samuel Ortiz]

On Sat, Jan 10, 2009 at 04:20:48PM +0000, Russell King - ARM Linux wrote:
> On Sat, Jan 10, 2009 at 04:56:12PM +0100, Samuel Ortiz wrote:
> > Hi Tony,
> > 
> > On Wed, Jan 07, 2009 at 01:16:15PM +0200, Tony Lindgren wrote:
> > > diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
> > > index b59c385..18179ac 100644
> > > --- a/drivers/mfd/twl4030-core.c
> > > +++ b/drivers/mfd/twl4030-core.c
> > > @@ -38,6 +38,7 @@
> > >  #include <linux/i2c.h>
> > >  #include <linux/i2c/twl4030.h>
> > >  
> > > +#include <mach/cpu.h>
> > That will break the build on !ARM for this driver.
> 
> ... which in itself is an argument for making it use the clk API
> properly so that these kinds of CPU specific dependencies are kept
> out of the driver.
I agree.
Until that gets done, if we really need to include a header file to fix this
build, I would rather go for a generic one, <linux/io.h> for example.

Cheers,
Samuel. 

> In other words:
> 
>         if (cpu_is_omap2430())
>                 osc = clk_get(NULL, "osc_ck");
>         else
>                 osc = clk_get(NULL, "osc_sys_ck");
> 
> becomes:
> 
>         osc = clk_get(dev, "hfclk");
> 
> since "hfclk" is the name of the input on the device, or it should be
> NULL if it is the only input on the device (iow, you don't want to
> distinguish it from the 32kHz clock.)
> 
> And that eliminates the need for any platform specific includes (which
> is the whole point of the clk API - giving drivers a _generic_ way to
> get at clock information without resorting to platform specific crap.)

-- 
Intel Open Source Technology Centre
http://oss.intel.com/

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[Russell King - ARM Linux]

On Sat, Jan 10, 2009 at 06:40:34PM +0100, Samuel Ortiz wrote:
> On Sat, Jan 10, 2009 at 04:20:48PM +0000, Russell King - ARM Linux wrote:
> > On Sat, Jan 10, 2009 at 04:56:12PM +0100, Samuel Ortiz wrote:
> > > Hi Tony,
> > > 
> > > On Wed, Jan 07, 2009 at 01:16:15PM +0200, Tony Lindgren wrote:
> > > > diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
> > > > index b59c385..18179ac 100644
> > > > --- a/drivers/mfd/twl4030-core.c
> > > > +++ b/drivers/mfd/twl4030-core.c
> > > > @@ -38,6 +38,7 @@
> > > >  #include <linux/i2c.h>
> > > >  #include <linux/i2c/twl4030.h>
> > > >  
> > > > +#include <mach/cpu.h>
> > > That will break the build on !ARM for this driver.
> > 
> > ... which in itself is an argument for making it use the clk API
> > properly so that these kinds of CPU specific dependencies are kept
> > out of the driver.
>
> I agree.
> Until that gets done, if we really need to include a header file to fix this
> build, I would rather go for a generic one, <linux/io.h> for example.

I fear that such an approach will result in the current situation
persisting.

I've tried to tackle the OMAP clock implementation, and ended up giving
up because other people are busy fiddling with it as well.  I was rather
hoping that these other changes were going to make it into the mainline
kernel so I could resume my work on it, but alas that's not happened.

And note that I _only_ work with the mainline kernel, so having work
sitting in other peoples trees derived from Tony's tree is completely
useless.

Of course, I could say "sod it, waited long enough, I'm merging my
omap-clks1 branch" for the next merge window.

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[David Brownell]

On Saturday 10 January 2009, Samuel Ortiz wrote:
> > --- a/drivers/mfd/twl4030-core.c
> > +++ b/drivers/mfd/twl4030-core.c
> > @@ -38,6 +38,7 @@
> >  #include <linux/i2c.h>
> >  #include <linux/i2c/twl4030.h>
> >  
> > +#include <mach/cpu.h>
> That will break the build on !ARM for this driver.

What needs to happen with twl4030-core.c is IMO this:

 - Near term:
     * revert 6354ab5c63bc986bf539026a1b289cc142f6e87c
       and just make the driver depend on HAVE_CLK
     * #ifdef CONFIG_ARM do the #include <mach/cpu.h>

 - Longer term:
     * get rid of that remaining OMAP dependency
       somehow (RMK's comment is the right direction,
       but insufficient).
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[David Brownell]

On Saturday 10 January 2009, Russell King - ARM Linux wrote:
> In other words:
> 
>         if (cpu_is_omap2430())
>                 osc = clk_get(NULL, "osc_ck");
>         else
>                 osc = clk_get(NULL, "osc_sys_ck");
> 
> becomes:
> 
>         osc = clk_get(dev, "hfclk");
> 
> since "hfclk" is the name of the input on the device, or it should be
> NULL if it is the only input on the device (iow, you don't want to
> distinguish it from the 32kHz clock.)

Sort of.  The twl4030 has "hfclkin" ... from which it
generates "hfclkout", and that likely becomes "osc_sys_ck"
(or "osc_ck" on omap2430).  Agreed that the OMAP main
clock is actually a proxy for what's needed.


> And that eliminates the need for any platform specific includes (which
> is the whole point of the clk API - giving drivers a _generic_ way to
> get at clock information without resorting to platform specific crap.)

Yeah but ... remembering that the twl4030 is an I2C
device, which is initialized well after the clock
framework and associated SoC platform devices, that
implementation approach begs a few questions:

 - How to associate clocks with non-SoC devices.

   This is an issue that comes up repeatedly when folk
   want to apply <linux/clk.h> calls to things like
   off-chip codecs ... sometimes fed by programmable
   off-chip clock generators, for which one would
   naturally want portable drivers.

 - How to perform *this* association "late", as part
   of setting up the I2C device when its i2c_adapter
   is set up ... and before i2c_driver.probe() for
   the device is called.  This obviously generalizes...

 - Likewise, how to reverse that association when
   that device is removed (e.g. because the adapter
   driver gets removed or unbound).  Also generalizes.

Full answers for those questions imply some degree of
implementation framework for <linux/clk.h> ... a change
from its current status as a pure interface.

Probably "Answers Mark I" would depend on extensions
to the platform specific <linux/clk.h> implementation 
frameworks.

- Dave

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[Samuel Ortiz]

On Sat, Jan 10, 2009 at 12:49:26PM -0800, David Brownell wrote:
> On Saturday 10 January 2009, Samuel Ortiz wrote:
> > > --- a/drivers/mfd/twl4030-core.c
> > > +++ b/drivers/mfd/twl4030-core.c
> > > @@ -38,6 +38,7 @@
> > >  #include <linux/i2c.h>
> > >  #include <linux/i2c/twl4030.h>
> > >  
> > > +#include <mach/cpu.h>
> > That will break the build on !ARM for this driver.
> 
> What needs to happen with twl4030-core.c is IMO this:
> 
>  - Near term:
>      * revert 6354ab5c63bc986bf539026a1b289cc142f6e87c
>        and just make the driver depend on HAVE_CLK
Yep, I'll do that afer the merge window.

>      * #ifdef CONFIG_ARM do the #include <mach/cpu.h>
Not too pretty, but a good enough compromise for me.
I'll push that.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: updated git pull request for omap compile fixes, mailbox and hsmmc

[Russell King - ARM Linux]

On Sat, Jan 10, 2009 at 11:05:24AM +0000, Russell King - ARM Linux wrote:
> On Thu, Jan 08, 2009 at 09:36:12AM +0200, Tony Lindgren wrote:
> > Madhusudhan Chikkature (1):
> >       omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3
> 
> This I'd argue falls into the same category, but since its well known
> between us and Pierre who's acked it, I think it has sufficiently low
> impact that it can be accepted.

... and now -rc1 is out, it's now too late for this.

Re: updated git pull request for omap compile fixes, mailbox and hsmmc

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [090111 12:15]:
> On Sat, Jan 10, 2009 at 11:05:24AM +0000, Russell King - ARM Linux wrote:
> > On Thu, Jan 08, 2009 at 09:36:12AM +0200, Tony Lindgren wrote:
> > > Madhusudhan Chikkature (1):
> > >       omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3
> > 
> > This I'd argue falls into the same category, but since its well known
> > between us and Pierre who's acked it, I think it has sufficiently low
> > impact that it can be accepted.
> 
> ... and now -rc1 is out, it's now too late for this.

Oh well. Will resubmit it later on LKML for Pierre, at least
the MMC init code is mostly dealt with now.

Regards,

Tony

Re: updated git pull request for omap compile fixes, mailbox and hsmmc

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [090110 13:05]:
> On Thu, Jan 08, 2009 at 09:36:12AM +0200, Tony Lindgren wrote:
> > OK, here's the pull request again:
> > 
> > The following changes since commit ede6f5aea054d3fb67c78857f7abdee602302043:
> >   Linus Torvalds (1):
> >         Fix up 64-bit byte swaps for most 32-bit architectures
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-misc-for-rmk
> > 
> > Hiroshi DOYU (10):
> >       omap mailbox: cleanup omap2 register definition with macro
> >       omap mailbox: add initial omap3 support
> >       omap mailbox: print hardware revision at startup
> >       omap mailbox: fix empty struct device for omap_mbox
> >       omap mailbox: fix empty struct device for omap1
> >       omap mailbox: fix empty struct device for omap2
> >       omap mailbox: add save_/restore_ctx() for PM
> >       omap mailbox: move mailbox.h into mailbox.c
> >       omap mailbox: convert sequence bit checking to module paramter
> >       omap mailbox: remove unnecessary header file inclusion
> 
> I'd rather avoid adding new stuff this late in the merge window - it's
> had no exposure in linux-next, etc.

OK, will drop it from omap-fixes queue and into omap3-upstream for
next merge window.

<snip>

Regards,

Tony

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[Tony Lindgren]

* Samuel Ortiz <sameo@openedhand.com> [090111 01:59]:
> On Sat, Jan 10, 2009 at 12:49:26PM -0800, David Brownell wrote:
> > On Saturday 10 January 2009, Samuel Ortiz wrote:
> > > > --- a/drivers/mfd/twl4030-core.c
> > > > +++ b/drivers/mfd/twl4030-core.c
> > > > @@ -38,6 +38,7 @@
> > > >  #include <linux/i2c.h>
> > > >  #include <linux/i2c/twl4030.h>
> > > >  
> > > > +#include <mach/cpu.h>
> > > That will break the build on !ARM for this driver.
> > 
> > What needs to happen with twl4030-core.c is IMO this:
> > 
> >  - Near term:
> >      * revert 6354ab5c63bc986bf539026a1b289cc142f6e87c
> >        and just make the driver depend on HAVE_CLK
> Yep, I'll do that afer the merge window.
> 
> >      * #ifdef CONFIG_ARM do the #include <mach/cpu.h>
> Not too pretty, but a good enough compromise for me.
> I'll push that.

Thanks! I'll rework the other omap build fixes today.

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

Re: [PATCH 1/2] ARM: OMAP: Fix missing includes

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [090110 19:57]:
> On Sat, Jan 10, 2009 at 06:40:34PM +0100, Samuel Ortiz wrote:
> > On Sat, Jan 10, 2009 at 04:20:48PM +0000, Russell King - ARM Linux wrote:
> > > On Sat, Jan 10, 2009 at 04:56:12PM +0100, Samuel Ortiz wrote:
> > > > Hi Tony,
> > > > 
> > > > On Wed, Jan 07, 2009 at 01:16:15PM +0200, Tony Lindgren wrote:
> > > > > diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
> > > > > index b59c385..18179ac 100644
> > > > > --- a/drivers/mfd/twl4030-core.c
> > > > > +++ b/drivers/mfd/twl4030-core.c
> > > > > @@ -38,6 +38,7 @@
> > > > >  #include <linux/i2c.h>
> > > > >  #include <linux/i2c/twl4030.h>
> > > > >  
> > > > > +#include <mach/cpu.h>
> > > > That will break the build on !ARM for this driver.
> > > 
> > > ... which in itself is an argument for making it use the clk API
> > > properly so that these kinds of CPU specific dependencies are kept
> > > out of the driver.
> >
> > I agree.
> > Until that gets done, if we really need to include a header file to fix this
> > build, I would rather go for a generic one, <linux/io.h> for example.
> 
> I fear that such an approach will result in the current situation
> persisting.
> 
> I've tried to tackle the OMAP clock implementation, and ended up giving
> up because other people are busy fiddling with it as well.  I was rather
> hoping that these other changes were going to make it into the mainline
> kernel so I could resume my work on it, but alas that's not happened.

Those are good fixes, thanks. And things are happening, we just need
a bit of time to get all the clock patches queued up.

> And note that I _only_ work with the mainline kernel, so having work
> sitting in other peoples trees derived from Tony's tree is completely
> useless.

Sure, we'd like to work only against the mainline kernel too and have
linux-omap tree only contain patches queued up for the next merge
window. And that should help with issues regarding other linux-omap
based trees too.

> Of course, I could say "sod it, waited long enough, I'm merging my
> omap-clks1 branch" for the next merge window.

I don't see a problem with merging your omapm-clks1. Paul, do you see
any issues with that?

AFAIK, Paul is in process of rebasing his clock changes on top of your
clock patches. And we already have your clock patches now in linux-omap
tree. So we'll start posting clock changes early on for the next merge
window as there are quite a bit of clock patches.

Regards,

Tony

Re: [PATCH 2/2] ARM: OMAP: Fix gpio by switching to generic gpio calls

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [090110 13:02]:
> On Wed, Jan 07, 2009 at 01:17:45PM +0200, Tony Lindgren wrote:
> > From: Jarkko Nikula <jarkko.nikula@nokia.com>
> > Date: Wed, 7 Jan 2009 12:54:34 +0200
> > Subject: [PATCH] ARM: OMAP: Fix gpio by switching to generic gpio calls
> > 
> > Fix compile by removing remaining omap specific gpio
> > calls. Based on earlier patches by Jarkko Nikula.
> 
> This isn't the whole story... There's another build error related to
> the OMAP GPIO changes which remain unaddressed:
> 
> arch/arm/plat-omap/gpio.c:1792: error: 'struct gpio_bank' has no member named 'suspend_wakeup'

Looks like this happens with CONFIG_DEBUG_FS, will fix.

> and there's also the unrelated:
> 
> arch/arm/mach-omap1/board-palmte.c:198: error: variable 'palmte_mmc_config' has initializer but incomplete type

Thanks, looks like I somehow missed removing the old style MMC init
for palmte.

Will post a series of omap-fixes soonish.

Tony

Re: updated git pull request for omap compile fixes, mailbox and hsmmc

[Russell King - ARM Linux]

On Mon, Jan 12, 2009 at 08:24:42AM +0200, Tony Lindgren wrote:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [090111 12:15]:
> > On Sat, Jan 10, 2009 at 11:05:24AM +0000, Russell King - ARM Linux wrote:
> > > On Thu, Jan 08, 2009 at 09:36:12AM +0200, Tony Lindgren wrote:
> > > > Madhusudhan Chikkature (1):
> > > >       omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3
> > > 
> > > This I'd argue falls into the same category, but since its well known
> > > between us and Pierre who's acked it, I think it has sufficiently low
> > > impact that it can be accepted.
> > 
> > ... and now -rc1 is out, it's now too late for this.
> 
> Oh well. Will resubmit it later on LKML for Pierre, at least
> the MMC init code is mostly dealt with now.

Actually, as Pierre is okay with it coming via my tree, I'd prefer that
so I can sanely run my devel branch on the LDP.

Re: updated git pull request for omap compile fixes, mailbox and hsmmc

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [090112 18:47]:
> On Mon, Jan 12, 2009 at 08:24:42AM +0200, Tony Lindgren wrote:
> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [090111 12:15]:
> > > On Sat, Jan 10, 2009 at 11:05:24AM +0000, Russell King - ARM Linux wrote:
> > > > On Thu, Jan 08, 2009 at 09:36:12AM +0200, Tony Lindgren wrote:
> > > > > Madhusudhan Chikkature (1):
> > > > >       omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3
> > > > 
> > > > This I'd argue falls into the same category, but since its well known
> > > > between us and Pierre who's acked it, I think it has sufficiently low
> > > > impact that it can be accepted.
> > > 
> > > ... and now -rc1 is out, it's now too late for this.
> > 
> > Oh well. Will resubmit it later on LKML for Pierre, at least
> > the MMC init code is mostly dealt with now.
> 
> Actually, as Pierre is okay with it coming via my tree, I'd prefer that
> so I can sanely run my devel branch on the LDP.

OK, will start putting together for-next branch.

Tony

Re: updated git pull request for omap compile fixes, mailbox and hsmmc

[Russell King - ARM Linux]

On Tue, Jan 13, 2009 at 12:30:02PM +0200, Tony Lindgren wrote:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [090112 18:47]:
> > On Mon, Jan 12, 2009 at 08:24:42AM +0200, Tony Lindgren wrote:
> > > * Russell King - ARM Linux <linux@arm.linux.org.uk> [090111 12:15]:
> > > > On Sat, Jan 10, 2009 at 11:05:24AM +0000, Russell King - ARM Linux wrote:
> > > > > On Thu, Jan 08, 2009 at 09:36:12AM +0200, Tony Lindgren wrote:
> > > > > > Madhusudhan Chikkature (1):
> > > > > >       omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3
> > > > > 
> > > > > This I'd argue falls into the same category, but since its well known
> > > > > between us and Pierre who's acked it, I think it has sufficiently low
> > > > > impact that it can be accepted.
> > > > 
> > > > ... and now -rc1 is out, it's now too late for this.
> > > 
> > > Oh well. Will resubmit it later on LKML for Pierre, at least
> > > the MMC init code is mostly dealt with now.
> > 
> > Actually, as Pierre is okay with it coming via my tree, I'd prefer that
> > so I can sanely run my devel branch on the LDP.
> 
> OK, will start putting together for-next branch.

I'd like the MMC driver on its own please.

Re: updated git pull request for omap compile fixes, mailbox and hsmmc

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [090119 08:37]:
> On Tue, Jan 13, 2009 at 12:30:02PM +0200, Tony Lindgren wrote:
> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [090112 18:47]:
> > > On Mon, Jan 12, 2009 at 08:24:42AM +0200, Tony Lindgren wrote:
> > > > * Russell King - ARM Linux <linux@arm.linux.org.uk> [090111 12:15]:
> > > > > On Sat, Jan 10, 2009 at 11:05:24AM +0000, Russell King - ARM Linux wrote:
> > > > > > On Thu, Jan 08, 2009 at 09:36:12AM +0200, Tony Lindgren wrote:
> > > > > > > Madhusudhan Chikkature (1):
> > > > > > >       omap mmc: Add new omap hsmmc controller for 2430 and 34xx, v3
> > > > > > 
> > > > > > This I'd argue falls into the same category, but since its well known
> > > > > > between us and Pierre who's acked it, I think it has sufficiently low
> > > > > > impact that it can be accepted.
> > > > > 
> > > > > ... and now -rc1 is out, it's now too late for this.
> > > > 
> > > > Oh well. Will resubmit it later on LKML for Pierre, at least
> > > > the MMC init code is mostly dealt with now.
> > > 
> > > Actually, as Pierre is okay with it coming via my tree, I'd prefer that
> > > so I can sanely run my devel branch on the LDP.
> > 
> > OK, will start putting together for-next branch.
> 
> I'd like the MMC driver on its own please.

Posted to your patch system as 5369/1.

Tony