[meego-commits] 14365: Changes to Trunk/kernel-adaptation-n900
Peter Zhu
no_reply at build.meego.com
Tue Mar 1 05:36:23 UTC 2011
Hi,
I have made the following changes to kernel-adaptation-n900 in project Trunk. Please review and accept ASAP.
Thank You,
Peter Zhu
[This message was auto-generated]
---
Request #14365:
submit: Trunk:Testing/kernel-adaptation-n900(r2) -> Trunk/kernel-adaptation-n900
Message:
Move to Trunk
State: new 2011-02-28T16:34:23 peter
Comment: None
changes files:
--------------
--- kernel.changes
+++ kernel.changes
@@ -0,0 +1,9 @@
+* Thu Feb 10 2011 Ilkka Koskinen <ilkka.koskinen at nokia.com> - 2.6.37
+- Updated config-generic from the reference kernel (GadgetFS=y)
+- Compile USB GadgetFS and FunctionFS as module (BMC#13423)
+- Fix: HSI compilation warning (Bug)
+- fbdev-sgx : XvOverlay image size limit has dropped to 652x489 with .37 kernel (BMC#13410)
+- Enabled the driver controlling buttons connected to GPIO pins
+- Fix: CONFIG_CONNECTOR should be compiled in instead of as module (BMC#13606)
+- isppreview: new default coeffs for more ambient independent quality
+
new:
----
linux-2.6-isppreview-new-default-coeffs-for-more-ambient-indep.patch
linux-2.6-omap-rx51-mark-reserved-memory-earlier.patch
linux-2.61-HSI-hsi_char-hsi_char_ioctl-compilation-warning.patch
spec files:
-----------
--- kernel-adaptation-n900.spec
+++ kernel-adaptation-n900.spec
@@ -304,6 +304,11 @@
Patch341: linux-2.6-Media-Controller-OMAP-ISP-Camera-for-RX51-patchset.patch
Patch342: linux-2.6-omap-iommu-Compile-in-as-it-doesn-t-work-as-module.patch
+# Bug fixes, misc.
+Patch343: linux-2.61-HSI-hsi_char-hsi_char_ioctl-compilation-warning.patch
+Patch344: linux-2.6-omap-rx51-mark-reserved-memory-earlier.patch
+Patch345: linux-2.6-isppreview-new-default-coeffs-for-more-ambient-indep.patch
+
#
# End of the Nokia N900 patches
#
@@ -697,6 +702,14 @@
# linux-2.6-omap-iommu-Compile-in-as-it-doesn-t-work-as-module.patch
%patch342 -p1
+# Bug fixes, misc.
+# linux-2.61-HSI-hsi_char-hsi_char_ioctl-compilation-warning.patch
+%patch343 -p1
+# linux-2.6-omap-rx51-mark-reserved-memory-earlier.patch
+%patch344 -p1
+# linux-2.6-isppreview-new-default-coeffs-for-more-ambient-indep.patch
+%patch345 -p1
+
#
# End of the Nokia N900 patches
#
other changes:
--------------
++++++ config-adaptation-n900
--- config-adaptation-n900
+++ config-adaptation-n900
@@ -357,7 +357,6 @@
# CONFIG_CAIF is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
# CONFIG_DEBUG_DEVRES is not set
-CONFIG_CONNECTOR=m
CONFIG_MTD=y
# CONFIG_MTD_DEBUG is not set
# CONFIG_MTD_TESTS is not set
@@ -516,6 +515,7 @@
# CONFIG_INPUT_SPARSEKMAP is not set
# CONFIG_INPUT_JOYDEV is not set
# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_GPIO_POLLED is not set
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_MCS is not set
@@ -886,7 +886,10 @@
# CONFIG_USB_AUDIO is not set
CONFIG_USB_ETH=m
# CONFIG_USB_ETH_EEM is not set
-# CONFIG_USB_FUNCTIONFS is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+# CONFIG_USB_FUNCTIONFS_ETH is not set
+# CONFIG_USB_FUNCTIONFS_RNDIS is not set
CONFIG_USB_G_NOKIA=m
# CONFIG_USB_G_NOKIA_EEM is not set
# CONFIG_USB_G_MULTI is not set
++++++ config-generic
--- config-generic
+++ config-generic
@@ -2286,7 +2286,7 @@
# CONFIG_USB_ZERO is not set
# CONFIG_USB_ETH is not set
# CONFIG_USB_ETH_RNDIS is not set
-# CONFIG_USB_GADGETFS is not set
+CONFIG_USB_GADGETFS=y
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
++++++ kernel-adaptation-n900.config
--- kernel-adaptation-n900.config
+++ kernel-adaptation-n900.config
@@ -807,7 +807,7 @@
# CONFIG_DEBUG_DRIVER is not set
# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_CONNECTOR=m
+CONFIG_CONNECTOR=y
CONFIG_MTD=y
# CONFIG_PARPORT is not set
CONFIG_PNP=y
@@ -2286,7 +2286,7 @@
# CONFIG_USB_ZERO is not set
CONFIG_USB_ETH=m
# CONFIG_USB_ETH_RNDIS is not set
-# CONFIG_USB_GADGETFS is not set
+CONFIG_USB_GADGETFS=m
# CONFIG_USB_FILE_STORAGE is not set
# CONFIG_USB_FILE_STORAGE_TEST is not set
# CONFIG_USB_MASS_STORAGE is not set
@@ -2883,7 +2883,7 @@
# CONFIG_MRST is not set
# CONFIG_SFI is not set
# CONFIG_MDIO_GPIO is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_MOUSE_GPIO is not set
# CONFIG_I2C_GPIO is not set
CONFIG_DEBUG_GPIO=y
@@ -4250,7 +4250,9 @@
# CONFIG_USB_GADGET_R8A66597 is not set
# CONFIG_USB_AUDIO is not set
# CONFIG_USB_ETH_EEM is not set
-# CONFIG_USB_FUNCTIONFS is not set
+CONFIG_USB_FUNCTIONFS=m
+# CONFIG_USB_FUNCTIONFS_ETH is not set
+# CONFIG_USB_FUNCTIONFS_RNDIS is not set
CONFIG_USB_G_NOKIA=m
# CONFIG_USB_G_NOKIA_EEM is not set
# CONFIG_USB_G_MULTI is not set
++++++ linux-2.6-isppreview-new-default-coeffs-for-more-ambient-indep.patch (new)
--- linux-2.6-isppreview-new-default-coeffs-for-more-ambient-indep.patch
+++ linux-2.6-isppreview-new-default-coeffs-for-more-ambient-indep.patch
+From fa40e780fc1aec50c39fe430ba845a826b03dd25 Mon Sep 17 00:00:00 2001
+From: Teemu Tuominen <tux at t3.fi>
+Date: Mon, 21 Feb 2011 09:41:08 +0200
+Subject: [PATCH] isppreview: new default coeffs for more ambient independent quality
+
+---
+ drivers/media/video/isp/isppreview.c | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/media/video/isp/isppreview.c b/drivers/media/video/isp/isppreview.c
+index 15f5a2e..18cefdc 100644
+--- a/drivers/media/video/isp/isppreview.c
++++ b/drivers/media/video/isp/isppreview.c
+@@ -37,9 +37,9 @@
+ /* Default values in Office Flourescent Light for RGBtoRGB Blending */
+ static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = {
+ { /* RGB-RGB Matrix */
+- {0x01E2, 0x0F30, 0x0FEE},
+- {0x0F9B, 0x01AC, 0x0FB9},
+- {0x0FE0, 0x0EC0, 0x0260}
++ {0x0100, 0x0000, 0x0000},
++ {0x0000, 0x0100, 0x0000},
++ {0x0000, 0x0000, 0x0100}
+ }, /* RGB Offset */
+ {0x0000, 0x0000, 0x0000}
+ };
+@@ -47,9 +47,9 @@ static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = {
+ /* Default values in Office Flourescent Light for RGB to YUV Conversion*/
+ static struct omap3isp_prev_csc flr_prev_csc = {
+ { /* CSC Coef Matrix */
+- {66, 129, 25},
+- {-38, -75, 112},
+- {112, -94 , -18}
++ {76, 152, 28},
++ {-44, -84, 128},
++ {128, -98 , -20}
+ }, /* CSC Offset */
+ {0x0, 0x0, 0x0}
+ };
+--
+1.7.0.4
+
++++++ linux-2.6-omap-rx51-mark-reserved-memory-earlier.patch (new)
--- linux-2.6-omap-rx51-mark-reserved-memory-earlier.patch
+++ linux-2.6-omap-rx51-mark-reserved-memory-earlier.patch
+From 9eb715379cf844933541266962a2c547dcad2900 Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras at gmail.com>
+Date: Fri, 15 Oct 2010 14:46:24 +0200
+Subject: [PATCH 2/3] omap: rx51: mark reserved memory earlier
+
+So that omap_vram_set_sdram_vram() is called before
+omap_vram_reserve_sdram_memblock().
+
+Signed-off-by: Felipe Contreras <felipe.contreras <at> gmail.com>
+---
+ arch/arm/mach-omap2/board-rx51.c | 9 +++++++--
+ 1 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
+index 08e2b71..b14e4d6 100644
+--- a/arch/arm/mach-omap2/board-rx51.c
++++ b/arch/arm/mach-omap2/board-rx51.c
+@@ -146,15 +146,20 @@ static void __init rx51_init(void)
+ static void __init rx51_map_io(void)
+ {
+ omap2_set_globals_3xxx();
+- rx51_video_mem_init();
+ omap34xx_map_common_io();
+ }
+
++static void __init rx51_reserve(void)
++{
++ rx51_video_mem_init();
++ omap_reserve();
++}
++
+ MACHINE_START(NOKIA_RX51, "Nokia RX-51 board")
+ /* Maintainer: Lauri Leukkunen <lauri.leukkunen at nokia.com> */
+ .boot_params = 0x80000100,
+ .map_io = rx51_map_io,
+- .reserve = omap_reserve,
++ .reserve = rx51_reserve,
+ .init_irq = rx51_init_irq,
+ .init_machine = rx51_init,
+ .timer = &omap_timer,
+--
+1.7.0.4
+
++++++ linux-2.61-HSI-hsi_char-hsi_char_ioctl-compilation-warning.patch (new)
--- linux-2.61-HSI-hsi_char-hsi_char_ioctl-compilation-warning.patch
+++ linux-2.61-HSI-hsi_char-hsi_char_ioctl-compilation-warning.patch
+From dc0afe0a736190e57cb494a2969f2a3fab0c32e0 Mon Sep 17 00:00:00 2001
+From: Ilkka Koskinen <ilkka.koskinen at nokia.com>
+Date: Thu, 10 Feb 2011 18:03:43 +0200
+Subject: [PATCH 1/3] HSI: hsi_char: hsi_char_ioctl() compilation warning
+
+hsi_char_ioctl() is assigned to unlocked_ioctl instead of ioctl.
+The types differ from each other, which resulted in assigning
+a wrong type of function point.
+
+Signed-off-by: Ilkka Koskinen <ilkka.koskinen at nokia.com>
+---
+ drivers/hsi/clients/hsi_char.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/hsi/clients/hsi_char.c b/drivers/hsi/clients/hsi_char.c
+index 9767412..1ba7d84 100644
+--- a/drivers/hsi/clients/hsi_char.c
++++ b/drivers/hsi/clients/hsi_char.c
+@@ -720,8 +720,8 @@ static inline void hsi_char_tx2ecfg(struct hsc_tx_config *tx_cfg,
+ tx_cfg->arb_mode = cfg->arb_mode;
+ }
+
+-static long hsi_char_ioctl(struct inode *inode, struct file *file,
+- unsigned int cmd, unsigned long arg)
++static long hsi_char_ioctl(struct file *file, unsigned int cmd,
++ unsigned long arg)
+ {
+ struct hsi_char_channel *channel = file->private_data;
+ unsigned int state;
+--
+1.7.0.4
+
++++++ series
--- series
+++ series
@@ -147,6 +147,11 @@
linux-2.6-Media-Controller-OMAP-ISP-Camera-for-RX51-patchset.patch
linux-2.6-omap-iommu-Compile-in-as-it-doesn-t-work-as-module.patch
+# Bug fixes, misc.
+linux-2.61-HSI-hsi_char-hsi_char_ioctl-compilation-warning.patch
+linux-2.6-omap-rx51-mark-reserved-memory-earlier.patch
+linux-2.6-isppreview-new-default-coeffs-for-more-ambient-indep.patch
+
#
# End of the Nokia N900 patches
#
@@ -250,4 +255,4 @@
# turn on "print fatal signals" by default, so that we can debug /sbin/init
# crashes
-linux-2.6.35-fatal-signals.patch
+linux-2.6.35-fatal-signals.patch
\ No newline at end of file
More information about the MeeGo-commits
mailing list