diff options
Diffstat (limited to 'packages/linux/linux-omap-2.6.28')
5 files changed, 64 insertions, 248 deletions
diff --git a/packages/linux/linux-omap-2.6.28/0001-board-omap3beagle-set-i2c-3-to-100kHz.patch b/packages/linux/linux-omap-2.6.28/0001-board-omap3beagle-set-i2c-3-to-100kHz.patch new file mode 100644 index 0000000000..d4a9716349 --- /dev/null +++ b/packages/linux/linux-omap-2.6.28/0001-board-omap3beagle-set-i2c-3-to-100kHz.patch @@ -0,0 +1,30 @@ +From 8364891aa9a99eac26e6069840c00489764d963f Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@beagleboard.org> +Date: Thu, 15 Jan 2009 20:11:07 +0100 +Subject: [PATCH] board-omap3beagle: set i2c-3 to 100kHz + +Changing it do 100kHz is needed to make more devices works properly. Controlling the TI DLP Pico projector[1] doesn't work properly at 400kHz, 100kHz and lower work fine. EDID readout is unaffected by this change. + +[1] http://focus.ti.com/dlpdmd/docs/dlpdiscovery.tsp?sectionId=60&tabId=2234 + +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 fe97bab..f279404 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -227,7 +227,7 @@ static int __init omap3_beagle_i2c_init(void) + #ifdef CONFIG_I2C2_OMAP_BEAGLE + omap_register_i2c_bus(2, 400, NULL, 0); + #endif +- omap_register_i2c_bus(3, 400, NULL, 0); ++ omap_register_i2c_bus(3, 100, NULL, 0); + return 0; + } + +-- +1.5.6.5 + 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/beagle-asoc.diff b/packages/linux/linux-omap-2.6.28/beagleboard/beagle-asoc.diff deleted file mode 100644 index 6763d85c32..0000000000 --- a/packages/linux/linux-omap-2.6.28/beagleboard/beagle-asoc.diff +++ /dev/null @@ -1,212 +0,0 @@ -From: Felipe Contreras <felipe.contreras@gmail.com> -To: linux-omap@vger.kernel.org -Cc: Felipe Contreras <felipe.contreras@gmail.com> -Subject: [PATCH] alsa: add Beagleboard SoC configuration. - -This is exactly the same as the overo configuration. It might make sense -to have them in a single one. - -Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> ---- - -This was suggested by Koen Kooi. - - sound/soc/omap/Kconfig | 8 ++ - sound/soc/omap/Makefile | 2 + - sound/soc/omap/omap3beagle.c | 149 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 159 insertions(+), 0 deletions(-) - create mode 100644 sound/soc/omap/omap3beagle.c - -diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig -index d7b8939..ebad024 100644 ---- a/sound/soc/omap/Kconfig -+++ b/sound/soc/omap/Kconfig -@@ -22,3 +22,11 @@ config SND_OMAP_SOC_OVERO - help - Say Y if you want to add support for SoC audio on the Gumstix Overo. - -+config SND_OMAP_SOC_OMAP3_BEAGLE -+ tristate "SoC Audio support for OMAP3 Beagle" -+ depends on SND_OMAP_SOC && MACH_OMAP3_BEAGLE -+ select SND_OMAP_SOC_MCBSP -+ select SND_SOC_TWL4030 -+ help -+ Say Y if you want to add support for SoC audio on the Beagleboard. -+ -diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile -index b96b97b..09fd0bb 100644 ---- a/sound/soc/omap/Makefile -+++ b/sound/soc/omap/Makefile -@@ -8,7 +8,9 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o - # OMAP Machine Support - snd-soc-n810-objs := n810.o - snd-soc-overo-objs := overo.o -+snd-soc-omap3beagle-objs := omap3beagle.o - - obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o - obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o -+obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o - -diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c -new file mode 100644 -index 0000000..1d0e398 ---- /dev/null -+++ b/sound/soc/omap/omap3beagle.c -@@ -0,0 +1,149 @@ -+/* -+ * omap3beagle.c -- SoC audio for OMAP3 Beagle -+ * -+ * Author: Steve Sakoman <steve@sakoman.com> -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * version 2 as published by the Free Software Foundation. -+ * -+ * This program is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ * -+ */ -+ -+#include <linux/clk.h> -+#include <linux/platform_device.h> -+#include <sound/core.h> -+#include <sound/pcm.h> -+#include <sound/soc.h> -+#include <sound/soc-dapm.h> -+ -+#include <asm/mach-types.h> -+#include <mach/hardware.h> -+#include <mach/gpio.h> -+#include <mach/mcbsp.h> -+ -+#include "omap-mcbsp.h" -+#include "omap-pcm.h" -+#include "../codecs/twl4030.h" -+ -+static int omap3beagle_hw_params(struct snd_pcm_substream *substream, -+ struct snd_pcm_hw_params *params) -+{ -+ struct snd_soc_pcm_runtime *rtd = substream->private_data; -+ struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; -+ struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; -+ int ret; -+ -+ /* Set codec DAI configuration */ -+ ret = snd_soc_dai_set_fmt(codec_dai, -+ SND_SOC_DAIFMT_I2S | -+ SND_SOC_DAIFMT_NB_NF | -+ SND_SOC_DAIFMT_CBM_CFM); -+ if (ret < 0) { -+ printk(KERN_ERR "can't set codec DAI configuration\n"); -+ return ret; -+ } -+ -+ /* Set cpu DAI configuration */ -+ ret = snd_soc_dai_set_fmt(cpu_dai, -+ SND_SOC_DAIFMT_I2S | -+ SND_SOC_DAIFMT_NB_NF | -+ SND_SOC_DAIFMT_CBM_CFM); -+ if (ret < 0) { -+ printk(KERN_ERR "can't set cpu DAI configuration\n"); -+ return ret; -+ } -+ -+ /* Set the codec system clock for DAC and ADC */ -+ ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000, -+ SND_SOC_CLOCK_IN); -+ if (ret < 0) { -+ printk(KERN_ERR "can't set codec system clock\n"); -+ return ret; -+ } -+ -+ return 0; -+} -+ -+static struct snd_soc_ops omap3beagle_ops = { -+ .hw_params = omap3beagle_hw_params, -+}; -+ -+/* Digital audio interface glue - connects codec <--> CPU */ -+static struct snd_soc_dai_link omap3beagle_dai = { -+ .name = "TWL4030", -+ .stream_name = "TWL4030", -+ .cpu_dai = &omap_mcbsp_dai[0], -+ .codec_dai = &twl4030_dai, -+ .ops = &omap3beagle_ops, -+}; -+ -+/* Audio machine driver */ -+static struct snd_soc_machine snd_soc_machine_omap3beagle = { -+ .name = "omap3beagle", -+ .dai_link = &omap3beagle_dai, -+ .num_links = 1, -+}; -+ -+/* Audio subsystem */ -+static struct snd_soc_device omap3beagle_snd_devdata = { -+ .machine = &snd_soc_machine_omap3beagle, -+ .platform = &omap_soc_platform, -+ .codec_dev = &soc_codec_dev_twl4030, -+}; -+ -+static struct platform_device *omap3beagle_snd_device; -+ -+static int __init omap3beagle_soc_init(void) -+{ -+ int ret; -+ -+ printk(KERN_INFO "OMAP3 Beagle SoC init\n"); -+ if (!machine_is_omap3_beagle()) { -+ printk(KERN_ERR "Not OMAP3 Beagle!\n"); -+ return -ENODEV; -+ } -+ -+ omap3beagle_snd_device = platform_device_alloc("soc-audio", -1); -+ if (!omap3beagle_snd_device) { -+ printk(KERN_ERR "Platform device allocation failed\n"); -+ return -ENOMEM; -+ } -+ -+ platform_set_drvdata(omap3beagle_snd_device, &omap3beagle_snd_devdata); -+ omap3beagle_snd_devdata.dev = &omap3beagle_snd_device->dev; -+ *(unsigned int *)omap3beagle_dai.cpu_dai->private_data = 1; /* McBSP2 */ -+ -+ ret = platform_device_add(omap3beagle_snd_device); -+ if (ret) -+ goto err1; -+ -+ return 0; -+ -+err1: -+ printk(KERN_ERR "Unable to add platform device\n"); -+ platform_device_put(omap3beagle_snd_device); -+ -+ return ret; -+} -+ -+static void __exit omap3beagle_soc_exit(void) -+{ -+ platform_device_unregister(omap3beagle_snd_device); -+} -+ -+module_init(omap3beagle_soc_init); -+module_exit(omap3beagle_soc_exit); -+ -+MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>"); -+MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle"); -+MODULE_LICENSE("GPL"); --- -1.6.0.1 - --- -To unsubscribe from this list: send the line "unsubscribe linux-omap" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html - diff --git a/packages/linux/linux-omap-2.6.28/beagleboard/defconfig b/packages/linux/linux-omap-2.6.28/beagleboard/defconfig index 4e3dd6edc1..2a0818ab0f 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 @@ -831,7 +831,8 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set -# CONFIG_INPUT_MISC is not set +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y # # Hardware I/O ports @@ -1040,8 +1041,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 +1707,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 +1719,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 |