summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-10-11 16:06:11 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-10-11 16:06:11 +0000
commite518f7a4c2ebbb21a4157fe4ae8ac04c56afb0f8 (patch)
tree2e41d3a93f37db0716ac2840547bc1a54df6946d /meta
parent7ddb194822b5b84e7396ae983974c5ec9ca1f132 (diff)
downloadpoky-e518f7a4c2ebbb21a4157fe4ae8ac04c56afb0f8.tar.gz
linux-rp 2.6.23: unbreak for zylonite
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2862 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch290
-rw-r--r--meta/packages/linux/linux-rp-2.6.23/irq-gpio-offby1.patch17
-rw-r--r--meta/packages/linux/linux-rp_2.6.23.bb3
3 files changed, 98 insertions, 212 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch b/meta/packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch
index 1fba1a3b03..ad4ce996df 100644
--- a/meta/packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch
+++ b/meta/packages/linux/linux-rp-2.6.23/arm_pxa_20070923.patch
@@ -336,10 +336,8 @@
336# Signed-off-by: Russell King 336# Signed-off-by: Russell King
337# 337#
338# 338#
339Index: linux-2.6.22/arch/arm/Kconfig 339--- linux-2.6.23.orig/arch/arm/Kconfig
340=================================================================== 340+++ linux-2.6.23/arch/arm/Kconfig
341--- linux-2.6.22.orig/arch/arm/Kconfig 2007-09-24 20:57:20.000000000 +0200
342+++ linux-2.6.22/arch/arm/Kconfig 2007-09-24 20:57:20.000000000 +0200
343@@ -336,14 +336,14 @@ 341@@ -336,14 +336,14 @@
344 This enables support for Philips PNX4008 mobile platform. 342 This enables support for Philips PNX4008 mobile platform.
345 343
@@ -366,10 +364,8 @@ Index: linux-2.6.22/arch/arm/Kconfig
366 help 364 help
367 Enable support for iWMMXt context switching at run time if 365 Enable support for iWMMXt context switching at run time if
368 running on a CPU that supports it. 366 running on a CPU that supports it.
369Index: linux-2.6.22/arch/arm/boot/compressed/head-xscale.S 367--- linux-2.6.23.orig/arch/arm/boot/compressed/head-xscale.S
370=================================================================== 368+++ linux-2.6.23/arch/arm/boot/compressed/head-xscale.S
371--- linux-2.6.22.orig/arch/arm/boot/compressed/head-xscale.S 2007-09-24 20:56:50.000000000 +0200
372+++ linux-2.6.22/arch/arm/boot/compressed/head-xscale.S 2007-09-24 21:03:05.000000000 +0200
373@@ -33,10 +33,6 @@ 369@@ -33,10 +33,6 @@
374 bic r0, r0, #0x1000 @ clear Icache 370 bic r0, r0, #0x1000 @ clear Icache
375 mcr p15, 0, r0, c1, c0, 0 371 mcr p15, 0, r0, c1, c0, 0
@@ -381,10 +377,8 @@ Index: linux-2.6.22/arch/arm/boot/compressed/head-xscale.S
381 #ifdef CONFIG_ARCH_COTULLA_IDP 377 #ifdef CONFIG_ARCH_COTULLA_IDP
382 mov r7, #MACH_TYPE_COTULLA_IDP 378 mov r7, #MACH_TYPE_COTULLA_IDP
383 #endif 379 #endif
384Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig 380--- linux-2.6.23.orig/arch/arm/mach-pxa/Kconfig
385=================================================================== 381+++ linux-2.6.23/arch/arm/mach-pxa/Kconfig
386--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig 2007-09-24 20:57:20.000000000 +0200
387+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig 2007-09-24 20:57:20.000000000 +0200
388@@ -1,6 +1,24 @@ 382@@ -1,6 +1,24 @@
389 if ARCH_PXA 383 if ARCH_PXA
390 384
@@ -435,10 +429,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
435 config PXA_SHARP_C7xx 429 config PXA_SHARP_C7xx
436 bool 430 bool
437 select PXA_SSP 431 select PXA_SSP
438Index: linux-2.6.22/arch/arm/mach-pxa/Makefile 432--- linux-2.6.23.orig/arch/arm/mach-pxa/Makefile
439=================================================================== 433+++ linux-2.6.23/arch/arm/mach-pxa/Makefile
440--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile 2007-09-24 20:57:20.000000000 +0200
441+++ linux-2.6.22/arch/arm/mach-pxa/Makefile 2007-09-24 21:03:57.000000000 +0200
442@@ -6,6 +6,9 @@ 434@@ -6,6 +6,9 @@
443 obj-y += clock.o generic.o irq.o dma.o time.o 435 obj-y += clock.o generic.o irq.o dma.o time.o
444 obj-$(CONFIG_PXA25x) += pxa25x.o 436 obj-$(CONFIG_PXA25x) += pxa25x.o
@@ -462,10 +454,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
462 obj-$(CONFIG_MACH_HX2750) += hx2750.o hx2750_test.o 454 obj-$(CONFIG_MACH_HX2750) += hx2750.o hx2750_test.o
463 obj-$(CONFIG_MACH_HTCUNIVERSAL) += htcuniversal/ 455 obj-$(CONFIG_MACH_HTCUNIVERSAL) += htcuniversal/
464 456
465Index: linux-2.6.22/arch/arm/mach-pxa/clock.c 457--- linux-2.6.23.orig/arch/arm/mach-pxa/clock.c
466=================================================================== 458+++ linux-2.6.23/arch/arm/mach-pxa/clock.c
467--- linux-2.6.22.orig/arch/arm/mach-pxa/clock.c 2007-09-24 20:56:51.000000000 +0200
468+++ linux-2.6.22/arch/arm/mach-pxa/clock.c 2007-09-24 20:57:20.000000000 +0200
469@@ -9,19 +9,15 @@ 459@@ -9,19 +9,15 @@
470 #include <linux/string.h> 460 #include <linux/string.h>
471 #include <linux/clk.h> 461 #include <linux/clk.h>
@@ -616,10 +606,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/clock.c
616 return 0; 606 return 0;
617 } 607 }
618 arch_initcall(clk_init); 608 arch_initcall(clk_init);
619Index: linux-2.6.22/arch/arm/mach-pxa/clock.h 609--- /dev/null
620=================================================================== 610+++ linux-2.6.23/arch/arm/mach-pxa/clock.h
621--- /dev/null 1970-01-01 00:00:00.000000000 +0000
622+++ linux-2.6.22/arch/arm/mach-pxa/clock.h 2007-09-24 20:57:20.000000000 +0200
623@@ -0,0 +1,43 @@ 611@@ -0,0 +1,43 @@
624+struct clk; 612+struct clk;
625+ 613+
@@ -664,10 +652,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/clock.h
664+void clk_cken_disable(struct clk *clk); 652+void clk_cken_disable(struct clk *clk);
665+ 653+
666+void clks_register(struct clk *clks, size_t num); 654+void clks_register(struct clk *clks, size_t num);
667Index: linux-2.6.22/arch/arm/mach-pxa/devices.h 655--- linux-2.6.23.orig/arch/arm/mach-pxa/devices.h
668=================================================================== 656+++ linux-2.6.23/arch/arm/mach-pxa/devices.h
669--- linux-2.6.22.orig/arch/arm/mach-pxa/devices.h 2007-09-24 20:56:51.000000000 +0200
670+++ linux-2.6.22/arch/arm/mach-pxa/devices.h 2007-09-24 20:57:20.000000000 +0200
671@@ -9,3 +9,6 @@ 657@@ -9,3 +9,6 @@
672 extern struct platform_device pxa_device_i2s; 658 extern struct platform_device pxa_device_i2s;
673 extern struct platform_device pxa_device_ficp; 659 extern struct platform_device pxa_device_ficp;
@@ -675,10 +661,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/devices.h
675+ 661+
676+extern struct platform_device pxa27x_device_i2c_power; 662+extern struct platform_device pxa27x_device_i2c_power;
677+extern struct platform_device pxa27x_device_ohci; 663+extern struct platform_device pxa27x_device_ohci;
678Index: linux-2.6.22/arch/arm/mach-pxa/generic.c 664--- linux-2.6.23.orig/arch/arm/mach-pxa/generic.c
679=================================================================== 665+++ linux-2.6.23/arch/arm/mach-pxa/generic.c
680--- linux-2.6.22.orig/arch/arm/mach-pxa/generic.c 2007-09-24 20:57:20.000000000 +0200
681+++ linux-2.6.22/arch/arm/mach-pxa/generic.c 2007-09-24 20:57:20.000000000 +0200
682@@ -25,10 +25,6 @@ 666@@ -25,10 +25,6 @@
683 #include <linux/pm.h> 667 #include <linux/pm.h>
684 #include <linux/string.h> 668 #include <linux/string.h>
@@ -890,10 +874,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/generic.c
890 }; 874 };
891 875
892 void __init pxa_set_ffuart_info(struct platform_pxa_serial_funcs *info) 876 void __init pxa_set_ffuart_info(struct platform_pxa_serial_funcs *info)
893Index: linux-2.6.22/arch/arm/mach-pxa/generic.h 877--- linux-2.6.23.orig/arch/arm/mach-pxa/generic.h
894=================================================================== 878+++ linux-2.6.23/arch/arm/mach-pxa/generic.h
895--- linux-2.6.22.orig/arch/arm/mach-pxa/generic.h 2007-09-24 20:56:51.000000000 +0200
896+++ linux-2.6.22/arch/arm/mach-pxa/generic.h 2007-09-24 20:57:20.000000000 +0200
897@@ -15,14 +15,40 @@ 879@@ -15,14 +15,40 @@
898 extern void __init pxa_init_irq_low(void); 880 extern void __init pxa_init_irq_low(void);
899 extern void __init pxa_init_irq_high(void); 881 extern void __init pxa_init_irq_high(void);
@@ -935,10 +917,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/generic.h
935+#define pxa3xx_get_clk_frequency_khz(x) (0) 917+#define pxa3xx_get_clk_frequency_khz(x) (0)
936+#define pxa3xx_get_memclk_frequency_10khz() (0) 918+#define pxa3xx_get_memclk_frequency_10khz() (0)
937+#endif 919+#endif
938Index: linux-2.6.22/arch/arm/mach-pxa/irq.c 920--- linux-2.6.23.orig/arch/arm/mach-pxa/irq.c
939=================================================================== 921+++ linux-2.6.23/arch/arm/mach-pxa/irq.c
940--- linux-2.6.22.orig/arch/arm/mach-pxa/irq.c 2007-09-24 20:56:51.000000000 +0200
941+++ linux-2.6.22/arch/arm/mach-pxa/irq.c 2007-09-24 20:57:20.000000000 +0200
942@@ -38,33 +38,11 @@ 922@@ -38,33 +38,11 @@
943 ICMR |= (1 << irq); 923 ICMR |= (1 << irq);
944 } 924 }
@@ -1101,10 +1081,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/irq.c
1101+ pxa_low_gpio_chip.set_wake = set_wake; 1081+ pxa_low_gpio_chip.set_wake = set_wake;
1102+ pxa_muxed_gpio_chip.set_wake = set_wake; 1082+ pxa_muxed_gpio_chip.set_wake = set_wake;
1103+} 1083+}
1104Index: linux-2.6.22/arch/arm/mach-pxa/mfp.c 1084--- /dev/null
1105=================================================================== 1085+++ linux-2.6.23/arch/arm/mach-pxa/mfp.c
1106--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1107+++ linux-2.6.22/arch/arm/mach-pxa/mfp.c 2007-09-24 20:57:20.000000000 +0200
1108@@ -0,0 +1,235 @@ 1086@@ -0,0 +1,235 @@
1109+/* 1087+/*
1110+ * linux/arch/arm/mach-pxa/mfp.c 1088+ * linux/arch/arm/mach-pxa/mfp.c
@@ -1341,10 +1319,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/mfp.c
1341+{ 1319+{
1342+ memset(mfp_table, 0, sizeof(mfp_table)); 1320+ memset(mfp_table, 0, sizeof(mfp_table));
1343+} 1321+}
1344Index: linux-2.6.22/arch/arm/mach-pxa/pxa25x.c 1322--- linux-2.6.23.orig/arch/arm/mach-pxa/pxa25x.c
1345=================================================================== 1323+++ linux-2.6.23/arch/arm/mach-pxa/pxa25x.c
1346--- linux-2.6.22.orig/arch/arm/mach-pxa/pxa25x.c 2007-09-24 20:57:15.000000000 +0200
1347+++ linux-2.6.22/arch/arm/mach-pxa/pxa25x.c 2007-09-24 20:57:20.000000000 +0200
1348@@ -30,6 +30,7 @@ 1324@@ -30,6 +30,7 @@
1349 1325
1350 #include "generic.h" 1326 #include "generic.h"
@@ -1484,10 +1460,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/pxa25x.c
1484 if ((ret = pxa_init_dma(16))) 1460 if ((ret = pxa_init_dma(16)))
1485 return ret; 1461 return ret;
1486 #ifdef CONFIG_PM 1462 #ifdef CONFIG_PM
1487Index: linux-2.6.22/arch/arm/mach-pxa/pxa27x.c 1463--- linux-2.6.23.orig/arch/arm/mach-pxa/pxa27x.c
1488=================================================================== 1464+++ linux-2.6.23/arch/arm/mach-pxa/pxa27x.c
1489--- linux-2.6.22.orig/arch/arm/mach-pxa/pxa27x.c 2007-09-24 20:57:15.000000000 +0200
1490+++ linux-2.6.22/arch/arm/mach-pxa/pxa27x.c 2007-09-24 20:57:20.000000000 +0200
1491@@ -27,6 +27,7 @@ 1465@@ -27,6 +27,7 @@
1492 1466
1493 #include "generic.h" 1467 #include "generic.h"
@@ -1682,10 +1656,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/pxa27x.c
1682 if ((ret = pxa_init_dma(32))) 1656 if ((ret = pxa_init_dma(32)))
1683 return ret; 1657 return ret;
1684 #ifdef CONFIG_PM 1658 #ifdef CONFIG_PM
1685Index: linux-2.6.22/arch/arm/mach-pxa/pxa300.c 1659--- /dev/null
1686=================================================================== 1660+++ linux-2.6.23/arch/arm/mach-pxa/pxa300.c
1687--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1688+++ linux-2.6.22/arch/arm/mach-pxa/pxa300.c 2007-09-24 20:57:20.000000000 +0200
1689@@ -0,0 +1,93 @@ 1661@@ -0,0 +1,93 @@
1690+/* 1662+/*
1691+ * linux/arch/arm/mach-pxa/pxa300.c 1663+ * linux/arch/arm/mach-pxa/pxa300.c
@@ -1780,10 +1752,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/pxa300.c
1780+} 1752+}
1781+ 1753+
1782+core_initcall(pxa300_init); 1754+core_initcall(pxa300_init);
1783Index: linux-2.6.22/arch/arm/mach-pxa/pxa320.c 1755--- /dev/null
1784=================================================================== 1756+++ linux-2.6.23/arch/arm/mach-pxa/pxa320.c
1785--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1786+++ linux-2.6.22/arch/arm/mach-pxa/pxa320.c 2007-09-24 20:57:20.000000000 +0200
1787@@ -0,0 +1,88 @@ 1757@@ -0,0 +1,88 @@
1788+/* 1758+/*
1789+ * linux/arch/arm/mach-pxa/pxa320.c 1759+ * linux/arch/arm/mach-pxa/pxa320.c
@@ -1873,10 +1843,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/pxa320.c
1873+} 1843+}
1874+ 1844+
1875+core_initcall(pxa320_init); 1845+core_initcall(pxa320_init);
1876Index: linux-2.6.22/arch/arm/mach-pxa/pxa3xx.c 1846--- /dev/null
1877=================================================================== 1847+++ linux-2.6.23/arch/arm/mach-pxa/pxa3xx.c
1878--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1879+++ linux-2.6.22/arch/arm/mach-pxa/pxa3xx.c 2007-09-24 20:57:20.000000000 +0200
1880@@ -0,0 +1,216 @@ 1848@@ -0,0 +1,216 @@
1881+/* 1849+/*
1882+ * linux/arch/arm/mach-pxa/pxa3xx.c 1850+ * linux/arch/arm/mach-pxa/pxa3xx.c
@@ -2094,10 +2062,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/pxa3xx.c
2094+} 2062+}
2095+ 2063+
2096+subsys_initcall(pxa3xx_init); 2064+subsys_initcall(pxa3xx_init);
2097Index: linux-2.6.22/arch/arm/mach-pxa/time.c 2065--- linux-2.6.23.orig/arch/arm/mach-pxa/time.c
2098=================================================================== 2066+++ linux-2.6.23/arch/arm/mach-pxa/time.c
2099--- linux-2.6.22.orig/arch/arm/mach-pxa/time.c 2007-09-24 20:56:51.000000000 +0200
2100+++ linux-2.6.22/arch/arm/mach-pxa/time.c 2007-09-24 20:57:20.000000000 +0200
2101@@ -16,10 +16,48 @@ 2067@@ -16,10 +16,48 @@
2102 #include <linux/init.h> 2068 #include <linux/init.h>
2103 #include <linux/interrupt.h> 2069 #include <linux/interrupt.h>
@@ -2179,10 +2145,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/time.c
2179 2145
2180 setup_irq(IRQ_OST0, &pxa_ost0_irq); 2146 setup_irq(IRQ_OST0, &pxa_ost0_irq);
2181 2147
2182Index: linux-2.6.22/arch/arm/mach-pxa/zylonite.c 2148--- /dev/null
2183=================================================================== 2149+++ linux-2.6.23/arch/arm/mach-pxa/zylonite.c
2184--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2185+++ linux-2.6.22/arch/arm/mach-pxa/zylonite.c 2007-09-24 20:57:20.000000000 +0200
2186@@ -0,0 +1,184 @@ 2150@@ -0,0 +1,184 @@
2187+/* 2151+/*
2188+ * linux/arch/arm/mach-pxa/zylonite.c 2152+ * linux/arch/arm/mach-pxa/zylonite.c
@@ -2368,10 +2332,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/zylonite.c
2368+ .timer = &pxa_timer, 2332+ .timer = &pxa_timer,
2369+ .init_machine = zylonite_init, 2333+ .init_machine = zylonite_init,
2370+MACHINE_END 2334+MACHINE_END
2371Index: linux-2.6.22/arch/arm/mach-pxa/zylonite_pxa300.c 2335--- /dev/null
2372=================================================================== 2336+++ linux-2.6.23/arch/arm/mach-pxa/zylonite_pxa300.c
2373--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2374+++ linux-2.6.22/arch/arm/mach-pxa/zylonite_pxa300.c 2007-09-24 20:57:20.000000000 +0200
2375@@ -0,0 +1,188 @@ 2337@@ -0,0 +1,188 @@
2376+/* 2338+/*
2377+ * linux/arch/arm/mach-pxa/zylonite_pxa300.c 2339+ * linux/arch/arm/mach-pxa/zylonite_pxa300.c
@@ -2561,10 +2523,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/zylonite_pxa300.c
2561+ gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO102); 2523+ gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO102);
2562+ } 2524+ }
2563+} 2525+}
2564Index: linux-2.6.22/arch/arm/mach-pxa/zylonite_pxa320.c 2526--- /dev/null
2565=================================================================== 2527+++ linux-2.6.23/arch/arm/mach-pxa/zylonite_pxa320.c
2566--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2567+++ linux-2.6.22/arch/arm/mach-pxa/zylonite_pxa320.c 2007-09-24 20:57:20.000000000 +0200
2568@@ -0,0 +1,173 @@ 2528@@ -0,0 +1,173 @@
2569+/* 2529+/*
2570+ * linux/arch/arm/mach-pxa/zylonite_pxa320.c 2530+ * linux/arch/arm/mach-pxa/zylonite_pxa320.c
@@ -2739,10 +2699,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/zylonite_pxa320.c
2739+ gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO9); 2699+ gpio_eth_irq = mfp_to_gpio(MFP_PIN_GPIO9);
2740+ } 2700+ }
2741+} 2701+}
2742Index: linux-2.6.22/arch/arm/mm/Kconfig 2702--- linux-2.6.23.orig/arch/arm/mm/Kconfig
2743=================================================================== 2703+++ linux-2.6.23/arch/arm/mm/Kconfig
2744--- linux-2.6.22.orig/arch/arm/mm/Kconfig 2007-09-24 20:56:51.000000000 +0200
2745+++ linux-2.6.22/arch/arm/mm/Kconfig 2007-09-24 20:57:20.000000000 +0200
2746@@ -322,7 +322,7 @@ 2704@@ -322,7 +322,7 @@
2747 # XScale 2705 # XScale
2748 config CPU_XSCALE 2706 config CPU_XSCALE
@@ -2761,10 +2719,8 @@ Index: linux-2.6.22/arch/arm/mm/Kconfig
2761 default y 2719 default y
2762 select CPU_32v5 2720 select CPU_32v5
2763 select CPU_ABRT_EV5T 2721 select CPU_ABRT_EV5T
2764Index: linux-2.6.22/drivers/i2c/busses/i2c-pxa.c 2722--- linux-2.6.23.orig/drivers/i2c/busses/i2c-pxa.c
2765=================================================================== 2723+++ linux-2.6.23/drivers/i2c/busses/i2c-pxa.c
2766--- linux-2.6.22.orig/drivers/i2c/busses/i2c-pxa.c 2007-09-24 20:56:56.000000000 +0200
2767+++ linux-2.6.22/drivers/i2c/busses/i2c-pxa.c 2007-09-24 20:57:20.000000000 +0200
2768@@ -31,6 +31,8 @@ 2724@@ -31,6 +31,8 @@
2769 #include <linux/interrupt.h> 2725 #include <linux/interrupt.h>
2770 #include <linux/i2c-pxa.h> 2726 #include <linux/i2c-pxa.h>
@@ -2873,10 +2829,8 @@ Index: linux-2.6.22/drivers/i2c/busses/i2c-pxa.c
2873 release_mem_region(i2c->iobase, i2c->iosize); 2829 release_mem_region(i2c->iobase, i2c->iosize);
2874 kfree(i2c); 2830 kfree(i2c);
2875 2831
2876Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c 2832--- linux-2.6.23.orig/drivers/input/keyboard/pxa27x_keyboard.c
2877=================================================================== 2833+++ linux-2.6.23/drivers/input/keyboard/pxa27x_keyboard.c
2878--- linux-2.6.22.orig/drivers/input/keyboard/pxa27x_keyboard.c 2007-09-24 20:56:56.000000000 +0200
2879+++ linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c 2007-09-24 20:57:20.000000000 +0200
2880@@ -23,6 +23,8 @@ 2834@@ -23,6 +23,8 @@
2881 #include <linux/input.h> 2835 #include <linux/input.h>
2882 #include <linux/device.h> 2836 #include <linux/device.h>
@@ -2969,10 +2923,8 @@ Index: linux-2.6.22/drivers/input/keyboard/pxa27x_keyboard.c
2969 platform_set_drvdata(pdev, NULL); 2923 platform_set_drvdata(pdev, NULL);
2970 2924
2971 return 0; 2925 return 0;
2972Index: linux-2.6.22/drivers/mmc/host/pxamci.c 2926--- linux-2.6.23.orig/drivers/mmc/host/pxamci.c
2973=================================================================== 2927+++ linux-2.6.23/drivers/mmc/host/pxamci.c
2974--- linux-2.6.22.orig/drivers/mmc/host/pxamci.c 2007-09-24 20:56:58.000000000 +0200
2975+++ linux-2.6.22/drivers/mmc/host/pxamci.c 2007-09-24 20:57:20.000000000 +0200
2976@@ -23,6 +23,8 @@ 2928@@ -23,6 +23,8 @@
2977 #include <linux/delay.h> 2929 #include <linux/delay.h>
2978 #include <linux/interrupt.h> 2930 #include <linux/interrupt.h>
@@ -3080,10 +3032,8 @@ Index: linux-2.6.22/drivers/mmc/host/pxamci.c
3080 release_resource(host->res); 3032 release_resource(host->res);
3081 3033
3082 mmc_free_host(mmc); 3034 mmc_free_host(mmc);
3083Index: linux-2.6.22/drivers/mmc/host/pxamci.h 3035--- linux-2.6.23.orig/drivers/mmc/host/pxamci.h
3084=================================================================== 3036+++ linux-2.6.23/drivers/mmc/host/pxamci.h
3085--- linux-2.6.22.orig/drivers/mmc/host/pxamci.h 2007-09-24 20:56:58.000000000 +0200
3086+++ linux-2.6.22/drivers/mmc/host/pxamci.h 2007-09-24 20:57:20.000000000 +0200
3087@@ -86,17 +86,3 @@ 3037@@ -86,17 +86,3 @@
3088 #define MMC_RXFIFO 0x0040 /* 8 bit */ 3038 #define MMC_RXFIFO 0x0040 /* 8 bit */
3089 3039
@@ -3102,23 +3052,17 @@ Index: linux-2.6.22/drivers/mmc/host/pxamci.h
3102- 3052-
3103-#define CLOCKRATE CLOCKRATE_MAX 3053-#define CLOCKRATE CLOCKRATE_MAX
3104- 3054-
3105Index: linux-2.6.22/drivers/mtd/maps/lubbock-flash.c 3055--- linux-2.6.23.orig/drivers/mtd/maps/lubbock-flash.c
3106=================================================================== 3056+++ linux-2.6.23/drivers/mtd/maps/lubbock-flash.c
3107--- linux-2.6.22.orig/drivers/mtd/maps/lubbock-flash.c 2007-07-09 01:32:17.000000000 +0200 3057@@ -22,6 +22,7 @@
3108+++ linux-2.6.22/drivers/mtd/maps/lubbock-flash.c 2007-09-24 20:57:20.000000000 +0200
3109@@ -24,10 +24,10 @@
3110 3058
3111 #include <asm/io.h> 3059 #include <asm/io.h>
3112 #include <asm/hardware.h> 3060 #include <asm/hardware.h>
3113+#include <asm/mach-types.h> 3061+#include <asm/mach-types.h>
3114 #include <asm/arch/pxa-regs.h> 3062 #include <asm/arch/pxa-regs.h>
3115 #include <asm/arch/lubbock.h> 3063 #include <asm/arch/lubbock.h>
3116 3064 #include <asm/cacheflush.h>
3117- 3065@@ -71,9 +72,14 @@
3118 #define ROM_ADDR 0x00000000
3119 #define FLASH_ADDR 0x04000000
3120
3121@@ -73,9 +73,14 @@
3122 3066
3123 static int __init init_lubbock(void) 3067 static int __init init_lubbock(void)
3124 { 3068 {
@@ -3134,23 +3078,17 @@ Index: linux-2.6.22/drivers/mtd/maps/lubbock-flash.c
3134 lubbock_maps[0].bankwidth = lubbock_maps[1].bankwidth = 3078 lubbock_maps[0].bankwidth = lubbock_maps[1].bankwidth =
3135 (BOOT_DEF & 1) ? 2 : 4; 3079 (BOOT_DEF & 1) ? 2 : 4;
3136 3080
3137Index: linux-2.6.22/drivers/mtd/maps/mainstone-flash.c 3081--- linux-2.6.23.orig/drivers/mtd/maps/mainstone-flash.c
3138=================================================================== 3082+++ linux-2.6.23/drivers/mtd/maps/mainstone-flash.c
3139--- linux-2.6.22.orig/drivers/mtd/maps/mainstone-flash.c 2007-07-09 01:32:17.000000000 +0200 3083@@ -22,6 +22,7 @@
3140+++ linux-2.6.22/drivers/mtd/maps/mainstone-flash.c 2007-09-24 20:57:20.000000000 +0200
3141@@ -24,10 +24,10 @@
3142 3084
3143 #include <asm/io.h> 3085 #include <asm/io.h>
3144 #include <asm/hardware.h> 3086 #include <asm/hardware.h>
3145+#include <asm/mach-types.h> 3087+#include <asm/mach-types.h>
3146 #include <asm/arch/pxa-regs.h> 3088 #include <asm/arch/pxa-regs.h>
3147 #include <asm/arch/mainstone.h> 3089 #include <asm/arch/mainstone.h>
3148 3090 #include <asm/cacheflush.h>
3149- 3091@@ -76,6 +77,9 @@
3150 #define ROM_ADDR 0x00000000
3151 #define FLASH_ADDR 0x04000000
3152
3153@@ -77,6 +77,9 @@
3154 int SW7 = 0; /* FIXME: get from SCR (Mst doc section 3.2.1.1) */ 3092 int SW7 = 0; /* FIXME: get from SCR (Mst doc section 3.2.1.1) */
3155 int ret = 0, i; 3093 int ret = 0, i;
3156 3094
@@ -3160,10 +3098,8 @@ Index: linux-2.6.22/drivers/mtd/maps/mainstone-flash.c
3160 mainstone_maps[0].bankwidth = (BOOT_DEF & 1) ? 2 : 4; 3098 mainstone_maps[0].bankwidth = (BOOT_DEF & 1) ? 2 : 4;
3161 mainstone_maps[1].bankwidth = 4; 3099 mainstone_maps[1].bankwidth = 4;
3162 3100
3163Index: linux-2.6.22/drivers/net/irda/pxaficp_ir.c 3101--- linux-2.6.23.orig/drivers/net/irda/pxaficp_ir.c
3164=================================================================== 3102+++ linux-2.6.23/drivers/net/irda/pxaficp_ir.c
3165--- linux-2.6.22.orig/drivers/net/irda/pxaficp_ir.c 2007-07-09 01:32:17.000000000 +0200
3166+++ linux-2.6.22/drivers/net/irda/pxaficp_ir.c 2007-09-24 20:57:20.000000000 +0200
3167@@ -23,6 +23,7 @@ 3103@@ -23,6 +23,7 @@
3168 #include <linux/dma-mapping.h> 3104 #include <linux/dma-mapping.h>
3169 #include <linux/platform_device.h> 3105 #include <linux/platform_device.h>
@@ -3293,10 +3229,8 @@ Index: linux-2.6.22/drivers/net/irda/pxaficp_ir.c
3293 free_netdev(dev); 3229 free_netdev(dev);
3294 } 3230 }
3295 3231
3296Index: linux-2.6.22/drivers/net/smc91x.c 3232--- linux-2.6.23.orig/drivers/net/smc91x.c
3297=================================================================== 3233+++ linux-2.6.23/drivers/net/smc91x.c
3298--- linux-2.6.22.orig/drivers/net/smc91x.c 2007-07-09 01:32:17.000000000 +0200
3299+++ linux-2.6.22/drivers/net/smc91x.c 2007-09-24 20:57:20.000000000 +0200
3300@@ -173,56 +173,6 @@ 3234@@ -173,56 +173,6 @@
3301 */ 3235 */
3302 #define MII_DELAY 1 3236 #define MII_DELAY 1
@@ -3379,10 +3313,8 @@ Index: linux-2.6.22/drivers/net/smc91x.c
3379 smc_request_datacs(pdev, ndev); 3313 smc_request_datacs(pdev, ndev);
3380 3314
3381 return 0; 3315 return 0;
3382Index: linux-2.6.22/drivers/net/smc91x.h 3316--- linux-2.6.23.orig/drivers/net/smc91x.h
3383=================================================================== 3317+++ linux-2.6.23/drivers/net/smc91x.h
3384--- linux-2.6.22.orig/drivers/net/smc91x.h 2007-09-24 20:57:01.000000000 +0200
3385+++ linux-2.6.22/drivers/net/smc91x.h 2007-09-24 20:57:20.000000000 +0200
3386@@ -461,6 +461,59 @@ 3318@@ -461,6 +461,59 @@
3387 3319
3388 #endif 3320 #endif
@@ -3508,10 +3440,8 @@ Index: linux-2.6.22/drivers/net/smc91x.h
3508 } 3440 }
3509 #endif 3441 #endif
3510 3442
3511Index: linux-2.6.22/drivers/serial/pxa.c 3443--- linux-2.6.23.orig/drivers/serial/pxa.c
3512=================================================================== 3444+++ linux-2.6.23/drivers/serial/pxa.c
3513--- linux-2.6.22.orig/drivers/serial/pxa.c 2007-09-24 20:57:20.000000000 +0200
3514+++ linux-2.6.22/drivers/serial/pxa.c 2007-09-24 20:57:20.000000000 +0200
3515@@ -42,6 +42,7 @@ 3445@@ -42,6 +42,7 @@
3516 #include <linux/tty.h> 3446 #include <linux/tty.h>
3517 #include <linux/tty_flip.h> 3447 #include <linux/tty_flip.h>
@@ -3769,10 +3699,8 @@ Index: linux-2.6.22/drivers/serial/pxa.c
3769 3699
3770 return 0; 3700 return 0;
3771 } 3701 }
3772Index: linux-2.6.22/drivers/serial/serial_core.c 3702--- linux-2.6.23.orig/drivers/serial/serial_core.c
3773=================================================================== 3703+++ linux-2.6.23/drivers/serial/serial_core.c
3774--- linux-2.6.22.orig/drivers/serial/serial_core.c 2007-09-24 20:57:19.000000000 +0200
3775+++ linux-2.6.22/drivers/serial/serial_core.c 2007-09-24 20:57:20.000000000 +0200
3776@@ -2128,6 +2128,14 @@ 3704@@ -2128,6 +2128,14 @@
3777 spin_unlock_irqrestore(&port->lock, flags); 3705 spin_unlock_irqrestore(&port->lock, flags);
3778 3706
@@ -3812,10 +3740,8 @@ Index: linux-2.6.22/drivers/serial/serial_core.c
3812 * Ensure UPF_DEAD is not set. 3740 * Ensure UPF_DEAD is not set.
3813 */ 3741 */
3814 port->flags &= ~UPF_DEAD; 3742 port->flags &= ~UPF_DEAD;
3815Index: linux-2.6.22/drivers/usb/gadget/pxa2xx_udc.c 3743--- linux-2.6.23.orig/drivers/usb/gadget/pxa2xx_udc.c
3816=================================================================== 3744+++ linux-2.6.23/drivers/usb/gadget/pxa2xx_udc.c
3817--- linux-2.6.22.orig/drivers/usb/gadget/pxa2xx_udc.c 2007-09-24 20:57:04.000000000 +0200
3818+++ linux-2.6.22/drivers/usb/gadget/pxa2xx_udc.c 2007-09-24 20:57:20.000000000 +0200
3819@@ -43,6 +43,8 @@ 3745@@ -43,6 +43,8 @@
3820 #include <linux/platform_device.h> 3746 #include <linux/platform_device.h>
3821 #include <linux/dma-mapping.h> 3747 #include <linux/dma-mapping.h>
@@ -3966,10 +3892,8 @@ Index: linux-2.6.22/drivers/usb/gadget/pxa2xx_udc.c
3966 platform_set_drvdata(pdev, NULL); 3892 platform_set_drvdata(pdev, NULL);
3967 the_controller = NULL; 3893 the_controller = NULL;
3968 return 0; 3894 return 0;
3969Index: linux-2.6.22/drivers/usb/gadget/pxa2xx_udc.h 3895--- linux-2.6.23.orig/drivers/usb/gadget/pxa2xx_udc.h
3970=================================================================== 3896+++ linux-2.6.23/drivers/usb/gadget/pxa2xx_udc.h
3971--- linux-2.6.22.orig/drivers/usb/gadget/pxa2xx_udc.h 2007-09-24 20:57:17.000000000 +0200
3972+++ linux-2.6.22/drivers/usb/gadget/pxa2xx_udc.h 2007-09-24 20:57:20.000000000 +0200
3973@@ -125,6 +125,7 @@ 3897@@ -125,6 +125,7 @@
3974 struct timer_list timer; 3898 struct timer_list timer;
3975 3899
@@ -3978,10 +3902,8 @@ Index: linux-2.6.22/drivers/usb/gadget/pxa2xx_udc.h
3978 struct pxa2xx_udc_mach_info *mach; 3902 struct pxa2xx_udc_mach_info *mach;
3979 u64 dma_mask; 3903 u64 dma_mask;
3980 struct pxa2xx_ep ep [PXA_UDC_NUM_ENDPOINTS]; 3904 struct pxa2xx_ep ep [PXA_UDC_NUM_ENDPOINTS];
3981Index: linux-2.6.22/drivers/video/pxafb.c 3905--- linux-2.6.23.orig/drivers/video/pxafb.c
3982=================================================================== 3906+++ linux-2.6.23/drivers/video/pxafb.c
3983--- linux-2.6.22.orig/drivers/video/pxafb.c 2007-09-24 20:57:18.000000000 +0200
3984+++ linux-2.6.22/drivers/video/pxafb.c 2007-09-24 20:57:20.000000000 +0200
3985@@ -37,6 +37,8 @@ 3907@@ -37,6 +37,8 @@
3986 #include <linux/cpufreq.h> 3908 #include <linux/cpufreq.h>
3987 #include <linux/platform_device.h> 3909 #include <linux/platform_device.h>
@@ -4087,10 +4009,8 @@ Index: linux-2.6.22/drivers/video/pxafb.c
4087 strcpy(fbi->fb.fix.id, PXA_NAME); 4009 strcpy(fbi->fb.fix.id, PXA_NAME);
4088 4010
4089 fbi->fb.fix.type = FB_TYPE_PACKED_PIXELS; 4011 fbi->fb.fix.type = FB_TYPE_PACKED_PIXELS;
4090Index: linux-2.6.22/drivers/video/pxafb.h 4012--- linux-2.6.23.orig/drivers/video/pxafb.h
4091=================================================================== 4013+++ linux-2.6.23/drivers/video/pxafb.h
4092--- linux-2.6.22.orig/drivers/video/pxafb.h 2007-09-24 20:57:18.000000000 +0200
4093+++ linux-2.6.22/drivers/video/pxafb.h 2007-09-24 20:57:20.000000000 +0200
4094@@ -94,6 +94,7 @@ 4014@@ -94,6 +94,7 @@
4095 struct pxafb_info { 4015 struct pxafb_info {
4096 struct fb_info fb; 4016 struct fb_info fb;
@@ -4099,10 +4019,8 @@ Index: linux-2.6.22/drivers/video/pxafb.h
4099 4019
4100 /* 4020 /*
4101 * These are the addresses we mapped 4021 * These are the addresses we mapped
4102Index: linux-2.6.22/include/asm-arm/arch-pxa/hardware.h 4022--- linux-2.6.23.orig/include/asm-arm/arch-pxa/hardware.h
4103=================================================================== 4023+++ linux-2.6.23/include/asm-arm/arch-pxa/hardware.h
4104--- linux-2.6.22.orig/include/asm-arm/arch-pxa/hardware.h 2007-09-24 20:57:09.000000000 +0200
4105+++ linux-2.6.22/include/asm-arm/arch-pxa/hardware.h 2007-09-24 20:57:20.000000000 +0200
4106@@ -80,6 +80,24 @@ 4024@@ -80,6 +80,24 @@
4107 _id == 0x411; \ 4025 _id == 0x411; \
4108 }) 4026 })
@@ -4201,10 +4119,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/hardware.h
4201 4119
4202 #endif 4120 #endif
4203 4121
4204Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 4122--- linux-2.6.23.orig/include/asm-arm/arch-pxa/irqs.h
4205=================================================================== 4123+++ linux-2.6.23/include/asm-arm/arch-pxa/irqs.h
4206--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h 2007-09-24 20:57:20.000000000 +0200
4207+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 2007-09-24 20:57:20.000000000 +0200
4208@@ -66,12 +66,6 @@ 4124@@ -66,12 +66,6 @@
4209 #define IRQ_TO_GPIO_2_x(i) ((i) - PXA_GPIO_IRQ_BASE) 4125 #define IRQ_TO_GPIO_2_x(i) ((i) - PXA_GPIO_IRQ_BASE)
4210 #define IRQ_TO_GPIO(i) (((i) < IRQ_GPIO(2)) ? ((i) - IRQ_GPIO0) : IRQ_TO_GPIO_2_x(i)) 4126 #define IRQ_TO_GPIO(i) (((i) < IRQ_GPIO(2)) ? ((i) - IRQ_GPIO0) : IRQ_TO_GPIO_2_x(i))
@@ -4218,10 +4134,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
4218 /* 4134 /*
4219 * The next 16 interrupts are for board specific purposes. Since 4135 * The next 16 interrupts are for board specific purposes. Since
4220 * the kernel can only run on one machine at a time, we can re-use 4136 * the kernel can only run on one machine at a time, we can re-use
4221Index: linux-2.6.22/include/asm-arm/arch-pxa/mfp-pxa300.h 4137--- /dev/null
4222=================================================================== 4138+++ linux-2.6.23/include/asm-arm/arch-pxa/mfp-pxa300.h
4223--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4224+++ linux-2.6.22/include/asm-arm/arch-pxa/mfp-pxa300.h 2007-09-24 20:57:20.000000000 +0200
4225@@ -0,0 +1,574 @@ 4139@@ -0,0 +1,574 @@
4226+/* 4140+/*
4227+ * linux/include/asm-arm/arch-pxa/mfp-pxa300.h 4141+ * linux/include/asm-arm/arch-pxa/mfp-pxa300.h
@@ -4797,10 +4711,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/mfp-pxa300.h
4797+#endif /* CONFIG_CPU_PXA310 */ 4711+#endif /* CONFIG_CPU_PXA310 */
4798+ 4712+
4799+#endif /* __ASM_ARCH_MFP_PXA300_H */ 4713+#endif /* __ASM_ARCH_MFP_PXA300_H */
4800Index: linux-2.6.22/include/asm-arm/arch-pxa/mfp-pxa320.h 4714--- /dev/null
4801=================================================================== 4715+++ linux-2.6.23/include/asm-arm/arch-pxa/mfp-pxa320.h
4802--- /dev/null 1970-01-01 00:00:00.000000000 +0000
4803+++ linux-2.6.22/include/asm-arm/arch-pxa/mfp-pxa320.h 2007-09-24 20:57:20.000000000 +0200
4804@@ -0,0 +1,446 @@ 4716@@ -0,0 +1,446 @@
4805+/* 4717+/*
4806+ * linux/include/asm-arm/arch-pxa/mfp-pxa320.h 4718+ * linux/include/asm-arm/arch-pxa/mfp-pxa320.h
@@ -5248,10 +5160,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/mfp-pxa320.h
5248+#define GPIO14_PWM3_OUT MFP_CFG(GPIO14, AF1) 5160+#define GPIO14_PWM3_OUT MFP_CFG(GPIO14, AF1)
5249+ 5161+
5250+#endif /* __ASM_ARCH_MFP_PXA320_H */ 5162+#endif /* __ASM_ARCH_MFP_PXA320_H */
5251Index: linux-2.6.22/include/asm-arm/arch-pxa/mfp.h 5163--- /dev/null
5252=================================================================== 5164+++ linux-2.6.23/include/asm-arm/arch-pxa/mfp.h
5253--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5254+++ linux-2.6.22/include/asm-arm/arch-pxa/mfp.h 2007-09-24 20:57:20.000000000 +0200
5255@@ -0,0 +1,576 @@ 5165@@ -0,0 +1,576 @@
5256+/* 5166+/*
5257+ * linux/include/asm-arm/arch-pxa/mfp.h 5167+ * linux/include/asm-arm/arch-pxa/mfp.h
@@ -5829,10 +5739,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/mfp.h
5829+void __init pxa3xx_init_mfp(void); 5739+void __init pxa3xx_init_mfp(void);
5830+ 5740+
5831+#endif /* __ASM_ARCH_MFP_H */ 5741+#endif /* __ASM_ARCH_MFP_H */
5832Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 5742--- linux-2.6.23.orig/include/asm-arm/arch-pxa/pxa-regs.h
5833=================================================================== 5743+++ linux-2.6.23/include/asm-arm/arch-pxa/pxa-regs.h
5834--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-09-24 20:57:20.000000000 +0200
5835+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 2007-09-24 20:57:20.000000000 +0200
5836@@ -1184,7 +1184,7 @@ 5744@@ -1184,7 +1184,7 @@
5837 5745
5838 #define GPIO_bit(x) (1 << ((x) & 0x1f)) 5746 #define GPIO_bit(x) (1 << ((x) & 0x1f))
@@ -5842,10 +5750,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
5842 5750
5843 /* Interrupt Controller */ 5751 /* Interrupt Controller */
5844 5752
5845Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa3xx-regs.h 5753--- /dev/null
5846=================================================================== 5754+++ linux-2.6.23/include/asm-arm/arch-pxa/pxa3xx-regs.h
5847--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5848+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa3xx-regs.h 2007-09-24 20:57:20.000000000 +0200
5849@@ -0,0 +1,75 @@ 5755@@ -0,0 +1,75 @@
5850+/* 5756+/*
5851+ * linux/include/asm-arm/arch-pxa/pxa3xx-regs.h 5757+ * linux/include/asm-arm/arch-pxa/pxa3xx-regs.h
@@ -5922,10 +5828,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa3xx-regs.h
5922+#define PXA320_CKEN_GRAPHICS 7 /* Graphics controller clock enable */ 5828+#define PXA320_CKEN_GRAPHICS 7 /* Graphics controller clock enable */
5923+ 5829+
5924+#endif /* __ASM_ARCH_PXA3XX_REGS_H */ 5830+#endif /* __ASM_ARCH_PXA3XX_REGS_H */
5925Index: linux-2.6.22/include/asm-arm/arch-pxa/timex.h 5831--- linux-2.6.23.orig/include/asm-arm/arch-pxa/timex.h
5926=================================================================== 5832+++ linux-2.6.23/include/asm-arm/arch-pxa/timex.h
5927--- linux-2.6.22.orig/include/asm-arm/arch-pxa/timex.h 2007-07-09 01:32:17.000000000 +0200
5928+++ linux-2.6.22/include/asm-arm/arch-pxa/timex.h 2007-09-24 20:57:20.000000000 +0200
5929@@ -21,4 +21,6 @@ 5833@@ -21,4 +21,6 @@
5930 #else 5834 #else
5931 #define CLOCK_TICK_RATE 3250000 5835 #define CLOCK_TICK_RATE 3250000
@@ -5933,10 +5837,8 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/timex.h
5933+#else 5837+#else
5934+#define CLOCK_TICK_RATE 3250000 5838+#define CLOCK_TICK_RATE 3250000
5935 #endif 5839 #endif
5936Index: linux-2.6.22/include/asm-arm/arch-pxa/zylonite.h 5840--- /dev/null
5937=================================================================== 5841+++ linux-2.6.23/include/asm-arm/arch-pxa/zylonite.h
5938--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5939+++ linux-2.6.22/include/asm-arm/arch-pxa/zylonite.h 2007-09-24 20:57:20.000000000 +0200
5940@@ -0,0 +1,35 @@ 5842@@ -0,0 +1,35 @@
5941+#ifndef __ASM_ARCH_ZYLONITE_H 5843+#ifndef __ASM_ARCH_ZYLONITE_H
5942+#define __ASM_ARCH_ZYLONITE_H 5844+#define __ASM_ARCH_ZYLONITE_H
diff --git a/meta/packages/linux/linux-rp-2.6.23/irq-gpio-offby1.patch b/meta/packages/linux/linux-rp-2.6.23/irq-gpio-offby1.patch
deleted file mode 100644
index fcf5bb3ae0..0000000000
--- a/meta/packages/linux/linux-rp-2.6.23/irq-gpio-offby1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
1---
2 arch/arm/mach-pxa/irq.c | 2 +-
3 1 file changed, 1 insertion(+), 1 deletion(-)
4
5Index: linux-2.6.22/arch/arm/mach-pxa/irq.c
6===================================================================
7--- linux-2.6.22.orig/arch/arm/mach-pxa/irq.c 2007-09-25 01:42:57.000000000 +0200
8+++ linux-2.6.22/arch/arm/mach-pxa/irq.c 2007-09-25 01:43:03.000000000 +0200
9@@ -301,7 +301,7 @@
10 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
11 }
12
13- for (irq = IRQ_GPIO(2); irq <= IRQ_GPIO(gpio_nr); irq++) {
14+ for (irq = IRQ_GPIO(2); irq < IRQ_GPIO(gpio_nr); irq++) {
15 set_irq_chip(irq, &pxa_muxed_gpio_chip);
16 set_irq_handler(irq, handle_edge_irq);
17 set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/packages/linux/linux-rp_2.6.23.bb
index c50c553056..6e9b30423b 100644
--- a/meta/packages/linux/linux-rp_2.6.23.bb
+++ b/meta/packages/linux/linux-rp_2.6.23.bb
@@ -1,5 +1,7 @@
1require linux-rp.inc 1require linux-rp.inc
2 2
3PR = "r1"
4
3DEFAULT_PREFERENCE = "-1" 5DEFAULT_PREFERENCE = "-1"
4DEFAULT_PREFERENCE_htcuniversal = "1" 6DEFAULT_PREFERENCE_htcuniversal = "1"
5DEFAULT_PREFERENCE_zylonite = "1" 7DEFAULT_PREFERENCE_zylonite = "1"
@@ -120,7 +122,6 @@ SRC_URI_append_htcuniversal ="\
120SRC_URI_append_zylonite ="\ 122SRC_URI_append_zylonite ="\
121 file://arm_pxa_20070923.patch;patch=1 \ 123 file://arm_pxa_20070923.patch;patch=1 \
122 file://pxa_fb_overlay.patch;patch=1 \ 124 file://pxa_fb_overlay.patch;patch=1 \
123 file://irq-gpio-offby1.patch;patch=1 \
124 file://zylonite-boot.patch;patch=1 \ 125 file://zylonite-boot.patch;patch=1 \
125 " 126 "
126 127
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 23:24:59 +0000