mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-05-07 11:59:49 +00:00
Code Issues Projects Releases Wiki Activity

linux-ti335x-psp: make all patches work with 'git am'

Browse Source 
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-11-30 16:44:35 +01:00
parent 63545554b6
commit 81c2ba4f91
9 changed files with 43 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0001-AM335x-Add-support-for-TSC-on-Beta-GP-EVM.patch
+4 -4
View File
@@ -1,4 +1,4 @@
From 3c22386bee665fb13aeb1f28016a9e77fc6c2dc2 Mon Sep 17 00:00:00 2001
From de1ae4c44093c7f62af58caf3bdba83bb9531295 Mon Sep 17 00:00:00 2001
From: Patil, Rachna <rachna@ti.com>
Date: Fri, 11 Nov 2011 18:03:27 +0530
Subject: [PATCH 1/9] AM335x: Add support for TSC on Beta GP EVM.
@@ -15,10 +15,10 @@ Signed-off-by: Patil, Rachna <rachna@ti.com>
3 files changed, 73 insertions(+), 28 deletions(-)
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index 590c4ca..9ec56c6 100644
index b27fb97..7f52de1 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -912,6 +912,14 @@ static void dvi_init(int evm_id, int profile)
@@ -920,6 +920,14 @@ static void dvi_init(int evm_id, int profile)
static void tsc_init(int evm_id, int profile)
{
int err;
@@ -215,5 +215,5 @@ index 29f87db..b9d9a46 100644
+
};
--
1.7.4.1
1.7.2.5
recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0002-ARM-OMAP-AM335x-Add-support-for-Beta-GP-EVM.patch
+7 -7
View File
@@ -1,4 +1,4 @@
From 98d0446f94a6f89016f5ed73cb6bc304075cceb6 Mon Sep 17 00:00:00 2001
From 0a88ddcef9bdd64f5857c2195c49365f3ef674a3 Mon Sep 17 00:00:00 2001
From: Patil, Rachna <rachna@ti.com>
Date: Fri, 11 Nov 2011 13:09:51 +0530
Subject: [PATCH 2/9] ARM: OMAP: AM335x: Add support for Beta GP EVM.
@@ -19,7 +19,7 @@ Signed-off-by: Patil, Rachna <rachna@ti.com>
1 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index 9ec56c6..d6bf7b1 100644
index 7f52de1..ecda26a 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -329,6 +329,11 @@ struct am335x_evm_eeprom_config {
@@ -34,7 +34,7 @@ index 9ec56c6..d6bf7b1 100644
#define EEPROM_MAC_ADDRESS_OFFSET 60 /* 4+8+4+12+32 */
#define EEPROM_NO_OF_MAC_ADDR 3
static char am335x_mac_addr[EEPROM_NO_OF_MAC_ADDR][ETH_ALEN];
@@ -629,25 +634,8 @@ static struct pinmux_config mmc1_pin_mux[] = {
@@ -637,25 +642,8 @@ static struct pinmux_config mmc1_pin_mux[] = {
{"gpmc_ad0.mmc1_dat0", OMAP_MUX_MODE1 | AM33XX_PIN_INPUT_PULLUP},
{"gpmc_csn1.mmc1_clk", OMAP_MUX_MODE2 | AM33XX_PIN_INPUT_PULLUP},
{"gpmc_csn2.mmc1_cmd", OMAP_MUX_MODE2 | AM33XX_PIN_INPUT_PULLUP},
@@ -62,7 +62,7 @@ index 9ec56c6..d6bf7b1 100644
{NULL, 0},
};
@@ -1138,20 +1126,6 @@ static void mmc1_init(int evm_id, int profile)
@@ -1161,20 +1149,6 @@ static void mmc1_init(int evm_id, int profile)
return;
}
@@ -83,7 +83,7 @@ index 9ec56c6..d6bf7b1 100644
static void mmc2_wl12xx_init(int evm_id, int profile)
{
setup_pin_mux(mmc2_wl12xx_pin_mux);
@@ -1488,9 +1462,8 @@ static struct evm_dev_cfg gen_purp_evm_dev_cfg[] = {
@@ -1511,9 +1485,8 @@ static struct evm_dev_cfg gen_purp_evm_dev_cfg[] = {
{evm_nand_init, DEV_ON_DGHTR_BRD,
(PROFILE_ALL & ~PROFILE_2 & ~PROFILE_3)},
{i2c1_init, DEV_ON_DGHTR_BRD, (PROFILE_0 | PROFILE_3 | PROFILE_7)},
@@ -94,7 +94,7 @@ index 9ec56c6..d6bf7b1 100644
{mmc2_wl12xx_init, DEV_ON_BASEBOARD, (PROFILE_0 | PROFILE_3 |
PROFILE_5)},
{mmc0_init, DEV_ON_BASEBOARD, (PROFILE_ALL & ~PROFILE_5)},
@@ -1563,9 +1536,21 @@ static void setup_low_cost_evm(void)
@@ -1588,9 +1561,21 @@ static void setup_low_cost_evm(void)
static void setup_general_purpose_evm(void)
{
u32 prof_sel = am335x_get_profile_selection();
@@ -118,5 +118,5 @@ index 9ec56c6..d6bf7b1 100644
}
--
1.7.4.1
1.7.2.5
recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0003-AM335x-Add-support-for-pressure-measurement-on-TSC.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From b086fa2754f2c5f4f05a9690f170e2ef86207b4e Mon Sep 17 00:00:00 2001
From 4c5ada67509fc0a47941813900c03b842e6452d1 Mon Sep 17 00:00:00 2001
From: Patil, Rachna <rachna@ti.com>
Date: Fri, 11 Nov 2011 18:28:54 +0530
Subject: [PATCH 3/9] AM335x: Add support for pressure measurement on TSC.
@@ -15,7 +15,7 @@ Signed-off-by: Patil, Rachna <rachna@ti.com>
3 files changed, 66 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index d6bf7b1..46fce3e 100644
index ecda26a..d7af6dd 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -194,6 +194,7 @@ static struct resource tsc_resources[] = {
@@ -215,5 +215,5 @@ index b9d9a46..2c547bb 100644
+ int x_plate_resistance;
};
--
1.7.4.1
1.7.2.5
recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0004-tscadc-Add-general-purpose-mode-untested-with-touchs.patch
+10 -51
View File
@@ -1,60 +1,19 @@
From 2b44ca7878e41f25b91486ebcb8db2c3be1f61eb Mon Sep 17 00:00:00 2001
From d987e3ae4bf83e8a46702ad44e435e6cbea183dc Mon Sep 17 00:00:00 2001
From: Joel A Fernandes <joelagnel@ti.com>
Date: Sat, 29 Oct 2011 01:17:43 -0500
Date: Wed, 30 Nov 2011 15:00:40 +0100
Subject: [PATCH 4/9] tscadc: Add general purpose mode, untested with touchscreen functionality
Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
---
adc-notes.txt | 33 +++++
arch/arm/mach-omap2/board-am335xevm.c | 6 +
arch/arm/mach-omap2/mux33xx.c | 12 ++
arch/arm/mach-omap2/mux33xx.h | 4 +
drivers/input/touchscreen/ti_tscadc.c | 209 +++++++++++++++++++++++++--------
include/linux/input/ti_tscadc.h | 4 +
6 files changed, 216 insertions(+), 52 deletions(-)
create mode 100755 adc-notes.txt
5 files changed, 183 insertions(+), 52 deletions(-)
diff --git a/adc-notes.txt b/adc-notes.txt
new file mode 100755
index 0000000..178e262
--- /dev/null
+++ b/adc-notes.txt
@@ -0,0 +1,33 @@
+Features
+ - software register bit for SOC (Start of conversion) and EOC
+ - single conversion (one-shot) - software enabled
+ - Data stored in either of 2 fifo groups- can be read through dma or cpu
+
+
+Events
+ - Status bit to indicate if ADC is busy converting (can use polling to check if conversion is finished)
+ - Interrupts on FIFO threhold levels reached
+ - In on one-shot mode, Step-enable bit is turned off automatically after conversion - can be used to check if conversion is finished.
+ - 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)
+ - For availability of data, the FIFO interrupts and word count reg should be used.
+
+Clocks-
+ - ADC uses adc_clk
+ - Sequencers, FIFO etc use ocp_clk
+
+One shot mode
+ - Step-enable bit is turned off automatically after conversion - can be used to check if conversion is finished.
+
+ADC Controller
+==============
+*** config steps
+1. configure a STEPCONFIG register
+ For ADC we would like to configure the steps as general-purpose (non-touch screen)
+2. Enable TSC_ADC_SS
+3. Set STEPENABLE bit of any step for the sequencer to go to that step, perform conversion and store the data in FIFO
+
+*** reading data:
+1. Check word count reg in FIFO register
+2. If non 0, read word
+3. Step enable bit can be polled to check if conversion is over or not.
+
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index 46fce3e..c8da580 100644
index d7af6dd..8221ba9 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -456,6 +456,10 @@ static struct pinmux_config tsc_pin_mux[] = {
@@ -68,16 +27,16 @@ index 46fce3e..c8da580 100644
{"vrefp.vrefp", OMAP_MUX_MODE0 | AM33XX_INPUT_EN},
{"vrefn.vrefn", OMAP_MUX_MODE0 | AM33XX_INPUT_EN},
{NULL, 0},
@@ -1513,6 +1517,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = {
{usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE},
@@ -1537,6 +1541,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = {
{i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE},
{mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE},
{boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL},
+ {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL},
{NULL, 0, 0},
};
@@ -1524,6 +1529,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
{usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE},
@@ -1549,6 +1554,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
{i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE},
{mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE},
{boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL},
+ {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL},
@@ -85,7 +44,7 @@ index 46fce3e..c8da580 100644
};
diff --git a/arch/arm/mach-omap2/mux33xx.c b/arch/arm/mach-omap2/mux33xx.c
index 4399003..832a50b 100644
index 06719df..35986ca 100644
--- a/arch/arm/mach-omap2/mux33xx.c
+++ b/arch/arm/mach-omap2/mux33xx.c
@@ -587,6 +587,18 @@ static struct omap_mux __initdata am33xx_muxmodes[] = {
@@ -459,5 +418,5 @@ index 2c547bb..850cd4b 100644
+ int mode;
};
--
1.7.4.1
1.7.2.5
recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0005-tscadc-Add-board-file-mfd-support-fix-warning.patch
+7 -7
View File
@@ -1,6 +1,6 @@
From 800fc5594ec8922ef06e4063497d858cfd92c655 Mon Sep 17 00:00:00 2001
From 0d765160ef94e0ab6f30725b01e5102ca119449f Mon Sep 17 00:00:00 2001
From: Joel A Fernandes <joelagnel@ti.com>
Date: Wed, 23 Nov 2011 17:52:57 -0600
Date: Wed, 30 Nov 2011 15:02:17 +0100
Subject: [PATCH 5/9] tscadc: Add board file mfd support, fix warning
Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
@@ -10,7 +10,7 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index c8da580..563770e 100644
index 8221ba9..30f23d7 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -195,6 +195,11 @@ static struct resource tsc_resources[] = {
@@ -42,7 +42,7 @@ index c8da580..563770e 100644
static u8 am335x_iis_serializer_direction1[] = {
INACTIVE_MODE, INACTIVE_MODE, TX_MODE, RX_MODE,
INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE, INACTIVE_MODE,
@@ -919,6 +934,16 @@ static void tsc_init(int evm_id, int profile)
@@ -927,6 +942,16 @@ static void tsc_init(int evm_id, int profile)
pr_err("failed to register touchscreen device\n");
}
@@ -59,8 +59,8 @@ index c8da580..563770e 100644
static void boneleds_init(int evm_id, int profile )
{
int err;
@@ -1517,7 +1542,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = {
{usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE},
@@ -1541,7 +1566,7 @@ static struct evm_dev_cfg beaglebone_old_dev_cfg[] = {
{i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE},
{mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE},
{boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL},
- {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL},
@@ -82,5 +82,5 @@ index 76fc7b6..49a5a70 100644
int clk_value;
int clock_rate, irqenable, ctrl;
--
1.7.4.1
1.7.2.5
recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0006-AM335X-init-tsc-bone-style-for-new-boards.patch
+6 -6
View File
@@ -1,6 +1,6 @@
From be48948e9fe62f75cb221309aec0990f9ecd5e01 Mon Sep 17 00:00:00 2001
From 42b8e841175da74cb583b91b8b18b3b6b89ea8f7 Mon Sep 17 00:00:00 2001
From: Joel A Fernandes <joelagnel@ti.com>
Date: Mon, 28 Nov 2011 18:01:07 -0600
Date: Wed, 30 Nov 2011 15:03:59 +0100
Subject: [PATCH 6/9] AM335X: init tsc bone style for new boards
Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
@@ -9,11 +9,11 @@ Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
index 563770e..20b4e29 100644
index 30f23d7..8e1521c 100644
--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
@@ -1554,7 +1554,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
{usb1_init, DEV_ON_BASEBOARD, PROFILE_NONE},
@@ -1579,7 +1579,7 @@ static struct evm_dev_cfg beaglebone_dev_cfg[] = {
{i2c2_init, DEV_ON_BASEBOARD, PROFILE_NONE},
{mmc0_init, DEV_ON_BASEBOARD, PROFILE_NONE},
{boneleds_init, DEV_ON_BASEBOARD, PROFILE_ALL},
- {tsc_init, DEV_ON_BASEBOARD, PROFILE_ALL},
@@ -22,5 +22,5 @@ index 563770e..20b4e29 100644
};
--
1.7.4.1
1.7.2.5
recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0007-tscadc-make-stepconfig-channel-configurable.patch
+2 -2
View File
@@ -1,4 +1,4 @@
From 012ea9d8c2e7e522b1bd614ba5df814224663140 Mon Sep 17 00:00:00 2001
From 26a77cf4dc71a322049fc619814a2a46ccdc31c9 Mon Sep 17 00:00:00 2001
From: Joel A Fernandes <joelagnel@ti.com>
Date: Mon, 28 Nov 2011 18:18:04 -0600
Subject: [PATCH 7/9] tscadc: make stepconfig channel-configurable
@@ -42,5 +42,5 @@ index 49a5a70..638feb9 100644
irqenable = TSCADC_IRQENB_FIFO0THRES;
}
--
1.7.4.1
1.7.2.5
recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0008-tscadc-Trigger-through-sysfs.patch
+2 -2
View File
@@ -1,4 +1,4 @@
From 01b25097f2ad4ca1e9f35547b1a040c5f06a5dfd Mon Sep 17 00:00:00 2001
From 57ce0ce446d8c4626b4ea01005a1173da36f095c Mon Sep 17 00:00:00 2001
From: Joel A Fernandes <joelagnel@ti.com>
Date: Mon, 28 Nov 2011 20:55:25 -0600
Subject: [PATCH 8/9] tscadc: Trigger through sysfs
@@ -147,5 +147,5 @@ index 850cd4b..fc239c6 100644
#define TI_TSCADC_TSCMODE 0
#define TI_TSCADC_GENMODE 1
--
1.7.4.1
1.7.2.5
recipes-kernel/linux/linux-ti33x-psp-3.1/adc/0009-meta-ti-Remove-debug-messages-for-meta-ti.patch
+2 -2
View File
@@ -1,4 +1,4 @@
From ddb162b6ced5d47caa3a62ab5e95b659287a32d1 Mon Sep 17 00:00:00 2001
From f4332fb1d88c6301ffca75e9fc9bea1e434b8986 Mon Sep 17 00:00:00 2001
From: Joel A Fernandes <joelagnel@ti.com>
Date: Mon, 28 Nov 2011 20:56:48 -0600
Subject: [PATCH 9/9] meta-ti: Remove debug messages for meta-ti
@@ -30,5 +30,5 @@ index 0126219..182428b 100644
for (i = 0; i < fifo1count; i++) {
read_sample = tscadc_readl(ts_dev, TSCADC_REG_FIFO0);
--
1.7.4.1
1.7.2.5