diff options
Diffstat (limited to 'packages/linux/linux-omap-2.6.28')
4 files changed, 77 insertions, 35 deletions
diff --git a/packages/linux/linux-omap-2.6.28/0015-OMAPFB-remove-debug-print.patch b/packages/linux/linux-omap-2.6.28/0015-OMAPFB-remove-debug-print.patch new file mode 100644 index 0000000000..ecb7aecba7 --- /dev/null +++ b/packages/linux/linux-omap-2.6.28/0015-OMAPFB-remove-debug-print.patch @@ -0,0 +1,25 @@ +From 73f2a252fc273b6d3ee7daab9681728a915f7236 Mon Sep 17 00:00:00 2001 +From: Tomi Valkeinen <tomi.valkeinen@nokia.com> +Date: Thu, 8 Jan 2009 12:02:07 +0200 +Subject: [PATCH] OMAPFB: remove debug print + +--- + drivers/video/omap2/omapfb-main.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/omap2/omapfb-main.c b/drivers/video/omap2/omapfb-main.c +index 9dbff42..d043c43 100644 +--- a/drivers/video/omap2/omapfb-main.c ++++ b/drivers/video/omap2/omapfb-main.c +@@ -973,8 +973,6 @@ static int omapfb_allocate_all_fbs(struct omapfb2_device *fbdev) + while ((tok = strsep(&s, ","))) { + unsigned long size; + +- printk("param '%s'\n", tok); +- + size = memparse(tok, NULL); + + if (size == 0) { +-- +1.5.6.3 + diff --git a/packages/linux/linux-omap-2.6.28/beagleboard/defconfig b/packages/linux/linux-omap-2.6.28/beagleboard/defconfig index 4e3dd6edc1..d2f0af0c60 100644 --- a/packages/linux/linux-omap-2.6.28/beagleboard/defconfig +++ b/packages/linux/linux-omap-2.6.28/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-omap1 -# Fri Jan 9 17:09:12 2009 +# Wed Jan 14 19:12:03 2009 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -194,6 +194,7 @@ CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MPU_TIMER is not set CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_32K_TIMER_HZ=128 +CONFIG_OMAP_TICK_GPTIMER=12 CONFIG_OMAP_DM_TIMER=y # CONFIG_OMAP_LL_DEBUG_UART1 is not set # CONFIG_OMAP_LL_DEBUG_UART2 is not set @@ -219,7 +220,6 @@ CONFIG_ARCH_OMAP3430=y CONFIG_MACH_OMAP3_BEAGLE=y # CONFIG_MACH_OVERO is not set # CONFIG_MACH_OMAP3_PANDORA is not set -CONFIG_OMAP_TICK_GPTIMER=12 # # Boot options @@ -1040,8 +1040,8 @@ CONFIG_HWMON=y # CONFIG_SENSORS_TSC210X is not set CONFIG_SENSORS_OMAP34XX=y # CONFIG_HWMON_DEBUG_CHIP is not set -# CONFIG_THERMAL is not set -# CONFIG_THERMAL_HWMON is not set +CONFIG_THERMAL=y +CONFIG_THERMAL_HWMON=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_NOWAYOUT=y @@ -1706,7 +1706,7 @@ CONFIG_LEDS_CLASS=y # LED drivers # # CONFIG_LEDS_OMAP_DEBUG is not set -# CONFIG_LEDS_OMAP is not set +CONFIG_LEDS_OMAP=y # CONFIG_LEDS_OMAP_PWM is not set # CONFIG_LEDS_PCA9532 is not set CONFIG_LEDS_GPIO=y @@ -1718,8 +1718,8 @@ CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y -# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set -# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y CONFIG_RTC_HCTOSYS=y diff --git a/packages/linux/linux-omap-2.6.28/musb-hsdma.diff b/packages/linux/linux-omap-2.6.28/musb-hsdma.diff deleted file mode 100644 index 05de732ed0..0000000000 --- a/packages/linux/linux-omap-2.6.28/musb-hsdma.diff +++ /dev/null @@ -1,28 +0,0 @@ -From: Ajay Kumar Gupta <ajay.gupta@ti.com> -Date: Tue, 13 Jan 2009 12:08:44 +0000 (+0200) -Subject: usb: musb: fix bug in musbhsdma programming -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftmlind%2Flinux-omap-2.6.git;a=commitdiff_plain;h=15f75b6226c2d3b82062bb721e7cb9a1d6f35efd - -usb: musb: fix bug in musbhsdma programming - -Mode bit should be set based on function parameter "mode" of -configure_channel() function. - -Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> -Acked-by: Felipe Balbi <felipe.balbi@nokia.com> -Signed-off-by: Tony Lindgren <tony@atomide.com> ---- - -diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c -index 75b15ce..4394bd3 100644 ---- a/drivers/usb/musb/musbhsdma.c -+++ b/drivers/usb/musb/musbhsdma.c -@@ -136,7 +136,7 @@ static void configure_channel(struct dma_channel *channel, - csr |= MUSB_HSDMA_BURSTMODE_INCR4; - - csr |= (musb_channel->epnum << MUSB_HSDMA_ENDPOINT_SHIFT) -- | MUSB_HSDMA_MODE1 -+ | (mode ? MUSB_HSDMA_MODE1 : 0) - | MUSB_HSDMA_ENABLE - | MUSB_HSDMA_IRQENABLE - | (musb_channel->transmit diff --git a/packages/linux/linux-omap-2.6.28/revert-XCCR.patch b/packages/linux/linux-omap-2.6.28/revert-XCCR.patch new file mode 100644 index 0000000000..fe9a91fe21 --- /dev/null +++ b/packages/linux/linux-omap-2.6.28/revert-XCCR.patch @@ -0,0 +1,45 @@ +diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h +index 113c246..c727e89 100644 +--- a/arch/arm/plat-omap/include/mach/mcbsp.h ++++ b/arch/arm/plat-omap/include/mach/mcbsp.h +@@ -235,16 +235,11 @@ + #define XPBBLK(value) ((value)<<7) /* Bits 7:8 */ + + /*********************** McBSP XCCR bit definitions *************************/ +-#define EXTCLKGATE 0x8000 +-#define PPCONNECT 0x4000 +-#define DXENDLY(value) ((value)<<12) /* Bits 12:13 */ +-#define XFULL_CYCLE 0x0800 + #define DILB 0x0020 + #define XDMAEN 0x0008 + #define XDISABLE 0x0001 + + /********************** McBSP RCCR bit definitions *************************/ +-#define RFULL_CYCLE 0x0800 + #define RDMAEN 0x0008 + #define RDISABLE 0x0001 + +@@ -276,8 +271,6 @@ struct omap_mcbsp_reg_cfg { + u16 rcerh; + u16 xcerg; + u16 xcerh; +- u16 xccr; +- u16 rccr; + }; + + typedef enum { +diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c +index e5842e3..6d70d2f 100644 +--- a/arch/arm/plat-omap/mcbsp.c ++++ b/arch/arm/plat-omap/mcbsp.c +@@ -173,10 +173,6 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) + OMAP_MCBSP_WRITE(io_base, MCR2, config->mcr2); + OMAP_MCBSP_WRITE(io_base, MCR1, config->mcr1); + OMAP_MCBSP_WRITE(io_base, PCR0, config->pcr0); +- if (cpu_is_omap2430() || cpu_is_omap34xx()) { +- OMAP_MCBSP_WRITE(io_base, XCCR, config->xccr); +- OMAP_MCBSP_WRITE(io_base, RCCR, config->rccr); +- } + } + EXPORT_SYMBOL(omap_mcbsp_config); + |