From 7d148c4fc62735c57d6bf2d1980f2ad28e9dc3b7 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 9 Apr 2009 06:57:51 -0300
Subject: backport commit 51c62982a33d9086fd8876293411d28a5f97247a

From: Mauro Carvalho Chehab <mchehab@redhat.com>

kernel-sync:
Author: Eric Miao <eric.miao@marvell.com>

    [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage

    Considering the header mess ATM, it is not always possible to
include
    the correct header files within board code. Let's keep this simple:

      <mach/pxa25x.h>  - for pxa25x based platforms
      <mach/pxa27x.h>  - for pxa27x based platforms
      <mach/pxa300.h>  - for pxa300 based platforms
      <mach/pxa320.h>  - for pxa320 based platforms
      <mach/pxa930.h>  - for pxa930 based platforms

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 linux/arch/arm/mach-pxa/devices.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linux/arch/arm/mach-pxa/devices.c')

diff --git a/linux/arch/arm/mach-pxa/devices.c b/linux/arch/arm/mach-pxa/devices.c
index 5b7747052..5ec10735b 100644
--- a/linux/arch/arm/mach-pxa/devices.c
+++ b/linux/arch/arm/mach-pxa/devices.c
@@ -32,7 +32,9 @@
 #include <mach/audio.h>
 #include <mach/pxa3xx_nand.h>
 #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
 #include <mach/pxa-regs.h>
+#endif
 #include <mach/udc.h>
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
-- 
cgit v1.2.3


From ab4c84b189fc450ac5edee0d4461b0c1bf0c86c6 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 16 Jun 2009 18:36:39 -0300
Subject: backport some files that are maintained elsewhere

From: Mauro Carvalho Chehab <mchehab@redhat.com>

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 linux/arch/arm/mach-pxa/devices.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'linux/arch/arm/mach-pxa/devices.c')

diff --git a/linux/arch/arm/mach-pxa/devices.c b/linux/arch/arm/mach-pxa/devices.c
index 5ec10735b..d19f5096a 100644
--- a/linux/arch/arm/mach-pxa/devices.c
+++ b/linux/arch/arm/mach-pxa/devices.c
@@ -39,7 +39,7 @@
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
 #include <mach/irda.h>
-#include <mach/i2c.h>
+#include <plat/i2c.h>
 #include <mach/ohci.h>
 #include <mach/pxa27x_keypad.h>
 #include <mach/pxa2xx_spi.h>
@@ -104,7 +104,10 @@ void __init pxa_set_mci_info(struct pxamci_platform_data *info)
 }
 
 
-static struct pxa2xx_udc_mach_info pxa_udc_info;
+static struct pxa2xx_udc_mach_info pxa_udc_info = {
+	.gpio_pullup = -1,
+	.gpio_vbus   = -1,
+};
 
 void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)
 {
@@ -319,7 +322,7 @@ static struct resource pxa3xx_resources_i2c_power[] = {
 };
 
 struct platform_device pxa3xx_device_i2c_power = {
-	.name		= "pxa2xx-i2c",
+	.name		= "pxa3xx-pwri2c",
 	.id		= 1,
 	.resource	= pxa3xx_resources_i2c_power,
 	.num_resources	= ARRAY_SIZE(pxa3xx_resources_i2c_power),
-- 
cgit v1.2.3