2.6.39, cleanup: tweak wip_to_be_pushed patches, some irq changes went into 2.6.39

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

patch.sh

@@ -85,7 +85,6 @@ patch -s -p1 < "${DIR}/patches/wip_to_be_pushed/0006-omap3-beagle-add-i2c-bus2.p
 patch -s -p1 < "${DIR}/patches/wip_to_be_pushed/0007-omap3-beagle-add-initial-expansionboard-infrastructu.patch"
 patch -s -p1 < "${DIR}/patches/wip_to_be_pushed/0008-omap3-beagle-expansionboard-zippy.patch"
 patch -s -p1 < "${DIR}/patches/wip_to_be_pushed/0009-omap3-beagle-expansionboard-zippy2.patch"
-patch -s -p1 < "${DIR}/patches/wip_to_be_pushed/0001-omap-beagle-irq_set_irq_type-over-set_irq_type.patch"
 
 }
 

patches/wip_to_be_pushed/0001-omap-beagle-irq_set_irq_type-over-set_irq_type.patch

-From d40b7c8644e3244ba14e6621279e19e22b1796d9 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Tue, 29 Mar 2011 16:03:18 -0500
-Subject: [PATCH] omap: beagle: irq_set_irq_type over set_irq_type
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/mach-omap2/board-omap3beagle.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index c833cde..0e951b8 100644
---- a/arch/arm/mach-omap2/board-omap3beagle.c
-+++ b/arch/arm/mach-omap2/board-omap3beagle.c
-@@ -184,7 +184,7 @@ static void __init omap3beagle_enc28j60_init(void)
- 	    (gpio_direction_input(OMAP3BEAGLE_GPIO_ENC28J60_IRQ) == 0)) {
- 		gpio_export(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, 0);
- 		omap3beagle_zippy_spi_board_info[0].irq = OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_ENC28J60_IRQ);
--		set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
-+		irq_set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
- 	} else {
- 		pr_err("could not obtain gpio for ENC28J60_IRQ\n");
- 		return;
-@@ -226,7 +226,7 @@ static void __init omap3beagle_ks8851_init(void)
- 	    (gpio_direction_input(OMAP3BEAGLE_GPIO_KS8851_IRQ) == 0)) {
- 		gpio_export(OMAP3BEAGLE_GPIO_KS8851_IRQ, 0);
- 		omap3beagle_zippy2_spi_board_info[0].irq = OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_KS8851_IRQ);
--		set_irq_type(omap3beagle_zippy2_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
-+		irq_set_irq_type(omap3beagle_zippy2_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
- 	} else {
- 		pr_err("could not obtain gpio for KS8851_IRQ\n");
- 		return;
--- 
-1.7.1
-

patches/wip_to_be_pushed/0001-omap3-beagle-convert-printk-KERN_INFO-to-pr_info.patch

-From b839727d3a684fccd9a754a74af1302b30db2c89 Mon Sep 17 00:00:00 2001
+From 4e458e96027ba5097e9ef5781a7e3fa8eb658c73 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Sun, 13 Mar 2011 11:42:51 -0500
 Subject: [PATCH 1/9] omap3: beagle: convert printk(KERN_INFO to pr_info(
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 files changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index e663c43..c8f99e7 100644
+index 33007fd..36fe485 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -109,23 +109,23 @@ static void __init omap3_beagle_init_rev(void)

patches/wip_to_be_pushed/0002-omap3-beagle-convert-printk-KERN_ERR-to-pr_err.patch

-From ce2dbb09e6bb77abab7831fdb6f60ea18e585302 Mon Sep 17 00:00:00 2001
+From 322d2af1d3e740cab05d2fd84f24e5e0d14c55ff Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Sun, 13 Mar 2011 11:44:30 -0500
 Subject: [PATCH 2/9] omap3: beagle: convert printk(KERN_ERR to pr_err(
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index c8f99e7..8672dc9 100644
+index 36fe485..e84d89b 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -136,7 +136,7 @@ fail2:

patches/wip_to_be_pushed/0003-omap3-beagle-detect-new-xM-revision-B.patch

-From b26500db37933d9f97d599dcaa4a02a477df6e9b Mon Sep 17 00:00:00 2001
+From 6b21830c34a53d4807e50ccea60e86c76e3a7640 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Sun, 13 Mar 2011 11:47:37 -0500
 Subject: [PATCH 3/9] omap3: beagle: detect new xM revision B
@@ -11,7 +11,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 files changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 8672dc9..ebb90dc 100644
+index e84d89b..dd15413 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -62,7 +62,8 @@

patches/wip_to_be_pushed/0004-omap3-beagle-detect-new-xM-revision-C.patch

-From 63adecd24f76bcb0afad0d8ee82b45ad79dc6c24 Mon Sep 17 00:00:00 2001
+From 345d8afdd4266928dfaa6dabfa6ba4f709922ad1 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Sun, 13 Mar 2011 12:00:29 -0500
 Subject: [PATCH 4/9] omap3: beagle: detect new xM revision C

patches/wip_to_be_pushed/0005-omap3-beagle-if-rev-unknown-assume-xM-revision-C.patch

-From d5737713dd61498b8a678c852e1879d5b32bea1e Mon Sep 17 00:00:00 2001
+From 9c98180c13a6bef37800a86f62b3145dac2850b5 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Sun, 13 Mar 2011 12:02:55 -0500
 Subject: [PATCH 5/9] omap3: beagle: if rev unknown, assume xM revision C
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 4dc7685..76d2ac2 100644
+index 50be864..dabad8c 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -136,8 +136,8 @@ static void __init omap3_beagle_init_rev(void)

patches/wip_to_be_pushed/0006-omap3-beagle-add-i2c-bus2.patch

-From 0482a7a15976ef562fd54e527dc09c51977b3981 Mon Sep 17 00:00:00 2001
+From fd2c6a1b660fe1b4eddffde8ce04637fbb407bfb Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Sun, 13 Mar 2011 12:29:53 -0500
 Subject: [PATCH 6/9] omap3: beagle: add i2c bus2
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index 76d2ac2..d5c46a5 100644
+index dabad8c..cce35e6 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -487,6 +487,7 @@ static int __init omap3_beagle_i2c_init(void)

patches/wip_to_be_pushed/0007-omap3-beagle-add-initial-expansionboard-infrastructu.patch

-From 07bd8fe1526f2df2eda42221d0680c9267a7c1c4 Mon Sep 17 00:00:00 2001
+From 8999c141a7bc3a66cc65274a44b81d1f1fd850f2 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Sun, 13 Mar 2011 12:26:41 -0500
 Subject: [PATCH 7/9] omap3: beagle: add initial expansionboard infrastructure
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 files changed, 13 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index d5c46a5..cda6813 100644
+index cce35e6..cde7bfd 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -153,6 +153,8 @@ fail0:
@@ -21,7 +21,7 @@ index d5c46a5..cda6813 100644
  static struct mtd_partition omap3beagle_nand_partitions[] = {
  	/* All the partition sizes are listed in terms of NAND block size */
  	{
-@@ -670,6 +672,15 @@ static void __init beagle_opp_init(void)
+@@ -671,6 +673,15 @@ static void __init beagle_opp_init(void)
  	return;
  }
  
@@ -37,7 +37,7 @@ index d5c46a5..cda6813 100644
  static void __init omap3_beagle_init(void)
  {
  	omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
-@@ -697,6 +708,8 @@ static void __init omap3_beagle_init(void)
+@@ -698,6 +709,8 @@ static void __init omap3_beagle_init(void)
  	beagle_opp_init();
  }
  

patches/wip_to_be_pushed/0008-omap3-beagle-expansionboard-zippy.patch

-From 97fb928b63108bf1f79974c344be0c62bea71182 Mon Sep 17 00:00:00 2001
+From d136cdc8dad16258cf7330b9a8b2c5e6a6d47d53 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Sun, 13 Mar 2011 12:34:29 -0500
 Subject: [PATCH 8/9] omap3: beagle: expansionboard zippy
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 files changed, 78 insertions(+), 0 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index cda6813..feacc5e 100644
+index cde7bfd..e3a18e7 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -21,6 +21,7 @@
@@ -52,7 +52,7 @@ index cda6813..feacc5e 100644
 +	    (gpio_direction_input(OMAP3BEAGLE_GPIO_ENC28J60_IRQ) == 0)) {
 +		gpio_export(OMAP3BEAGLE_GPIO_ENC28J60_IRQ, 0);
 +		omap3beagle_zippy_spi_board_info[0].irq = OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_ENC28J60_IRQ);
-+		set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
++		irq_set_irq_type(omap3beagle_zippy_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
 +	} else {
 +		pr_err("could not obtain gpio for ENC28J60_IRQ\n");
 +		return;
@@ -114,7 +114,7 @@ index cda6813..feacc5e 100644
  	/* Bus 3 is attached to the DVI port where devices like the pico DLP
  	 * projector don't work reliably with 400kHz */
  	omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom));
-@@ -696,6 +765,15 @@ static void __init omap3_beagle_init(void)
+@@ -697,6 +766,15 @@ static void __init omap3_beagle_init(void)
  	/* REVISIT leave DVI powered down until it's needed ... */
  	gpio_direction_output(170, true);
  
@@ -128,7 +128,7 @@ index cda6813..feacc5e 100644
 +	}
 +
  	usb_musb_init(&musb_board_data);
- 	usb_ehci_init(&ehci_pdata);
+ 	usbhs_init(&usbhs_bdata);
  	omap3beagle_flash_init();
 -- 
 1.7.1

patches/wip_to_be_pushed/0009-omap3-beagle-expansionboard-zippy2.patch

-From 50a2b551e2fa4eef87fa396307cacc07b8712c31 Mon Sep 17 00:00:00 2001
+From 91cdc2eccdfe11c3ad41790a9959859bf736d086 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
 Date: Sun, 13 Mar 2011 12:36:31 -0500
 Subject: [PATCH 9/9] omap3: beagle: expansionboard zippy2
@@ -9,7 +9,7 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  1 files changed, 53 insertions(+), 1 deletions(-)
 
 diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
-index feacc5e..e1aab93 100644
+index e3a18e7..b28e2c6 100644
 --- a/arch/arm/mach-omap2/board-omap3beagle.c
 +++ b/arch/arm/mach-omap2/board-omap3beagle.c
 @@ -198,6 +198,48 @@ static void __init omap3beagle_enc28j60_init(void)
@@ -44,7 +44,7 @@ index feacc5e..e1aab93 100644
 +	    (gpio_direction_input(OMAP3BEAGLE_GPIO_KS8851_IRQ) == 0)) {
 +		gpio_export(OMAP3BEAGLE_GPIO_KS8851_IRQ, 0);
 +		omap3beagle_zippy2_spi_board_info[0].irq = OMAP_GPIO_IRQ(OMAP3BEAGLE_GPIO_KS8851_IRQ);
-+		set_irq_type(omap3beagle_zippy2_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
++		irq_set_irq_type(omap3beagle_zippy2_spi_board_info[0].irq, IRQ_TYPE_EDGE_FALLING);
 +	} else {
 +		pr_err("could not obtain gpio for KS8851_IRQ\n");
 +		return;
@@ -71,7 +71,7 @@ index feacc5e..e1aab93 100644
  	{
  	omap_register_i2c_bus(2, 400,  beagle_i2c2_boardinfo,
  			ARRAY_SIZE(beagle_i2c2_boardinfo));
-@@ -774,6 +817,15 @@ static void __init omap3_beagle_init(void)
+@@ -775,6 +818,15 @@ static void __init omap3_beagle_init(void)
  		mmc[1].gpio_cd = 162;
  	}
  
@@ -85,7 +85,7 @@ index feacc5e..e1aab93 100644
 +	}
 +
  	usb_musb_init(&musb_board_data);
- 	usb_ehci_init(&ehci_pdata);
+ 	usbhs_init(&usbhs_bdata);
  	omap3beagle_flash_init();
 -- 
 1.7.1