[Armadeus-commitlog] SF.net SVN: armadeus:[835] trunk/buildroot/target/device/armadeus/linux/ kerne
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[835] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.23.1
|
From: <ar...@us...> - 2008-07-18 16:05:27
|
Revision: 835
http://armadeus.svn.sourceforge.net/armadeus/?rev=835&view=rev
Author: artemys
Date: 2008-07-18 16:02:37 +0000 (Fri, 18 Jul 2008)
Log Message:
-----------
[LINUX] Split tsc2102 spi patch in 2 parts (driver/build) + do some defines update in tsc2102.h
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-linux-2.6.23.1-tsc2102.diff
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-tsc2102-integrate-driver-to-linux-build-system.diff
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-linux-2.6.23.1-tsc2102.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-linux-2.6.23.1-tsc2102.diff 2008-07-18 08:16:51 UTC (rev 834)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-linux-2.6.23.1-tsc2102.diff 2008-07-18 16:02:37 UTC (rev 835)
@@ -1,7 +1,6 @@
-diff -pNur ref/linux-2.6.18.1/include/linux/spi/tsc2102.h linux-2.6.18.1/include/linux/spi/tsc2102.h
---- ref/linux-2.6.18.1/include/linux/spi/tsc2102.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.18.1/include/linux/spi/tsc2102.h 2007-09-22 01:42:29.000000000 +0200
-@@ -0,0 +1,175 @@
+--- linux-2.6.23.original/include/linux/spi/tsc2102.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.mod/include/linux/spi/tsc2102.h 2007-09-22 01:42:29.000000000 +0200
+@@ -0,0 +1,176 @@
+/*
+ * include/linux/spi/tsc2102.h
+ *
@@ -57,7 +56,7 @@
+extern int tsc2102_temp1_cb(tsc2102_temp_t handler);
+extern int tsc2102_temp2_cb(tsc2102_temp_t handler);
+
-+#ifdef CONFIG_SOUND
++#if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
+extern void tsc2102_set_volume(uint8_t left_ch, uint8_t right_ch);
+extern void tsc2102_set_mute(int left_ch, int right_ch);
+extern void tsc2102_get_mute(int *left_ch, int *right_ch);
@@ -66,7 +65,7 @@
+extern void tsc2102_set_i2s_master(int state);
+extern void tsc2102_set_deemphasis(int enable);
+extern void tsc2102_set_bassboost(int enable);
-+#endif
++#endif // CONFIG_SOUND || CONFIG_SOUND_MODULE
+
+extern void tsc2102_keyclick(int amplitude, int freq, int length);
+
@@ -123,7 +122,8 @@
+/* Field masks for Audio Control 1 */
+#define AC1_WLEN(ARG) (((ARG) & 0x03) << 10)
+#define AC1_DATFM(ARG) (((ARG) & 0x03) << 8)
-+#define AC1_DACFS(ARG) ((ARG) & 0x3f)
++#define AC1_DACFS_MASK (0x3f)
++#define AC1_DACFS(ARG) ((ARG) & AC1_DACFS_MASK)
+
+/* Field masks for TSC2102_DAC_GAIN_CTRL */
+#define DGC_DALMU (1 << 15)
@@ -162,7 +162,7 @@
+#define PLL1_PLLEN (1 << 15)
+#define PLL1_Q_VAL(ARG) (((ARG) & 0x0f) << 11)
+#define PLL1_P_VAL(ARG) (((ARG) & 0x07) << 8)
-+#define PLL1_I_VAL(ARG) (((ARG) & 0x3f) << 2)
++#define PLL1_J_VAL(ARG) (((ARG) & 0x3f) << 2)
+
+/* Field masks for TSC2102_PLL2_CTRL */
+#define PLL2_D_VAL(ARG) (((ARG) & 0x3fff) << 2)
@@ -177,38 +177,8 @@
+};
+
+#endif /* __LINUX_SPI_TSC2102_H */
-diff -pNur test/buildroot/build_arm_nofpu/linux-2.6.18.1/drivers/spi/Kconfig armadeus/buildroot/build_arm_nofpu/linux-2.6.18.1/drivers/spi/Kconfig
---- ref/linux-2.6.18.1/drivers/spi/Kconfig 2007-09-22 02:39:35.000000000 +0200
-+++ linux-2.6.18.1/drivers/spi/Kconfig 2007-09-16 11:08:17.000000000 +0200
-@@ -230,6 +230,14 @@ comment "SPI Protocol Masters"
- sysfs interface, with each line presented as a kind of GPIO
- exposing both switch control and diagnostic feedback.
-
-+config SPI_TSC2102
-+ depends on SPI_MASTER
-+ depends on HWMON = n || HWMON
-+ tristate "TSC2102 codec support"
-+ ---help---
-+ Say Y here if you want support for the TSC2102 chip. It
-+ will be needed for the touchscreen driver on some boards.
-+
- #
- # Add new SPI protocol masters in alphabetical order above this line
- #
-diff -pNur ref/linux-2.6.18.1/drivers/spi/Makefile linux-2.6.18.1/drivers/spi/Makefile
---- ref/linux-2.6.18.1/drivers/spi/Makefile 2007-09-22 02:39:35.000000000 +0200
-+++ linux-2.6.18.1/drivers/spi/Makefile 2007-09-16 11:08:16.000000000 +0200
-@@ -33,6 +33,7 @@
- obj-$(CONFIG_SPI_AT25) += at25.o
- 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)
-diff -pNur ref/linux-2.6.18.1/drivers/spi/tsc2102.c linux-2.6.18.1/drivers/spi/tsc2102.c
---- ref/linux-2.6.18.1/drivers/spi/tsc2102.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.18.1/drivers/spi/tsc2102.c 2007-09-22 01:42:55.000000000 +0200
+--- linux-2.6.23.original/drivers/spi/tsc2102.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.23.mod/drivers/spi/tsc2102.c 2007-09-22 01:42:55.000000000 +0200
@@ -0,0 +1,1103 @@
+/*
+ * drivers/spi/tsc2102.c
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-tsc2102-integrate-driver-to-linux-build-system.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-tsc2102-integrate-driver-to-linux-build-system.diff (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.23.1/073-tsc2102-integrate-driver-to-linux-build-system.diff 2008-07-18 16:02:37 UTC (rev 835)
@@ -0,0 +1,27 @@
+--- linux-2.6.23.original/drivers/spi/Kconfig 2007-09-22 02:39:35.000000000 +0200
++++ linux-2.6.23.mod/drivers/spi/Kconfig 2007-09-16 11:08:17.000000000 +0200
+@@ -230,6 +230,14 @@ comment "SPI Protocol Masters"
+ sysfs interface, with each line presented as a kind of GPIO
+ exposing both switch control and diagnostic feedback.
+
++config SPI_TSC2102
++ depends on SPI_MASTER
++ depends on HWMON = n || HWMON
++ tristate "TSC2102 codec support"
++ ---help---
++ Say Y here if you want support for the TSC2102 chip. It
++ will be needed for the touchscreen driver on some boards.
++
+ #
+ # Add new SPI protocol masters in alphabetical order above this line
+ #
+--- linux-2.6.23.original/drivers/spi/Makefile 2007-09-22 02:39:35.000000000 +0200
++++ linux-2.6.23.mod/drivers/spi/Makefile 2007-09-16 11:08:16.000000000 +0200
+@@ -33,6 +33,7 @@
+ obj-$(CONFIG_SPI_AT25) += at25.o
+ 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)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|