summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-23 21:18:58 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-23 21:18:58 +0000
commit765f6203e38fc16d03f24d9d83db3a0e9a805fdc (patch)
tree299b56ac98703d416f8fb39af793857aba63e836 /meta
parent54df65042fec4f2520936d013a6193b5c06f0ee3 (diff)
downloadpoky-765f6203e38fc16d03f24d9d83db3a0e9a805fdc.tar.gz
linux-nokia800: Add missing 770 patch hunk
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1775 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch35
-rw-r--r--meta/packages/linux/linux-nokia800_2.6.18-osso40.bb2
2 files changed, 30 insertions, 7 deletions
diff --git a/meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch b/meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
index cf3013f48e..aa801fbb5e 100644
--- a/meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
+++ b/meta/packages/linux/linux-nokia800-2.6.18-osso40/nokia770_nand_fix.patch
@@ -3,12 +3,13 @@
3 drivers/cbus/tahvo-usb.c | 4 ++-- 3 drivers/cbus/tahvo-usb.c | 4 ++--
4 drivers/i2c/chips/isp1301_omap.c | 1 + 4 drivers/i2c/chips/isp1301_omap.c | 1 +
5 drivers/mtd/nand/omap-hw.c | 37 +++++++++++++++---------------------- 5 drivers/mtd/nand/omap-hw.c | 37 +++++++++++++++----------------------
6 4 files changed, 19 insertions(+), 24 deletions(-) 6 drivers/video/omap/omapfb_main.c | 4 ++--
7 5 files changed, 21 insertions(+), 26 deletions(-)
7 8
8Index: linux-g/arch/arm/mach-omap1/mmu.c 9Index: linux-g/arch/arm/mach-omap1/mmu.c
9=================================================================== 10===================================================================
10--- linux-g.orig/arch/arm/mach-omap1/mmu.c 2007-05-23 16:39:20.000000000 +0100 11--- linux-g.orig/arch/arm/mach-omap1/mmu.c 2007-05-23 18:05:21.000000000 +0100
11+++ linux-g/arch/arm/mach-omap1/mmu.c 2007-05-23 17:42:06.000000000 +0100 12+++ linux-g/arch/arm/mach-omap1/mmu.c 2007-05-23 18:05:23.000000000 +0100
12@@ -29,6 +29,7 @@ 13@@ -29,6 +29,7 @@
13 #include <linux/kernel.h> 14 #include <linux/kernel.h>
14 #include <linux/mm.h> 15 #include <linux/mm.h>
@@ -20,7 +21,7 @@ Index: linux-g/arch/arm/mach-omap1/mmu.c
20Index: linux-g/drivers/cbus/tahvo-usb.c 21Index: linux-g/drivers/cbus/tahvo-usb.c
21=================================================================== 22===================================================================
22--- linux-g.orig/drivers/cbus/tahvo-usb.c 2006-11-08 12:18:51.000000000 +0000 23--- linux-g.orig/drivers/cbus/tahvo-usb.c 2006-11-08 12:18:51.000000000 +0000
23+++ linux-g/drivers/cbus/tahvo-usb.c 2007-05-23 17:58:06.000000000 +0100 24+++ linux-g/drivers/cbus/tahvo-usb.c 2007-05-23 18:05:23.000000000 +0100
24@@ -135,8 +135,8 @@ static irqreturn_t omap_otg_irq(int irq, 25@@ -135,8 +135,8 @@ static irqreturn_t omap_otg_irq(int irq,
25 if ((!(OTG_CTRL_REG & OTG_DRIVER_SEL)) && 26 if ((!(OTG_CTRL_REG & OTG_DRIVER_SEL)) &&
26 tu->otg.host && tu->otg.state == OTG_STATE_A_HOST) { 27 tu->otg.host && tu->otg.state == OTG_STATE_A_HOST) {
@@ -35,7 +36,7 @@ Index: linux-g/drivers/cbus/tahvo-usb.c
35Index: linux-g/drivers/i2c/chips/isp1301_omap.c 36Index: linux-g/drivers/i2c/chips/isp1301_omap.c
36=================================================================== 37===================================================================
37--- linux-g.orig/drivers/i2c/chips/isp1301_omap.c 2006-11-08 12:18:51.000000000 +0000 38--- linux-g.orig/drivers/i2c/chips/isp1301_omap.c 2006-11-08 12:18:51.000000000 +0000
38+++ linux-g/drivers/i2c/chips/isp1301_omap.c 2007-05-23 17:55:01.000000000 +0100 39+++ linux-g/drivers/i2c/chips/isp1301_omap.c 2007-05-23 18:05:23.000000000 +0100
39@@ -32,6 +32,7 @@ 40@@ -32,6 +32,7 @@
40 #include <linux/usb_gadget.h> 41 #include <linux/usb_gadget.h>
41 #include <linux/usb.h> 42 #include <linux/usb.h>
@@ -47,7 +48,7 @@ Index: linux-g/drivers/i2c/chips/isp1301_omap.c
47Index: linux-g/drivers/mtd/nand/omap-hw.c 48Index: linux-g/drivers/mtd/nand/omap-hw.c
48=================================================================== 49===================================================================
49--- linux-g.orig/drivers/mtd/nand/omap-hw.c 2006-11-08 12:18:55.000000000 +0000 50--- linux-g.orig/drivers/mtd/nand/omap-hw.c 2006-11-08 12:18:55.000000000 +0000
50+++ linux-g/drivers/mtd/nand/omap-hw.c 2007-05-23 17:27:43.000000000 +0100 51+++ linux-g/drivers/mtd/nand/omap-hw.c 2007-05-23 18:05:23.000000000 +0100
51@@ -386,11 +386,6 @@ static u_char omap_nand_read_byte(struct 52@@ -386,11 +386,6 @@ static u_char omap_nand_read_byte(struct
52 return nand_read_reg8(NND_ACCESS); 53 return nand_read_reg8(NND_ACCESS);
53 } 54 }
@@ -158,3 +159,25 @@ Index: linux-g/drivers/mtd/nand/omap-hw.c
158 omap_mtd->eccsize = 2048; 159 omap_mtd->eccsize = 2048;
159 nand_write_reg(NND_ECC_SELECT, 6); 160 nand_write_reg(NND_ECC_SELECT, 6);
160 } 161 }
162Index: linux-g/drivers/video/omap/omapfb_main.c
163===================================================================
164--- linux-g.orig/drivers/video/omap/omapfb_main.c 2007-05-23 18:05:21.000000000 +0100
165+++ linux-g/drivers/video/omap/omapfb_main.c 2007-05-23 22:27:39.000000000 +0100
166@@ -110,7 +110,7 @@ static struct lcd_ctrl *ctrls[] = {
167
168 #ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
169 #ifdef CONFIG_ARCH_OMAP1
170-extern struct lcd_ctrl_extif omap1_ext_if;
171+extern struct lcd_ctrl_extif sossi_extif;
172 #else
173 extern struct lcd_ctrl_extif omap2_ext_if;
174 #endif
175@@ -1658,7 +1658,7 @@ static int omapfb_do_probe(struct platfo
176 #ifdef CONFIG_ARCH_OMAP1
177 fbdev->int_ctrl = &omap1_int_ctrl;
178 #ifdef CONFIG_FB_OMAP_LCDC_EXTERNAL
179- fbdev->ext_if = &omap1_ext_if;
180+ fbdev->ext_if = &sossi_extif;
181 #endif
182 #else /* OMAP2 */
183 fbdev->int_ctrl = &omap2_int_ctrl;
diff --git a/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb b/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
index 52e22e6d78..24a98667ba 100644
--- a/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
+++ b/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
@@ -1,6 +1,6 @@
1require linux-nokia800.inc 1require linux-nokia800.inc
2 2
3PR = "r1" 3PR = "r2"
4SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \ 4SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \
5 http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \ 5 http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \
6 ${RPSRC}/lzo_kernel-r0.patch;patch=1 \ 6 ${RPSRC}/lzo_kernel-r0.patch;patch=1 \