summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-07-29 13:30:03 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-07-29 13:30:03 +0000
commiteaafef765cc133a43eccef6c53f53ac5fb87ba2f (patch)
tree30cfd0721c67927937251ce4607b59872bb9bf89
parentff065cec2b8af6c29c20f7d5937daafae928f02b (diff)
downloadpoky-eaafef765cc133a43eccef6c53f53ac5fb87ba2f.tar.gz
linux-rp: fix sound on corgi: ARM patch 5174/1
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4980 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch73
-rw-r--r--meta/packages/linux/linux-rp_2.6.26.bb2
2 files changed, 53 insertions, 22 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch b/meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch
index 40214e42b0..e0db0746cd 100644
--- a/meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch
+++ b/meta/packages/linux/linux-rp-2.6.26/zaurus-i2c-init.patch
@@ -14,15 +14,42 @@ Stanislav.
14Reported-by: Stanislav Brabec <utx@penguin.cz> 14Reported-by: Stanislav Brabec <utx@penguin.cz>
15Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> 15Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
16--- 16---
17 arch/arm/mach-pxa/corgi.c | 2 ++
17 arch/arm/mach-pxa/poodle.c | 2 ++ 18 arch/arm/mach-pxa/poodle.c | 2 ++
18 arch/arm/mach-pxa/spitz.c | 2 ++ 19 arch/arm/mach-pxa/spitz.c | 2 ++
19 2 files changed, 4 insertions(+), 0 deletions(-) 20 3 files changed, 6 insertions(+)
20 21
21diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c 22--- linux-2.6.26.orig/arch/arm/mach-pxa/corgi.c
22index 39612cf..510018b 100644 23+++ linux-2.6.26/arch/arm/mach-pxa/corgi.c
23--- a/arch/arm/mach-pxa/poodle.c 24@@ -38,10 +38,11 @@
24+++ b/arch/arm/mach-pxa/poodle.c 25 #include <asm/arch/pxa-regs.h>
25@@ -36,6 +36,7 @@ 26 #include <asm/arch/pxa2xx-gpio.h>
27 #include <asm/arch/irda.h>
28 #include <asm/arch/mmc.h>
29 #include <asm/arch/udc.h>
30+#include <asm/arch/i2c.h>
31 #include <asm/arch/corgi.h>
32 #include <asm/arch/sharpsl.h>
33
34 #include <asm/mach/sharpsl_param.h>
35 #include <asm/hardware/scoop.h>
36@@ -529,10 +530,11 @@ static void __init corgi_init(void)
37 pxa_gpio_mode(CORGI_GPIO_HSYNC | GPIO_IN);
38
39 pxa_set_udc_info(&udc_info);
40 pxa_set_mci_info(&corgi_mci_platform_data);
41 pxa_set_ficp_info(&corgi_ficp_platform_data);
42+ pxa_set_i2c_info(NULL);
43
44 platform_scoop_config = &corgi_pcmcia_config;
45
46 platform_add_devices(devices, ARRAY_SIZE(devices));
47 }
48--- linux-2.6.26.orig/arch/arm/mach-pxa/poodle.c
49+++ linux-2.6.26/arch/arm/mach-pxa/poodle.c
50@@ -33,10 +33,11 @@
51
52 #include <asm/arch/pxa-regs.h>
26 #include <asm/arch/pxa2xx-gpio.h> 53 #include <asm/arch/pxa2xx-gpio.h>
27 #include <asm/arch/mmc.h> 54 #include <asm/arch/mmc.h>
28 #include <asm/arch/udc.h> 55 #include <asm/arch/udc.h>
@@ -30,7 +57,11 @@ index 39612cf..510018b 100644
30 #include <asm/arch/irda.h> 57 #include <asm/arch/irda.h>
31 #include <asm/arch/poodle.h> 58 #include <asm/arch/poodle.h>
32 #include <asm/arch/pxafb.h> 59 #include <asm/arch/pxafb.h>
33@@ -387,6 +388,7 @@ static void __init poodle_init(void) 60 #include <asm/arch/sharpsl.h>
61 #include <asm/arch/ssp.h>
62@@ -386,10 +387,11 @@ static void __init poodle_init(void)
63 pxa_gpio_mode(POODLE_GPIO_USB_PULLUP | GPIO_OUT);
64 pxa_gpio_mode(POODLE_GPIO_IR_ON | GPIO_OUT);
34 pxa_set_udc_info(&udc_info); 65 pxa_set_udc_info(&udc_info);
35 pxa_set_mci_info(&poodle_mci_platform_data); 66 pxa_set_mci_info(&poodle_mci_platform_data);
36 pxa_set_ficp_info(&poodle_ficp_platform_data); 67 pxa_set_ficp_info(&poodle_ficp_platform_data);
@@ -38,11 +69,13 @@ index 39612cf..510018b 100644
38 69
39 platform_scoop_config = &poodle_pcmcia_config; 70 platform_scoop_config = &poodle_pcmcia_config;
40 71
41diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c 72 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
42index 35616a5..e2bde09 100644 73 if (ret) {
43--- a/arch/arm/mach-pxa/spitz.c 74--- linux-2.6.26.orig/arch/arm/mach-pxa/spitz.c
44+++ b/arch/arm/mach-pxa/spitz.c 75+++ linux-2.6.26/arch/arm/mach-pxa/spitz.c
45@@ -38,6 +38,7 @@ 76@@ -36,10 +36,11 @@
77 #include <asm/mach/irq.h>
78
46 #include <asm/arch/pxa-regs.h> 79 #include <asm/arch/pxa-regs.h>
47 #include <asm/arch/pxa2xx-regs.h> 80 #include <asm/arch/pxa2xx-regs.h>
48 #include <asm/arch/pxa2xx-gpio.h> 81 #include <asm/arch/pxa2xx-gpio.h>
@@ -50,7 +83,11 @@ index 35616a5..e2bde09 100644
50 #include <asm/arch/irda.h> 83 #include <asm/arch/irda.h>
51 #include <asm/arch/mmc.h> 84 #include <asm/arch/mmc.h>
52 #include <asm/arch/ohci.h> 85 #include <asm/arch/ohci.h>
53@@ -572,6 +573,7 @@ static void __init common_init(void) 86 #include <asm/arch/udc.h>
87 #include <asm/arch/pxafb.h>
88@@ -579,10 +580,11 @@ static void __init common_init(void)
89 pxa_set_mci_info(&spitz_mci_platform_data);
90 pxa_set_ohci_info(&spitz_ohci_platform_data);
54 pxa_set_ficp_info(&spitz_ficp_platform_data); 91 pxa_set_ficp_info(&spitz_ficp_platform_data);
55 set_pxa_fb_parent(&spitzssp_device.dev); 92 set_pxa_fb_parent(&spitzssp_device.dev);
56 set_pxa_fb_info(&spitz_pxafb_info); 93 set_pxa_fb_info(&spitz_pxafb_info);
@@ -58,11 +95,5 @@ index 35616a5..e2bde09 100644
58 } 95 }
59 96
60 #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI) 97 #if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)
61-- 98 static void spitz_bl_set_intensity(int intensity)
621.5.6.2 99 {
63
64
65-------------------------------------------------------------------
66List admin: http://lists.arm.linux.org.uk/mailman/listinfo/linux-arm-kernel
67FAQ: http://www.arm.linux.org.uk/mailinglists/faq.php
68Etiquette: http://www.arm.linux.org.uk/mailinglists/etiquette.php
diff --git a/meta/packages/linux/linux-rp_2.6.26.bb b/meta/packages/linux/linux-rp_2.6.26.bb
index 13d72ce03f..4a3dd09d1e 100644
--- a/meta/packages/linux/linux-rp_2.6.26.bb
+++ b/meta/packages/linux/linux-rp_2.6.26.bb
@@ -1,6 +1,6 @@
1require linux-rp.inc 1require linux-rp.inc
2 2
3PR = "r10" 3PR = "r11"
4 4
5DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
6DEFAULT_PREFERENCE_qemuarm = "1" 6DEFAULT_PREFERENCE_qemuarm = "1"