diff options
author | Koen Kooi <k-kooi@ti.com> | 2010-02-25 16:12:56 +0100 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2010-04-12 19:43:20 +0200 |
commit | b14ca0169babf5bd2a599b19ee156427b822ab00 (patch) | |
tree | b2e13fad6aca56259cded0a3aa3c8805ad2dbd59 /recipes/linux/linux-omap-psp-2.6.32/beagleboard | |
parent | 73efa8afa568d88ebf94563e9200fbcdfb669fbe (diff) |
linux-omap-psp 2.6.32: update to latest PSP git
* refresh patches and make them all git am'able
* Add initial beagleboardXM support
* make it the default for beagleboard
* turn off rtc-ds1307 since it renders beagles without zippy expansion boards unbootable
* PSP git broke multi usb gadget, disable it for now
Diffstat (limited to 'recipes/linux/linux-omap-psp-2.6.32/beagleboard')
3 files changed, 14 insertions, 136 deletions
diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/0001-beagleboard-omap3_-foo-_rate_table-omap35x_-foo.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/0001-beagleboard-omap3_-foo-_rate_table-omap35x_-foo.patch deleted file mode 100644 index 9079185618..0000000000 --- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/0001-beagleboard-omap3_-foo-_rate_table-omap35x_-foo.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3f0c5ac9e0724a77adc7cd8f9ef058d8d7973ff6 Mon Sep 17 00:00:00 2001 -From: OpenEmbedded User <oe@OE-builder.(none)> -Date: Wed, 27 Jan 2010 21:57:13 +0100 -Subject: [PATCH] beagleboard: omap3_<foo>_rate_table -> omap35x_<foo>_rate_table - ---- - arch/arm/mach-omap2/board-omap3beagle.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 3b7f6ec..1caaa01 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -502,8 +502,8 @@ static struct platform_device keys_gpio = { - static void __init omap3_beagle_init_irq(void) - { - omap2_init_common_hw(mt46h32m32lf6_sdrc_params, -- mt46h32m32lf6_sdrc_params, omap3_mpu_rate_table, -- omap3_dsp_rate_table, omap3_l3_rate_table); -+ mt46h32m32lf6_sdrc_params, omap35x_mpu_rate_table, -+ omap35x_dsp_rate_table, omap35x_l3_rate_table); - omap_init_irq(); - #ifdef CONFIG_OMAP_32K_TIMER - omap2_gp_clockevent_set_gptimer(12); --- -1.5.4.3 - diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/0001-board-omap3beagle-prepare-for-DM3730-based-Beaglebo.patch b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/0001-board-omap3beagle-prepare-for-DM3730-based-Beaglebo.patch deleted file mode 100644 index 4d2ca54583..0000000000 --- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/0001-board-omap3beagle-prepare-for-DM3730-based-Beaglebo.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 99669461e2ddd9947c30bbd5e49561609cee1367 Mon Sep 17 00:00:00 2001 -From: OpenEmbedded User <oe@OE-builder.(none)> -Date: Mon, 8 Feb 2010 16:30:59 +0100 -Subject: [PATCH] board-omap3beagle: prepare for DM3730 based BeagleboardXM - - * OPP changes copy/pasted from board-omap3evm.c - * EHCI changes copy/pasted from Steve Kipisz' 2.6.33rcX work ---- - arch/arm/mach-omap2/board-omap3beagle.c | 57 ++++++++++++++++++++++++++---- - 1 files changed, 49 insertions(+), 8 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 1caaa01..accf80d 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -53,6 +53,23 @@ - #include "pm.h" - #include "omap3-opp.h" - -+#ifdef CONFIG_PM -+static struct omap_opp * _omap35x_mpu_rate_table = omap35x_mpu_rate_table; -+static struct omap_opp * _omap37x_mpu_rate_table = omap37x_mpu_rate_table; -+static struct omap_opp * _omap35x_dsp_rate_table = omap35x_dsp_rate_table; -+static struct omap_opp * _omap37x_dsp_rate_table = omap37x_dsp_rate_table; -+static struct omap_opp * _omap35x_l3_rate_table = omap35x_l3_rate_table; -+static struct omap_opp * _omap37x_l3_rate_table = omap37x_l3_rate_table; -+#else /* CONFIG_PM */ -+static struct omap_opp * _omap35x_mpu_rate_table = NULL; -+static struct omap_opp * _omap37x_mpu_rate_table = NULL; -+static struct omap_opp * _omap35x_dsp_rate_table = NULL; -+static struct omap_opp * _omap37x_dsp_rate_table = NULL; -+static struct omap_opp * _omap35x_l3_rate_table = NULL; -+static struct omap_opp * _omap37x_l3_rate_table = NULL; -+#endif /* CONFIG_PM */ -+ -+ - #define GPMC_CS0_BASE 0x60 - #define GPMC_CS_SIZE 0x30 - -@@ -303,12 +320,23 @@ static int beagle_twl_gpio_setup(struct device *dev, - * power switch and overcurrent detect - */ - -- gpio_request(gpio + 1, "EHCI_nOC"); -- gpio_direction_input(gpio + 1); -+ if (cpu_is_omap3630()) { -+ gpio_request(gpio + 1, "nDVI_PWR_EN"); -+ gpio_direction_output(gpio + 1, 0); -+ -+ /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ -+ gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); -+ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1); -+ } -+ else { -+ gpio_request(gpio + 1, "EHCI_nOC"); -+ gpio_direction_input(gpio + 1); -+ -+ /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ -+ gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); -+ gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); -+ } - -- /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */ -- gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR"); -- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0); - - /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */ - gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1; -@@ -501,9 +529,22 @@ static struct platform_device keys_gpio = { - - static void __init omap3_beagle_init_irq(void) - { -- omap2_init_common_hw(mt46h32m32lf6_sdrc_params, -- mt46h32m32lf6_sdrc_params, omap35x_mpu_rate_table, -- omap35x_dsp_rate_table, omap35x_l3_rate_table); -+ if (cpu_is_omap3630()) -+ { -+ omap2_init_common_hw(mt46h32m32lf6_sdrc_params, -+ NULL, -+ _omap37x_mpu_rate_table, -+ _omap37x_dsp_rate_table, -+ _omap37x_l3_rate_table); -+ } -+ else -+ { -+ omap2_init_common_hw(mt46h32m32lf6_sdrc_params, -+ NULL, -+ _omap35x_mpu_rate_table, -+ _omap35x_dsp_rate_table, -+ _omap35x_l3_rate_table); -+ } - omap_init_irq(); - #ifdef CONFIG_OMAP_32K_TIMER - omap2_gp_clockevent_set_gptimer(12); --- -1.5.4.3 - diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig index b83e652f20..67ae51069f 100644 --- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig +++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue Feb 9 09:34:08 2010 +# Thu Feb 25 19:07:26 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -255,8 +255,8 @@ CONFIG_OMAP_DM_TIMER=y CONFIG_OMAP_LL_DEBUG_UART3=y # CONFIG_OMAP_LL_DEBUG_NONE is not set # CONFIG_OMAP_PM_NONE is not set -CONFIG_OMAP_PM_NOOP=y -# CONFIG_OMAP_PM_SRF is not set +# CONFIG_OMAP_PM_NOOP is not set +CONFIG_OMAP_PM_SRF=y CONFIG_ARCH_OMAP34XX=y CONFIG_ARCH_OMAP3430=y CONFIG_OMAP_PACKAGE_CBB=y @@ -378,9 +378,9 @@ CONFIG_CPU_FREQ_TABLE=y CONFIG_CPU_FREQ_DEBUG=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y @@ -1616,6 +1616,7 @@ CONFIG_MFD_CORE=y CONFIG_TWL4030_CORE=y CONFIG_TWL4030_POWER=y CONFIG_TWL4030_CODEC=y +# CONFIG_TWL4030_MADC is not set # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set @@ -1733,6 +1734,7 @@ CONFIG_VIDEO_WM8775=m CONFIG_VIDEO_MT9V011=m # CONFIG_VIDEO_TCM825X is not set CONFIG_VIDEO_MT9P012=m +# CONFIG_VIDEO_MT9T111 is not set # CONFIG_VIDEO_DW9710 is not set # CONFIG_VIDEO_OV3640 is not set # CONFIG_VIDEO_IMX046 is not set @@ -1741,8 +1743,8 @@ CONFIG_VIDEO_MT9P012=m CONFIG_VIDEO_SAA711X=m # CONFIG_VIDEO_SAA717X is not set # CONFIG_VIDEO_SAA7191 is not set -CONFIG_VIDEO_TVP514X=m -CONFIG_VIDEO_TVP5150=m +# CONFIG_VIDEO_TVP514X is not set +# CONFIG_VIDEO_TVP5150 is not set # CONFIG_VIDEO_VPX3220 is not set # @@ -1998,10 +2000,9 @@ CONFIG_OMAP2_DSS_VENC=y CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO=y # CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE is not set # CONFIG_OMAP2_DSS_SDI is not set -CONFIG_OMAP2_DSS_DSI=y -CONFIG_OMAP2_DSS_USE_DSI_PLL=y +# CONFIG_OMAP2_DSS_DSI is not set # CONFIG_OMAP2_DSS_FAKE_VSYNC is not set -CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=1 +CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 CONFIG_FB_OMAP2=y CONFIG_FB_OMAP2_DEBUG_SUPPORT=y # CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set @@ -2011,9 +2012,10 @@ CONFIG_FB_OMAP2_NUM_FBS=3 # OMAP2/3 Display Device Drivers # CONFIG_PANEL_GENERIC=y +# CONFIG_PANEL_LGPHILIPS_LB035Q02 is not set +# CONFIG_PANEL_SAMSUNG_LTE430WQ_F0C is not set CONFIG_PANEL_SHARP_LS037V7DW01=y # CONFIG_PANEL_SHARP_LQ043T1DG01 is not set -# CONFIG_PANEL_TAAL is not set # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # @@ -2432,7 +2434,7 @@ CONFIG_RTC_INTF_DEV=y # # I2C RTC drivers # -CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1307=n # CONFIG_RTC_DRV_DS1374 is not set # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_MAX6900 is not set |