[meego-commits] 5776: Changes to Trunk/kernel
Anas Nashif
nashif at linux.intel.com
Thu Jul 15 23:55:09 UTC 2010
Hi,
I have made the following changes to kernel in project Trunk. Please review and accept ASAP.
Thank You,
Anas Nashif
[This message was auto-generated]
---
Request #5776:
submit: Trunk:Testing/kernel(r84) -> Trunk/kernel
Message:
* Thu Jul 15 2010 Arjan van de Ven <arjan at linux.intel.com> - 2.6.35-rc5
- update -ac patch
- Infineon 6x60 modem driver
- SPI-3 controller driver
- initial CE4100 integration
- various random GMA600 graphics drivers updates
- Medfield EHCI updates
* Tue Jul 13 2010 Ameya Palande <ameya.palande at nokia.com> - 2.6.35-rc5
- Enable CONFIG_RFKILL for ARM platform, otherwise connman doesn't work
reliably.
State: new 2010-07-15T11:49:45 nashif
Comment: None
changes files:
--------------
--- kernel.changes
+++ kernel.changes
@@ -0,0 +1,12 @@
+* Thu Jul 15 2010 Arjan van de Ven <arjan at linux.intel.com> - 2.6.35-rc5
+- update -ac patch
+ - Infineon 6x60 modem driver
+ - SPI-3 controller driver
+ - initial CE4100 integration
+ - various random GMA600 graphics drivers updates
+ - Medfield EHCI updates
+
+* Tue Jul 13 2010 Ameya Palande <ameya.palande at nokia.com> - 2.6.35-rc5
+- Enable CONFIG_RFKILL for ARM platform, otherwise connman doesn't work
+ reliably.
+
old:
----
linux-2.6.35-rc5-ac-20100713.patch
new:
----
linux-2.6.35-ac-fixups.patch
linux-2.6.35-rc5-ac-20100715.patch
spec files:
-----------
--- kernel-ivi.spec
+++ kernel-ivi.spec
@@ -206,9 +206,8 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc5-ac-20100713.patch
-Patch201: linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
-
+Patch200: linux-2.6.35-rc5-ac-20100715.patch
+Patch201: linux-2.6.35-ac-fixups.patch
#
# End of the Moorsetown architecture patches
#
@@ -528,11 +527,10 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc5-ac-20100713.patch
+# linux-2.6.35-rc5-ac-20100715.patch
%patch200 -p1
-# linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
+# linux-2.6.35-ac-fixups.patch
%patch201 -p1
-
#
# End of the Moorsetown architecture patches
#
--- kernel-mrst.spec
+++ kernel-mrst.spec
@@ -207,9 +207,8 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc5-ac-20100713.patch
-Patch201: linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
-
+Patch200: linux-2.6.35-rc5-ac-20100715.patch
+Patch201: linux-2.6.35-ac-fixups.patch
#
# End of the Moorsetown architecture patches
#
@@ -529,11 +528,10 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc5-ac-20100713.patch
+# linux-2.6.35-rc5-ac-20100715.patch
%patch200 -p1
-# linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
+# linux-2.6.35-ac-fixups.patch
%patch201 -p1
-
#
# End of the Moorsetown architecture patches
#
--- kernel-n900.spec
+++ kernel-n900.spec
@@ -206,9 +206,8 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc5-ac-20100713.patch
-Patch201: linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
-
+Patch200: linux-2.6.35-rc5-ac-20100715.patch
+Patch201: linux-2.6.35-ac-fixups.patch
#
# End of the Moorsetown architecture patches
#
@@ -528,11 +527,10 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc5-ac-20100713.patch
+# linux-2.6.35-rc5-ac-20100715.patch
%patch200 -p1
-# linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
+# linux-2.6.35-ac-fixups.patch
%patch201 -p1
-
#
# End of the Moorsetown architecture patches
#
--- kernel-netbook.spec
+++ kernel-netbook.spec
@@ -206,9 +206,8 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc5-ac-20100713.patch
-Patch201: linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
-
+Patch200: linux-2.6.35-rc5-ac-20100715.patch
+Patch201: linux-2.6.35-ac-fixups.patch
#
# End of the Moorsetown architecture patches
#
@@ -528,11 +527,10 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc5-ac-20100713.patch
+# linux-2.6.35-rc5-ac-20100715.patch
%patch200 -p1
-# linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
+# linux-2.6.35-ac-fixups.patch
%patch201 -p1
-
#
# End of the Moorsetown architecture patches
#
--- kernel.spec
+++ kernel.spec
@@ -218,9 +218,8 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-Patch200: linux-2.6.35-rc5-ac-20100713.patch
-Patch201: linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
-
+Patch200: linux-2.6.35-rc5-ac-20100715.patch
+Patch201: linux-2.6.35-ac-fixups.patch
#
# End of the Moorsetown architecture patches
#
@@ -570,11 +569,10 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-# linux-2.6.35-rc5-ac-20100713.patch
+# linux-2.6.35-rc5-ac-20100715.patch
%patch200 -p1
-# linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
+# linux-2.6.35-ac-fixups.patch
%patch201 -p1
-
#
# End of the Moorsetown architecture patches
#
other changes:
--------------
++++++ Makefile.config
--- Makefile.config
+++ Makefile.config
@@ -10,7 +10,7 @@
$(CFG)-ivi.config \
$(CFG)-n900.config
-PLATFORMS = x86
+PLATFORMS = x86 arm
TEMPFILES = $(addprefix temp-, $(addsuffix -generic, $(PLATFORMS)))
configs: $(CONFIGFILES)
@@ -31,8 +31,8 @@
kernel-mrst.config: config-mrst config-generic
perl merge.pl $^ > $@
-tmp-arm-config: config-arm-generic config-generic
+temp-arm-config: config-arm-generic config-generic
perl merge.pl $^ > $@
-kernel-n900.config: config-arm-n900 tmp-arm-config
+kernel-n900.config: config-arm-n900 temp-arm-config
perl merge.pl $^ > $@
++++++ config-arm-generic
--- config-arm-generic
+++ config-arm-generic
@@ -244,7 +244,6 @@
# CONFIG_MAC80211_MESH is not set
# CONFIG_MAC80211_LEDS is not set
# CONFIG_WIMAX is not set
-# CONFIG_RFKILL is not set
# CONFIG_MAC80211_DEBUGFS is not set
#
++++++ config-generic
--- config-generic
+++ config-generic
@@ -1836,13 +1836,6 @@
CONFIG_FB=y
# CONFIG_FIRMWARE_EDID is not set
# CONFIG_FB_TRIDENT_ACCEL is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
@@ -2955,8 +2948,6 @@
# CONFIG_MSTWN_POWER_MGMT is not set
# CONFIG_USB_NET_MBM is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_LANGWELL is not set
# CONFIG_USB_MRSTN_GADGET is not set
# CONFIG_INTEL_LNW_DMAC1 is not set
@@ -3167,7 +3158,6 @@
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_PERF_EVENTS=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
CONFIG_KSM=y
# CONFIG_MEMORY_FAILURE is not set
CONFIG_PM_RUNTIME=y
@@ -3319,7 +3309,6 @@
# CONFIG_EEEPC_WMI is not set
# CONFIG_VHOST_NET is not set
# CONFIG_VIDEO_TLG2300 is not set
-# CONFIG_VMWARE_BALLOON is not set
CONFIG_USB_IPHETH=m
CONFIG_USB_SIERRA_NET=m
# CONFIG_HMC6352 is not set
@@ -3410,7 +3399,6 @@
CONFIG_INPUT_AD714X_I2C=m
CONFIG_INPUT_AD714X_SPI=m
CONFIG_GPIO_JANZ_TTL=m
-# CONFIG_MFD_TC35892 is not set
# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
# CONFIG_FB_TMIO is not set
# CONFIG_VIDEO_TM6000_ALSA is not set
@@ -3485,7 +3473,6 @@
CONFIG_CROSS_COMPILE=""
# CONFIG_FB_XGI is not set
-# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_ISL29020 is not set
# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
# CONFIG_BT_HCIH4P is not set
@@ -3499,3 +3486,9 @@
# CONFIG_MFLD_LEDFLASH is not set
# CONFIG_HSI is not set
# CONFIG_CMT is not set
+# CONFIG_DRM_INTEL_MID is not set
+# CONFIG_CE4100 is not set
+# CONFIG_SPI_PW_SPI3 is not set
+# CONFIG_USB_PENWELL_OTG is not set
+# CONFIG_SERIAL_IFX6X60
+
++++++ config-ivi
--- config-ivi
+++ config-ivi
@@ -142,8 +142,6 @@
CONFIG_MTD_CONCAT=y
CONFIG_MTD_PARTITIONS=y
# CONFIG_MTD_TESTS is not set
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_MTD_OOPS is not set
# CONFIG_MTD_CFI is not set
# CONFIG_MTD_JEDECPROBE is not set
# CONFIG_MTD_RAM is not set
++++++ config-mrst
--- config-mrst
+++ config-mrst
@@ -26,8 +26,6 @@
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_SELECTED=y
CONFIG_USB_GADGET_LANGWELL=y
-CONFIG_USB_GADGET_LANGWELL=y
-CONFIG_USB_LANGWELL=y
CONFIG_USB_LANGWELL=y
CONFIG_USB_GADGET_DUALSPEED=y
CONFIG_USB_STILL_IMAGE=y
@@ -151,3 +149,7 @@
CONFIG_TOUCHSCREEN_CY8CTMG110=y
CONFIG_MFLD_LEDFLASH=y
+CONFIG_DRM_INTEL_MID=y
+CONFIG_SPI_PW_SPI3=y
+CONFIG_USB_PENWELL_OTG=y
+CONFIG_SERIAL_IFX6X60=y
++++++ linux-2.6.35-ac-fixups.patch (new)
--- linux-2.6.35-ac-fixups.patch
+++ linux-2.6.35-ac-fixups.patch
+--- linux-2.6.34/drivers/staging/Makefile~ 2010-07-15 10:15:48.000000000 -0400
++++ linux-2.6.34/drivers/staging/Makefile 2010-07-15 10:17:12.931999230 -0400
+@@ -57,4 +57,3 @@
+ obj-$(CONFIG_MSM_STAGING) += msm/
+ obj-$(CONFIG_DRM_INTEL_MID) += mrst/
+ obj-$(CONFIG_MFLD_LEDFLASH) += mfld_ledflash/
+-obj-$(CONFIG_CE4100) += ice4100/
++++++ linux-2.6.35-rc5-ac-20100713.patch -> linux-2.6.35-rc5-ac-20100715.patch
--- linux-2.6.35-rc5-ac-20100713.patch
+++ linux-2.6.35-rc5-ac-20100715.patch
@@ -14621,7 +14621,7 @@
+MODULE_DESCRIPTION("Driver for Moorestown virtual RTC");
+MODULE_LICENSE("GPL");
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
-index 8b23165..0d4cba0 100644
+index 8b23165..7ab5b9a 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -550,6 +550,7 @@ config SERIAL_S5PV210
@@ -14689,8 +14689,19 @@
config SERIAL_BFIN
tristate "Blackfin serial port support"
depends on BLACKFIN
+@@ -1575,4 +1619,10 @@ config SERIAL_ALTERA_UART_CONSOLE
+ help
+ Enable a Altera UART port to be the system console.
+
++config SERIAL_IFX6X60
++ tristate "SPI protocol driver for Infineon 6x60 modem"
++ depends on SPI_PW_SPI3 && GPIOLIB
++ help
++ Support for the IFX6x60 modem devices on Intel MID platforms.
++
+ endmenu
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
-index 208a855..1ca4fd5 100644
+index 208a855..7e006ff 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -46,6 +46,8 @@ obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o
@@ -14702,12 +14713,1633 @@
obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
obj-$(CONFIG_SERIAL_MUX) += mux.o
obj-$(CONFIG_SERIAL_68328) += 68328serial.o
-@@ -84,3 +86,5 @@ obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o
+@@ -84,3 +86,6 @@ obj-$(CONFIG_SERIAL_TIMBERDALE) += timbuart.o
obj-$(CONFIG_SERIAL_GRLIB_GAISLER_APBUART) += apbuart.o
obj-$(CONFIG_SERIAL_ALTERA_JTAGUART) += altera_jtaguart.o
obj-$(CONFIG_SERIAL_ALTERA_UART) += altera_uart.o
+obj-$(CONFIG_SERIAL_MRST_MAX3110) += mrst_max3110.o
+obj-$(CONFIG_SERIAL_MFD_HSU) += mfd.o
++obj-$(CONFIG_SERIAL_IFX6X60) += ifx6x60.o
+diff --git a/drivers/serial/ifx6x60.c b/drivers/serial/ifx6x60.c
+new file mode 100644
+index 0000000..4403946
+--- /dev/null
++++ b/drivers/serial/ifx6x60.c
+@@ -0,0 +1,1482 @@
++/****************************************************************************
++ *
++ * Driver for the IFX 6x60 spi modem.
++ *
++ * Copyright (C) 2008 Option International
++ * Copyright (C) 2008 Filip Aben <f.aben at option.com>
++ * Denis Joseph Barrow <d.barow at option.com>
++ * Jan Dumon <j.dumon at option.com>
++ *
++ * Copyright (C) 2009, 2010 Intel Corp
++ * Jim Stanley <jim.stanley at intel.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
++ * USA
++ *
++ * Driver modified by Intel from Option gtm501l_spi.c
++ *
++ *
++ *****************************************************************************/
++#include <linux/module.h>
++#include <linux/termios.h>
++#include <linux/tty.h>
++#include <linux/device.h>
++#include <linux/spi/spi.h>
++#include <linux/tty.h>
++#include <linux/kfifo.h>
++#include <linux/tty_flip.h>
++#include <linux/timer.h>
++#include <linux/serial.h>
++#include <linux/interrupt.h>
++#include <linux/irq.h>
++#include <linux/rfkill.h>
++#include <linux/fs.h>
++#include <linux/ip.h>
++#include <linux/dmapool.h>
++#include <linux/gpio.h>
++#include <linux/sched.h>
++#include <linux/time.h>
++#include <linux/wait.h>
++#include <linux/tty.h>
++#include <linux/pm.h>
++#include <linux/pm_runtime.h>
++#include <linux/spi/ifx_modem.h>
++
++#include <linux/spi/pw_spi3.h>
++#include "ifx6x60.h"
++
++#define IFX_SPI_MORE_MASK 0x10
++#define IFX_SPI_MORE_BIT 12 /* bit position in u16 */
++#define IFX_SPI_CTS_BIT 13 /* bit position in u16 */
++#define IFX_SPI_MODE SPI_MODE_1
++#define IFX_SPI_TTY_ID 0
++#define IFX_SPI_TIMEOUT_SEC 2
++#define IFX_SPI_HEADER_0 (-1)
++#define IFX_SPI_HEADER_F (-2)
++
++/* #define IFX_SPI_DEBUG */
++
++/* forward reference */
++static void ifx_spi_handle_srdy(struct ifx_spi_device *ifx_dev);
++
++/* local variables */
++static int spi_b16 = 1; /* 8 or 16 bit word length */
++static struct tty_driver *tty_drv;
++static struct ifx_spi_device *saved_ifx_dev;
++static struct lock_class_key ifx_spi_key;
++
++static int tm_ignore_srdy;
++static int tm_ignore_spito;
++static unsigned int ignore_spito_stop = 10;
++static unsigned int ignore_srdy_start = 25;
++#ifdef IFX_SPI_DEBUG
++static unsigned int testmode;
++#define TESTMODE_COMMON_MASK 0xff
++#define TESTMODE_ENABLE_DMA 0x01
++#define TESTMODE_ENABLE_POLL 0x02
++#define TESTMODE_ENABLE_LOOPBACK 0x04
++#define TESTMODE_ENABLE_INTR 0x08
++#define TESTMODE_PRIV_MASK 0xff00
++#define TESTMODE_IGNORE_SRDY 0x100
++#define TESTMODE_IGNORE_SPITO 0x200
++
++module_param(testmode, uint, S_IRUGO);
++module_param(ignore_spito_stop, uint, S_IRUGO);
++module_param(ignore_srdy_start, uint, S_IRUGO);
++MODULE_PARM_DESC(testmode, "supply test mode bits");
++MODULE_PARM_DESC(ignore_spito_stop, "number of spi timeouts to ignore");
++MODULE_PARM_DESC(ignore_srdy_start,
++ "number of GPIO slave-ready interrupts before ignoring");
++
++#define TESTMODE(x) (testmode & x)
++#else /* IFX_SPI_DEBUG */
++#define TESTMODE(x) (0)
++#endif /* IFX_SPI_DEBUG */
++
++/* GPIO/GPE settings */
++static inline void mrdy_set_high(void)
++{
++ gpio_set_value(saved_ifx_dev->gpio.mrdy, 1);
++}
++static inline void mrdy_set_low(void)
++{
++ gpio_set_value(saved_ifx_dev->gpio.mrdy, 0);
++}
++
++
++
++/* set bit in power status and signal power system if status becomes non-0 */
++static void
++ifx_spi_power_state_set(struct ifx_spi_device *ifx_dev, unsigned char val)
++{
++ unsigned long flags;
++
++ spin_lock_irqsave(&ifx_dev->power_lock, flags);
++
++ /*
++ * if power status is already non-0, just update, else
++ * tell power system
++ */
++ if (!ifx_dev->power_status) {
++ dev_dbg(&ifx_dev->spi_dev->dev, "pm_runtime_get called");
++ pm_runtime_get(&ifx_dev->spi_dev->dev);
++ }
++ ifx_dev->power_status |= val;
++
++ spin_unlock_irqrestore(&ifx_dev->power_lock, flags);
++}
++
++/* clear bit in power status and signal power system if status becomes 0 */
++static void
++ifx_spi_power_state_clear(struct ifx_spi_device *ifx_dev, unsigned char val)
++{
++ unsigned long flags;
++
++ spin_lock_irqsave(&ifx_dev->power_lock, flags);
++
++ if (ifx_dev->power_status) {
++ ifx_dev->power_status &= ~val;
++ if (!ifx_dev->power_status) {
(275296 more lines skipped)
++++++ series
--- series
+++ series
@@ -51,9 +51,8 @@
# The main consolidated MRST/MFLD tree from
# git//git.kernel.org/pub/scm/linux/kernel/git/alan/linux-2.6-mid-ref
#
-linux-2.6.35-rc5-ac-20100713.patch
-linux-2.6.35-pvr-get-rid-of-LinuxInitMutex.patch
-
+linux-2.6.35-rc5-ac-20100715.patch
+linux-2.6.35-ac-fixups.patch
#
# End of the Moorsetown architecture patches
#
More information about the MeeGo-commits
mailing list