diff options
17 files changed, 268 insertions, 125 deletions
diff --git a/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch b/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch index 43059b2cc2..8b40d660cf 100644 --- a/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch +++ b/recipes/linux/linux-omap-2.6.37rc/0001-ARM-OMAP-beagleboard-Add-infrastructure-to-do-fixups.patch @@ -1,7 +1,7 @@ -From 26383be87990cba18af2da275d12781d179215a8 Mon Sep 17 00:00:00 2001 +From 29fb3969c82a750b41746a299e484172dba443dc Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Wed, 6 Oct 2010 10:19:34 +0200 -Subject: [PATCH 1/8] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot +Subject: [PATCH 01/14] ARM: OMAP: beagleboard: Add infrastructure to do fixups based on expansionboard name passed by u-boot Add support for Tincantools Zippy and Zippy2 expansionboards as well @@ -11,7 +11,7 @@ Signed-off-by: Koen Kooi <koen@beagleboard.org> 1 files changed, 139 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 14f4224..9962932 100644 +index f1a8ede..2943e1f 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -21,6 +21,7 @@ @@ -164,7 +164,7 @@ index 14f4224..9962932 100644 /* Bus 3 is attached to the DVI port where devices like the pico DLP * projector don't work reliably with 400kHz */ omap_register_i2c_bus(3, 100, beagle_i2c_eeprom, ARRAY_SIZE(beagle_i2c_eeprom)); -@@ -558,6 +665,15 @@ static struct omap_musb_board_data musb_board_data = { +@@ -555,6 +662,15 @@ static struct omap_musb_board_data musb_board_data = { .power = 100, }; @@ -180,7 +180,7 @@ index 14f4224..9962932 100644 static void __init omap3_beagle_init(void) { omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); -@@ -572,6 +688,24 @@ static void __init omap3_beagle_init(void) +@@ -569,6 +685,24 @@ static void __init omap3_beagle_init(void) /* REVISIT leave DVI powered down until it's needed ... */ gpio_direction_output(170, true); @@ -205,7 +205,7 @@ index 14f4224..9962932 100644 usb_musb_init(&musb_board_data); usb_ehci_init(&ehci_pdata); omap3beagle_flash_init(); -@@ -583,6 +717,8 @@ static void __init omap3_beagle_init(void) +@@ -580,6 +714,8 @@ static void __init omap3_beagle_init(void) beagle_display_init(); } diff --git a/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch b/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch index 0a28478dc0..1dbcaa803d 100644 --- a/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch +++ b/recipes/linux/linux-omap-2.6.37rc/0002-modedb.c-add-proper-720p60-mode.patch @@ -1,7 +1,7 @@ -From 3f6d595815a2362c3c7b3ed0db48aad2436f2c4e Mon Sep 17 00:00:00 2001 +From 415c97e9ba23bb7d0f24edde11236b0a149d134c Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Mon, 8 Mar 2010 14:38:31 +0100 -Subject: [PATCH 2/8] modedb.c: add proper 720p60 mode +Subject: [PATCH 02/14] modedb.c: add proper 720p60 mode Signed-off-by: Koen Kooi <koen@beagleboard.org> --- diff --git a/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch b/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch index f68319481b..b20c8c6ce4 100644 --- a/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch +++ b/recipes/linux/linux-omap-2.6.37rc/0003-ARM-OMAP-fix-USB-initialization-for-beagleboard-xM.patch @@ -1,7 +1,7 @@ -From 5eca3854e9bd6fa1d27f2def25176bb9fc27b86d Mon Sep 17 00:00:00 2001 +From c908140c053071789dfa72f34bee76223ba9bdb7 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Thu, 7 Oct 2010 09:25:45 +0200 -Subject: [PATCH 3/8] ARM: OMAP: fix USB initialization for beagleboard-xM +Subject: [PATCH 03/14] ARM: OMAP: fix USB initialization for beagleboard-xM Signed-off-by: Koen Kooi <koen@beagleboard.org> --- @@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi <koen@beagleboard.org> 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 9962932..800ba5b 100644 +index 2943e1f..92335a9 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -390,12 +390,14 @@ static int beagle_twl_gpio_setup(struct device *dev, diff --git a/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch b/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch index bc6a224722..0dd728792c 100644 --- a/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch +++ b/recipes/linux/linux-omap-2.6.37rc/0004-ARM-OMAP-Power-on-EHCI-serial-camera-and-DVI-on-beag.patch @@ -1,7 +1,7 @@ -From c423f45fee0b6b5148e9ad31a79761b8562e2df8 Mon Sep 17 00:00:00 2001 +From 28d1c68dd4fd99b61375217efbe7b59f42f5c886 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Thu, 7 Oct 2010 11:46:01 +0200 -Subject: [PATCH 4/8] ARM: OMAP: Power on EHCI, serial, camera and DVI on beagleboard-x< +Subject: [PATCH 04/14] ARM: OMAP: Power on EHCI, serial, camera and DVI on beagleboard-x< Signed-off-by: Koen Kooi <koen@beagleboard.org> --- @@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi <koen@beagleboard.org> 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 800ba5b..3bc524c 100644 +index 92335a9..6d7f008 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -399,6 +399,25 @@ static int beagle_twl_gpio_setup(struct device *dev, diff --git a/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch b/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch index 5b2f7402c7..169bd0187c 100644 --- a/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch +++ b/recipes/linux/linux-omap-2.6.37rc/0005-mmc-don-t-display-single-block-read-console-messages.patch @@ -1,7 +1,7 @@ -From 386961b3ee4201286f1f0d91785a0edc9f053360 Mon Sep 17 00:00:00 2001 +From d7fd875f1885b184c8c9f9145a9a00cc40af1c1b Mon Sep 17 00:00:00 2001 From: Steve Sakoman <steve@sakoman.com> Date: Mon, 4 Jan 2010 19:20:25 -0800 -Subject: [PATCH 5/8] mmc: don't display single block read console messages +Subject: [PATCH 05/14] mmc: don't display single block read console messages mmc: don't display single block read console messages --- diff --git a/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch b/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch index 8226b19040..d909fff925 100644 --- a/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch +++ b/recipes/linux/linux-omap-2.6.37rc/0006-MTD-silence-ecc-errors-on-mtdblock0.patch @@ -1,7 +1,7 @@ -From 7565934e99f3e0b2a4d1bdae5542db7ceda03ccf Mon Sep 17 00:00:00 2001 +From d7a2fe3f2304b3ad49e1f406565038fc3d8834e6 Mon Sep 17 00:00:00 2001 From: Steve Sakoman <steve@sakoman.com> Date: Mon, 26 Apr 2010 11:17:26 -0700 -Subject: [PATCH 6/8] MTD: silence ecc errors on mtdblock0 +Subject: [PATCH 06/14] MTD: silence ecc errors on mtdblock0 mtdblock0 is the x-load partition, which uses hw ecc this confuses linux, which uses sw ecc diff --git a/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch b/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch index e938f72438..2d1cb0e617 100644 --- a/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch +++ b/recipes/linux/linux-omap-2.6.37rc/0007-Miracle-patch.patch @@ -1,7 +1,7 @@ -From f88552cc59b8292b45dd16ec56198e50f040122a Mon Sep 17 00:00:00 2001 +From 27f26e95a6cb18d2afc103c6b17bde7d79a95c01 Mon Sep 17 00:00:00 2001 From: Mike Galbraith <efault@gmx.de> Date: Fri, 19 Nov 2010 12:52:42 +0100 -Subject: [PATCH 7/8] Miracle patch +Subject: [PATCH 07/14] Miracle patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -113,7 +113,7 @@ Signed-off-by: Mike Galbraith <efault@gmx.de> create mode 100644 kernel/sched_autogroup.h diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index 92e83e5..86820a7 100644 +index cdd2a6e..b79a8fb 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1622,6 +1622,8 @@ and is between 256 and 4096 characters. It is defined in the file @@ -138,7 +138,7 @@ index c05c5af..5698038 100644 static void proc_set_tty(struct task_struct *tsk, struct tty_struct *tty) diff --git a/include/linux/sched.h b/include/linux/sched.h -index d0036e5..6dff9ac 100644 +index 2c79e92..1e677c2 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -509,6 +509,8 @@ struct thread_group_cputimer { @@ -160,7 +160,7 @@ index d0036e5..6dff9ac 100644 /* * Cumulative resource counters for dead threads in the group, * and for reaped dead child processes forked by this group. -@@ -1930,6 +1935,20 @@ int sched_rt_handler(struct ctl_table *table, int write, +@@ -1931,6 +1936,20 @@ int sched_rt_handler(struct ctl_table *table, int write, extern unsigned int sysctl_sched_compat_yield; @@ -182,10 +182,10 @@ index d0036e5..6dff9ac 100644 extern int rt_mutex_getprio(struct task_struct *p); extern void rt_mutex_setprio(struct task_struct *p, int prio); diff --git a/init/Kconfig b/init/Kconfig -index 88c1046..8fc6606 100644 +index c972899..a4985d9 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -728,6 +728,18 @@ config NET_NS +@@ -741,6 +741,18 @@ config NET_NS endif # NAMESPACES @@ -229,7 +229,7 @@ index 3b159c5..b6f2475 100644 sig->oom_adj = current->signal->oom_adj; sig->oom_score_adj = current->signal->oom_score_adj; diff --git a/kernel/sched.c b/kernel/sched.c -index aa14a56..ba9d6e7 100644 +index dc91a4d..b4ed496 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -78,6 +78,7 @@ @@ -240,7 +240,7 @@ index aa14a56..ba9d6e7 100644 #define CREATE_TRACE_POINTS #include <trace/events/sched.h> -@@ -615,11 +616,14 @@ static inline int cpu_of(struct rq *rq) +@@ -605,11 +606,14 @@ static inline int cpu_of(struct rq *rq) */ static inline struct task_group *task_group(struct task_struct *p) { @@ -256,7 +256,7 @@ index aa14a56..ba9d6e7 100644 } /* Change a task's cfs_rq and parent entity if it moves across CPUs/groups */ -@@ -2016,6 +2020,7 @@ static void sched_irq_time_avg_update(struct rq *rq, u64 curr_irq_time) { } +@@ -2006,6 +2010,7 @@ static void sched_irq_time_avg_update(struct rq *rq, u64 curr_irq_time) { } #include "sched_idletask.c" #include "sched_fair.c" #include "sched_rt.c" @@ -264,7 +264,7 @@ index aa14a56..ba9d6e7 100644 #include "sched_stoptask.c" #ifdef CONFIG_SCHED_DEBUG # include "sched_debug.c" -@@ -7962,7 +7967,7 @@ void __init sched_init(void) +@@ -7979,7 +7984,7 @@ void __init sched_init(void) #ifdef CONFIG_CGROUP_SCHED list_add(&init_task_group.list, &task_groups); INIT_LIST_HEAD(&init_task_group.children); @@ -273,7 +273,7 @@ index aa14a56..ba9d6e7 100644 #endif /* CONFIG_CGROUP_SCHED */ #if defined CONFIG_FAIR_GROUP_SCHED && defined CONFIG_SMP -@@ -8492,15 +8497,11 @@ void sched_destroy_group(struct task_group *tg) +@@ -8509,15 +8514,11 @@ void sched_destroy_group(struct task_group *tg) /* change task's runqueue when it moves between groups. * The caller of this function should have put the task in its new group * by now. This function just updates tsk->se.cfs_rq and tsk->se.parent to @@ -291,7 +291,7 @@ index aa14a56..ba9d6e7 100644 running = task_current(rq, tsk); on_rq = tsk->se.on_rq; -@@ -8521,7 +8522,15 @@ void sched_move_task(struct task_struct *tsk) +@@ -8538,7 +8539,15 @@ void sched_move_task(struct task_struct *tsk) tsk->sched_class->set_curr_task(rq); if (on_rq) enqueue_task(rq, tsk, 0); @@ -478,7 +478,7 @@ index 0000000..6048f5d + +#endif /* CONFIG_SCHED_AUTOGROUP */ diff --git a/kernel/sysctl.c b/kernel/sysctl.c -index b65bf63..983e6b2 100644 +index 5abfa15..b162f65 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -382,6 +382,17 @@ static struct ctl_table kern_table[] = { diff --git a/recipes/linux/linux-omap-2.6.37rc/0007-OMAP-DSS2-OMAPFB-use-phys_to_virt-for-RAM-mappings.patch b/recipes/linux/linux-omap-2.6.37rc/0007-OMAP-DSS2-OMAPFB-use-phys_to_virt-for-RAM-mappings.patch deleted file mode 100644 index dedd30c73c..0000000000 --- a/recipes/linux/linux-omap-2.6.37rc/0007-OMAP-DSS2-OMAPFB-use-phys_to_virt-for-RAM-mappings.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 5679c6edf94f3ab28f9d9d8d134bda835c8d5b17 Mon Sep 17 00:00:00 2001 -From: Mike Rapoport <mike@compulab.co.il> -Date: Mon, 23 Aug 2010 09:40:09 +0300 -Subject: [PATCH 7/7] OMAP: DSS2: OMAPFB: use phys_to_virt for RAM mappings - -Extracted from message on linux-omap mailing list: -http://permalink.gmane.org/gmane.linux.ports.arm.omap/41348 -BugLink: https://bugs.launchpad.net/bugs/624115 - -After commit 309caa9cc6ff39d261264ec4ff10e29489afc8f8 (ARM: Prohibit -ioremap() on kernel managed RAM) it is impossible to ioremap SDRAM for -the framebuffer. Use phys_to_virt for kernel managed RAM mapping and -ioremap for other memory types - -Reported-by: Ameya Palande <ameya.palande@nokia.com> -Signed-off-by: Mike Rapoport <mike@compulab.co.il> -Signed-off-by: John Rigby <john.rigby@linaro.org> ---- - arch/arm/plat-omap/include/plat/vram.h | 1 + - drivers/video/omap2/omapfb/omapfb-main.c | 2 +- - drivers/video/omap2/vram.c | 10 ++++++++++ - 3 files changed, 12 insertions(+), 1 deletions(-) - -diff --git a/arch/arm/plat-omap/include/plat/vram.h b/arch/arm/plat-omap/include/plat/vram.h -index 0aa4ecd..b1b137c 100644 ---- a/arch/arm/plat-omap/include/plat/vram.h -+++ b/arch/arm/plat-omap/include/plat/vram.h -@@ -33,6 +33,7 @@ extern int omap_vram_alloc(int mtype, size_t size, unsigned long *paddr); - extern int omap_vram_reserve(unsigned long paddr, size_t size); - extern void omap_vram_get_info(unsigned long *vram, unsigned long *free_vram, - unsigned long *largest_free_block); -+extern void __iomem *omap_vram_remap(size_t size, unsigned long paddr); - - #ifdef CONFIG_OMAP2_VRAM - extern void omap_vram_set_sdram_vram(u32 size, u32 start); -diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c -index 04034d4..39f53b1 100644 ---- a/drivers/video/omap2/omapfb/omapfb-main.c -+++ b/drivers/video/omap2/omapfb/omapfb-main.c -@@ -1436,7 +1436,7 @@ static int omapfb_alloc_fbmem(struct fb_info *fbi, unsigned long size, - } - - if (ofbi->rotation_type != OMAP_DSS_ROT_VRFB) { -- vaddr = ioremap_wc(paddr, size); -+ vaddr = omap_vram_remap(size, paddr); - - if (!vaddr) { - dev_err(fbdev->dev, "failed to ioremap framebuffer\n"); -diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c -index f6fdc20..37557b6 100644 ---- a/drivers/video/omap2/vram.c -+++ b/drivers/video/omap2/vram.c -@@ -30,6 +30,7 @@ - #include <linux/debugfs.h> - #include <linux/jiffies.h> - #include <linux/module.h> -+#include <linux/io.h> - - #include <asm/setup.h> - -@@ -425,6 +426,15 @@ void omap_vram_get_info(unsigned long *vram, - } - EXPORT_SYMBOL(omap_vram_get_info); - -+void __iomem *omap_vram_remap(size_t size, unsigned long paddr) -+{ -+ if (region_mem_type(paddr) == OMAP_VRAM_MEMTYPE_SDRAM) -+ return phys_to_virt(paddr); -+ -+ return ioremap_wc(paddr, size); -+} -+EXPORT_SYMBOL(omap_vram_remap); -+ - #if defined(CONFIG_DEBUG_FS) - static int vram_debug_show(struct seq_file *s, void *unused) - { --- -1.6.6.1 - diff --git a/recipes/linux/linux-omap-2.6.37rc/0008-ARM-OMAP-add-omap_rev_-macros.patch b/recipes/linux/linux-omap-2.6.37rc/0008-ARM-OMAP-add-omap_rev_-macros.patch index abf8ff3dc1..4260282e29 100644 --- a/recipes/linux/linux-omap-2.6.37rc/0008-ARM-OMAP-add-omap_rev_-macros.patch +++ b/recipes/linux/linux-omap-2.6.37rc/0008-ARM-OMAP-add-omap_rev_-macros.patch @@ -1,7 +1,7 @@ -From 7b1ce28ae31b4114634d1b1b67f8de7a4d8df20d Mon Sep 17 00:00:00 2001 +From 020068c783093a74ef15086afc6405e44676bbd2 Mon Sep 17 00:00:00 2001 From: Koen Kooi <koen@dominion.thruhere.net> Date: Tue, 23 Nov 2010 11:40:20 +0100 -Subject: [PATCH 8/8] ARM: OMAP: add omap_rev_* macros +Subject: [PATCH 08/14] ARM: OMAP: add omap_rev_* macros This is just to make the SGX modules build that depend on omap_rev_lt_3_0 diff --git a/recipes/linux/linux-omap-2.6.37rc/0009-omap-Beagle-detect-new-xM-revision-B.patch b/recipes/linux/linux-omap-2.6.37rc/0009-omap-Beagle-detect-new-xM-revision-B.patch new file mode 100644 index 0000000000..d2a64a87aa --- /dev/null +++ b/recipes/linux/linux-omap-2.6.37rc/0009-omap-Beagle-detect-new-xM-revision-B.patch @@ -0,0 +1,43 @@ +From c5d20d17936c53b62603cdc8a9cf771bc5c6fcd2 Mon Sep 17 00:00:00 2001 +From: Robert Nelson <robertcnelson@gmail.com> +Date: Tue, 9 Nov 2010 08:34:55 -0600 +Subject: [PATCH 09/14] omap: Beagle: detect new xM revision B + +The xM B uses a DM3730 ES1.1 over the ES1.0 on xM A's, no other board changes. + +Signed-off-by: Robert Nelson <robertcnelson@gmail.com> +Signed-off-by: Koen Kooi <koen@beagleboard.org> +--- + arch/arm/mach-omap2/board-omap3beagle.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 6d7f008..f63f319 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -59,7 +59,8 @@ + * AXBX = GPIO173, GPIO172, GPIO171: 1 1 1 + * C1_3 = GPIO173, GPIO172, GPIO171: 1 1 0 + * C4 = GPIO173, GPIO172, GPIO171: 1 0 1 +- * XM = GPIO173, GPIO172, GPIO171: 0 0 0 ++ * XMA = GPIO173, GPIO172, GPIO171: 0 0 0 ++ * XMB = GPIO173, GPIO172, GPIO171: 0 0 1 + */ + enum { + OMAP3BEAGLE_BOARD_UNKN = 0, +@@ -118,7 +119,11 @@ static void __init omap3_beagle_init_rev(void) + omap3_beagle_version = OMAP3BEAGLE_BOARD_C4; + break; + case 0: +- printk(KERN_INFO "OMAP3 Beagle Rev: xM\n"); ++ printk(KERN_INFO "OMAP3 Beagle Rev: xM A\n"); ++ omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; ++ break; ++ case 1: ++ printk(KERN_INFO "OMAP3 Beagle Rev: xM B\n"); + omap3_beagle_version = OMAP3BEAGLE_BOARD_XM; + break; + default: +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.37rc/0010-OMAP-DSS2-enable-hsclk-in-dsi_pll_init-for-OMAP36XX.patch b/recipes/linux/linux-omap-2.6.37rc/0010-OMAP-DSS2-enable-hsclk-in-dsi_pll_init-for-OMAP36XX.patch new file mode 100644 index 0000000000..224d43be10 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.37rc/0010-OMAP-DSS2-enable-hsclk-in-dsi_pll_init-for-OMAP36XX.patch @@ -0,0 +1,31 @@ +From 033209b9aceb9a2dc395e70f49eee9f7b406bb90 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman <steve@sakoman.com> +Date: Mon, 10 May 2010 20:44:09 -0700 +Subject: [PATCH 10/14] OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XX + +Signed-off-by: Koen Kooi <koen@beagleboard.org> +--- + drivers/video/omap2/dss/dpi.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) + +diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c +index 960e977..23047b6 100644 +--- a/drivers/video/omap2/dss/dpi.c ++++ b/drivers/video/omap2/dss/dpi.c +@@ -177,7 +177,12 @@ int omapdss_dpi_display_enable(struct omap_dss_device *dssdev) + + #ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL + dss_clk_enable(DSS_CLK_FCK2); +- r = dsi_pll_init(dssdev, 0, 1); ++ ++ if (cpu_is_omap3630()) ++ r = dsi_pll_init(dssdev, 1, 1); ++ else ++ r = dsi_pll_init(dssdev, 0, 1); ++ + if (r) + goto err3; + #endif +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.37rc/0011-omap3-Increase-limit-on-bootarg-mpurate.patch b/recipes/linux/linux-omap-2.6.37rc/0011-omap3-Increase-limit-on-bootarg-mpurate.patch new file mode 100644 index 0000000000..1cdf7a645f --- /dev/null +++ b/recipes/linux/linux-omap-2.6.37rc/0011-omap3-Increase-limit-on-bootarg-mpurate.patch @@ -0,0 +1,33 @@ +From cf1744b32411e18b41aa0de370c50057b577f4c7 Mon Sep 17 00:00:00 2001 +From: Sanjeev Premi <premi@ti.com> +Date: Thu, 29 Apr 2010 14:09:42 +0530 +Subject: [PATCH 11/14] omap3: Increase limit on bootarg 'mpurate' + +The value of mpurate is currently expected to be less +than 1000 when specified in MHz. + +This patch raises this limit to 2000 to support 1GHz +capable processors. The new limit should be reasonable +for quite some time. + +Signed-off-by: Koen Kooi <koen@beagleboard.org> +--- + arch/arm/plat-omap/clock.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c +index fc62fb5..f3e3d29 100644 +--- a/arch/arm/plat-omap/clock.c ++++ b/arch/arm/plat-omap/clock.c +@@ -181,7 +181,7 @@ static int __init omap_clk_setup(char *str) + if (!mpurate) + return 1; + +- if (mpurate < 1000) ++ if (mpurate < 2000) + mpurate *= 1000000; + + return 1; +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.37rc/0012-AM37x-Switch-SGX-clocks-to-200MHz.patch b/recipes/linux/linux-omap-2.6.37rc/0012-AM37x-Switch-SGX-clocks-to-200MHz.patch new file mode 100644 index 0000000000..af27af617b --- /dev/null +++ b/recipes/linux/linux-omap-2.6.37rc/0012-AM37x-Switch-SGX-clocks-to-200MHz.patch @@ -0,0 +1,29 @@ +From 2f7fbd88fbaf05433fc5a6e6a6c2897246a67af6 Mon Sep 17 00:00:00 2001 +From: Prabindh Sundareson <prabu@ti.com> +Date: Thu, 3 Jun 2010 11:20:57 +0530 +Subject: [PATCH 12/14] AM37x: Switch SGX clocks to 200MHz + +Signed-off-by: Prabindh Sundareson <prabu@ti.com> +Signed-off-by: Koen Kooi <koen@beagleboard.org> +--- + arch/arm/mach-omap2/clock3xxx_data.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c +index a8c8c7a..a56f8e9 100644 +--- a/arch/arm/mach-omap2/clock3xxx_data.c ++++ b/arch/arm/mach-omap2/clock3xxx_data.c +@@ -3267,8 +3267,8 @@ static struct omap_clk omap3xxx_clks[] = { + CLK(NULL, "gfx_l3_ick", &gfx_l3_ick, CK_3430ES1), + CLK(NULL, "gfx_cg1_ck", &gfx_cg1_ck, CK_3430ES1), + CLK(NULL, "gfx_cg2_ck", &gfx_cg2_ck, CK_3430ES1), +- CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2 | CK_3517), +- CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2 | CK_3517), ++ CLK(NULL, "sgx_fck", &sgx_fck, CK_3430ES2 | CK_3517 | CK_36XX), ++ CLK(NULL, "sgx_ick", &sgx_ick, CK_3430ES2 | CK_3517 | CK_36XX), + CLK(NULL, "d2d_26m_fck", &d2d_26m_fck, CK_3430ES1), + CLK(NULL, "modem_fck", &modem_fck, CK_343X), + CLK(NULL, "sad2d_ick", &sad2d_ick, CK_343X), +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.37rc/0013-ARM-OMAP-Beagle-clarify-CAM_EN-power.patch b/recipes/linux/linux-omap-2.6.37rc/0013-ARM-OMAP-Beagle-clarify-CAM_EN-power.patch new file mode 100644 index 0000000000..c637421e1e --- /dev/null +++ b/recipes/linux/linux-omap-2.6.37rc/0013-ARM-OMAP-Beagle-clarify-CAM_EN-power.patch @@ -0,0 +1,26 @@ +From ba1cb56e706e5a7291eb43f3a3cc566def5a4e28 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Sun, 5 Dec 2010 13:23:04 +0100 +Subject: [PATCH 13/14] ARM: OMAP: Beagle: clarify CAM_EN power + +Signed-off-by: Koen Kooi <koen@beagleboard.org> +--- + arch/arm/mach-omap2/board-omap3beagle.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index f63f319..c3f8b69 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -417,7 +417,7 @@ static int beagle_twl_gpio_setup(struct device *dev, + gpio_direction_output(gpio + 1, 0); + } + +- /* Power on camera interface */ ++ /* Power on camera interface on P7/P8 or DVI on A2 and beyond */ + if (omap3_beagle_get_rev() == OMAP3BEAGLE_BOARD_XM) { + gpio_request(gpio + 2, "CAM_EN"); + gpio_direction_output(gpio + 2, 1); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.37rc/0014-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch b/recipes/linux/linux-omap-2.6.37rc/0014-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch new file mode 100644 index 0000000000..ae98923457 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.37rc/0014-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch @@ -0,0 +1,57 @@ +From 8b3ec1b570be50d4488c2b865dc76ef47eccf699 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Sun, 5 Dec 2010 13:25:00 +0100 +Subject: [PATCH 14/14] ARM: OMAP: beagleboard: pre-export GPIOs to userspace when using a Tincantools trainerboard + +This really needs a for loop, patches welcome + +Signed-off-by: Koen Kooi <koen@beagleboard.org> +--- + arch/arm/mach-omap2/board-omap3beagle.c | 31 +++++++++++++++++++++++++++++++ + 1 files changed, 31 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index c3f8b69..60e7fa6 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -729,6 +729,37 @@ static void __init omap3_beagle_init(void) + mmc[1].gpio_cd = 162; + } + ++ if(!strcmp(expansionboard_name, "trainer")) ++ { ++ printk(KERN_INFO "Beagle expansionboard: exporting GPIOs 130-141,162 to userspace\n"); ++ gpio_request(130, "sysfs"); ++ gpio_export(130, 1); ++ gpio_request(131, "sysfs"); ++ gpio_export(131, 1); ++ gpio_request(132, "sysfs"); ++ gpio_export(132, 1); ++ gpio_request(133, "sysfs"); ++ gpio_export(133, 1); ++ gpio_request(134, "sysfs"); ++ gpio_export(134, 1); ++ gpio_request(135, "sysfs"); ++ gpio_export(135, 1); ++ gpio_request(136, "sysfs"); ++ gpio_export(136, 1); ++ gpio_request(137, "sysfs"); ++ gpio_export(137, 1); ++ gpio_request(138, "sysfs"); ++ gpio_export(138, 1); ++ gpio_request(139, "sysfs"); ++ gpio_export(139, 1); ++ gpio_request(140, "sysfs"); ++ gpio_export(140, 1); ++ gpio_request(141, "sysfs"); ++ gpio_export(141, 1); ++ gpio_request(162, "sysfs"); ++ gpio_export(162, 1); ++ } ++ + usb_musb_init(&musb_board_data); + usb_ehci_init(&ehci_pdata); + omap3beagle_flash_init(); +-- +1.6.6.1 + diff --git a/recipes/linux/linux-omap-2.6.37rc/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.37rc/beagleboard/defconfig index e4c4b447ce..ec50299376 100644 --- a/recipes/linux/linux-omap-2.6.37rc/beagleboard/defconfig +++ b/recipes/linux/linux-omap-2.6.37rc/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux/arm 2.6.37-rc2 Kernel Configuration -# Fri Nov 19 14:06:22 2010 +# Linux/arm 2.6.37-rc4 Kernel Configuration +# Sat Dec 4 22:00:31 2010 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -86,6 +86,7 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_MEM_RES_CTLR=y CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y +CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y CONFIG_RT_GROUP_SCHED=y @@ -312,7 +313,7 @@ CONFIG_MACH_OMAP3_BEAGLE=y # CONFIG_MACH_OVERO is not set # CONFIG_MACH_OMAP3EVM is not set # CONFIG_MACH_OMAP3517EVM is not set -CONFIG_MACH_CRANEBOARD=y +# CONFIG_MACH_CRANEBOARD is not set # CONFIG_MACH_OMAP3_PANDORA is not set # CONFIG_MACH_OMAP3_TOUCHBOOK is not set # CONFIG_MACH_OMAP_3430SDP is not set @@ -479,7 +480,6 @@ CONFIG_SUSPEND_FREEZER=y # CONFIG_APM_EMULATION is not set CONFIG_PM_RUNTIME=y CONFIG_PM_OPS=y -CONFIG_PM_OPP=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_NET=y @@ -2405,11 +2405,8 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_R8A66597_HCD is not set # CONFIG_USB_HWA_HCD is not set CONFIG_USB_MUSB_HDRC=y -CONFIG_USB_MUSB_SOC=y - -# -# OMAP 343x high speed USB support -# +# CONFIG_USB_MUSB_TUSB6010 is not set +CONFIG_USB_MUSB_OMAP2PLUS=y # CONFIG_USB_MUSB_AM35X is not set # CONFIG_USB_MUSB_HOST is not set # CONFIG_USB_MUSB_PERIPHERAL is not set @@ -2762,7 +2759,7 @@ CONFIG_ADIS16255=m # CONFIG_LIRC_STAGING is not set CONFIG_SMB_FS=m # CONFIG_SMB_NLS_DEFAULT is not set -CONFIG_EASYCAP=m +# CONFIG_EASYCAP is not set # CONFIG_TIDSPBRIDGE is not set # CONFIG_MACH_OMAP3_WESTBRIDGE_AST_PNAND_HAL is not set CONFIG_MACH_NO_WESTBRIDGE=y diff --git a/recipes/linux/linux-omap_2.6.37rc.bb b/recipes/linux/linux-omap_2.6.37rc.bb index e641563350..72fb17a68d 100644 --- a/recipes/linux/linux-omap_2.6.37rc.bb +++ b/recipes/linux/linux-omap_2.6.37rc.bb @@ -6,9 +6,9 @@ KERNEL_IMAGETYPE = "uImage" COMPATIBLE_MACHINE = "beagleboard" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -PV = "2.6.36+2.6.37-rc3" +PV = "2.6.36+2.6.37-rc4" MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}" -SRCREV = "063d907edaf3fbf9776c189c3e02f2c7a129d18c" +SRCREV = "a04fd22204b13ce34a3f8a8157f83c44d64f8da9" FILESPATHPKG_prepend = "linux-omap-2.6.37rc:" @@ -24,6 +24,12 @@ SRC_URI_append = " \ file://0006-MTD-silence-ecc-errors-on-mtdblock0.patch \ file://0007-Miracle-patch.patch \ file://0008-ARM-OMAP-add-omap_rev_-macros.patch \ + file://0009-omap-Beagle-detect-new-xM-revision-B.patch \ + file://0010-OMAP-DSS2-enable-hsclk-in-dsi_pll_init-for-OMAP36XX.patch \ +# file://0011-omap3-Increase-limit-on-bootarg-mpurate.patch \ + file://0012-AM37x-Switch-SGX-clocks-to-200MHz.patch \ + file://0013-ARM-OMAP-Beagle-clarify-CAM_EN-power.patch \ + file://0014-ARM-OMAP-beagleboard-pre-export-GPIOs-to-userspace-w.patch \ " SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ |