summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@openedhand.com>2007-09-11 13:32:55 +0000
committerSamuel Ortiz <sameo@openedhand.com>2007-09-11 13:32:55 +0000
commit7c5e63702a18d6c53fcbf75ee3a90cd1e1526391 (patch)
tree393704e4b5ee04de63fb734f506c1dc933c3136c /meta/packages
parent720b5c11fbbafb0883fc388639a283d5f3afea1d (diff)
downloadpoky-7c5e63702a18d6c53fcbf75ee3a90cd1e1526391.tar.gz
linux-rp-2.6.22+2.6.23-rc4: Added ASIC3 keys to the HTC kernel build.
Now most of the Universal key events are catched (e.g. screen cover, volume keys, etc...). git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2725 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal3
-rw-r--r--meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/htcuni.patch167
2 files changed, 94 insertions, 76 deletions
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal
index fb112b768b..1a787d4f23 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal
+++ b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/defconfig-htcuniversal
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.23-rc4 3# Linux kernel version: 2.6.23-rc4
4# Wed Aug 29 17:19:57 2007 4# Tue Sep 11 13:04:28 2007
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_SYS_SUPPORTS_APM_EMULATION=y 7CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -611,6 +611,7 @@ CONFIG_INPUT_KEYBOARD=y
611# CONFIG_KEYBOARD_STOWAWAY is not set 611# CONFIG_KEYBOARD_STOWAWAY is not set
612CONFIG_KEYBOARD_PXA27x=y 612CONFIG_KEYBOARD_PXA27x=y
613CONFIG_KEYBOARD_GPIO=y 613CONFIG_KEYBOARD_GPIO=y
614CONFIG_KEYBOARD_ASIC3=y
614CONFIG_INPUT_MOUSE=y 615CONFIG_INPUT_MOUSE=y
615# CONFIG_MOUSE_PS2 is not set 616# CONFIG_MOUSE_PS2 is not set
616# CONFIG_MOUSE_SERIAL is not set 617# CONFIG_MOUSE_SERIAL is not set
diff --git a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/htcuni.patch b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/htcuni.patch
index 8f473467c0..4d746749c5 100644
--- a/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/htcuni.patch
+++ b/meta/packages/linux/linux-rp-2.6.22+2.6.23-rc4/htcuni.patch
@@ -23,6 +23,7 @@
23 arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c | 71 23 arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c | 71
24 arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h | 20 24 arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h | 20
25 arch/arm/mach-pxa/spitz.c | 2 25 arch/arm/mach-pxa/spitz.c | 2
26 drivers/input/keyboard/Kconfig | 7
26 drivers/input/keyboard/Makefile | 2 27 drivers/input/keyboard/Makefile | 2
27 drivers/input/keyboard/asic3_keys.c | 131 + 28 drivers/input/keyboard/asic3_keys.c | 131 +
28 drivers/leds/Kconfig | 7 29 drivers/leds/Kconfig | 7
@@ -59,12 +60,12 @@
59 include/linux/ioport.h | 1 60 include/linux/ioport.h | 1
60 include/linux/soc/asic3_base.h | 104 + 61 include/linux/soc/asic3_base.h | 104 +
61 include/linux/soc/tmio_mmc.h | 17 62 include/linux/soc/tmio_mmc.h | 17
62 60 files changed, 7468 insertions(+), 14 deletions(-) 63 61 files changed, 7475 insertions(+), 14 deletions(-)
63 64
64Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 65Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
65=================================================================== 66===================================================================
66--- /dev/null 1970-01-01 00:00:00.000000000 +0000 67--- /dev/null 1970-01-01 00:00:00.000000000 +0000
67+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 2007-08-29 12:44:49.000000000 +0200 68+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile 2007-09-11 12:53:37.000000000 +0200
68@@ -0,0 +1,19 @@ 69@@ -0,0 +1,19 @@
69+# 70+#
70+# Makefile for HTC Universal 71+# Makefile for HTC Universal
@@ -88,7 +89,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/Makefile
88Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 89Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
89=================================================================== 90===================================================================
90--- /dev/null 1970-01-01 00:00:00.000000000 +0000 91--- /dev/null 1970-01-01 00:00:00.000000000 +0000
91+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 2007-08-29 12:44:49.000000000 +0200 92+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c 2007-09-11 12:53:37.000000000 +0200
92@@ -0,0 +1,468 @@ 93@@ -0,0 +1,468 @@
93+/* 94+/*
94+ * Hardware definitions for HTC Universal 95+ * Hardware definitions for HTC Universal
@@ -561,7 +562,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal.c
561Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 562Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
562=================================================================== 563===================================================================
563--- /dev/null 1970-01-01 00:00:00.000000000 +0000 564--- /dev/null 1970-01-01 00:00:00.000000000 +0000
564+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 2007-08-29 12:44:49.000000000 +0200 565+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c 2007-09-11 12:53:37.000000000 +0200
565@@ -0,0 +1,917 @@ 566@@ -0,0 +1,917 @@
566+/* 567+/*
567+ * Audio support for codec Asahi Kasei AK4641 568+ * Audio support for codec Asahi Kasei AK4641
@@ -1483,7 +1484,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.c
1483Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 1484Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
1484=================================================================== 1485===================================================================
1485--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1486--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1486+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 2007-08-29 12:44:49.000000000 +0200 1487+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h 2007-09-11 12:53:37.000000000 +0200
1487@@ -0,0 +1,65 @@ 1488@@ -0,0 +1,65 @@
1488+/* 1489+/*
1489+ * Audio support for codec Asahi Kasei AK4641 1490+ * Audio support for codec Asahi Kasei AK4641
@@ -1553,7 +1554,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ak4641.h
1553Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 1554Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
1554=================================================================== 1555===================================================================
1555--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1556--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1556+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 2007-08-29 12:44:49.000000000 +0200 1557+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c 2007-09-11 12:53:37.000000000 +0200
1557@@ -0,0 +1,143 @@ 1558@@ -0,0 +1,143 @@
1558+/* 1559+/*
1559+ * LEDs support for the HP iPaq hx4700 1560+ * LEDs support for the HP iPaq hx4700
@@ -1701,7 +1702,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_asic3_leds.c
1701Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 1702Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
1702=================================================================== 1703===================================================================
1703--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1704--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1704+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 2007-08-29 12:44:49.000000000 +0200 1705+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c 2007-09-11 12:53:37.000000000 +0200
1705@@ -0,0 +1,61 @@ 1706@@ -0,0 +1,61 @@
1706+/* 1707+/*
1707+ * Use consistent with the GNU GPL is permitted, 1708+ * Use consistent with the GNU GPL is permitted,
@@ -1767,7 +1768,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bl.c
1767Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 1768Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
1768=================================================================== 1769===================================================================
1769--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1770--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1770+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 2007-08-29 12:44:49.000000000 +0200 1771+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c 2007-09-11 12:53:37.000000000 +0200
1771@@ -0,0 +1,135 @@ 1772@@ -0,0 +1,135 @@
1772+/* Bluetooth interface driver for TI BRF6150 on HX4700 1773+/* Bluetooth interface driver for TI BRF6150 on HX4700
1773+ * 1774+ *
@@ -1907,7 +1908,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.c
1907Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 1908Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
1908=================================================================== 1909===================================================================
1909--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1910--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1910+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 2007-08-29 12:44:49.000000000 +0200 1911+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h 2007-09-11 12:53:37.000000000 +0200
1911@@ -0,0 +1,17 @@ 1912@@ -0,0 +1,17 @@
1912+/* 1913+/*
1913+ * Bluetooth support file for calling bluetooth configuration functions 1914+ * Bluetooth support file for calling bluetooth configuration functions
@@ -1929,7 +1930,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_bt.h
1929Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 1930Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
1930=================================================================== 1931===================================================================
1931--- /dev/null 1970-01-01 00:00:00.000000000 +0000 1932--- /dev/null 1970-01-01 00:00:00.000000000 +0000
1932+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 2007-08-29 12:44:49.000000000 +0200 1933+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c 2007-09-11 12:53:37.000000000 +0200
1933@@ -0,0 +1,87 @@ 1934@@ -0,0 +1,87 @@
1934+/* 1935+/*
1935+ * Buttons driver for HTC Universal 1936+ * Buttons driver for HTC Universal
@@ -2021,7 +2022,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_buttons.c
2021Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2022Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
2022=================================================================== 2023===================================================================
2023--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2024--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2024+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2007-08-29 12:44:49.000000000 +0200 2025+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c 2007-09-11 12:53:37.000000000 +0200
2025@@ -0,0 +1,226 @@ 2026@@ -0,0 +1,226 @@
2026+/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs) 2027+/* Core Hardware driver for Hx4700 (Serial, ASIC3, EGPIOs)
2027+ * 2028+ *
@@ -2252,7 +2253,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_core.c
2252Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2253Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
2253=================================================================== 2254===================================================================
2254--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2255--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2255+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2007-08-29 12:44:49.000000000 +0200 2256+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c 2007-09-11 12:53:37.000000000 +0200
2256@@ -0,0 +1,212 @@ 2257@@ -0,0 +1,212 @@
2257+/* 2258+/*
2258+ * Use consistent with the GNU GPL is permitted, 2259+ * Use consistent with the GNU GPL is permitted,
@@ -2469,7 +2470,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_lcd.c
2469Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2470Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
2470=================================================================== 2471===================================================================
2471--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2472--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2472+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2007-08-29 12:44:49.000000000 +0200 2473+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c 2007-09-11 12:53:37.000000000 +0200
2473@@ -0,0 +1,167 @@ 2474@@ -0,0 +1,167 @@
2474+ 2475+
2475+/* Phone interface driver for Qualcomm MSM6250 on HTC Universal 2476+/* Phone interface driver for Qualcomm MSM6250 on HTC Universal
@@ -2641,7 +2642,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.c
2641Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2642Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
2642=================================================================== 2643===================================================================
2643--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2644--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2644+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2007-08-29 12:44:49.000000000 +0200 2645+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h 2007-09-11 12:53:37.000000000 +0200
2645@@ -0,0 +1,16 @@ 2646@@ -0,0 +1,16 @@
2646+/* 2647+/*
2647+ * Bluetooth support file for calling bluetooth configuration functions 2648+ * Bluetooth support file for calling bluetooth configuration functions
@@ -2662,7 +2663,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_phone.h
2662Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2663Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
2663=================================================================== 2664===================================================================
2664--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2665--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2665+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2007-08-29 12:44:49.000000000 +0200 2666+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c 2007-09-11 12:53:37.000000000 +0200
2666@@ -0,0 +1,69 @@ 2667@@ -0,0 +1,69 @@
2667+/* 2668+/*
2668+ * MyPal 716 power management support for the original HTC IPL in DoC G3 2669+ * MyPal 716 power management support for the original HTC IPL in DoC G3
@@ -2736,7 +2737,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_pm.c
2736Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2737Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
2737=================================================================== 2738===================================================================
2738--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2739--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2739+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2007-08-29 12:44:49.000000000 +0200 2740+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c 2007-09-11 12:53:37.000000000 +0200
2740@@ -0,0 +1,97 @@ 2741@@ -0,0 +1,97 @@
2741+/* 2742+/*
2742+ * pda_power driver for HTC Universal 2743+ * pda_power driver for HTC Universal
@@ -2838,7 +2839,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_power2.c
2838Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2839Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
2839=================================================================== 2840===================================================================
2840--- /dev/null 1970-01-01 00:00:00.000000000 +0000 2841--- /dev/null 1970-01-01 00:00:00.000000000 +0000
2841+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2007-08-29 12:44:49.000000000 +0200 2842+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c 2007-09-11 12:53:37.000000000 +0200
2842@@ -0,0 +1,490 @@ 2843@@ -0,0 +1,490 @@
2843+/* Touch screen driver for the TI something-or-other 2844+/* Touch screen driver for the TI something-or-other
2844+ * 2845+ *
@@ -3333,7 +3334,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_ts2.c
3333Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 3334Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
3334=================================================================== 3335===================================================================
3335--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3336--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3336+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 2007-08-29 12:44:49.000000000 +0200 3337+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c 2007-09-11 12:53:37.000000000 +0200
3337@@ -0,0 +1,71 @@ 3338@@ -0,0 +1,71 @@
3338+ 3339+
3339+/* 3340+/*
@@ -3409,7 +3410,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/htcuniversal_udc.c
3409Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 3410Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
3410=================================================================== 3411===================================================================
3411--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3412--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3412+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 2007-08-29 12:44:49.000000000 +0200 3413+++ linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h 2007-09-11 12:53:37.000000000 +0200
3413@@ -0,0 +1,20 @@ 3414@@ -0,0 +1,20 @@
3414+/* 3415+/*
3415+ * temporary TSC2046 touchscreen hack 3416+ * temporary TSC2046 touchscreen hack
@@ -3433,8 +3434,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/htcuniversal/tsc2046_ts.h
3433+#endif 3434+#endif
3434Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig 3435Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
3435=================================================================== 3436===================================================================
3436--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig 2007-08-29 12:44:46.000000000 +0200 3437--- linux-2.6.22.orig/arch/arm/mach-pxa/Kconfig 2007-09-11 12:53:33.000000000 +0200
3437+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig 2007-08-29 12:44:49.000000000 +0200 3438+++ linux-2.6.22/arch/arm/mach-pxa/Kconfig 2007-09-11 12:53:37.000000000 +0200
3438@@ -50,6 +50,14 @@ 3439@@ -50,6 +50,14 @@
3439 help 3440 help
3440 This enables support for the HP iPAQ HX2750 handheld. 3441 This enables support for the HP iPAQ HX2750 handheld.
@@ -3544,8 +3545,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Kconfig
3544- 3545-
3545Index: linux-2.6.22/arch/arm/mach-pxa/Makefile 3546Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
3546=================================================================== 3547===================================================================
3547--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile 2007-08-29 12:44:46.000000000 +0200 3548--- linux-2.6.22.orig/arch/arm/mach-pxa/Makefile 2007-09-11 12:53:33.000000000 +0200
3548+++ linux-2.6.22/arch/arm/mach-pxa/Makefile 2007-08-29 12:44:49.000000000 +0200 3549+++ linux-2.6.22/arch/arm/mach-pxa/Makefile 2007-09-11 12:53:37.000000000 +0200
3549@@ -20,6 +20,7 @@ 3550@@ -20,6 +20,7 @@
3550 obj-$(CONFIG_MACH_TOSA) += tosa.o 3551 obj-$(CONFIG_MACH_TOSA) += tosa.o
3551 obj-$(CONFIG_MACH_EM_X270) += em-x270.o 3552 obj-$(CONFIG_MACH_EM_X270) += em-x270.o
@@ -3556,8 +3557,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/Makefile
3556 led-y := leds.o 3557 led-y := leds.o
3557Index: linux-2.6.22/drivers/leds/Kconfig 3558Index: linux-2.6.22/drivers/leds/Kconfig
3558=================================================================== 3559===================================================================
3559--- linux-2.6.22.orig/drivers/leds/Kconfig 2007-08-29 12:44:30.000000000 +0200 3560--- linux-2.6.22.orig/drivers/leds/Kconfig 2007-09-11 12:53:14.000000000 +0200
3560+++ linux-2.6.22/drivers/leds/Kconfig 2007-08-29 12:44:49.000000000 +0200 3561+++ linux-2.6.22/drivers/leds/Kconfig 2007-09-11 12:53:37.000000000 +0200
3561@@ -101,6 +101,13 @@ 3562@@ -101,6 +101,13 @@
3562 outputs. To be useful the particular board must have LEDs 3563 outputs. To be useful the particular board must have LEDs
3563 and they must be connected to the GPIO lines. 3564 and they must be connected to the GPIO lines.
@@ -3575,7 +3576,7 @@ Index: linux-2.6.22/drivers/leds/Kconfig
3575Index: linux-2.6.22/drivers/leds/leds-asic3.c 3576Index: linux-2.6.22/drivers/leds/leds-asic3.c
3576=================================================================== 3577===================================================================
3577--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3578--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3578+++ linux-2.6.22/drivers/leds/leds-asic3.c 2007-08-29 12:44:49.000000000 +0200 3579+++ linux-2.6.22/drivers/leds/leds-asic3.c 2007-09-11 12:53:37.000000000 +0200
3579@@ -0,0 +1,189 @@ 3580@@ -0,0 +1,189 @@
3580+/* 3581+/*
3581+ * LEDs support for HTC ASIC3 devices. 3582+ * LEDs support for HTC ASIC3 devices.
@@ -3768,8 +3769,8 @@ Index: linux-2.6.22/drivers/leds/leds-asic3.c
3768+MODULE_LICENSE("GPL"); 3769+MODULE_LICENSE("GPL");
3769Index: linux-2.6.22/drivers/mfd/Kconfig 3770Index: linux-2.6.22/drivers/mfd/Kconfig
3770=================================================================== 3771===================================================================
3771--- linux-2.6.22.orig/drivers/mfd/Kconfig 2007-08-29 12:44:44.000000000 +0200 3772--- linux-2.6.22.orig/drivers/mfd/Kconfig 2007-09-11 12:53:30.000000000 +0200
3772+++ linux-2.6.22/drivers/mfd/Kconfig 2007-08-29 12:44:49.000000000 +0200 3773+++ linux-2.6.22/drivers/mfd/Kconfig 2007-09-11 12:53:37.000000000 +0200
3773@@ -15,6 +15,16 @@ 3774@@ -15,6 +15,16 @@
3774 interface. The device may be connected by PCI or local bus with 3775 interface. The device may be connected by PCI or local bus with
3775 varying functions enabled. 3776 varying functions enabled.
@@ -3789,8 +3790,8 @@ Index: linux-2.6.22/drivers/mfd/Kconfig
3789 menu "Multimedia Capabilities Port drivers" 3790 menu "Multimedia Capabilities Port drivers"
3790Index: linux-2.6.22/drivers/mfd/Makefile 3791Index: linux-2.6.22/drivers/mfd/Makefile
3791=================================================================== 3792===================================================================
3792--- linux-2.6.22.orig/drivers/mfd/Makefile 2007-08-29 12:44:44.000000000 +0200 3793--- linux-2.6.22.orig/drivers/mfd/Makefile 2007-09-11 12:53:30.000000000 +0200
3793+++ linux-2.6.22/drivers/mfd/Makefile 2007-08-29 12:44:49.000000000 +0200 3794+++ linux-2.6.22/drivers/mfd/Makefile 2007-09-11 12:53:37.000000000 +0200
3794@@ -2,6 +2,8 @@ 3795@@ -2,6 +2,8 @@
3795 # Makefile for multifunction miscellaneous devices 3796 # Makefile for multifunction miscellaneous devices
3796 # 3797 #
@@ -3803,7 +3804,7 @@ Index: linux-2.6.22/drivers/mfd/Makefile
3803Index: linux-2.6.22/drivers/mfd/asic3_base.c 3804Index: linux-2.6.22/drivers/mfd/asic3_base.c
3804=================================================================== 3805===================================================================
3805--- /dev/null 1970-01-01 00:00:00.000000000 +0000 3806--- /dev/null 1970-01-01 00:00:00.000000000 +0000
3806+++ linux-2.6.22/drivers/mfd/asic3_base.c 2007-08-29 12:44:49.000000000 +0200 3807+++ linux-2.6.22/drivers/mfd/asic3_base.c 2007-09-11 12:53:37.000000000 +0200
3807@@ -0,0 +1,1208 @@ 3808@@ -0,0 +1,1208 @@
3808+/* 3809+/*
3809+ * Driver interface to HTC "ASIC3" 3810+ * Driver interface to HTC "ASIC3"
@@ -5016,7 +5017,7 @@ Index: linux-2.6.22/drivers/mfd/asic3_base.c
5016Index: linux-2.6.22/drivers/mfd/soc-core.c 5017Index: linux-2.6.22/drivers/mfd/soc-core.c
5017=================================================================== 5018===================================================================
5018--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5019--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5019+++ linux-2.6.22/drivers/mfd/soc-core.c 2007-08-29 12:44:49.000000000 +0200 5020+++ linux-2.6.22/drivers/mfd/soc-core.c 2007-09-11 12:53:37.000000000 +0200
5020@@ -0,0 +1,106 @@ 5021@@ -0,0 +1,106 @@
5021+/* 5022+/*
5022+ * drivers/soc/soc-core.c 5023+ * drivers/soc/soc-core.c
@@ -5127,7 +5128,7 @@ Index: linux-2.6.22/drivers/mfd/soc-core.c
5127Index: linux-2.6.22/drivers/mfd/soc-core.h 5128Index: linux-2.6.22/drivers/mfd/soc-core.h
5128=================================================================== 5129===================================================================
5129--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5130--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5130+++ linux-2.6.22/drivers/mfd/soc-core.h 2007-08-29 12:44:49.000000000 +0200 5131+++ linux-2.6.22/drivers/mfd/soc-core.h 2007-09-11 12:53:37.000000000 +0200
5131@@ -0,0 +1,30 @@ 5132@@ -0,0 +1,30 @@
5132+/* 5133+/*
5133+ * drivers/soc/soc-core.h 5134+ * drivers/soc/soc-core.h
@@ -5162,7 +5163,7 @@ Index: linux-2.6.22/drivers/mfd/soc-core.h
5162Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h 5163Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
5163=================================================================== 5164===================================================================
5164--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5165--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5165+++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h 2007-08-29 12:44:49.000000000 +0200 5166+++ linux-2.6.22/include/asm-arm/arch-pxa/clock.h 2007-09-11 12:53:37.000000000 +0200
5166@@ -0,0 +1,27 @@ 5167@@ -0,0 +1,27 @@
5167+/* 5168+/*
5168+ * linux/include/asm-arm/arch-pxa/clock.h 5169+ * linux/include/asm-arm/arch-pxa/clock.h
@@ -5194,7 +5195,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/clock.h
5194Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 5195Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h
5195=================================================================== 5196===================================================================
5196--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5197--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5197+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 2007-08-29 12:44:49.000000000 +0200 5198+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h 2007-09-11 12:53:37.000000000 +0200
5198@@ -0,0 +1,213 @@ 5199@@ -0,0 +1,213 @@
5199+/* 5200+/*
5200+ * include/asm/arm/arch-pxa/htcuniversal-asic.h 5201+ * include/asm/arm/arch-pxa/htcuniversal-asic.h
@@ -5412,7 +5413,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-asic.h
5412Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 5413Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h
5413=================================================================== 5414===================================================================
5414--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5415--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5415+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 2007-08-29 12:44:49.000000000 +0200 5416+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h 2007-09-11 12:53:37.000000000 +0200
5416@@ -0,0 +1,220 @@ 5417@@ -0,0 +1,220 @@
5417+/* 5418+/*
5418+ * include/asm-arm/arch-pxa/htcuniversal-gpio.h 5419+ * include/asm-arm/arch-pxa/htcuniversal-gpio.h
@@ -5637,7 +5638,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-gpio.h
5637Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 5638Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h
5638=================================================================== 5639===================================================================
5639--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5640--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5640+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 2007-08-29 12:44:49.000000000 +0200 5641+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h 2007-09-11 12:53:37.000000000 +0200
5641@@ -0,0 +1,14 @@ 5642@@ -0,0 +1,14 @@
5642+/* 5643+/*
5643+ * include/asm/arm/arch-pxa/htcuniversal-init.h 5644+ * include/asm/arm/arch-pxa/htcuniversal-init.h
@@ -5656,7 +5657,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal-init.h
5656Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 5657Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h
5657=================================================================== 5658===================================================================
5658--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5659--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5659+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 2007-08-29 12:44:49.000000000 +0200 5660+++ linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h 2007-09-11 12:53:37.000000000 +0200
5660@@ -0,0 +1,3 @@ 5661@@ -0,0 +1,3 @@
5661+#include <asm/arch/irqs.h> 5662+#include <asm/arch/irqs.h>
5662+ 5663+
@@ -5664,7 +5665,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/htcuniversal.h
5664Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 5665Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
5665=================================================================== 5666===================================================================
5666--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5667--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5667+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 2007-08-29 12:44:49.000000000 +0200 5668+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h 2007-09-11 12:53:37.000000000 +0200
5668@@ -0,0 +1,6 @@ 5669@@ -0,0 +1,6 @@
5669+struct pxa_ll_pm_ops { 5670+struct pxa_ll_pm_ops {
5670+ void (*suspend)(unsigned long); 5671+ void (*suspend)(unsigned long);
@@ -5675,7 +5676,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-pm_ll.h
5675Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 5676Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h
5676=================================================================== 5677===================================================================
5677--- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h 2007-07-09 01:32:17.000000000 +0200 5678--- linux-2.6.22.orig/include/asm-arm/arch-pxa/sharpsl.h 2007-07-09 01:32:17.000000000 +0200
5678+++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 2007-08-29 12:44:49.000000000 +0200 5679+++ linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h 2007-09-11 12:53:37.000000000 +0200
5679@@ -25,12 +25,6 @@ 5680@@ -25,12 +25,6 @@
5680 /* 5681 /*
5681 * SharpSL Backlight 5682 * SharpSL Backlight
@@ -5692,7 +5693,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/sharpsl.h
5692Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 5693Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
5693=================================================================== 5694===================================================================
5694--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5695--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5695+++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 2007-08-29 12:44:49.000000000 +0200 5696+++ linux-2.6.22/include/asm-arm/hardware/asic3_keys.h 2007-09-11 12:53:37.000000000 +0200
5696@@ -0,0 +1,18 @@ 5697@@ -0,0 +1,18 @@
5697+#include <linux/input.h> 5698+#include <linux/input.h>
5698+ 5699+
@@ -5715,7 +5716,7 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_keys.h
5715Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 5716Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
5716=================================================================== 5717===================================================================
5717--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5718--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5718+++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 2007-08-29 12:44:49.000000000 +0200 5719+++ linux-2.6.22/include/asm-arm/hardware/asic3_leds.h 2007-09-11 12:53:37.000000000 +0200
5719@@ -0,0 +1,34 @@ 5720@@ -0,0 +1,34 @@
5720+/* 5721+/*
5721+ * LEDs support for HTC ASIC3 devices. 5722+ * LEDs support for HTC ASIC3 devices.
@@ -5754,7 +5755,7 @@ Index: linux-2.6.22/include/asm-arm/hardware/asic3_leds.h
5754Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 5755Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
5755=================================================================== 5756===================================================================
5756--- /dev/null 1970-01-01 00:00:00.000000000 +0000 5757--- /dev/null 1970-01-01 00:00:00.000000000 +0000
5757+++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 2007-08-29 12:44:49.000000000 +0200 5758+++ linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h 2007-09-11 12:53:37.000000000 +0200
5758@@ -0,0 +1,602 @@ 5759@@ -0,0 +1,602 @@
5759+/* 5760+/*
5760+ * 5761+ *
@@ -6360,8 +6361,8 @@ Index: linux-2.6.22/include/asm-arm/hardware/ipaq-asic3.h
6360+#endif 6361+#endif
6361Index: linux-2.6.22/include/linux/backlight.h 6362Index: linux-2.6.22/include/linux/backlight.h
6362=================================================================== 6363===================================================================
6363--- linux-2.6.22.orig/include/linux/backlight.h 2007-08-29 12:44:39.000000000 +0200 6364--- linux-2.6.22.orig/include/linux/backlight.h 2007-09-11 12:53:26.000000000 +0200
6364+++ linux-2.6.22/include/linux/backlight.h 2007-08-29 12:44:49.000000000 +0200 6365+++ linux-2.6.22/include/linux/backlight.h 2007-09-11 12:53:37.000000000 +0200
6365@@ -92,4 +92,11 @@ 6366@@ -92,4 +92,11 @@
6366 return dev_get_drvdata(&bl_dev->dev); 6367 return dev_get_drvdata(&bl_dev->dev);
6367 } 6368 }
@@ -6377,7 +6378,7 @@ Index: linux-2.6.22/include/linux/backlight.h
6377Index: linux-2.6.22/include/linux/gpiodev.h 6378Index: linux-2.6.22/include/linux/gpiodev.h
6378=================================================================== 6379===================================================================
6379--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6380--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6380+++ linux-2.6.22/include/linux/gpiodev.h 2007-08-29 12:44:49.000000000 +0200 6381+++ linux-2.6.22/include/linux/gpiodev.h 2007-09-11 12:53:37.000000000 +0200
6381@@ -0,0 +1,44 @@ 6382@@ -0,0 +1,44 @@
6382+#ifndef __GPIODEV_H 6383+#ifndef __GPIODEV_H
6383+#define __GPIODEV_H 6384+#define __GPIODEV_H
@@ -6426,7 +6427,7 @@ Index: linux-2.6.22/include/linux/gpiodev.h
6426Index: linux-2.6.22/include/linux/input_pda.h 6427Index: linux-2.6.22/include/linux/input_pda.h
6427=================================================================== 6428===================================================================
6428--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6429--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6429+++ linux-2.6.22/include/linux/input_pda.h 2007-08-29 12:44:49.000000000 +0200 6430+++ linux-2.6.22/include/linux/input_pda.h 2007-09-11 12:53:37.000000000 +0200
6430@@ -0,0 +1,47 @@ 6431@@ -0,0 +1,47 @@
6431+#ifndef _INPUT_PDA_H 6432+#ifndef _INPUT_PDA_H
6432+#define _INPUT_PDA_H 6433+#define _INPUT_PDA_H
@@ -6478,7 +6479,7 @@ Index: linux-2.6.22/include/linux/input_pda.h
6478Index: linux-2.6.22/include/linux/soc/asic3_base.h 6479Index: linux-2.6.22/include/linux/soc/asic3_base.h
6479=================================================================== 6480===================================================================
6480--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6481--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6481+++ linux-2.6.22/include/linux/soc/asic3_base.h 2007-08-29 12:44:49.000000000 +0200 6482+++ linux-2.6.22/include/linux/soc/asic3_base.h 2007-09-11 12:53:37.000000000 +0200
6482@@ -0,0 +1,104 @@ 6483@@ -0,0 +1,104 @@
6483+#include <asm/types.h> 6484+#include <asm/types.h>
6484+#include <linux/gpiodev.h> 6485+#include <linux/gpiodev.h>
@@ -6587,7 +6588,7 @@ Index: linux-2.6.22/include/linux/soc/asic3_base.h
6587Index: linux-2.6.22/include/linux/soc/tmio_mmc.h 6588Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
6588=================================================================== 6589===================================================================
6589--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6590--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6590+++ linux-2.6.22/include/linux/soc/tmio_mmc.h 2007-08-29 12:44:49.000000000 +0200 6591+++ linux-2.6.22/include/linux/soc/tmio_mmc.h 2007-09-11 12:53:37.000000000 +0200
6591@@ -0,0 +1,17 @@ 6592@@ -0,0 +1,17 @@
6592+#include <linux/platform_device.h> 6593+#include <linux/platform_device.h>
6593+ 6594+
@@ -6608,8 +6609,8 @@ Index: linux-2.6.22/include/linux/soc/tmio_mmc.h
6608+}; 6609+};
6609Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 6610Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
6610=================================================================== 6611===================================================================
6611--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-08-29 12:44:47.000000000 +0200 6612--- linux-2.6.22.orig/include/asm-arm/arch-pxa/pxa-regs.h 2007-09-11 12:53:34.000000000 +0200
6612+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 2007-08-29 12:44:49.000000000 +0200 6613+++ linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h 2007-09-11 12:53:37.000000000 +0200
6613@@ -2043,6 +2043,8 @@ 6614@@ -2043,6 +2043,8 @@
6614 #define LDCMD_SOFINT (1 << 22) 6615 #define LDCMD_SOFINT (1 << 22)
6615 #define LDCMD_EOFINT (1 << 21) 6616 #define LDCMD_EOFINT (1 << 21)
@@ -6622,7 +6623,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/pxa-regs.h
6622Index: linux-2.6.22/drivers/mmc/host/Kconfig 6623Index: linux-2.6.22/drivers/mmc/host/Kconfig
6623=================================================================== 6624===================================================================
6624--- linux-2.6.22.orig/drivers/mmc/host/Kconfig 2007-07-09 01:32:17.000000000 +0200 6625--- linux-2.6.22.orig/drivers/mmc/host/Kconfig 2007-07-09 01:32:17.000000000 +0200
6625+++ linux-2.6.22/drivers/mmc/host/Kconfig 2007-08-29 12:44:49.000000000 +0200 6626+++ linux-2.6.22/drivers/mmc/host/Kconfig 2007-09-11 12:53:37.000000000 +0200
6626@@ -100,3 +100,9 @@ 6627@@ -100,3 +100,9 @@
6627 To compile this driver as a module, choose M here: the 6628 To compile this driver as a module, choose M here: the
6628 module will be called tifm_sd. 6629 module will be called tifm_sd.
@@ -6636,7 +6637,7 @@ Index: linux-2.6.22/drivers/mmc/host/Kconfig
6636Index: linux-2.6.22/drivers/mmc/host/Makefile 6637Index: linux-2.6.22/drivers/mmc/host/Makefile
6637=================================================================== 6638===================================================================
6638--- linux-2.6.22.orig/drivers/mmc/host/Makefile 2007-07-09 01:32:17.000000000 +0200 6639--- linux-2.6.22.orig/drivers/mmc/host/Makefile 2007-07-09 01:32:17.000000000 +0200
6639+++ linux-2.6.22/drivers/mmc/host/Makefile 2007-08-29 12:44:49.000000000 +0200 6640+++ linux-2.6.22/drivers/mmc/host/Makefile 2007-09-11 12:53:37.000000000 +0200
6640@@ -15,4 +15,4 @@ 6641@@ -15,4 +15,4 @@
6641 obj-$(CONFIG_MMC_OMAP) += omap.o 6642 obj-$(CONFIG_MMC_OMAP) += omap.o
6642 obj-$(CONFIG_MMC_AT91) += at91_mci.o 6643 obj-$(CONFIG_MMC_AT91) += at91_mci.o
@@ -6646,7 +6647,7 @@ Index: linux-2.6.22/drivers/mmc/host/Makefile
6646Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c 6647Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
6647=================================================================== 6648===================================================================
6648--- /dev/null 1970-01-01 00:00:00.000000000 +0000 6649--- /dev/null 1970-01-01 00:00:00.000000000 +0000
6649+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c 2007-08-29 14:36:15.000000000 +0200 6650+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.c 2007-09-11 12:53:37.000000000 +0200
6650@@ -0,0 +1,900 @@ 6651@@ -0,0 +1,900 @@
6651+/* Note that this driver can likely be merged into the tmio driver, so 6652+/* Note that this driver can likely be merged into the tmio driver, so
6652+ * consider this code temporary. It works, though. 6653+ * consider this code temporary. It works, though.
@@ -7551,7 +7552,7 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.c
7551Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h 7552Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
7552=================================================================== 7553===================================================================
7553--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7554--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7554+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h 2007-08-29 12:44:49.000000000 +0200 7555+++ linux-2.6.22/drivers/mmc/host/asic3_mmc.h 2007-09-11 12:53:37.000000000 +0200
7555@@ -0,0 +1,25 @@ 7556@@ -0,0 +1,25 @@
7556+#ifndef __ASIC3_MMC_H 7557+#ifndef __ASIC3_MMC_H
7557+#define __ASIC3_MMC_H 7558+#define __ASIC3_MMC_H
@@ -7581,7 +7582,7 @@ Index: linux-2.6.22/drivers/mmc/host/asic3_mmc.h
7581Index: linux-2.6.22/drivers/input/keyboard/Makefile 7582Index: linux-2.6.22/drivers/input/keyboard/Makefile
7582=================================================================== 7583===================================================================
7583--- linux-2.6.22.orig/drivers/input/keyboard/Makefile 2007-07-09 01:32:17.000000000 +0200 7584--- linux-2.6.22.orig/drivers/input/keyboard/Makefile 2007-07-09 01:32:17.000000000 +0200
7584+++ linux-2.6.22/drivers/input/keyboard/Makefile 2007-08-29 12:44:49.000000000 +0200 7585+++ linux-2.6.22/drivers/input/keyboard/Makefile 2007-09-11 12:53:37.000000000 +0200
7585@@ -21,4 +21,4 @@ 7586@@ -21,4 +21,4 @@
7586 obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o 7587 obj-$(CONFIG_KEYBOARD_PXA27x) += pxa27x_keyboard.o
7587 obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o 7588 obj-$(CONFIG_KEYBOARD_AAED2000) += aaed2000_kbd.o
@@ -7591,7 +7592,7 @@ Index: linux-2.6.22/drivers/input/keyboard/Makefile
7591Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c 7592Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
7592=================================================================== 7593===================================================================
7593--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7594--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7594+++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c 2007-08-29 12:44:49.000000000 +0200 7595+++ linux-2.6.22/drivers/input/keyboard/asic3_keys.c 2007-09-11 12:53:37.000000000 +0200
7595@@ -0,0 +1,131 @@ 7596@@ -0,0 +1,131 @@
7596+/* 7597+/*
7597+ * Generic buttons driver for ASIC3 SoC. 7598+ * Generic buttons driver for ASIC3 SoC.
@@ -7726,8 +7727,8 @@ Index: linux-2.6.22/drivers/input/keyboard/asic3_keys.c
7726+MODULE_LICENSE("GPL"); 7727+MODULE_LICENSE("GPL");
7727Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 7728Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
7728=================================================================== 7729===================================================================
7729--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h 2007-08-29 12:44:38.000000000 +0200 7730--- linux-2.6.22.orig/include/asm-arm/arch-pxa/irqs.h 2007-09-11 12:53:24.000000000 +0200
7730+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 2007-08-29 12:44:49.000000000 +0200 7731+++ linux-2.6.22/include/asm-arm/arch-pxa/irqs.h 2007-09-11 12:53:37.000000000 +0200
7731@@ -172,6 +172,8 @@ 7732@@ -172,6 +172,8 @@
7732 defined(CONFIG_MACH_LOGICPD_PXA270) || \ 7733 defined(CONFIG_MACH_LOGICPD_PXA270) || \
7733 defined(CONFIG_MACH_MAINSTONE) 7734 defined(CONFIG_MACH_MAINSTONE)
@@ -7740,7 +7741,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/irqs.h
7740Index: linux-2.6.22/include/linux/ioport.h 7741Index: linux-2.6.22/include/linux/ioport.h
7741=================================================================== 7742===================================================================
7742--- linux-2.6.22.orig/include/linux/ioport.h 2007-07-09 01:32:17.000000000 +0200 7743--- linux-2.6.22.orig/include/linux/ioport.h 2007-07-09 01:32:17.000000000 +0200
7743+++ linux-2.6.22/include/linux/ioport.h 2007-08-29 12:44:49.000000000 +0200 7744+++ linux-2.6.22/include/linux/ioport.h 2007-09-11 12:53:37.000000000 +0200
7744@@ -56,6 +56,7 @@ 7745@@ -56,6 +56,7 @@
7745 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2) 7746 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2)
7746 #define IORESOURCE_IRQ_LOWLEVEL (1<<3) 7747 #define IORESOURCE_IRQ_LOWLEVEL (1<<3)
@@ -7751,8 +7752,8 @@ Index: linux-2.6.22/include/linux/ioport.h
7751 #define IORESOURCE_DMA_TYPE_MASK (3<<0) 7752 #define IORESOURCE_DMA_TYPE_MASK (3<<0)
7752Index: linux-2.6.22/drivers/video/backlight/Kconfig 7753Index: linux-2.6.22/drivers/video/backlight/Kconfig
7753=================================================================== 7754===================================================================
7754--- linux-2.6.22.orig/drivers/video/backlight/Kconfig 2007-08-29 12:44:43.000000000 +0200 7755--- linux-2.6.22.orig/drivers/video/backlight/Kconfig 2007-09-11 12:53:30.000000000 +0200
7755+++ linux-2.6.22/drivers/video/backlight/Kconfig 2007-08-29 12:44:49.000000000 +0200 7756+++ linux-2.6.22/drivers/video/backlight/Kconfig 2007-09-11 12:53:37.000000000 +0200
7756@@ -40,7 +40,7 @@ 7757@@ -40,7 +40,7 @@
7757 7758
7758 config BACKLIGHT_CORGI 7759 config BACKLIGHT_CORGI
@@ -7765,7 +7766,7 @@ Index: linux-2.6.22/drivers/video/backlight/Kconfig
7765Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c 7766Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
7766=================================================================== 7767===================================================================
7767--- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c 2007-07-09 01:32:17.000000000 +0200 7768--- linux-2.6.22.orig/drivers/video/backlight/corgi_bl.c 2007-07-09 01:32:17.000000000 +0200
7768+++ linux-2.6.22/drivers/video/backlight/corgi_bl.c 2007-08-29 12:44:49.000000000 +0200 7769+++ linux-2.6.22/drivers/video/backlight/corgi_bl.c 2007-09-11 12:53:37.000000000 +0200
7769@@ -24,7 +24,7 @@ 7770@@ -24,7 +24,7 @@
7770 static int corgibl_intensity; 7771 static int corgibl_intensity;
7771 static struct backlight_properties corgibl_data; 7772 static struct backlight_properties corgibl_data;
@@ -7786,8 +7787,8 @@ Index: linux-2.6.22/drivers/video/backlight/corgi_bl.c
7786 if (!machinfo->limit_mask) 7787 if (!machinfo->limit_mask)
7787Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c 7788Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c
7788=================================================================== 7789===================================================================
7789--- linux-2.6.22.orig/arch/arm/mach-pxa/corgi.c 2007-08-29 12:44:45.000000000 +0200 7790--- linux-2.6.22.orig/arch/arm/mach-pxa/corgi.c 2007-09-11 12:53:32.000000000 +0200
7790+++ linux-2.6.22/arch/arm/mach-pxa/corgi.c 2007-08-29 12:44:49.000000000 +0200 7791+++ linux-2.6.22/arch/arm/mach-pxa/corgi.c 2007-09-11 12:53:37.000000000 +0200
7791@@ -20,6 +20,7 @@ 7792@@ -20,6 +20,7 @@
7792 #include <linux/interrupt.h> 7793 #include <linux/interrupt.h>
7793 #include <linux/mmc/host.h> 7794 #include <linux/mmc/host.h>
@@ -7807,8 +7808,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/corgi.c
7807 .limit_mask = 0x0b, 7808 .limit_mask = 0x0b,
7808Index: linux-2.6.22/arch/arm/mach-pxa/spitz.c 7809Index: linux-2.6.22/arch/arm/mach-pxa/spitz.c
7809=================================================================== 7810===================================================================
7810--- linux-2.6.22.orig/arch/arm/mach-pxa/spitz.c 2007-08-29 12:44:46.000000000 +0200 7811--- linux-2.6.22.orig/arch/arm/mach-pxa/spitz.c 2007-09-11 12:53:33.000000000 +0200
7811+++ linux-2.6.22/arch/arm/mach-pxa/spitz.c 2007-08-29 12:44:49.000000000 +0200 7812+++ linux-2.6.22/arch/arm/mach-pxa/spitz.c 2007-09-11 12:53:37.000000000 +0200
7812@@ -222,7 +222,7 @@ 7813@@ -222,7 +222,7 @@
7813 /* 7814 /*
7814 * Spitz Backlight Device 7815 * Spitz Backlight Device
@@ -7821,7 +7822,7 @@ Index: linux-2.6.22/arch/arm/mach-pxa/spitz.c
7821Index: linux-2.6.22/include/asm-arm/arch-pxa/serial.h 7822Index: linux-2.6.22/include/asm-arm/arch-pxa/serial.h
7822=================================================================== 7823===================================================================
7823--- /dev/null 1970-01-01 00:00:00.000000000 +0000 7824--- /dev/null 1970-01-01 00:00:00.000000000 +0000
7824+++ linux-2.6.22/include/asm-arm/arch-pxa/serial.h 2007-08-29 12:44:49.000000000 +0200 7825+++ linux-2.6.22/include/asm-arm/arch-pxa/serial.h 2007-09-11 12:53:37.000000000 +0200
7825@@ -0,0 +1,78 @@ 7826@@ -0,0 +1,78 @@
7826+/* 7827+/*
7827+ * linux/include/asm-arm/arch-pxa/serial.h 7828+ * linux/include/asm-arm/arch-pxa/serial.h
@@ -7904,7 +7905,7 @@ Index: linux-2.6.22/include/asm-arm/arch-pxa/serial.h
7904Index: linux-2.6.22/drivers/serial/pxa.c 7905Index: linux-2.6.22/drivers/serial/pxa.c
7905=================================================================== 7906===================================================================
7906--- linux-2.6.22.orig/drivers/serial/pxa.c 2007-07-09 01:32:17.000000000 +0200 7907--- linux-2.6.22.orig/drivers/serial/pxa.c 2007-07-09 01:32:17.000000000 +0200
7907+++ linux-2.6.22/drivers/serial/pxa.c 2007-08-29 12:44:49.000000000 +0200 7908+++ linux-2.6.22/drivers/serial/pxa.c 2007-09-11 12:53:37.000000000 +0200
7908@@ -46,6 +46,7 @@ 7909@@ -46,6 +46,7 @@
7909 #include <asm/io.h> 7910 #include <asm/io.h>
7910 #include <asm/hardware.h> 7911 #include <asm/hardware.h>
@@ -7971,8 +7972,8 @@ Index: linux-2.6.22/drivers/serial/pxa.c
7971 static void 7972 static void
7972Index: linux-2.6.22/arch/arm/mach-pxa/generic.c 7973Index: linux-2.6.22/arch/arm/mach-pxa/generic.c
7973=================================================================== 7974===================================================================
7974--- linux-2.6.22.orig/arch/arm/mach-pxa/generic.c 2007-08-29 12:44:25.000000000 +0200 7975--- linux-2.6.22.orig/arch/arm/mach-pxa/generic.c 2007-09-11 12:53:11.000000000 +0200
7975+++ linux-2.6.22/arch/arm/mach-pxa/generic.c 2007-08-29 12:44:49.000000000 +0200 7976+++ linux-2.6.22/arch/arm/mach-pxa/generic.c 2007-09-11 12:53:37.000000000 +0200
7976@@ -42,6 +42,7 @@ 7977@@ -42,6 +42,7 @@
7977 #include <asm/arch/mmc.h> 7978 #include <asm/arch/mmc.h>
7978 #include <asm/arch/irda.h> 7979 #include <asm/arch/irda.h>
@@ -8002,8 +8003,8 @@ Index: linux-2.6.22/arch/arm/mach-pxa/generic.c
8002 .start = 0x40301680, 8003 .start = 0x40301680,
8003Index: linux-2.6.22/drivers/leds/Makefile 8004Index: linux-2.6.22/drivers/leds/Makefile
8004=================================================================== 8005===================================================================
8005--- linux-2.6.22.orig/drivers/leds/Makefile 2007-08-29 12:44:30.000000000 +0200 8006--- linux-2.6.22.orig/drivers/leds/Makefile 2007-09-11 12:53:14.000000000 +0200
8006+++ linux-2.6.22/drivers/leds/Makefile 2007-08-29 12:44:49.000000000 +0200 8007+++ linux-2.6.22/drivers/leds/Makefile 2007-09-11 12:53:37.000000000 +0200
8007@@ -16,6 +16,7 @@ 8008@@ -16,6 +16,7 @@
8008 obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o 8009 obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o
8009 obj-$(CONFIG_LEDS_H1940) += leds-h1940.o 8010 obj-$(CONFIG_LEDS_H1940) += leds-h1940.o
@@ -8014,8 +8015,8 @@ Index: linux-2.6.22/drivers/leds/Makefile
8014 # LED Triggers 8015 # LED Triggers
8015Index: linux-2.6.22/arch/arm/Kconfig 8016Index: linux-2.6.22/arch/arm/Kconfig
8016=================================================================== 8017===================================================================
8017--- linux-2.6.22.orig/arch/arm/Kconfig 2007-08-29 17:18:19.000000000 +0200 8018--- linux-2.6.22.orig/arch/arm/Kconfig 2007-09-11 12:53:32.000000000 +0200
8018+++ linux-2.6.22/arch/arm/Kconfig 2007-08-29 17:18:58.000000000 +0200 8019+++ linux-2.6.22/arch/arm/Kconfig 2007-09-11 12:53:37.000000000 +0200
8019@@ -1032,6 +1032,8 @@ 8020@@ -1032,6 +1032,8 @@
8020 8021
8021 source "drivers/w1/Kconfig" 8022 source "drivers/w1/Kconfig"
@@ -8025,3 +8026,19 @@ Index: linux-2.6.22/arch/arm/Kconfig
8025 source "drivers/hwmon/Kconfig" 8026 source "drivers/hwmon/Kconfig"
8026 8027
8027 #source "drivers/l3/Kconfig" 8028 #source "drivers/l3/Kconfig"
8029Index: linux-2.6.22/drivers/input/keyboard/Kconfig
8030===================================================================
8031--- linux-2.6.22.orig/drivers/input/keyboard/Kconfig 2007-09-11 14:28:45.000000000 +0200
8032+++ linux-2.6.22/drivers/input/keyboard/Kconfig 2007-09-11 14:29:05.000000000 +0200
8033@@ -253,4 +253,11 @@
8034 To compile this driver as a module, choose M here: the
8035 module will be called gpio-keys.
8036
8037+config KEYBOARD_ASIC3
8038+ tristate "Buttons on ASIC3 SoC GPIOs (iPaqs, etc.)"
8039+ depends on HTC_ASIC3
8040+ help
8041+ This enables support for the buttons attached to GPIOs of
8042+ HTC ASIC3 peripheral controller.
8043+
8044 endif
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-10-09 12:25:25 +0000