[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-95-gf2ef6ee
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-95-gf2ef6ee
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-12-28 14:14:34
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via f2ef6ee142d66d14b2179624f8beb463f9dab100 (commit)
via bfd514c1ebba020cb8b289aec4ecf4027ae1c513 (commit)
via 0526c9eea97f12369300fb075949eb3175f92802 (commit)
from 3d356c3ec86c5613fb7e780d173863d44e091193 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f2ef6ee142d66d14b2179624f8beb463f9dab100
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Fri Dec 28 15:14:10 2012 +0100
[LINUX][3.7] apf27 config: select touchscreen by default
commit bfd514c1ebba020cb8b289aec4ecf4027ae1c513
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Fri Dec 28 15:13:27 2012 +0100
[LINUX][3.7] apf27-dev: update SPI support
commit 0526c9eea97f12369300fb075949eb3175f92802
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Fri Dec 28 15:12:59 2012 +0100
[LINUX][3.7] adapt patches 073* and 074* from 2.6.38
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-linux-3.7.config | 2 +-
.../0073-armadeus-tsc2102.patch} | 0
...2_integrate_driver_to_linux_build_system.patch} | 16 +++++-----
...hscreen-add_driver_to_linux_build_system.patch} | 14 ++++----
.../0074-armadeus-tsc2102-touchscreen.patch} | 0
.../3.7/0201-armadeus-add_apf27dev_baseboard.patch | 32 ++++++++++++++-----
6 files changed, 39 insertions(+), 25 deletions(-)
copy patches/linux/{2.6.38/073-armadeus-tsc2102.patch => 3.7/0073-armadeus-tsc2102.patch} (100%)
copy patches/linux/{2.6.38/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch => 3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch} (68%)
copy patches/linux/{2.6.38/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch => 3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch} (78%)
copy patches/linux/{2.6.38/074-armadeus-tsc2102-touchscreen.patch => 3.7/0074-armadeus-tsc2102-touchscreen.patch} (100%)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
index eb9454a..afe1dc0 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.7.config
@@ -112,6 +112,7 @@ CONFIG_KEYBOARD_IMX=m
# CONFIG_INPUT_MOUSE is not set
CONFIG_INPUT_JOYSTICK=y
CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_TSC2102=y
# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
@@ -126,7 +127,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_W1=y
CONFIG_W1_MASTER_MXC=y
CONFIG_W1_SLAVE_THERM=y
-CONFIG_HWMON=m
CONFIG_WATCHDOG=y
CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
diff --git a/patches/linux/2.6.38/073-armadeus-tsc2102.patch b/patches/linux/3.7/0073-armadeus-tsc2102.patch
similarity index 100%
copy from patches/linux/2.6.38/073-armadeus-tsc2102.patch
copy to patches/linux/3.7/0073-armadeus-tsc2102.patch
diff --git a/patches/linux/2.6.38/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch b/patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
similarity index 68%
copy from patches/linux/2.6.38/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
copy to patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
index 1fa3c8a..d3cad46 100644
--- a/patches/linux/2.6.38/073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
+++ b/patches/linux/3.7/0073-armadeus-tsc2102_integrate_driver_to_linux_build_system.patch
@@ -17,11 +17,11 @@
#
--- a/drivers/spi/Makefile 2010-12-07 13:15:11.000000000 +0100
+++ b/drivers/spi/Makefile 2010-12-07 13:15:27.000000000 +0100
-@@ -57,6 +57,7 @@
- # SPI protocol drivers (device/link on bus)
- obj-$(CONFIG_SPI_SPIDEV) += spidev.o
- obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
-+obj-$(CONFIG_SPI_TSC2102) += tsc2102.o
- # ... add above this line ...
-
- # SPI slave controller drivers (upstream link)
+@@ -62,6 +62,7 @@
+ obj-$(CONFIG_SPI_STMP3XXX) += spi-stmp.o
+ obj-$(CONFIG_SPI_TI_SSP) += spi-ti-ssp.o
+ obj-$(CONFIG_SPI_TLE62X0) += spi-tle62x0.o
++obj-$(CONFIG_SPI_TSC2102) += tsc2102.o
+ obj-$(CONFIG_SPI_TOPCLIFF_PCH) += spi-topcliff-pch.o
+ obj-$(CONFIG_SPI_TXX9) += spi-txx9.o
+ obj-$(CONFIG_SPI_XCOMM) += spi-xcomm.o
diff --git a/patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch b/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
similarity index 78%
copy from patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
copy to patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
index 3c5c787..6449ec7 100644
--- a/patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
+++ b/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen-add_driver_to_linux_build_system.patch
@@ -25,13 +25,13 @@ Index: linux-2.6.36/drivers/input/touchscreen/Kconfig
depends on AC97_BUS
Index: linux-2.6.36/drivers/input/touchscreen/Makefile
===================================================================
---- linux-2.6.36.orig/drivers/input/touchscreen/Makefile 2010-12-22 14:32:51.000000000 +0100
-+++ linux-2.6.36/drivers/input/touchscreen/Makefile 2010-12-22 14:33:05.000000000 +0100
-@@ -40,6 +40,7 @@
- obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o
- obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o
- obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o
-+obj-$(CONFIG_TOUCHSCREEN_TSC2102) += tsc2102_ts.o
+--- linux-3.7/drivers/input/touchscreen/Makefile 2012-12-11 04:30:57.000000000 +0100
++++ linux-3.7.new/drivers/input/touchscreen/Makefile 2012-12-23 12:23:37.000000000 +0100
+@@ -60,6 +60,7 @@
+ obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO) += tsc40.o
+ obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o
obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o
++obj-$(CONFIG_TOUCHSCREEN_TSC2102) += tsc2102_ts.o
obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o
obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o
+ obj-$(CONFIG_TOUCHSCREEN_WACOM_I2C) += wacom_i2c.o
diff --git a/patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen.patch b/patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch
similarity index 100%
copy from patches/linux/2.6.38/074-armadeus-tsc2102-touchscreen.patch
copy to patches/linux/3.7/0074-armadeus-tsc2102-touchscreen.patch
diff --git a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
index df0cf35..ff9ac9d 100644
--- a/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
+++ b/patches/linux/3.7/0201-armadeus-add_apf27dev_baseboard.patch
@@ -12,7 +12,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
===================================================================
--- /dev/null
+++ linux-3.7/arch/arm/mach-imx/apf27-dev.c
-@@ -0,0 +1,1012 @@
+@@ -0,0 +1,1026 @@
+ /*
+ * apf27-dev.c
+ * Support for AFP27 module's development baseboard
@@ -72,7 +72,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+#ifdef CONFIG_MAX1027
+#include <linux/spi/max1027.h>
+#endif
-+#ifdef CONFIG_TSC2102
++#ifdef CONFIG_SPI_TSC2102
+#include <linux/spi/tsc2102.h>
+#endif
+#include <linux/can/platform/mcp251x.h>
@@ -141,8 +141,12 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+
+#define TSC2101_INT 17
+#define CONFIG_SPI_MXC_SELECT1
++#define CONFIG_SPI_MXC_SELECT2
+
+#define SPI1_SS0 IMX_GPIO_NR(4, 28)
++#define SPI2_TSC2102_CS IMX_GPIO_NR(4, 21)
++#define SPI2_MCP251X_CS IMX_GPIO_NR(4, 20)
++#define SPI2_SPIDEV_SS IMX_GPIO_NR(2,17)
+#define TSC2101_INT_GPIO IMX_GPIO_NR(6, TSC2101_INT)
+#define USER_LED IMX_GPIO_NR(6, 14) /* PF14 */
+#define USER_BUTTON IMX_GPIO_NR(6, 13) /* PF13 */
@@ -175,6 +179,9 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+ /* PD19_PF_CSPI2_SS2,
+ PD20_PF_CSPI2_SS1, Preferably use CS pin as GPIO
+ PD21_PF_CSPI2_SS0, */
++ SPI2_TSC2102_CS|GPIO_OUT|GPIO_GPIO,
++ SPI2_MCP251X_CS|GPIO_OUT|GPIO_GPIO,
++ SPI2_SPIDEV_SS|GPIO_OUT|GPIO_GPIO,
+ PD22_PF_CSPI2_SCLK,
+ PD23_PF_CSPI2_MISO,
+ PD24_PF_CSPI2_MOSI,
@@ -480,9 +487,9 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+
+#ifdef CONFIG_SPI_MXC_SELECT2
+static int apf27_dev_spi1_cs[] = {
-+ (GPIO_PORTD + 21), /* 0: SPI2_SS0 used as GPIO for TSC2101_CS */
-+ (GPIO_PORTD + 20), /* 1: MCP251X_CS */
-+ (GPIO_PORTB + 17), /* 2: SPIDEV_CS (CSI_D5) */
++ SPI2_TSC2102_CS, /* 0: SPI2_SS0 used as GPIO for TSC2101_CS */
++ SPI2_MCP251X_CS, /* 1: MCP251X_CS */
++ SPI2_SPIDEV_SS, /* 2: SPIDEV_CS (CSI_D5) */
+};
+
+static struct spi_imx_master apf27dev_spi1_data = {
@@ -533,7 +540,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+};
+#endif /* CONFIG_ARMADEUS_MAX1027 */
+
-+#ifdef CONFIG_TSC2102
++#ifdef CONFIG_SPI_TSC2102
+/* APF27Dev has a SPI Touchscreen controller */
+
+static struct tsc210x_config apf27_tsc2101_config = {
@@ -586,7 +593,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+ .modalias = "tsc210x",
+ .max_speed_hz = 8000000,
+ .bus_num = 1, /* SPI2 */
-+ .irq = IRQ_GPIOF(TSC2101_INT),
++ /*.irq = (TSC2101_INT_GPIO),*/
+ .chip_select = 0,
+ .mode = 0,
+ .platform_data = &apf27_tsc2101_config,
@@ -945,6 +952,7 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+void __init apf27_baseboard_init(void)
+{
+ int ret;
++ int i;
+
+ /* SSI unit (TBDL) */
+// mxc_audmux_v1_configure_port(.....);
@@ -992,9 +1000,15 @@ Index: linux-3.7/arch/arm/mach-imx/apf27-dev.c
+ /* TSC2101 + optionnal CAN */
+ /* Can also be used as USB2 or external SPI, with jumper J23 */
+ /* Let hardware decide the state of CS at startup */
-+ mxc_gpio_mode(GPIO_PORTD | 21 | GPIO_GPIO | GPIO_IN);
++ /*mxc_gpio_mode(GPIO_PORTD | 21 | GPIO_GPIO | GPIO_IN);
+ mxc_gpio_mode(GPIO_PORTD | 20 | GPIO_GPIO | GPIO_IN);
-+ mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_IN);
++ mxc_gpio_mode(GPIO_PORTB | 17 | GPIO_GPIO | GPIO_IN);*/
++ for (i=0; i< ARRAY_SIZE(apf27dev_spi_board_info);i++) {
++ if (!strcmp(apf27dev_spi_board_info[i].modalias, "tsc210x")) {
++ apf27dev_spi_board_info[i].irq = gpio_to_irq(TSC2101_INT_GPIO);
++ }
++ }
++
+ imx27_add_spi_imx1(&apf27dev_spi1_data);
+#endif
+#ifdef CONFIG_SPI_MXC_SELECT3
hooks/post-receive
--
armadeus
|
