[meego-commits] 6820: Changes to Trunk:Testing/kernel
Arjan van de Ven
arjan at linux.intel.com
Wed Aug 18 23:38:41 UTC 2010
Hi,
I have made the following changes to kernel in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Arjan van de Ven
[This message was auto-generated]
---
Request #6820:
submit: devel:kernel/kernel(r134) -> Trunk:Testing/kernel
Message:
None
State: new 2010-08-18T11:29:13 arjan
Comment: None
changes files:
--------------
--- kernel.changes
+++ kernel.changes
@@ -0,0 +1,13 @@
+* Wed Aug 18 2010 Arjan van de Ven <arjan at linux.intel.com> - 2.6.35.2
+- flip CONFIG_CRYPTO_MANAGER_TESTS to on; Aava does not boot without it
+ (grumble)
+
+* Wed Aug 18 2010 Ameya Palande <ameya.palande at nokia.com> - 2.6.35
+- N900: Enable smc91x ethernet driver for N900 qemu emulation
+- N900: Add "init=/sbin/preinit" to the kernel command line
+- N900: Add omap3camera and tidspbridge driver
+
+* Tue Aug 17 2010 Arjan van de Ven <arjan at linux.intel.com> - 2.6.35.2
+- update to the 2.6.35.2 "must update" stable kernel
+- turn off KSM; not useful for our targets
+
new:
----
linux-2.6-omap3camera.patch
linux-2.6.36-tidspbridge.patch
patch-2.6.35.2.bz2
spec files:
-----------
--- kernel-ivi.spec
+++ kernel-ivi.spec
@@ -22,7 +22,7 @@
## If this is a released kernel ##
%if 0%{?released_kernel}
# Do we have a 2.6.21.y update to apply?
-%define stable_update 0
+%define stable_update 2
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -162,13 +162,13 @@
# Stable patch - critical bugfixes
#
-
+Patch1: patch-2.6.35.2.bz2
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch1: linux-2.6-build-nonintconfig.patch
+Patch2: linux-2.6-build-nonintconfig.patch
@@ -253,9 +253,12 @@
Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
# Introduce EEM support in g_nokia which should fix usb networking
Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
+# omap3camera driver
+Patch313: linux-2.6-omap3camera.patch
+# TI dspbridge driver
+Patch314: linux-2.6.36-tidspbridge.patch
#
-#
# End of the Nokia N900 patches
#
#####################################################################
@@ -508,14 +511,15 @@
# Stable patch - critical bugfixes
#
-
+# patch-2.6.35.2.bz2
+%patch1 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch1 -p1
+%patch2 -p1
@@ -619,9 +623,14 @@
# Introduce EEM support in g_nokia which should fix usb networking
# linux-2.6.37-EEM-support-for-g_nokia.patch
%patch312 -p1
+# omap3camera driver
+# linux-2.6-omap3camera.patch
+%patch313 -p1
+# TI dspbridge driver
+# linux-2.6.36-tidspbridge.patch
+%patch314 -p1
#
-#
# End of the Nokia N900 patches
#
#####################################################################
--- kernel-mrst.spec
+++ kernel-mrst.spec
@@ -22,7 +22,7 @@
## If this is a released kernel ##
%if 0%{?released_kernel}
# Do we have a 2.6.21.y update to apply?
-%define stable_update 0
+%define stable_update 2
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -163,13 +163,13 @@
# Stable patch - critical bugfixes
#
-
+Patch1: patch-2.6.35.2.bz2
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch1: linux-2.6-build-nonintconfig.patch
+Patch2: linux-2.6-build-nonintconfig.patch
@@ -254,9 +254,12 @@
Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
# Introduce EEM support in g_nokia which should fix usb networking
Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
+# omap3camera driver
+Patch313: linux-2.6-omap3camera.patch
+# TI dspbridge driver
+Patch314: linux-2.6.36-tidspbridge.patch
#
-#
# End of the Nokia N900 patches
#
#####################################################################
@@ -509,14 +512,15 @@
# Stable patch - critical bugfixes
#
-
+# patch-2.6.35.2.bz2
+%patch1 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch1 -p1
+%patch2 -p1
@@ -620,9 +624,14 @@
# Introduce EEM support in g_nokia which should fix usb networking
# linux-2.6.37-EEM-support-for-g_nokia.patch
%patch312 -p1
+# omap3camera driver
+# linux-2.6-omap3camera.patch
+%patch313 -p1
+# TI dspbridge driver
+# linux-2.6.36-tidspbridge.patch
+%patch314 -p1
#
-#
# End of the Nokia N900 patches
#
#####################################################################
--- kernel-n900.spec
+++ kernel-n900.spec
@@ -22,7 +22,7 @@
## If this is a released kernel ##
%if 0%{?released_kernel}
# Do we have a 2.6.21.y update to apply?
-%define stable_update 0
+%define stable_update 2
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -162,13 +162,13 @@
# Stable patch - critical bugfixes
#
-
+Patch1: patch-2.6.35.2.bz2
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch1: linux-2.6-build-nonintconfig.patch
+Patch2: linux-2.6-build-nonintconfig.patch
@@ -253,9 +253,12 @@
Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
# Introduce EEM support in g_nokia which should fix usb networking
Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
+# omap3camera driver
+Patch313: linux-2.6-omap3camera.patch
+# TI dspbridge driver
+Patch314: linux-2.6.36-tidspbridge.patch
#
-#
# End of the Nokia N900 patches
#
#####################################################################
@@ -508,14 +511,15 @@
# Stable patch - critical bugfixes
#
-
+# patch-2.6.35.2.bz2
+%patch1 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch1 -p1
+%patch2 -p1
@@ -619,9 +623,14 @@
# Introduce EEM support in g_nokia which should fix usb networking
# linux-2.6.37-EEM-support-for-g_nokia.patch
%patch312 -p1
+# omap3camera driver
+# linux-2.6-omap3camera.patch
+%patch313 -p1
+# TI dspbridge driver
+# linux-2.6.36-tidspbridge.patch
+%patch314 -p1
#
-#
# End of the Nokia N900 patches
#
#####################################################################
--- kernel-netbook.spec
+++ kernel-netbook.spec
@@ -22,7 +22,7 @@
## If this is a released kernel ##
%if 0%{?released_kernel}
# Do we have a 2.6.21.y update to apply?
-%define stable_update 0
+%define stable_update 2
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -162,13 +162,13 @@
# Stable patch - critical bugfixes
#
-
+Patch1: patch-2.6.35.2.bz2
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch1: linux-2.6-build-nonintconfig.patch
+Patch2: linux-2.6-build-nonintconfig.patch
@@ -253,9 +253,12 @@
Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
# Introduce EEM support in g_nokia which should fix usb networking
Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
+# omap3camera driver
+Patch313: linux-2.6-omap3camera.patch
+# TI dspbridge driver
+Patch314: linux-2.6.36-tidspbridge.patch
#
-#
# End of the Nokia N900 patches
#
#####################################################################
@@ -508,14 +511,15 @@
# Stable patch - critical bugfixes
#
-
+# patch-2.6.35.2.bz2
+%patch1 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch1 -p1
+%patch2 -p1
@@ -619,9 +623,14 @@
# Introduce EEM support in g_nokia which should fix usb networking
# linux-2.6.37-EEM-support-for-g_nokia.patch
%patch312 -p1
+# omap3camera driver
+# linux-2.6-omap3camera.patch
+%patch313 -p1
+# TI dspbridge driver
+# linux-2.6.36-tidspbridge.patch
+%patch314 -p1
#
-#
# End of the Nokia N900 patches
#
#####################################################################
--- kernel.spec
+++ kernel.spec
@@ -22,7 +22,7 @@
## If this is a released kernel ##
%if 0%{?released_kernel}
# Do we have a 2.6.21.y update to apply?
-%define stable_update 0
+%define stable_update 2
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
@@ -174,13 +174,13 @@
# Stable patch - critical bugfixes
#
-
+Patch1: patch-2.6.35.2.bz2
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
-Patch1: linux-2.6-build-nonintconfig.patch
+Patch2: linux-2.6-build-nonintconfig.patch
@@ -265,9 +265,12 @@
Patch311: linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
# Introduce EEM support in g_nokia which should fix usb networking
Patch312: linux-2.6.37-EEM-support-for-g_nokia.patch
+# omap3camera driver
+Patch313: linux-2.6-omap3camera.patch
+# TI dspbridge driver
+Patch314: linux-2.6.36-tidspbridge.patch
#
-#
# End of the Nokia N900 patches
#
#####################################################################
@@ -550,14 +553,15 @@
# Stable patch - critical bugfixes
#
-
+# patch-2.6.35.2.bz2
+%patch1 -p1
#
# Patch to add a "nonintconfig" option to the Makefile
# needed for unattended builds
#
# linux-2.6-build-nonintconfig.patch
-%patch1 -p1
+%patch2 -p1
@@ -661,9 +665,14 @@
# Introduce EEM support in g_nokia which should fix usb networking
# linux-2.6.37-EEM-support-for-g_nokia.patch
%patch312 -p1
+# omap3camera driver
+# linux-2.6-omap3camera.patch
+%patch313 -p1
+# TI dspbridge driver
+# linux-2.6.36-tidspbridge.patch
+%patch314 -p1
#
-#
# End of the Nokia N900 patches
#
#####################################################################
other changes:
--------------
++++++ config-arm-generic
--- config-arm-generic
+++ config-arm-generic
@@ -369,7 +369,6 @@
# CONFIG_ATA is not set
# CONFIG_MD is not set
CONFIG_TUN=m
-# CONFIG_NET_ETHERNET is not set
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
@@ -773,3 +772,15 @@
# CONFIG_PANEL_TOPPOLY_TDO35S is not set
# CONFIG_PANEL_TPO_TD043MTEA1 is not set
# CONFIG_HID_ORTEK is not set
+
+# CONFIG_PHYLIB is not set
+# CONFIG_AX88796 is not set
+# CONFIG_TI_DAVINCI_EMAC is not set
+# CONFIG_DM9000 is not set
+# CONFIG_ENC28J60 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_TI_ST is not set
+# CONFIG_VIDEO_TM6000 is not set
+# CONFIG_EEPROM_93CX6 is not set
++++++ config-arm-n900
--- config-arm-n900
+++ config-arm-n900
@@ -108,7 +108,7 @@
#
# Boot options
#
-CONFIG_CMDLINE="root=/dev/mmcblk0p1 rootwait console=tty1 console=ttyS2,115200n8 omapfb.vram=0:2M,1:2M,2:2M mtdoops.mtddev=2 nosplash"
+CONFIG_CMDLINE="init=/sbin/preinit root=/dev/mmcblk0p1 rootwait console=tty0 console=ttyS2,115200n8 omapfb.vram=0:2M,1:2M,2:2M mtdoops.mtddev=2 nosplash"
#
# IP: Netfilter Configuration
@@ -428,3 +428,61 @@
CONFIG_HSI_CMT_SPEECH=m
CONFIG_MTD_OOPS=y
+
+CONFIG_MII=m
+CONFIG_SMC91X=m
+
+CONFIG_TIDSPBRIDGE=m
+CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000
+# CONFIG_TIDSPBRIDGE_DEBUG is not set
+CONFIG_TIDSPBRIDGE_RECOVERY=y
+# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set
+CONFIG_TIDSPBRIDGE_WDT3=y
+CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5
+# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set
+CONFIG_TIDSPBRIDGE_BACKTRACE=y
+
+CONFIG_MEDIA_SUPPORT=m
+# CONFIG_OMAP_IOMMU_DEBUG is not set
+CONFIG_VIDEO_OMAP2_VOUT=m
+CONFIG_VIDEO_SMIAREGS=m
+# CONFIG_VIDEO_V4L1_COMPAT is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_RC_MAP is not set
+# CONFIG_MEDIA_ATTACH is not set
+# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
+# CONFIG_VIDEO_IR_I2C is not set
+CONFIG_VIDEO_MACH_RX51=m
+# CONFIG_VIDEO_TVAUDIO is not set
+# CONFIG_VIDEO_TDA7432 is not set
+# CONFIG_VIDEO_TDA9840 is not set
+# CONFIG_VIDEO_TDA9875 is not set
+# CONFIG_VIDEO_TEA6415C is not set
+# CONFIG_VIDEO_TEA6420 is not set
+# CONFIG_VIDEO_MSP3400 is not set
+# CONFIG_VIDEO_CS5345 is not set
+# CONFIG_VIDEO_CS53L32A is not set
+# CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_TLV320AIC23B is not set
+# CONFIG_VIDEO_WM8775 is not set
+# CONFIG_VIDEO_WM8739 is not set
+# CONFIG_VIDEO_VP27SMPX is not set
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_MT9V011 is not set
+# CONFIG_VIDEO_TCM825X is not set
+# CONFIG_VIDEO_SAA711X is not set
+# CONFIG_VIDEO_SAA717X is not set
+# CONFIG_VIDEO_SAA7191 is not set
+# CONFIG_VIDEO_TVP514X is not set
+# CONFIG_VIDEO_TVP5150 is not set
+# CONFIG_VIDEO_TVP7002 is not set
+# CONFIG_VIDEO_CX25840 is not set
+# CONFIG_VIDEO_CX2341X is not set
+# CONFIG_VIDEO_SAA7127 is not set
+# CONFIG_VIDEO_THS7303 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_UPD64031A is not set
+# CONFIG_VIDEO_UPD64083 is not set
+# CONFIG_V4L_USB_DRIVERS is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
++++++ config-generic
--- config-generic
+++ config-generic
@@ -3158,7 +3158,7 @@
# CONFIG_RCU_FANOUT_EXACT is not set
CONFIG_PERF_EVENTS=y
# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_KSM=y
+# CONFIG_KSM is not set
# CONFIG_MEMORY_FAILURE is not set
CONFIG_PM_RUNTIME=y
CONFIG_ACPI_POWER_METER=y
@@ -3538,3 +3538,6 @@
# CONFIG_PCIPCWATCHDOG is not set
# CONFIG_WDTPCI is not set
# CONFIG_USBPCWATCHDOG is not set
+# CONFIG_VIDEO_SMIAREGS is not set
+CONFIG_CRYPTO_MANAGER_TESTS=y
+
++++++ kernel.spec.in
--- kernel.spec.in
+++ kernel.spec.in
@@ -22,7 +22,7 @@
## If this is a released kernel ##
%if 0%{?released_kernel}
# Do we have a 2.6.21.y update to apply?
-%define stable_update 0
+%define stable_update 2
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev .%{stable_update}
++++++ linux-2.6-omap3camera.patch (new)
--- linux-2.6-omap3camera.patch
+++ linux-2.6-omap3camera.patch
+From 9231aa31d93b3e3598a65099a3d4c16cf99e63d3 Mon Sep 17 00:00:00 2001
+From: Sakari Ailus <sakari.ailus at nokia.com>
+Date: Fri, 31 Oct 2008 10:20:45 +0200
+Subject: [PATCH 1/2] omap3camera driver
+
+top commit: omap3isp: stat: fix buf_err counter for Histogram
+taken from: http://gitorious.org/omap3camera/mainline devel branch
+
+Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
+---
+ arch/arm/mach-omap2/Kconfig | 10 +
+ arch/arm/mach-omap2/Makefile | 1 +
+ arch/arm/mach-omap2/board-rx51-camera.c | 651 ++++++++
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 10 +
+ arch/arm/mach-omap2/devices.c | 46 +-
+ arch/arm/mach-omap2/devices.h | 17 +
+ arch/arm/plat-omap/include/mach/isp_user.h | 637 ++++++++
+ arch/arm/plat-omap/include/plat/omap34xx.h | 16 +-
+ arch/arm/plat-omap/iovmm.c | 46 +-
+ arch/arm/plat-omap/omap-pm-noop.c | 2 +-
+ drivers/media/Makefile | 8 +-
+ drivers/media/media-device.c | 330 ++++
+ drivers/media/media-devnode.c | 480 ++++++
+ drivers/media/media-entity.c | 621 +++++++
+ drivers/media/video/Kconfig | 48 +
+ drivers/media/video/Makefile | 13 +-
+ drivers/media/video/ad5820.c | 484 ++++++
+ drivers/media/video/adp1653.c | 566 +++++++
+ drivers/media/video/et8ek8.c | 1081 ++++++++++++
+ drivers/media/video/et8ek8.h | 79 +
+ drivers/media/video/isp/Makefile | 14 +
+ drivers/media/video/isp/bluegamma_table.h | 1040 ++++++++++++
+ drivers/media/video/isp/cfa_coef_table.h | 603 +++++++
+ drivers/media/video/isp/greengamma_table.h | 1040 ++++++++++++
+ drivers/media/video/isp/isp.c | 1686 +++++++++++++++++++
+ drivers/media/video/isp/isp.h | 402 +++++
+ drivers/media/video/isp/ispccdc.c | 2042 +++++++++++++++++++++++
+ drivers/media/video/isp/ispccdc.h | 177 ++
+ drivers/media/video/isp/ispccp2.c | 1035 ++++++++++++
+ drivers/media/video/isp/ispccp2.h | 89 +
+ drivers/media/video/isp/ispcsi2.c | 1214 ++++++++++++++
+ drivers/media/video/isp/ispcsi2.h | 158 ++
+ drivers/media/video/isp/ispcsiphy.c | 245 +++
+ drivers/media/video/isp/ispcsiphy.h | 72 +
+ drivers/media/video/isp/isph3a.h | 111 ++
+ drivers/media/video/isp/isph3a_aewb.c | 307 ++++
+ drivers/media/video/isp/isph3a_af.c | 358 ++++
+ drivers/media/video/isp/isphist.c | 505 ++++++
+ drivers/media/video/isp/isphist.h | 34 +
+ drivers/media/video/isp/isppreview.c | 2263 ++++++++++++++++++++++++++
+ drivers/media/video/isp/isppreview.h | 259 +++
+ drivers/media/video/isp/ispqueue.c | 1074 ++++++++++++
+ drivers/media/video/isp/ispqueue.h | 175 ++
+ drivers/media/video/isp/ispreg.h | 1802 ++++++++++++++++++++
+ drivers/media/video/isp/ispresizer.c | 1637 +++++++++++++++++++
+ drivers/media/video/isp/ispresizer.h | 136 ++
+ drivers/media/video/isp/ispstat.c | 971 +++++++++++
+ drivers/media/video/isp/ispstat.h | 161 ++
+ drivers/media/video/isp/ispvideo.c | 1241 ++++++++++++++
+ drivers/media/video/isp/ispvideo.h | 139 ++
+ drivers/media/video/isp/luma_enhance_table.h | 144 ++
+ drivers/media/video/isp/noise_filter_table.h | 79 +
+ drivers/media/video/isp/redgamma_table.h | 1040 ++++++++++++
+ drivers/media/video/omap34xxcam.c | 1562 ++++++++++++++++++
+ drivers/media/video/omap34xxcam.h | 137 ++
+ drivers/media/video/smia-sensor.c | 941 +++++++++++
+ drivers/media/video/smia-sensor.h | 39 +
+ drivers/media/video/smiaregs.c | 734 +++++++++
+ drivers/media/video/soc_mediabus.c | 2 +-
+ drivers/media/video/v4l2-common.c | 3 +
+ drivers/media/video/v4l2-dev.c | 40 +-
+ drivers/media/video/v4l2-device.c | 66 +-
+ drivers/media/video/v4l2-int-device.c | 31 +-
+ drivers/media/video/v4l2-subdev.c | 321 ++++
+ include/linux/i2c/twl.h | 10 +
+ include/linux/media.h | 75 +
+ include/linux/v4l2-mediabus.h | 90 +
+ include/linux/v4l2-subdev.h | 103 ++
+ include/linux/videodev2.h | 33 +
+ include/media/ad5820.h | 63 +
+ include/media/adp1653.h | 87 +
+ include/media/media-device.h | 74 +
+ include/media/media-devnode.h | 97 ++
+ include/media/media-entity.h | 102 ++
+ include/media/smiaregs.h | 155 ++
+ include/media/soc_mediabus.h | 3 +-
+ include/media/v4l2-chip-ident.h | 12 +
+ include/media/v4l2-common.h | 7 +
+ include/media/v4l2-dev.h | 9 +-
+ include/media/v4l2-device.h | 2 +
+ include/media/v4l2-int-device.h | 8 +-
+ include/media/v4l2-mediabus.h | 82 -
+ include/media/v4l2-subdev.h | 95 +-
+ 83 files changed, 32244 insertions(+), 138 deletions(-)
+ create mode 100644 arch/arm/mach-omap2/board-rx51-camera.c
+ create mode 100644 arch/arm/mach-omap2/devices.h
+ create mode 100644 arch/arm/plat-omap/include/mach/isp_user.h
+ create mode 100644 drivers/media/media-device.c
+ create mode 100644 drivers/media/media-devnode.c
+ create mode 100644 drivers/media/media-entity.c
+ create mode 100644 drivers/media/video/ad5820.c
+ create mode 100644 drivers/media/video/adp1653.c
+ create mode 100644 drivers/media/video/et8ek8.c
+ create mode 100644 drivers/media/video/et8ek8.h
+ create mode 100644 drivers/media/video/isp/Makefile
+ create mode 100644 drivers/media/video/isp/bluegamma_table.h
+ create mode 100644 drivers/media/video/isp/cfa_coef_table.h
+ create mode 100644 drivers/media/video/isp/greengamma_table.h
+ create mode 100644 drivers/media/video/isp/isp.c
+ create mode 100644 drivers/media/video/isp/isp.h
+ create mode 100644 drivers/media/video/isp/ispccdc.c
+ create mode 100644 drivers/media/video/isp/ispccdc.h
+ create mode 100644 drivers/media/video/isp/ispccp2.c
+ create mode 100644 drivers/media/video/isp/ispccp2.h
+ create mode 100644 drivers/media/video/isp/ispcsi2.c
+ create mode 100644 drivers/media/video/isp/ispcsi2.h
+ create mode 100644 drivers/media/video/isp/ispcsiphy.c
+ create mode 100644 drivers/media/video/isp/ispcsiphy.h
+ create mode 100644 drivers/media/video/isp/isph3a.h
+ create mode 100644 drivers/media/video/isp/isph3a_aewb.c
+ create mode 100644 drivers/media/video/isp/isph3a_af.c
+ create mode 100644 drivers/media/video/isp/isphist.c
+ create mode 100644 drivers/media/video/isp/isphist.h
+ create mode 100644 drivers/media/video/isp/isppreview.c
+ create mode 100644 drivers/media/video/isp/isppreview.h
+ create mode 100644 drivers/media/video/isp/ispqueue.c
+ create mode 100644 drivers/media/video/isp/ispqueue.h
+ create mode 100644 drivers/media/video/isp/ispreg.h
+ create mode 100644 drivers/media/video/isp/ispresizer.c
+ create mode 100644 drivers/media/video/isp/ispresizer.h
+ create mode 100644 drivers/media/video/isp/ispstat.c
+ create mode 100644 drivers/media/video/isp/ispstat.h
+ create mode 100644 drivers/media/video/isp/ispvideo.c
+ create mode 100644 drivers/media/video/isp/ispvideo.h
+ create mode 100644 drivers/media/video/isp/luma_enhance_table.h
+ create mode 100644 drivers/media/video/isp/noise_filter_table.h
+ create mode 100644 drivers/media/video/isp/redgamma_table.h
+ create mode 100644 drivers/media/video/omap34xxcam.c
+ create mode 100644 drivers/media/video/omap34xxcam.h
+ create mode 100644 drivers/media/video/smia-sensor.c
+ create mode 100644 drivers/media/video/smia-sensor.h
+ create mode 100644 drivers/media/video/smiaregs.c
+ create mode 100644 drivers/media/video/v4l2-subdev.c
+ create mode 100644 include/linux/media.h
+ create mode 100644 include/linux/v4l2-mediabus.h
+ create mode 100644 include/linux/v4l2-subdev.h
+ create mode 100644 include/media/ad5820.h
+ create mode 100644 include/media/adp1653.h
+ create mode 100644 include/media/media-device.h
+ create mode 100644 include/media/media-devnode.h
+ create mode 100644 include/media/media-entity.h
+ create mode 100644 include/media/smiaregs.h
+ delete mode 100644 include/media/v4l2-mediabus.h
+
+diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
+index b31b6f1..c44ce2e 100644
+--- a/arch/arm/mach-omap2/Kconfig
++++ b/arch/arm/mach-omap2/Kconfig
+@@ -120,6 +120,16 @@ config MACH_NOKIA_RX51
+ bool "Nokia RX-51 board"
+ depends on ARCH_OMAP3
+ select OMAP_PACKAGE_CBB
++ select VIDEO_MACH_RX51 if VIDEO_HELPER_CHIPS_AUTO
++
++config VIDEO_MACH_RX51
++ tristate "Nokia RX-51 board camera"
++ depends on MACH_NOKIA_RX51 && VIDEO_DEV && TWL4030_CORE
++ select VIDEO_OMAP3
++ select VIDEO_ET8EK8
++ select VIDEO_AD5820
++ select VIDEO_ADP1653
++ select VIDEO_SMIA_SENSOR
+
+ config MACH_OMAP_ZOOM2
+ bool "OMAP3 Zoom2 board"
+diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
+index 477f604..799215d 100644
+--- a/arch/arm/mach-omap2/Makefile
++++ b/arch/arm/mach-omap2/Makefile
+@@ -119,6 +119,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \
+ hsmmc.o \
+ board-sdp-flash.o
+ obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o
++obj-$(CONFIG_VIDEO_MACH_RX51) += board-rx51-camera.o
+ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
+ board-rx51-sdram.o \
+ board-rx51-peripherals.o \
+diff --git a/arch/arm/mach-omap2/board-rx51-camera.c b/arch/arm/mach-omap2/board-rx51-camera.c
+new file mode 100644
+index 0000000..d2d8e6e
+--- /dev/null
++++ b/arch/arm/mach-omap2/board-rx51-camera.c
+@@ -0,0 +1,651 @@
++/*
++ * arch/arm/mach-omap2/board-rx51-camera.c
++ *
++ * Copyright (C) 2008 Nokia Corporation
++ *
(33336 more lines skipped)
++++++ linux-2.6.36-tidspbridge.patch (new)
--- linux-2.6.36-tidspbridge.patch
+++ linux-2.6.36-tidspbridge.patch
+From e14ce7b80df7964074618c61e102e42c07490088 Mon Sep 17 00:00:00 2001
+From: Omar Ramirez Luna <omar.ramirez at ti.com>
+Date: Wed, 23 Jun 2010 16:01:55 +0300
+Subject: [PATCH 2/2] tidspbridge driver
+
+top commit:
+OUT-OF-TREE: tidspbridge: move platform_device_register under mach-omap2
+
+taken from:
+git://dev.omapzoom.org/pub/scm/tidspbridge/kernel-dspbridge.git
+
+Signed-off-by: Ameya Palande <ameya.palande at nokia.com>
+---
+ arch/arm/mach-omap2/Makefile | 4 +
+ arch/arm/mach-omap2/dspbridge.c | 109 +
+ arch/arm/mach-omap2/io.c | 3 +
+ drivers/staging/Kconfig | 2 +
+ drivers/staging/Makefile | 1 +
+ .../staging/tidspbridge/Documentation/CONTRIBUTORS | 45 +
+ drivers/staging/tidspbridge/Documentation/README | 70 +
+ .../staging/tidspbridge/Documentation/error-codes | 157 +
+ drivers/staging/tidspbridge/Kconfig | 90 +
+ drivers/staging/tidspbridge/Makefile | 34 +
+ drivers/staging/tidspbridge/TODO | 18 +
+ drivers/staging/tidspbridge/core/_cmm.h | 45 +
+ drivers/staging/tidspbridge/core/_deh.h | 35 +
+ drivers/staging/tidspbridge/core/_msg_sm.h | 142 +
+ drivers/staging/tidspbridge/core/_tiomap.h | 371 +++
+ drivers/staging/tidspbridge/core/_tiomap_pwr.h | 85 +
+ drivers/staging/tidspbridge/core/chnl_sm.c | 1014 ++++++
+ drivers/staging/tidspbridge/core/dsp-clock.c | 422 +++
+ drivers/staging/tidspbridge/core/io_sm.c | 2333 ++++++++++++++
+ drivers/staging/tidspbridge/core/msg_sm.c | 673 ++++
+ drivers/staging/tidspbridge/core/tiomap3430.c | 1802 +++++++++++
+ drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 550 ++++
+ drivers/staging/tidspbridge/core/tiomap_io.c | 455 +++
+ drivers/staging/tidspbridge/core/tiomap_io.h | 104 +
+ drivers/staging/tidspbridge/core/ue_deh.c | 273 ++
+ drivers/staging/tidspbridge/core/wdt.c | 150 +
+ drivers/staging/tidspbridge/dynload/cload.c | 1953 ++++++++++++
+ .../staging/tidspbridge/dynload/dload_internal.h | 344 +++
+ drivers/staging/tidspbridge/dynload/doff.h | 354 +++
+ drivers/staging/tidspbridge/dynload/getsection.c | 407 +++
+ drivers/staging/tidspbridge/dynload/header.h | 49 +
+ drivers/staging/tidspbridge/dynload/module_list.h | 159 +
+ drivers/staging/tidspbridge/dynload/params.h | 226 ++
+ drivers/staging/tidspbridge/dynload/reloc.c | 484 +++
+ drivers/staging/tidspbridge/dynload/reloc_table.h | 102 +
+ .../tidspbridge/dynload/reloc_table_c6000.c | 257 ++
+ drivers/staging/tidspbridge/dynload/tramp.c | 1143 +++++++
+ .../tidspbridge/dynload/tramp_table_c6000.c | 164 +
+ drivers/staging/tidspbridge/gen/gb.c | 167 +
+ drivers/staging/tidspbridge/gen/gh.c | 215 ++
+ drivers/staging/tidspbridge/gen/gs.c | 89 +
+ drivers/staging/tidspbridge/gen/uuidutil.c | 113 +
+ drivers/staging/tidspbridge/hw/EasiGlobal.h | 41 +
+ drivers/staging/tidspbridge/hw/MMUAccInt.h | 76 +
+ drivers/staging/tidspbridge/hw/MMURegAcM.h | 225 ++
+ drivers/staging/tidspbridge/hw/hw_defs.h | 58 +
+ drivers/staging/tidspbridge/hw/hw_mmu.c | 562 ++++
+ drivers/staging/tidspbridge/hw/hw_mmu.h | 163 +
+ .../tidspbridge/include/dspbridge/_chnl_sm.h | 181 ++
+ .../tidspbridge/include/dspbridge/brddefs.h | 39 +
+ .../staging/tidspbridge/include/dspbridge/cfg.h | 222 ++
+ .../tidspbridge/include/dspbridge/cfgdefs.h | 81 +
+ .../staging/tidspbridge/include/dspbridge/chnl.h | 130 +
+ .../tidspbridge/include/dspbridge/chnldefs.h | 66 +
+ .../tidspbridge/include/dspbridge/chnlpriv.h | 98 +
+ .../staging/tidspbridge/include/dspbridge/clk.h | 101 +
+ .../staging/tidspbridge/include/dspbridge/cmm.h | 386 +++
+ .../tidspbridge/include/dspbridge/cmmdefs.h | 105 +
+ .../staging/tidspbridge/include/dspbridge/cod.h | 369 +++
+ .../staging/tidspbridge/include/dspbridge/dbc.h | 46 +
+ .../staging/tidspbridge/include/dspbridge/dbdcd.h | 358 +++
+ .../tidspbridge/include/dspbridge/dbdcddef.h | 78 +
+ .../staging/tidspbridge/include/dspbridge/dbdefs.h | 514 ++++
+ .../tidspbridge/include/dspbridge/dbldefs.h | 141 +
+ .../staging/tidspbridge/include/dspbridge/dbll.h | 62 +
+ .../tidspbridge/include/dspbridge/dblldefs.h | 496 +++
+ .../tidspbridge/include/dspbridge/dehdefs.h | 32 +
+ .../staging/tidspbridge/include/dspbridge/dev.h | 702 +++++
+ .../tidspbridge/include/dspbridge/devdefs.h | 26 +
+ .../staging/tidspbridge/include/dspbridge/disp.h | 204 ++
+ .../tidspbridge/include/dspbridge/dispdefs.h | 35 +
+ .../staging/tidspbridge/include/dspbridge/dmm.h | 75 +
+ .../staging/tidspbridge/include/dspbridge/drv.h | 521 ++++
+ .../tidspbridge/include/dspbridge/drvdefs.h | 25 +
+ .../tidspbridge/include/dspbridge/dspapi-ioctl.h | 475 +++
+ .../staging/tidspbridge/include/dspbridge/dspapi.h | 167 +
+ .../tidspbridge/include/dspbridge/dspchnl.h | 72 +
+ .../tidspbridge/include/dspbridge/dspdefs.h | 1054 +++++++
+ .../staging/tidspbridge/include/dspbridge/dspdeh.h | 43 +
+ .../staging/tidspbridge/include/dspbridge/dspdrv.h | 62 +
+ .../staging/tidspbridge/include/dspbridge/dspio.h | 41 +
+ .../tidspbridge/include/dspbridge/dspioctl.h | 73 +
+ .../staging/tidspbridge/include/dspbridge/dspmsg.h | 56 +
+ .../tidspbridge/include/dspbridge/dynamic_loader.h | 492 +++
+ drivers/staging/tidspbridge/include/dspbridge/gb.h | 79 +
+ .../tidspbridge/include/dspbridge/getsection.h | 108 +
+ drivers/staging/tidspbridge/include/dspbridge/gh.h | 34 +
+ drivers/staging/tidspbridge/include/dspbridge/gs.h | 59 +
+ .../tidspbridge/include/dspbridge/host_os.h | 88 +
+ drivers/staging/tidspbridge/include/dspbridge/io.h | 114 +
+ .../staging/tidspbridge/include/dspbridge/io_sm.h | 298 ++
+ .../staging/tidspbridge/include/dspbridge/iodefs.h | 36 +
+ .../staging/tidspbridge/include/dspbridge/ldr.h | 29 +
+ .../staging/tidspbridge/include/dspbridge/list.h | 225 ++
+ .../staging/tidspbridge/include/dspbridge/mbx_sh.h | 184 ++
+ .../tidspbridge/include/dspbridge/memdefs.h | 30 +
+ .../staging/tidspbridge/include/dspbridge/mgr.h | 205 ++
+ .../tidspbridge/include/dspbridge/mgrpriv.h | 45 +
+ .../staging/tidspbridge/include/dspbridge/msg.h | 86 +
+ .../tidspbridge/include/dspbridge/msgdefs.h | 29 +
+ .../staging/tidspbridge/include/dspbridge/nldr.h | 57 +
+ .../tidspbridge/include/dspbridge/nldrdefs.h | 293 ++
+ .../staging/tidspbridge/include/dspbridge/node.h | 583 ++++
+ .../tidspbridge/include/dspbridge/nodedefs.h | 28 +
+ .../tidspbridge/include/dspbridge/nodepriv.h | 182 ++
+ .../staging/tidspbridge/include/dspbridge/ntfy.h | 217 ++
+ .../staging/tidspbridge/include/dspbridge/proc.h | 621 ++++
+ .../tidspbridge/include/dspbridge/procpriv.h | 25 +
+ .../staging/tidspbridge/include/dspbridge/pwr.h | 107 +
+ .../staging/tidspbridge/include/dspbridge/pwr_sh.h | 33 +
+ .../include/dspbridge/resourcecleanup.h | 52 +
+ .../staging/tidspbridge/include/dspbridge/rmm.h | 181 ++
+ .../staging/tidspbridge/include/dspbridge/rms_sh.h | 95 +
+ .../tidspbridge/include/dspbridge/rmstypes.h | 24 +
+ .../tidspbridge/include/dspbridge/services.h | 50 +
+ .../staging/tidspbridge/include/dspbridge/strm.h | 404 +++
+ .../tidspbridge/include/dspbridge/strmdefs.h | 46 +
+ .../staging/tidspbridge/include/dspbridge/sync.h | 109 +
+ .../tidspbridge/include/dspbridge/utildefs.h | 39 +
+ .../tidspbridge/include/dspbridge/uuidutil.h | 62 +
+ .../staging/tidspbridge/include/dspbridge/wdt.h | 79 +
+ drivers/staging/tidspbridge/pmgr/chnl.c | 163 +
+ drivers/staging/tidspbridge/pmgr/chnlobj.h | 46 +
+ drivers/staging/tidspbridge/pmgr/cmm.c | 1154 +++++++
+ drivers/staging/tidspbridge/pmgr/cod.c | 652 ++++
+ drivers/staging/tidspbridge/pmgr/dbll.c | 1585 ++++++++++
+ drivers/staging/tidspbridge/pmgr/dev.c | 1151 +++++++
+ drivers/staging/tidspbridge/pmgr/dmm.c | 533 ++++
+ drivers/staging/tidspbridge/pmgr/dspapi.c | 1906 ++++++++++++
+ drivers/staging/tidspbridge/pmgr/io.c | 142 +
+ drivers/staging/tidspbridge/pmgr/ioobj.h | 38 +
+ drivers/staging/tidspbridge/pmgr/msg.c | 129 +
+ drivers/staging/tidspbridge/pmgr/msgobj.h | 38 +
+ drivers/staging/tidspbridge/rmgr/dbdcd.c | 1512 +++++++++
+ drivers/staging/tidspbridge/rmgr/disp.c | 752 +++++
+ drivers/staging/tidspbridge/rmgr/drv.c | 929 ++++++
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 656 ++++
+ drivers/staging/tidspbridge/rmgr/drv_interface.h | 28 +
+ drivers/staging/tidspbridge/rmgr/dspdrv.c | 142 +
+ drivers/staging/tidspbridge/rmgr/mgr.c | 375 +++
+ drivers/staging/tidspbridge/rmgr/nldr.c | 1974 ++++++++++++
+ drivers/staging/tidspbridge/rmgr/node.c | 3234 ++++++++++++++++++++
+ drivers/staging/tidspbridge/rmgr/proc.c | 1936 ++++++++++++
+ drivers/staging/tidspbridge/rmgr/pwr.c | 176 ++
+ drivers/staging/tidspbridge/rmgr/rmm.c | 537 ++++
+ drivers/staging/tidspbridge/rmgr/strm.c | 853 ++++++
+ drivers/staging/tidspbridge/services/cfg.c | 253 ++
+ drivers/staging/tidspbridge/services/ntfy.c | 31 +
+ drivers/staging/tidspbridge/services/services.c | 70 +
+ drivers/staging/tidspbridge/services/sync.c | 104 +
+ 150 files changed, 50001 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/mach-omap2/dspbridge.c
+ create mode 100644 drivers/staging/tidspbridge/Documentation/CONTRIBUTORS
+ create mode 100644 drivers/staging/tidspbridge/Documentation/README
+ create mode 100644 drivers/staging/tidspbridge/Documentation/error-codes
+ create mode 100644 drivers/staging/tidspbridge/Kconfig
+ create mode 100644 drivers/staging/tidspbridge/Makefile
+ create mode 100644 drivers/staging/tidspbridge/TODO
+ create mode 100644 drivers/staging/tidspbridge/core/_cmm.h
+ create mode 100644 drivers/staging/tidspbridge/core/_deh.h
+ create mode 100644 drivers/staging/tidspbridge/core/_msg_sm.h
+ create mode 100644 drivers/staging/tidspbridge/core/_tiomap.h
+ create mode 100644 drivers/staging/tidspbridge/core/_tiomap_pwr.h
+ create mode 100644 drivers/staging/tidspbridge/core/chnl_sm.c
+ create mode 100644 drivers/staging/tidspbridge/core/dsp-clock.c
+ create mode 100644 drivers/staging/tidspbridge/core/io_sm.c
+ create mode 100644 drivers/staging/tidspbridge/core/msg_sm.c
+ create mode 100644 drivers/staging/tidspbridge/core/tiomap3430.c
+ create mode 100644 drivers/staging/tidspbridge/core/tiomap3430_pwr.c
+ create mode 100644 drivers/staging/tidspbridge/core/tiomap_io.c
+ create mode 100644 drivers/staging/tidspbridge/core/tiomap_io.h
+ create mode 100644 drivers/staging/tidspbridge/core/ue_deh.c
+ create mode 100644 drivers/staging/tidspbridge/core/wdt.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/cload.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/dload_internal.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/doff.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/getsection.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/header.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/module_list.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/params.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/reloc.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/reloc_table.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/reloc_table_c6000.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/tramp.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/tramp_table_c6000.c
(50888 more lines skipped)
++++++ patch-2.6.35.2.bz2 (new)
--- patch-2.6.35.2.bz2
+++ patch-2.6.35.2.bz2
+diff --git a/Makefile b/Makefile
+index 141da26..3cf2397 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2
+ PATCHLEVEL = 6
+ SUBLEVEL = 35
+-EXTRAVERSION =
++EXTRAVERSION = .2
+ NAME = Sheep on Meth
+
+ # *DOCUMENTATION*
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 98922f7..4824fb4 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -1027,6 +1027,18 @@ config PL310_ERRATA_588369
+ is not correctly implemented in PL310 as clean lines are not
+ invalidated as a result of these operations. Note that this errata
+ uses Texas Instrument's secure monitor api.
++
++config ARM_ERRATA_720789
++ bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID"
++ depends on CPU_V7 && SMP
++ help
++ This option enables the workaround for the 720789 Cortex-A9 (prior to
++ r2p0) erratum. A faulty ASID can be sent to the other CPUs for the
++ broadcasted CP15 TLB maintenance operations TLBIASIDIS and TLBIMVAIS.
++ As a consequence of this erratum, some TLB entries which should be
++ invalidated are not, resulting in an incoherency in the system page
++ tables. The workaround changes the TLB flushing routines to invalidate
++ entries regardless of the ASID.
+ endmenu
+
+ source "arch/arm/common/Kconfig"
+diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h
+index bd863d8..33b546a 100644
+--- a/arch/arm/include/asm/tlbflush.h
++++ b/arch/arm/include/asm/tlbflush.h
+@@ -378,7 +378,11 @@ static inline void local_flush_tlb_mm(struct mm_struct *mm)
+ if (tlb_flag(TLB_V6_I_ASID))
+ asm("mcr p15, 0, %0, c8, c5, 2" : : "r" (asid) : "cc");
+ if (tlb_flag(TLB_V7_UIS_ASID))
++#ifdef CONFIG_ARM_ERRATA_720789
++ asm("mcr p15, 0, %0, c8, c3, 0" : : "r" (zero) : "cc");
++#else
+ asm("mcr p15, 0, %0, c8, c3, 2" : : "r" (asid) : "cc");
++#endif
+
+ if (tlb_flag(TLB_BTB)) {
+ /* flush the branch target cache */
+@@ -424,7 +428,11 @@ local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
+ if (tlb_flag(TLB_V6_I_PAGE))
+ asm("mcr p15, 0, %0, c8, c5, 1" : : "r" (uaddr) : "cc");
+ if (tlb_flag(TLB_V7_UIS_PAGE))
++#ifdef CONFIG_ARM_ERRATA_720789
++ asm("mcr p15, 0, %0, c8, c3, 3" : : "r" (uaddr & PAGE_MASK) : "cc");
++#else
+ asm("mcr p15, 0, %0, c8, c3, 1" : : "r" (uaddr) : "cc");
++#endif
+
+ if (tlb_flag(TLB_BTB)) {
+ /* flush the branch target cache */
+diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
+index fdda6be..d717b49 100644
+--- a/arch/arm/mach-pxa/cm-x300.c
++++ b/arch/arm/mach-pxa/cm-x300.c
+@@ -745,9 +745,10 @@ static void __init cm_x300_init(void)
+ {
+ cm_x300_init_mfp();
+
+- pxa_set_ffuart_info(NULL);
+ pxa_set_btuart_info(NULL);
+ pxa_set_stuart_info(NULL);
++ if (cpu_is_pxa300())
++ pxa_set_ffuart_info(NULL);
+
+ cm_x300_init_da9030();
+ cm_x300_init_dm9000();
+diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
+index 71437c6..9ebbd31 100644
+--- a/arch/arm/plat-mxc/gpio.c
++++ b/arch/arm/plat-mxc/gpio.c
+@@ -214,13 +214,16 @@ static void _set_gpio_direction(struct gpio_chip *chip, unsigned offset,
+ struct mxc_gpio_port *port =
+ container_of(chip, struct mxc_gpio_port, chip);
+ u32 l;
++ unsigned long flags;
+
++ spin_lock_irqsave(&port->lock, flags);
+ l = __raw_readl(port->base + GPIO_GDIR);
+ if (dir)
+ l |= 1 << offset;
+ else
+ l &= ~(1 << offset);
+ __raw_writel(l, port->base + GPIO_GDIR);
++ spin_unlock_irqrestore(&port->lock, flags);
+ }
+
+ static void mxc_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+@@ -229,9 +232,12 @@ static void mxc_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+ container_of(chip, struct mxc_gpio_port, chip);
+ void __iomem *reg = port->base + GPIO_DR;
+ u32 l;
++ unsigned long flags;
+
++ spin_lock_irqsave(&port->lock, flags);
+ l = (__raw_readl(reg) & (~(1 << offset))) | (value << offset);
+ __raw_writel(l, reg);
++ spin_unlock_irqrestore(&port->lock, flags);
+ }
+
+ static int mxc_gpio_get(struct gpio_chip *chip, unsigned offset)
+@@ -285,6 +291,8 @@ int __init mxc_gpio_init(struct mxc_gpio_port *port, int cnt)
+ port[i].chip.base = i * 32;
+ port[i].chip.ngpio = 32;
+
++ spin_lock_init(&port[i].lock);
++
+ /* its a serious configuration bug when it fails */
+ BUG_ON( gpiochip_add(&port[i].chip) < 0 );
+
+diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h
+index 894d2f8..7a0dc5a 100644
+--- a/arch/arm/plat-mxc/include/mach/gpio.h
++++ b/arch/arm/plat-mxc/include/mach/gpio.h
+@@ -19,6 +19,7 @@
+ #ifndef __ASM_ARCH_MXC_GPIO_H__
+ #define __ASM_ARCH_MXC_GPIO_H__
+
++#include <linux/spinlock.h>
+ #include <mach/hardware.h>
+ #include <asm-generic/gpio.h>
+
+@@ -36,6 +37,7 @@ struct mxc_gpio_port {
+ int virtual_irq_start;
+ struct gpio_chip chip;
+ u32 both_edges;
++ spinlock_t lock;
+ };
+
+ int mxc_gpio_init(struct mxc_gpio_port*, int);
+diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c
+index 4c247e0..df971fa 100644
+--- a/arch/parisc/kernel/firmware.c
++++ b/arch/parisc/kernel/firmware.c
+@@ -1123,7 +1123,6 @@ static char __attribute__((aligned(64))) iodc_dbuf[4096];
+ */
+ int pdc_iodc_print(const unsigned char *str, unsigned count)
+ {
+- static int posx; /* for simple TAB-Simulation... */
+ unsigned int i;
+ unsigned long flags;
+
+@@ -1133,19 +1132,12 @@ int pdc_iodc_print(const unsigned char *str, unsigned count)
+ iodc_dbuf[i+0] = '\r';
+ iodc_dbuf[i+1] = '\n';
+ i += 2;
+- posx = 0;
+ goto print;
+- case '\t':
+- while (posx & 7) {
+- iodc_dbuf[i] = ' ';
+- i++, posx++;
+- }
+- break;
+ case '\b': /* BS */
+- posx -= 2;
++ i--; /* overwrite last */
+ default:
+ iodc_dbuf[i] = str[i];
+- i++, posx++;
++ i++;
+ break;
+ }
+ }
+diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
+index 77cfe7a..5d2f17d 100644
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile
+@@ -163,9 +163,11 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/
+ # Default to zImage, override when needed
+ all: zImage
+
+-BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.%
++# With make 3.82 we cannot mix normal and wildcard targets
++BOOT_TARGETS1 := zImage zImage.initrd uImaged
++BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.%
+
+-PHONY += $(BOOT_TARGETS)
++PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)
+
+ boot := arch/$(ARCH)/boot
+
+@@ -180,10 +182,16 @@ relocs_check: arch/powerpc/relocs_check.pl vmlinux
+ zImage: relocs_check
+ endif
(4227 more lines skipped)
++++++ series
--- series
+++ series
@@ -7,7 +7,7 @@
# Stable patch - critical bugfixes
#
-
+patch-2.6.35.2.bz2
#
# Patch to add a "nonintconfig" option to the Makefile
@@ -98,9 +98,12 @@
linux-2.6.36-wl1251-fix-trigger-scan-timeout-usage.patch
# Introduce EEM support in g_nokia which should fix usb networking
linux-2.6.37-EEM-support-for-g_nokia.patch
+# omap3camera driver
+linux-2.6-omap3camera.patch
+# TI dspbridge driver
+linux-2.6.36-tidspbridge.patch
#
-#
# End of the Nokia N900 patches
#
#####################################################################
More information about the MeeGo-commits
mailing list