summaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-ti33x-psp-3.1
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-11-30 16:44:35 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2011-11-30 16:44:35 +0100
commit81c2ba4f91b62a7800e62e1aaba5783a7596c46b (patch)
tree0226753ca22e46fb026568520e0671db2f186ed0 /recipes-kernel/linux/linux-ti33x-psp-3.1
parent63545554b6dc63297d522280df8b3fcb1b0ba30f (diff)
downloadmeta-ti-81c2ba4f91b62a7800e62e1aaba5783a7596c46b.tar.gz
linux-ti335x-psp: make all patches work with 'git am'
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-kernel/linux/linux-ti33x-psp-3.1')
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch8
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0002-ARM-OMAP-AM335x-Add-support-for-Beta-GP-EVM.patch14
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0003-AM335x-Add-support-for-pressure-measurement-on-TSC.patch6
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0004-tscadc-Add-general-purpose-mode-untested-with-touchs.patch61
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0005-tscadc-Add-board-file-mfd-support-fix-warning.patch14
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0006-AM335X-init-tsc-bone-style-for-new-boards.patch12
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0007-tscadc-make-stepconfig-channel-configurable.patch4
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0008-tscadc-Trigger-through-sysfs.patch4
-rw-r--r--recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0009-meta-ti-Remove-debug-messages-for-meta-ti.patch4
9 files changed, 43 insertions, 84 deletions
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch
index b4b14b87..23a0c8f6 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch
@@ -1,4 +1,4 @@
1From 3c22386bee665fb13aeb1f28016a9e77fc6c2dc2 Mon Sep 17 00:00:00 2001 1From de1ae4c44093c7f62af58caf3bdba83bb9531295 Mon Sep 17 00:00:00 2001
2From: Patil, Rachna <rachna@ti.com> 2From: Patil, Rachna <rachna@ti.com>
3Date: Fri, 11 Nov 2011 18:03:27 +0530 3Date: Fri, 11 Nov 2011 18:03:27 +0530
4Subject: [PATCH 1/9] AM335x: Add support for TSC on Beta GP EVM. 4Subject: [PATCH 1/9] AM335x: Add support for TSC on Beta GP EVM.
@@ -15,10 +15,10 @@ Signed-off-by: Patil, Rachna <rachna@ti.com>
15 3 files changed, 73 insertions(+), 28 deletions(-) 15 3 files changed, 73 insertions(+), 28 deletions(-)
16 16
17diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c 17diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
18index 590c4ca..9ec56c6 100644 18index b27fb97..7f52de1 100644
19--- a/arch/arm/mach-omap2/board-am335xevm.c 19--- a/arch/arm/mach-omap2/board-am335xevm.c
20+++ b/arch/arm/mach-omap2/board-am335xevm.c 20+++ b/arch/arm/mach-omap2/board-am335xevm.c
21@@ -912,6 +912,14 @@ static void dvi_init(int evm_id, int profile) 21@@ -920,6 +920,14 @@ static void dvi_init(int evm_id, int profile)
22 static void tsc_init(int evm_id, int profile) 22 static void tsc_init(int evm_id, int profile)
23 { 23 {
24 int err; 24 int err;
@@ -215,5 +215,5 @@ index 29f87db..b9d9a46 100644
215+ 215+
216 }; 216 };
217-- 217--
2181.7.4.1 2181.7.2.5
219 219
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0002-ARM-OMAP-AM335x-Add-support-for-Beta-GP-EVM.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0002-ARM-OMAP-AM335x-Add-support-for-Beta-GP-EVM.patch
index c7e4b786..9c4a6302 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0002-ARM-OMAP-AM335x-Add-support-for-Beta-GP-EVM.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0002-ARM-OMAP-AM335x-Add-support-for-Beta-GP-EVM.patch
@@ -1,4 +1,4 @@
1From 98d0446f94a6f89016f5ed73cb6bc304075cceb6 Mon Sep 17 00:00:00 2001 1From 0a88ddcef9bdd64f5857c2195c49365f3ef674a3 Mon Sep 17 00:00:00 2001
2From: Patil, Rachna <rachna@ti.com> 2From: Patil, Rachna <rachna@ti.com>
3Date: Fri, 11 Nov 2011 13:09:51 +0530 3Date: Fri, 11 Nov 2011 13:09:51 +0530
4Subject: [PATCH 2/9] ARM: OMAP: AM335x: Add support for Beta GP EVM. 4Subject: [PATCH 2/9] ARM: OMAP: AM335x: Add support for Beta GP EVM.
@@ -19,7 +19,7 @@ Signed-off-by: Patil, Rachna <rachna@ti.com>
19 1 files changed, 21 insertions(+), 36 deletions(-) 19 1 files changed, 21 insertions(+), 36 deletions(-)
20 20
21diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c 21diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
22index 9ec56c6..d6bf7b1 100644 22index 7f52de1..ecda26a 100644
23--- a/arch/arm/mach-omap2/board-am335xevm.c 23--- a/arch/arm/mach-omap2/board-am335xevm.c
24+++ b/arch/arm/mach-omap2/board-am335xevm.c 24+++ b/arch/arm/mach-omap2/board-am335xevm.c
25@@ -329,6 +329,11 @@ struct am335x_evm_eeprom_config { 25@@ -329,6 +329,11 @@ struct am335x_evm_eeprom_config {
@@ -34,7 +34,7 @@ index 9ec56c6..d6bf7b1 100644
34 #define EEPROM_MAC_ADDRESS_OFFSET 60 /* 4+8+4+12+32 */ 34 #define EEPROM_MAC_ADDRESS_OFFSET 60 /* 4+8+4+12+32 */
35 #define EEPROM_NO_OF_MAC_ADDR 3 35 #define EEPROM_NO_OF_MAC_ADDR 3
36 static char am335x_mac_addr[EEPROM_NO_OF_MAC_ADDR][ETH_ALEN]; 36 static char am335x_mac_addr[EEPROM_NO_OF_MAC_ADDR][ETH_ALEN];
37@@ -629,25 +634,8 @@ static struct pinmux_config mmc1_pin_mux[] = { 37@@ -637,25 +642,8 @@ static struct pinmux_config mmc1_pin_mux[] = {
38 {"gpmc_ad0.mmc1_dat0", OMAP_MUX_MODE1 | AM33XX_PIN_INPUT_PULLUP}, 38 {"gpmc_ad0.mmc1_dat0", OMAP_MUX_MODE1 | AM33XX_PIN_INPUT_PULLUP},
39 {"gpmc_csn1.mmc1_clk", OMAP_MUX_MODE2 | AM33XX_PIN_INPUT_PULLUP}, 39 {"gpmc_csn1.mmc1_clk", OMAP_MUX_MODE2 | AM33XX_PIN_INPUT_PULLUP},
40 {"gpmc_csn2.mmc1_cmd", OMAP_MUX_MODE2 | AM33XX_PIN_INPUT_PULLUP}, 40 {"gpmc_csn2.mmc1_cmd", OMAP_MUX_MODE2 | AM33XX_PIN_INPUT_PULLUP},
@@ -62,7 +62,7 @@ index 9ec56c6..d6bf7b1 100644
62 {NULL, 0}, 62 {NULL, 0},
63 }; 63 };
64 64
65@@ -1138,20 +1126,6 @@ static void mmc1_init(int evm_id, int profile) 65@@ -1161,20 +1149,6 @@ static void mmc1_init(int evm_id, int profile)
66 return; 66 return;
67 } 67 }
68 68
@@ -83,7 +83,7 @@ index 9ec56c6..d6bf7b1 100644
83 static void mmc2_wl12xx_init(int evm_id, int profile) 83 static void mmc2_wl12xx_init(int evm_id, int profile)
84 { 84 {
85 setup_pin_mux(mmc2_wl12xx_pin_mux); 85 setup_pin_mux(mmc2_wl12xx_pin_mux);
86@@ -1488,9 +1462,8 @@ static struct evm_dev_cfg gen_purp_evm_dev_cfg[] = { 86@@ -1511,9 +1485,8 @@ static struct evm_dev_cfg gen_purp_evm_dev_cfg[] = {
87 {evm_nand_init, DEV_ON_DGHTR_BRD, 87 {evm_nand_init, DEV_ON_DGHTR_BRD,
88 (PROFILE_ALL & ~PROFILE_2 & ~PROFILE_3)}, 88 (PROFILE_ALL & ~PROFILE_2 & ~PROFILE_3)},
89 {i2c1_init, DEV_ON_DGHTR_BRD, (PROFILE_0 | PROFILE_3 | PROFILE_7)}, 89 {i2c1_init, DEV_ON_DGHTR_BRD, (PROFILE_0 | PROFILE_3 | PROFILE_7)},
@@ -94,7 +94,7 @@ index 9ec56c6..d6bf7b1 100644
94 {mmc2_wl12xx_init, DEV_ON_BASEBOARD, (PROFILE_0 | PROFILE_3 | 94 {mmc2_wl12xx_init, DEV_ON_BASEBOARD, (PROFILE_0 | PROFILE_3 |
95 PROFILE_5)}, 95 PROFILE_5)},
96 {mmc0_init, DEV_ON_BASEBOARD, (PROFILE_ALL & ~PROFILE_5)}, 96 {mmc0_init, DEV_ON_BASEBOARD, (PROFILE_ALL & ~PROFILE_5)},
97@@ -1563,9 +1536,21 @@ static void setup_low_cost_evm(void) 97@@ -1588,9 +1561,21 @@ static void setup_low_cost_evm(void)
98 static void setup_general_purpose_evm(void) 98 static void setup_general_purpose_evm(void)
99 { 99 {
100 u32 prof_sel = am335x_get_profile_selection(); 100 u32 prof_sel = am335x_get_profile_selection();
@@ -118,5 +118,5 @@ index 9ec56c6..d6bf7b1 100644
118 } 118 }
119 119
120-- 120--
1211.7.4.1 1211.7.2.5
122 122
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0003-AM335x-Add-support-for-pressure-measurement-on-TSC.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0003-AM335x-Add-support-for-pressure-measurement-on-TSC.patch
index 9e733162..df3bd615 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0003-AM335x-Add-support-for-pressure-measurement-on-TSC.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0003-AM335x-Add-support-for-pressure-measurement-on-TSC.patch
@@ -1,4 +1,4 @@
1From b086fa2754f2c5f4f05a9690f170e2ef86207b4e Mon Sep 17 00:00:00 2001 1From 4c5ada67509fc0a47941813900c03b842e6452d1 Mon Sep 17 00:00:00 2001
2From: Patil, Rachna <rachna@ti.com> 2From: Patil, Rachna <rachna@ti.com>
3Date: Fri, 11 Nov 2011 18:28:54 +0530 3Date: Fri, 11 Nov 2011 18:28:54 +0530
4Subject: [PATCH 3/9] AM335x: Add support for pressure measurement on TSC. 4Subject: [PATCH 3/9] AM335x: Add support for pressure measurement on TSC.
@@ -15,7 +15,7 @@ Signed-off-by: Patil, Rachna <rachna@ti.com>
15 3 files changed, 66 insertions(+), 15 deletions(-) 15 3 files changed, 66 insertions(+), 15 deletions(-)
16 16
17diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c 17diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
18index d6bf7b1..46fce3e 100644 18index ecda26a..d7af6dd 100644
19--- a/arch/arm/mach-omap2/board-am335xevm.c 19--- a/arch/arm/mach-omap2/board-am335xevm.c
20+++ b/arch/arm/mach-omap2/board-am335xevm.c 20+++ b/arch/arm/mach-omap2/board-am335xevm.c
21@@ -194,6 +194,7 @@ static struct resource tsc_resources[] = { 21@@ -194,6 +194,7 @@ static struct resource tsc_resources[] = {
@@ -215,5 +215,5 @@ index b9d9a46..2c547bb 100644
215+ int x_plate_resistance; 215+ int x_plate_resistance;
216 }; 216 };
217-- 217--
2181.7.4.1 2181.7.2.5
219 219
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0004-tscadc-Add-general-purpose-mode-untested-with-touchs.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0004-tscadc-Add-general-purpose-mode-untested-with-touchs.patch
index adbe1a5a..a89c0742 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0004-tscadc-Add-general-purpose-mode-untested-with-touchs.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0004-tscadc-Add-general-purpose-mode-untested-with-touchs.patch
@@ -1,60 +1,19 @@
1From 2b44ca7878e41f25b91486ebcb8db2c3be1f61eb Mon Sep 17 00:00:00 2001 1From d987e3ae4bf83e8a46702ad44e435e6cbea183dc Mon Sep 17 00:00:00 2001
2From: Joel A Fernandes <joelagnel@ti.com> 2From: Joel A Fernandes <joelagnel@ti.com>
3Date: Sat, 29 Oct 2011 01:17:43 -0500 3Date: Wed, 30 Nov 2011 15:00:40 +0100
4Subject: [PATCH 4/9] tscadc: Add general purpose mode, untested with touchscreen functionality 4Subject: [PATCH 4/9] tscadc: Add general purpose mode, untested with touchscreen functionality
5 5
6Signed-off-by: Joel A Fernandes <joelagnel@ti.com> 6Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
7--- 7---
8 adc-notes.txt | 33 +++++
9 arch/arm/mach-omap2/board-am335xevm.c | 6 + 8 arch/arm/mach-omap2/board-am335xevm.c | 6 +
10 arch/arm/mach-omap2/mux33xx.c | 12 ++ 9 arch/arm/mach-omap2/mux33xx.c | 12 ++
11 arch/arm/mach-omap2/mux33xx.h | 4 + 10 arch/arm/mach-omap2/mux33xx.h | 4 +
12 drivers/input/touchscreen/ti_tscadc.c | 209 +++++++++++++++++++++++++-------- 11 drivers/input/touchscreen/ti_tscadc.c | 209 +++++++++++++++++++++++++--------
13 include/linux/input/ti_tscadc.h | 4 + 12 include/linux/input/ti_tscadc.h | 4 +
14 6 files changed, 216 insertions(+), 52 deletions(-) 13 5 files changed, 183 insertions(+), 52 deletions(-)
15 create mode 100755 adc-notes.txt
16 14
17diff --git a/adc-notes.txt b/adc-notes.txt
18new file mode 100755
19index 0000000..178e262
20--- /dev/null
21+++ b/adc-notes.txt
22@@ -0,0 +1,33 @@
23+Features
24+ - software register bit for SOC (Start of conversion) and EOC
25+ - single conversion (one-shot) - software enabled
26+ - Data stored in either of 2 fifo groups- can be read through dma or cpu
27+
28+
29+Events
30+ - Status bit to indicate if ADC is busy converting (can use polling to check if conversion is finished)
31+ - Interrupts on FIFO threhold levels reached
32+ - In on one-shot mode, Step-enable bit is turned off automatically after conversion - can be used to check if conversion is finished.
33+ - END_OF_SEQUENCE interrupt can be configured when the FSM is done with the last enabled step (but should not be used to check if data is in the FIFO)
34+ - For availability of data, the FIFO interrupts and word count reg should be used.
35+
36+Clocks-
37+ - ADC uses adc_clk
38+ - Sequencers, FIFO etc use ocp_clk
39+
40+One shot mode
41+ - Step-enable bit is turned off automatically after conversion - can be used to check if conversion is finished.
42+
43+ADC Controller
44+==============
45+*** config steps
46+1. configure a STEPCONFIG register
47+ For ADC we would like to configure the steps as general-purpose (non-touch screen)
48+2. Enable TSC_ADC_SS
49+3. Set STEPENABLE bit of any step for the sequencer to go to that step, perform conversion and store the data in FIFO
50+
51+*** reading data:
52+1. Check word count reg in FIFO register
53+2. If non 0, read word
54+3. Step enable bit can be polled to check if conversion is over or not.
55+
56diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c 15diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
57index 46fce3e..c8da580 100644 16index d7af6dd..8221ba9 100644
58--- a/arch/arm/mach-omap2/board-am335xevm.c 17--- a/arch/arm/mach-omap2/board-am335xevm.c
59+++ b/arch/arm/mach-omap2/board-am335xevm.c 18+++ b/arch/arm/mach-omap2/board-am335xevm.c
60@@ -456,6 +456,10 @@ static struct pinmux_config tsc_pin_mux[] = { 19@@ -456,6 +456,10 @@ static struct pinmux_config tsc_pin_mux[] = {
@@ -68,16 +27,16 @@ index 46fce3e..c8da580 100644
68 {"vrefp.vrefp", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, 27 {"vrefp.vrefp", OMAP_MUX_MODE0 | AM33XX_INPUT_EN},
69 {"vrefn.vrefn", OMAP_MUX_MODE0 | AM33XX_INPUT_EN}, 28 {"vrefn.vrefn", OMAP_MUX_MODE0 | AM33XX_INPUT_EN},
70 {NULL, 0}, 29 {NULL, 0},
71@@ -1513,6 +1517,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { 30@@ -1537,6 +1541,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = {
72 {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, 31 {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE},
73 {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, 32 {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE},
74 {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, 33 {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL},
75+ {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL}, 34+ {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL},
76 {NULL, 0, 0}, 35 {NULL, 0, 0},
77 }; 36 };
78 37
79@@ -1524,6 +1529,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { 38@@ -1549,6 +1554,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
80 {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, 39 {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE},
81 {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, 40 {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE},
82 {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, 41 {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL},
83+ {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL}, 42+ {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL},
@@ -85,7 +44,7 @@ index 46fce3e..c8da580 100644
85 }; 44 };
86 45
87diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c 46diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c
88index 4399003..832a50b 100644 47index 06719df..35986ca 100644
89--- a/arch/arm/mach-omap2/mux33xx.c 48--- a/arch/arm/mach-omap2/mux33xx.c
90+++ b/arch/arm/mach-omap2/mux33xx.c 49+++ b/arch/arm/mach-omap2/mux33xx.c
91@@ -587,6 +587,18 @@ static struct omap_mux __initdata am33xx_muxmodes[] = { 50@@ -587,6 +587,18 @@ static struct omap_mux __initdata am33xx_muxmodes[] = {
@@ -459,5 +418,5 @@ index 2c547bb..850cd4b 100644
459+ int mode; 418+ int mode;
460 }; 419 };
461-- 420--
4621.7.4.1 4211.7.2.5
463 422
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0005-tscadc-Add-board-file-mfd-support-fix-warning.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0005-tscadc-Add-board-file-mfd-support-fix-warning.patch
index 745855f8..299ab8ca 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0005-tscadc-Add-board-file-mfd-support-fix-warning.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0005-tscadc-Add-board-file-mfd-support-fix-warning.patch
@@ -1,6 +1,6 @@
1From 800fc5594ec8922ef06e4063497d858cfd92c655 Mon Sep 17 00:00:00 2001 1From 0d765160ef94e0ab6f30725b01e5102ca119449f Mon Sep 17 00:00:00 2001
2From: Joel A Fernandes <joelagnel@ti.com> 2From: Joel A Fernandes <joelagnel@ti.com>
3Date: Wed, 23 Nov 2011 17:52:57 -0600 3Date: Wed, 30 Nov 2011 15:02:17 +0100
4Subject: [PATCH 5/9] tscadc: Add board file mfd support, fix warning 4Subject: [PATCH 5/9] tscadc: Add board file mfd support, fix warning
5 5
6Signed-off-by: Joel A Fernandes <joelagnel@ti.com> 6Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
@@ -10,7 +10,7 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
10 2 files changed, 27 insertions(+), 2 deletions(-) 10 2 files changed, 27 insertions(+), 2 deletions(-)
11 11
12diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c 12diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
13index c8da580..563770e 100644 13index 8221ba9..30f23d7 100644
14--- a/arch/arm/mach-omap2/board-am335xevm.c 14--- a/arch/arm/mach-omap2/board-am335xevm.c
15+++ b/arch/arm/mach-omap2/board-am335xevm.c 15+++ b/arch/arm/mach-omap2/board-am335xevm.c
16@@ -195,6 +195,11 @@ static struct resource tsc_resources[] = { 16@@ -195,6 +195,11 @@ static struct resource tsc_resources[] = {
@@ -42,7 +42,7 @@ index c8da580..563770e 100644
42 static u8 am335x_iis_serializer_direction1[] = { 42 static u8 am335x_iis_serializer_direction1[] = {
43 INACTIVE_MODE, INACTIVE_MODE, TX_MODE, RX_MODE, 43 INACTIVE_MODE, INACTIVE_MODE, TX_MODE, RX_MODE,
44 INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, 44 INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
45@@ -919,6 +934,16 @@ static void tsc_init(int evm_id, int profile) 45@@ -927,6 +942,16 @@ static void tsc_init(int evm_id, int profile)
46 pr_err("failed to register touchscreen device\n"); 46 pr_err("failed to register touchscreen device\n");
47 } 47 }
48 48
@@ -59,8 +59,8 @@ index c8da580..563770e 100644
59 static void boneleds_init(int evm_id, int profile ) 59 static void boneleds_init(int evm_id, int profile )
60 { 60 {
61 int err; 61 int err;
62@@ -1517,7 +1542,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = { 62@@ -1541,7 +1566,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = {
63 {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, 63 {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE},
64 {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, 64 {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE},
65 {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, 65 {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL},
66- {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL}, 66- {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL},
@@ -82,5 +82,5 @@ index 76fc7b6..49a5a70 100644
82 int clk_value; 82 int clk_value;
83 int clock_rate, irqenable, ctrl; 83 int clock_rate, irqenable, ctrl;
84-- 84--
851.7.4.1 851.7.2.5
86 86
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0006-AM335X-init-tsc-bone-style-for-new-boards.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0006-AM335X-init-tsc-bone-style-for-new-boards.patch
index 85f200d9..ab9d3f3c 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0006-AM335X-init-tsc-bone-style-for-new-boards.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0006-AM335X-init-tsc-bone-style-for-new-boards.patch
@@ -1,6 +1,6 @@
1From be48948e9fe62f75cb221309aec0990f9ecd5e01 Mon Sep 17 00:00:00 2001 1From 42b8e841175da74cb583b91b8b18b3b6b89ea8f7 Mon Sep 17 00:00:00 2001
2From: Joel A Fernandes <joelagnel@ti.com> 2From: Joel A Fernandes <joelagnel@ti.com>
3Date: Mon, 28 Nov 2011 18:01:07 -0600 3Date: Wed, 30 Nov 2011 15:03:59 +0100
4Subject: [PATCH 6/9] AM335X: init tsc bone style for new boards 4Subject: [PATCH 6/9] AM335X: init tsc bone style for new boards
5 5
6Signed-off-by: Joel A Fernandes <joelagnel@ti.com> 6Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
@@ -9,11 +9,11 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
9 1 files changed, 1 insertions(+), 1 deletions(-) 9 1 files changed, 1 insertions(+), 1 deletions(-)
10 10
11diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c 11diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
12index 563770e..20b4e29 100644 12index 30f23d7..8e1521c 100644
13--- a/arch/arm/mach-omap2/board-am335xevm.c 13--- a/arch/arm/mach-omap2/board-am335xevm.c
14+++ b/arch/arm/mach-omap2/board-am335xevm.c 14+++ b/arch/arm/mach-omap2/board-am335xevm.c
15@@ -1554,7 +1554,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = { 15@@ -1579,7 +1579,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
16 {usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE}, 16 {i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE},
17 {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE}, 17 {mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE},
18 {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL}, 18 {boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL},
19- {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL}, 19- {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL},
@@ -22,5 +22,5 @@ index 563770e..20b4e29 100644
22 }; 22 };
23 23
24-- 24--
251.7.4.1 251.7.2.5
26 26
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0007-tscadc-make-stepconfig-channel-configurable.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0007-tscadc-make-stepconfig-channel-configurable.patch
index 487c5568..ec66f044 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0007-tscadc-make-stepconfig-channel-configurable.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0007-tscadc-make-stepconfig-channel-configurable.patch
@@ -1,4 +1,4 @@
1From 012ea9d8c2e7e522b1bd614ba5df814224663140 Mon Sep 17 00:00:00 2001 1From 26a77cf4dc71a322049fc619814a2a46ccdc31c9 Mon Sep 17 00:00:00 2001
2From: Joel A Fernandes <joelagnel@ti.com> 2From: Joel A Fernandes <joelagnel@ti.com>
3Date: Mon, 28 Nov 2011 18:18:04 -0600 3Date: Mon, 28 Nov 2011 18:18:04 -0600
4Subject: [PATCH 7/9] tscadc: make stepconfig channel-configurable 4Subject: [PATCH 7/9] tscadc: make stepconfig channel-configurable
@@ -42,5 +42,5 @@ index 49a5a70..638feb9 100644
42 irqenable = TSCADC_IRQENB_FIFO0THRES; 42 irqenable = TSCADC_IRQENB_FIFO0THRES;
43 } 43 }
44-- 44--
451.7.4.1 451.7.2.5
46 46
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0008-tscadc-Trigger-through-sysfs.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0008-tscadc-Trigger-through-sysfs.patch
index 378e8ccb..86d3d681 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0008-tscadc-Trigger-through-sysfs.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0008-tscadc-Trigger-through-sysfs.patch
@@ -1,4 +1,4 @@
1From 01b25097f2ad4ca1e9f35547b1a040c5f06a5dfd Mon Sep 17 00:00:00 2001 1From 57ce0ce446d8c4626b4ea01005a1173da36f095c Mon Sep 17 00:00:00 2001
2From: Joel A Fernandes <joelagnel@ti.com> 2From: Joel A Fernandes <joelagnel@ti.com>
3Date: Mon, 28 Nov 2011 20:55:25 -0600 3Date: Mon, 28 Nov 2011 20:55:25 -0600
4Subject: [PATCH 8/9] tscadc: Trigger through sysfs 4Subject: [PATCH 8/9] tscadc: Trigger through sysfs
@@ -147,5 +147,5 @@ index 850cd4b..fc239c6 100644
147 #define TI_TSCADC_TSCMODE 0 147 #define TI_TSCADC_TSCMODE 0
148 #define TI_TSCADC_GENMODE 1 148 #define TI_TSCADC_GENMODE 1
149-- 149--
1501.7.4.1 1501.7.2.5
151 151
diff --git a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0009-meta-ti-Remove-debug-messages-for-meta-ti.patch b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0009-meta-ti-Remove-debug-messages-for-meta-ti.patch
index 2c305701..55ea82da 100644
--- a/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0009-meta-ti-Remove-debug-messages-for-meta-ti.patch
+++ b/recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0009-meta-ti-Remove-debug-messages-for-meta-ti.patch
@@ -1,4 +1,4 @@
1From ddb162b6ced5d47caa3a62ab5e95b659287a32d1 Mon Sep 17 00:00:00 2001 1From f4332fb1d88c6301ffca75e9fc9bea1e434b8986 Mon Sep 17 00:00:00 2001
2From: Joel A Fernandes <joelagnel@ti.com> 2From: Joel A Fernandes <joelagnel@ti.com>
3Date: Mon, 28 Nov 2011 20:56:48 -0600 3Date: Mon, 28 Nov 2011 20:56:48 -0600
4Subject: [PATCH 9/9] meta-ti: Remove debug messages for meta-ti 4Subject: [PATCH 9/9] meta-ti: Remove debug messages for meta-ti
@@ -30,5 +30,5 @@ index 0126219..182428b 100644
30 for (i = 0; i < fifo1count; i++) { 30 for (i = 0; i < fifo1count; i++) {
31 read_sample = tscadc_readl(ts_dev, TSCADC_REG_FIFO0); 31 read_sample = tscadc_readl(ts_dev, TSCADC_REG_FIFO0);
32-- 32--
331.7.4.1 331.7.2.5
34 34