From 363dc06e79fd13b277a506967b46a77ffbec8d7d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 9 May 2008 19:08:08 +0000 Subject: linux-omap2 git: add working DVI patch (sent upstream for review), update defconfig --- ...e-add-driver-to-turn-on-the-TFP410-framer.patch | 186 ++++++++++++++++++++ .../beagleboard/beagle-dvi-first-try.diff | 187 --------------------- .../linux/linux-omap2-git/beagleboard/defconfig | 18 +- packages/linux/linux-omap2_git.bb | 4 +- 4 files changed, 200 insertions(+), 195 deletions(-) create mode 100644 packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch delete mode 100644 packages/linux/linux-omap2-git/beagleboard/beagle-dvi-first-try.diff diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch b/packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch new file mode 100644 index 0000000000..e58c90adea --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch @@ -0,0 +1,186 @@ +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 0c0cbfc..c992cc7 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -63,12 +63,23 @@ static struct platform_device omap3_beagle_twl4030rtc_device = { + .id = -1, + }; + ++static struct platform_device omap3_beagle_lcd_device = { ++ .name = "omap3beagle_lcd", ++ .id = -1, ++}; ++ ++static struct omap_lcd_config omap3_beagle_lcd_config __initdata = { ++ .ctrl_name = "internal", ++}; ++ + static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { + { OMAP_TAG_UART, &omap3_beagle_uart_config }, + { OMAP_TAG_MMC, &omap3beagle_mmc_config }, ++ { OMAP_TAG_LCD, &omap3_beagle_lcd_config }, + }; + + static struct platform_device *omap3_beagle_devices[] __initdata = { ++ &omap3_beagle_lcd_device, + #ifdef CONFIG_RTC_DRV_TWL4030 + &omap3_beagle_twl4030rtc_device, + #endif +diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile +index cad6a68..fe7ee5d 100644 +--- a/drivers/video/omap/Makefile ++++ b/drivers/video/omap/Makefile +@@ -32,6 +32,7 @@ objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o + objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o + objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o + objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o ++objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o + objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o + + omapfb-objs := $(objs-yy) +diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c +new file mode 100644 +index 0000000..d49101a +--- /dev/null ++++ b/drivers/video/omap/lcd_omap3beagle.c +@@ -0,0 +1,140 @@ ++/* ++ * LCD panel support for the TI OMAP3 Beagle board ++ * ++ * Author: Koen Kooi ++ * ++ * Derived from drivers/video/omap/lcd-omap3evm.c ++ * ++ * This program is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by the ++ * Free Software Foundation; either version 2 of the License, or (at your ++ * option) any later version. ++ * ++ * 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., ++ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++ ++#define LCD_PANEL_ENABLE_GPIO 170 ++ ++#define LCD_XRES 1024 ++#define LCD_YRES 768 ++#define LCD_PIXCLOCK_MAX 64000 /* in pico seconds */ ++#define LCD_PIXCLOCK_MIN 64000 /* in pico seconds */ ++ ++#define ENABLE_VDAC_DEDICATED 0x03 ++#define ENABLE_VDAC_DEV_GRP 0x20 ++#define ENABLE_VPLL2_DEDICATED 0x05 ++#define ENABLE_VPLL2_DEV_GRP 0xE0 ++ ++static int omap3beagle_panel_init(struct lcd_panel *panel, ++ struct omapfb_device *fbdev) ++{ ++ omap_request_gpio(LCD_PANEL_ENABLE_GPIO); ++ ++ return 0; ++} ++ ++static void omap3beagle_panel_cleanup(struct lcd_panel *panel) ++{ ++} ++ ++static int omap3beagle_panel_enable(struct lcd_panel *panel) ++{ ++ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 1); ++ return 0; ++} ++ ++static void omap3beagle_panel_disable(struct lcd_panel *panel) ++{ ++ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 0); ++} ++ ++static unsigned long omap3beagle_panel_get_caps(struct lcd_panel *panel) ++{ ++ return 0; ++} ++ ++struct lcd_panel omap3beagle_panel = { ++ .name = "omap3beagle", ++ .config = OMAP_LCDC_PANEL_TFT, ++ ++ .bpp = 24, ++ .data_lines = 24, ++ .x_res = LCD_XRES, ++ .y_res = LCD_YRES, ++ .hsw = 3, /* hsync_len (4) - 1 */ ++ .hfp = 3, /* right_margin (4) - 1 */ ++ .hbp = 39, /* left_margin (40) - 1 */ ++ .vsw = 1, /* vsync_len (2) - 1 */ ++ .vfp = 2, /* lower_margin */ ++ .vbp = 7, /* upper_margin (8) - 1 */ ++ ++ .pixel_clock = LCD_PIXCLOCK_MAX, ++ ++ .init = omap3beagle_panel_init, ++ .cleanup = omap3beagle_panel_cleanup, ++ .enable = omap3beagle_panel_enable, ++ .disable = omap3beagle_panel_disable, ++ .get_caps = omap3beagle_panel_get_caps, ++}; ++ ++static int omap3beagle_panel_probe(struct platform_device *pdev) ++{ ++ omapfb_register_panel(&omap3beagle_panel); ++ return 0; ++} ++ ++static int omap3beagle_panel_remove(struct platform_device *pdev) ++{ ++ return 0; ++} ++ ++static int omap3beagle_panel_suspend(struct platform_device *pdev, ++ pm_message_t mesg) ++{ ++ return 0; ++} ++ ++static int omap3beagle_panel_resume(struct platform_device *pdev) ++{ ++ return 0; ++} ++ ++struct platform_driver omap3beagle_panel_driver = { ++ .probe = omap3beagle_panel_probe, ++ .remove = omap3beagle_panel_remove, ++ .suspend = omap3beagle_panel_suspend, ++ .resume = omap3beagle_panel_resume, ++ .driver = { ++ .name = "omap3beagle_lcd", ++ .owner = THIS_MODULE, ++ }, ++}; ++ ++static int __init omap3beagle_panel_drv_init(void) ++{ ++ return platform_driver_register(&omap3beagle_panel_driver); ++} ++ ++static void __exit omap3beagle_panel_drv_exit(void) ++{ ++ platform_driver_unregister(&omap3beagle_panel_driver); ++} ++ ++module_init(omap3beagle_panel_drv_init); ++module_exit(omap3beagle_panel_drv_exit); diff --git a/packages/linux/linux-omap2-git/beagleboard/beagle-dvi-first-try.diff b/packages/linux/linux-omap2-git/beagleboard/beagle-dvi-first-try.diff deleted file mode 100644 index b6f9615ec4..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/beagle-dvi-first-try.diff +++ /dev/null @@ -1,187 +0,0 @@ -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 0c0cbfc..c992cc7 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -63,12 +63,23 @@ static struct platform_device omap3_beagle_twl4030rtc_device = { - .id = -1, - }; - -+static struct platform_device omap3_beagle_lcd_device = { -+ .name = "omap3beagle_lcd", -+ .id = -1, -+}; -+ -+static struct omap_lcd_config omap3_beagle_lcd_config __initdata = { -+ .ctrl_name = "internal", -+}; -+ - static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { - { OMAP_TAG_UART, &omap3_beagle_uart_config }, - { OMAP_TAG_MMC, &omap3beagle_mmc_config }, -+ { OMAP_TAG_LCD, &omap3_beagle_lcd_config }, - }; - - static struct platform_device *omap3_beagle_devices[] __initdata = { -+ &omap3_beagle_lcd_device, - #ifdef CONFIG_RTC_DRV_TWL4030 - &omap3_beagle_twl4030rtc_device, - #endif -diff --git a/drivers/video/omap/Makefile b/drivers/video/omap/Makefile -index cad6a68..fe7ee5d 100644 ---- a/drivers/video/omap/Makefile -+++ b/drivers/video/omap/Makefile -@@ -32,6 +32,7 @@ objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o - objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o - objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o - objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o -+objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o - objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o - - omapfb-objs := $(objs-yy) -diff --git a/drivers/video/omap/lcd_omap3beagle.c b/drivers/video/omap/lcd_omap3beagle.c -new file mode 100644 -index 0000000..99343b1 ---- /dev/null -+++ b/drivers/video/omap/lcd_omap3beagle.c -@@ -0,0 +1,141 @@ -+/* -+ * LCD panel support for the TI OMAP3 Beagle board -+ * -+ * Author: Koen Kooi -+ * -+ * Derived from drivers/video/omap/lcd-omap3evm.c -+ * -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the -+ * Free Software Foundation; either version 2 of the License, or (at your -+ * option) any later version. -+ * -+ * 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., -+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ */ -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+#define LCD_PANEL_ENABLE_GPIO 170 -+ -+#define LCD_XRES 1024 -+#define LCD_YRES 768 -+#define LCD_PIXCLOCK_MAX 16700 /* in pico seconds */ -+#define LCD_PIXCLOCK_MIN 15200 /* in pico seconds */ -+ -+#define ENABLE_VDAC_DEDICATED 0x03 -+#define ENABLE_VDAC_DEV_GRP 0x20 -+#define ENABLE_VPLL2_DEDICATED 0x05 -+#define ENABLE_VPLL2_DEV_GRP 0xE0 -+ -+static int omap3beagle_panel_init(struct lcd_panel *panel, -+ struct omapfb_device *fbdev) -+{ -+ omap_request_gpio(LCD_PANEL_ENABLE_GPIO); -+ -+ return 0; -+} -+ -+static void omap3beagle_panel_cleanup(struct lcd_panel *panel) -+{ -+} -+ -+static int omap3beagle_panel_enable(struct lcd_panel *panel) -+{ -+ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 0); -+ return 0; -+} -+ -+static void omap3beagle_panel_disable(struct lcd_panel *panel) -+{ -+ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 1); -+} -+ -+static unsigned long omap3beagle_panel_get_caps(struct lcd_panel *panel) -+{ -+ return 0; -+} -+ -+struct lcd_panel omap3beagle_panel = { -+ .name = "omap3beagle", -+ .config = OMAP_LCDC_PANEL_TFT | OMAP_LCDC_INV_VSYNC | -+ OMAP_LCDC_INV_HSYNC, -+ -+ .bpp = 16, -+ .data_lines = 18, -+ .x_res = LCD_XRES, -+ .y_res = LCD_YRES, -+ .hsw = 3, /* hsync_len (4) - 1 */ -+ .hfp = 3, /* right_margin (4) - 1 */ -+ .hbp = 39, /* left_margin (40) - 1 */ -+ .vsw = 1, /* vsync_len (2) - 1 */ -+ .vfp = 2, /* lower_margin */ -+ .vbp = 7, /* upper_margin (8) - 1 */ -+ -+ .pixel_clock = LCD_PIXCLOCK_MAX, -+ -+ .init = omap3beagle_panel_init, -+ .cleanup = omap3beagle_panel_cleanup, -+ .enable = omap3beagle_panel_enable, -+ .disable = omap3beagle_panel_disable, -+ .get_caps = omap3beagle_panel_get_caps, -+}; -+ -+static int omap3beagle_panel_probe(struct platform_device *pdev) -+{ -+ omapfb_register_panel(&omap3beagle_panel); -+ return 0; -+} -+ -+static int omap3beagle_panel_remove(struct platform_device *pdev) -+{ -+ return 0; -+} -+ -+static int omap3beagle_panel_suspend(struct platform_device *pdev, -+ pm_message_t mesg) -+{ -+ return 0; -+} -+ -+static int omap3beagle_panel_resume(struct platform_device *pdev) -+{ -+ return 0; -+} -+ -+struct platform_driver omap3beagle_panel_driver = { -+ .probe = omap3beagle_panel_probe, -+ .remove = omap3beagle_panel_remove, -+ .suspend = omap3beagle_panel_suspend, -+ .resume = omap3beagle_panel_resume, -+ .driver = { -+ .name = "omap3beagle_lcd", -+ .owner = THIS_MODULE, -+ }, -+}; -+ -+static int __init omap3beagle_panel_drv_init(void) -+{ -+ return platform_driver_register(&omap3beagle_panel_driver); -+} -+ -+static void __exit omap3beagle_panel_drv_exit(void) -+{ -+ platform_driver_unregister(&omap3beagle_panel_driver); -+} -+ -+module_init(omap3beagle_panel_drv_init); -+module_exit(omap3beagle_panel_drv_exit); diff --git a/packages/linux/linux-omap2-git/beagleboard/defconfig b/packages/linux/linux-omap2-git/beagleboard/defconfig index 9e2c6d4034..8d238c6594 100644 --- a/packages/linux/linux-omap2-git/beagleboard/defconfig +++ b/packages/linux/linux-omap2-git/beagleboard/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.26-rc1-omap1 -# Wed May 7 10:17:18 2008 +# Fri May 9 20:17:52 2008 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -688,7 +688,6 @@ CONFIG_USB_ZD1201=m # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_RTL8187 is not set # CONFIG_P54_COMMON is not set -# CONFIG_IWLWIFI is not set # CONFIG_IWLWIFI_LEDS is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y @@ -1229,13 +1228,17 @@ CONFIG_FB_DEFERRED_IO=y CONFIG_FB_OMAP=y # CONFIG_FB_OMAP_LCDC_EXTERNAL is not set # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set -CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Display device support # -# CONFIG_DISPLAY_SUPPORT is not set +CONFIG_DISPLAY_SUPPORT=y + +# +# Display hardware drivers +# # # Console display driver support @@ -1248,7 +1251,10 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y # CONFIG_FONTS is not set CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -# CONFIG_LOGO is not set +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y # # Sound @@ -1358,7 +1364,7 @@ CONFIG_USB_SUSPEND=y # USB Host Controller Drivers # # CONFIG_USB_C67X00_HCD is not set -CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD=y CONFIG_OMAP_EHCI_PHY_MODE=y # CONFIG_OMAP_EHCI_TLL_MODE is not set CONFIG_USB_EHCI_ROOT_HUB_TT=y diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index ac8a59e99e..545817b860 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA SRCREV = "cb170dcdce58de20b045ae964a4ccfc29aad1647" PV = "2.6.25+2.6.26-rc1+git${SRCREV}" -PR = "r10" +PR = "r11" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ @@ -15,7 +15,7 @@ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://usb-timout.patch;patch=1 \ file://l2-cache.patch;patch=1 \ file://0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch;patch=1 \ -# file://beagle-dvi-first-try.diff;patch=1 \ + file://0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch;patch=1 \ " COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard" -- cgit v1.2.3