From d13e15663fb6ccd34dd7214178e3d1caf645179f Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 11 Sep 2009 09:05:21 +0200 Subject: linux-omap: add 2.6.31 --- ...0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch | 42 ++++++++-------- .../dss2/0004-OMAP-Add-VRAM-manager.patch | 34 ++++--------- recipes/linux/linux-omap_2.6.31.bb | 58 ++++++++++++++++++++++ recipes/linux/linux-omap_git.bb | 6 +-- 4 files changed, 91 insertions(+), 49 deletions(-) create mode 100644 recipes/linux/linux-omap_2.6.31.bb diff --git a/recipes/linux/linux-omap-2.6.31/dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch b/recipes/linux/linux-omap-2.6.31/dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch index 9a4ea8b9ad..0167fe2a55 100644 --- a/recipes/linux/linux-omap-2.6.31/dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch +++ b/recipes/linux/linux-omap-2.6.31/dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch @@ -1,20 +1,17 @@ -From 798f9b1bc478c7ded724fc190c65e413c2401314 Mon Sep 17 00:00:00 2001 From: Vaibhav Hiremath -Date: Tue, 11 Aug 2009 15:52:04 +0530 -Subject: [PATCH 1/5] OMAP3: Enable DSS2 for OMAP3EVM board +Date: Thu, 10 Sep 2009 15:11:34 +0000 (+0530) +Subject: OMAP3: Enable DSS2 for OMAP3EVM board +X-Git-Url: http://arago-project.org/git/people/?p=vaibhav%2Fti-psp-omap-video.git;a=commitdiff_plain;h=1022536cf655419eac21299eac837f57f8f72eef + +OMAP3: Enable DSS2 for OMAP3EVM board Tested - - Validated all three outut interfaces (LCD, DVI and TV) + TODO: - - Support for Backlight control range (0 - 100) - Enable selection for both S-Video and Composite TV out - DVI color (VPLL2_DEV_GRP should be equal to 0x7) - -Signed-off-by: Vaibhav Hiremath --- - arch/arm/configs/omap3_evm_defconfig | 51 +++++++- - arch/arm/mach-omap2/board-omap3evm.c | 234 ++++++++++++++++++++++++++++++++-- - 2 files changed, 273 insertions(+), 12 deletions(-) diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig index d5ff477..ba395a2 100644 @@ -79,7 +76,7 @@ index d5ff477..ba395a2 100644 # diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c -index c0cb29d..0bc26b3 100644 +index 35f6075..5bc4bfe 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -22,6 +22,7 @@ @@ -271,9 +268,9 @@ index c0cb29d..0bc26b3 100644 + }, +}; - static struct omap_uart_platform_data omap3_evm_uart_config __initdata = { - .enabled_uarts = ((1 << 0) | (1 << 1) | (1 << 2)), -@@ -143,6 +313,14 @@ static int omap3evm_twl_gpio_setup(struct device *dev, + static struct twl4030_hsmmc_info mmc[] = { + { +@@ -139,6 +309,14 @@ static int omap3evm_twl_gpio_setup(struct device *dev, * the P2 connector; notably LEDA for the LCD backlight. */ @@ -288,7 +285,7 @@ index c0cb29d..0bc26b3 100644 /* TWL4030_GPIO_MAX + 1 == ledB (out, active low LED) */ gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; -@@ -194,6 +372,47 @@ static struct twl4030_madc_platform_data omap3evm_madc_data = { +@@ -190,6 +368,47 @@ static struct twl4030_madc_platform_data omap3evm_madc_data = { .irq_line = 1, }; @@ -336,7 +333,7 @@ index c0cb29d..0bc26b3 100644 static struct twl4030_platform_data omap3evm_twldata = { .irq_base = TWL4030_IRQ_BASE, .irq_end = TWL4030_IRQ_END, -@@ -203,6 +422,8 @@ static struct twl4030_platform_data omap3evm_twldata = { +@@ -199,6 +418,8 @@ static struct twl4030_platform_data omap3evm_twldata = { .madc = &omap3evm_madc_data, .usb = &omap3evm_usb_data, .gpio = &omap3evm_gpio_data, @@ -345,7 +342,7 @@ index c0cb29d..0bc26b3 100644 }; static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = { -@@ -223,15 +444,6 @@ static int __init omap3_evm_i2c_init(void) +@@ -219,15 +440,6 @@ static int __init omap3_evm_i2c_init(void) return 0; } @@ -361,20 +358,24 @@ index c0cb29d..0bc26b3 100644 static void ads7846_dev_init(void) { if (gpio_request(OMAP3_EVM_TS_GPIO, "ADS7846 pendown") < 0) -@@ -287,11 +499,10 @@ static void __init omap3_evm_init_irq(void) - } +@@ -275,7 +487,6 @@ struct spi_board_info omap3evm_spi_board_info[] = { + }; static struct omap_board_config_kernel omap3_evm_config[] __initdata = { - { OMAP_TAG_LCD, &omap3_evm_lcd_config }, }; + static void __init omap3_evm_init_irq(void) +@@ -289,7 +500,7 @@ static void __init omap3_evm_init_irq(void) + } + static struct platform_device *omap3_evm_devices[] __initdata = { - &omap3_evm_lcd_device, + &omap3_evm_dss_device, &omap3evm_smc911x_device, }; -@@ -314,6 +525,7 @@ static void __init omap3_evm_init(void) +@@ -310,6 +521,7 @@ static void __init omap3_evm_init(void) usb_musb_init(); usb_ehci_init(EHCI_HCD_OMAP_MODE_PHY, true, true, 57, 61); ads7846_dev_init(); @@ -382,6 +383,3 @@ index c0cb29d..0bc26b3 100644 } static void __init omap3_evm_map_io(void) --- -1.6.2.4 - diff --git a/recipes/linux/linux-omap-2.6.31/dss2/0004-OMAP-Add-VRAM-manager.patch b/recipes/linux/linux-omap-2.6.31/dss2/0004-OMAP-Add-VRAM-manager.patch index 13fe0b0234..47eab0fa7d 100644 --- a/recipes/linux/linux-omap-2.6.31/dss2/0004-OMAP-Add-VRAM-manager.patch +++ b/recipes/linux/linux-omap-2.6.31/dss2/0004-OMAP-Add-VRAM-manager.patch @@ -1,7 +1,9 @@ -From cb8ce54283e64bd30636b7bcd2d7bb4e200825d2 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen -Date: Fri, 7 Aug 2009 12:01:55 +0300 -Subject: [PATCH 04/18] OMAP: Add VRAM manager +Date: Fri, 7 Aug 2009 09:01:55 +0000 (+0300) +Subject: OMAP: Add VRAM manager +X-Git-Url: http://arago-project.org/git/people/?p=vaibhav%2Fti-psp-omap-video.git;a=commitdiff_plain;h=9e5a02f69fe2261ac928aa956add6f1c9f48386d + +OMAP: Add VRAM manager Add a Video RAM manager for OMAP 2 and 3 platforms. VRAM manager is used to allocate large continuous blocks of SDRAM or SRAM. The features VRAM @@ -20,33 +22,20 @@ and boot parameter overrides kernel config and board file. Signed-off-by: Tomi Valkeinen --- - arch/arm/mach-omap2/io.c | 2 + - arch/arm/plat-omap/include/mach/vram.h | 63 +++ - arch/arm/plat-omap/sram.c | 8 + - drivers/video/Kconfig | 1 + - drivers/video/Makefile | 1 + - drivers/video/omap2/Kconfig | 2 + - drivers/video/omap2/Makefile | 1 + - drivers/video/omap2/vram.c | 655 ++++++++++++++++++++++++++++++++ - 8 files changed, 733 insertions(+), 0 deletions(-) - create mode 100644 arch/arm/plat-omap/include/mach/vram.h - create mode 100644 drivers/video/omap2/Kconfig - create mode 100644 drivers/video/omap2/Makefile - create mode 100644 drivers/video/omap2/vram.c diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c -index 49199a3..f837063 100644 +index 4a08ad3..e5dd736 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c -@@ -32,6 +32,7 @@ - #include +@@ -33,6 +33,7 @@ #include #include + #include +#include #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once clkdev is ready */ #include "clock.h" -@@ -240,6 +241,7 @@ void __init omap2_map_common_io(void) +@@ -246,6 +247,7 @@ void __init omap2_map_common_io(void) omap2_check_revision(); omap_sram_init(); omapfb_reserve_sdram(); @@ -124,7 +113,7 @@ index 0000000..fe72f81 + +#endif diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c -index 5eae787..c9b89cd 100644 +index 925f647..cda311b 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -28,6 +28,7 @@ @@ -849,6 +838,3 @@ index 0000000..634ce23 + omap_vram_sram_start = start; + omap_vram_sram_size = size; +} --- -1.6.2.4 - diff --git a/recipes/linux/linux-omap_2.6.31.bb b/recipes/linux/linux-omap_2.6.31.bb new file mode 100644 index 0000000000..cf7f69318f --- /dev/null +++ b/recipes/linux/linux-omap_2.6.31.bb @@ -0,0 +1,58 @@ +require linux.inc + +DESCRIPTION = "Linux kernel for OMAP processors" +KERNEL_IMAGETYPE = "uImage" + +COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm|omap3-pandora|overo|omapzoom" + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_omapzoom2 = "1" + +SRCREV = "52a962f09ab2306a2ac6e22c2d3bac1a76ac" + +# The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc +#PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}" +PV = "2.6.31" + +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ + file://defconfig" + +SRC_URI_append = " \ + file://ehci-phy-reset.patch;patch=1 \ + file://ehci.patch;patch=1 \ + file://0001-implement-TIF_RESTORE_SIGMASK-support-and-enable-the.patch;patch=1 \ + file://cache/l1cache-shift.patch;patch=1 \ + file://cache/copy-page-tweak.patch;patch=1 \ + file://dss2/0001-OMAP2-Add-funcs-for-writing-SMS_ROT_-registers.patch;patch=1 \ + file://dss2/0002-OMAP-OMAPFB-split-omapfb.h.patch;patch=1 \ + file://dss2/0003-OMAP-OMAPFB-add-omapdss-device.patch;patch=1 \ + file://dss2/0004-OMAP-Add-VRAM-manager.patch;patch=1 \ + file://dss2/0005-OMAP-Add-support-for-VRFB-rotation-engine.patch;patch=1 \ + file://dss2/0006-OMAP-DSS2-Documentation-for-DSS2.patch;patch=1 \ + file://dss2/0007-OMAP-DSS2-Display-Subsystem-Driver-core.patch;patch=1 \ + file://dss2/0008-OMAP-DSS2-Add-more-core-files.patch;patch=1 \ + file://dss2/0009-OMAP-DSS2-DISPC.patch;patch=1 \ + file://dss2/0010-OMAP-DSS2-DPI-driver.patch;patch=1 \ + file://dss2/0011-OMAP-DSS2-Video-encoder-driver.patch;patch=1 \ + file://dss2/0012-OMAP-DSS2-RFBI-driver.patch;patch=1 \ + file://dss2/0013-OMAP-DSS2-SDI-driver.patch;patch=1 \ + file://dss2/0014-OMAP-DSS2-DSI-driver.patch;patch=1 \ + file://dss2/0015-OMAP-DSS2-omapfb-driver.patch;patch=1 \ + file://dss2/0016-OMAP-DSS2-Add-DPI-panel-drivers.patch;patch=1 \ + file://dss2/0017-OMAP-DSS2-Taal-DSI-command-mode-panel-driver.patch;patch=1 \ + file://dss2/0001-OMAP3-Enable-DSS2-for-OMAP3EVM-board.patch;patch=1 \ + file://dss2/0002-V4L2-Added-New-V4L2-CIDs-for-omap-devices-V4L2-IOCT.patch;patch=1 \ + file://dss2/0003-V4L2-Updated-v4l2_common-for-new-V4L2-CIDs.patch;patch=1 \ + file://dss2/0004-OMAP2-3-V4L2-Add-support-for-OMAP2-3-V4L2-driver-on.patch;patch=1 \ + file://expansion-boards/tincantools-zippy.patch;patch=1 \ + file://madc/madc-driver.patch;patch=1 \ + file://madc/madc.patch;patch=1 \ +" + +SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ +" + +S = "${WORKDIR}/git" + +module_autoload_ohci-hcd_omap5912osk = "ohci-hcd" + diff --git a/recipes/linux/linux-omap_git.bb b/recipes/linux/linux-omap_git.bb index f19840d4f4..65aa1187db 100644 --- a/recipes/linux/linux-omap_git.bb +++ b/recipes/linux/linux-omap_git.bb @@ -8,13 +8,13 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard| DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_omapzoom2 = "1" -SRCREV = "3777b1e9ffb6e0901be93cbe201ae8e96003179b" +SRCREV = "52a962f09ab2306a2ac6e22c2d3bac1a76ac" FILESPATHPKG_prepend = "linux-omap-2.6.31:" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}" -PR = "r0" +#PV = "2.6.30+2.6.31-rc8+gitr${SRCREV}" +PV = "2.6.31" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \ file://defconfig" -- cgit 1.2.3-korg