From 1e58e809753a45191c1e99c207598a461e75488e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 22 Aug 2011 22:41:18 +0200 Subject: linux 3.0: fix uLCD poweron for beagleboard Signed-off-by: Koen Kooi --- ...ays-Add-support-for-ThreeFiveCorp-S9700-D.patch | 4 +- .../ulcd/0002-omap3-beagle-added-lcd-driver.patch | 4 +- ...003-Make-fbset-show-correct-timing-values.patch | 40 ------------------ ...d-Set-LCD-power-enable-GPIO-in-board-file.patch | 49 ++++++++++++++++++++++ ...004-Make-fbset-show-correct-timing-values.patch | 40 ++++++++++++++++++ recipes-kernel/linux/linux_3.0.bb | 5 ++- 6 files changed, 96 insertions(+), 46 deletions(-) delete mode 100644 recipes-kernel/linux/linux-3.0/ulcd/0003-Make-fbset-show-correct-timing-values.patch create mode 100644 recipes-kernel/linux/linux-3.0/ulcd/0003-lcd-Set-LCD-power-enable-GPIO-in-board-file.patch create mode 100644 recipes-kernel/linux/linux-3.0/ulcd/0004-Make-fbset-show-correct-timing-values.patch diff --git a/recipes-kernel/linux/linux-3.0/ulcd/0001-omap2-displays-Add-support-for-ThreeFiveCorp-S9700-D.patch b/recipes-kernel/linux/linux-3.0/ulcd/0001-omap2-displays-Add-support-for-ThreeFiveCorp-S9700-D.patch index 6912aa21..926398d1 100644 --- a/recipes-kernel/linux/linux-3.0/ulcd/0001-omap2-displays-Add-support-for-ThreeFiveCorp-S9700-D.patch +++ b/recipes-kernel/linux/linux-3.0/ulcd/0001-omap2-displays-Add-support-for-ThreeFiveCorp-S9700-D.patch @@ -1,7 +1,7 @@ -From 1890f67c9114d6fdf7696d6fa4eef62b1d7f74c4 Mon Sep 17 00:00:00 2001 +From 364e5e30ff9257f1bac68d7f30f3e7f51e8b1bfc Mon Sep 17 00:00:00 2001 From: Roger Monk Date: Wed, 10 Aug 2011 16:54:34 +0200 -Subject: [PATCH 1/3] omap2-displays: Add support for ThreeFiveCorp S9700 Display +Subject: [PATCH 1/4] omap2-displays: Add support for ThreeFiveCorp S9700 Display * Add support for s9700rtwv35tr01b display panel * This is used on BeagleBoardToys ULCD/-lite daugtercards diff --git a/recipes-kernel/linux/linux-3.0/ulcd/0002-omap3-beagle-added-lcd-driver.patch b/recipes-kernel/linux/linux-3.0/ulcd/0002-omap3-beagle-added-lcd-driver.patch index 8eea97df..a0d3b3c1 100644 --- a/recipes-kernel/linux/linux-3.0/ulcd/0002-omap3-beagle-added-lcd-driver.patch +++ b/recipes-kernel/linux/linux-3.0/ulcd/0002-omap3-beagle-added-lcd-driver.patch @@ -1,7 +1,7 @@ -From 807d261326e06903007c95457d6934588a483be0 Mon Sep 17 00:00:00 2001 +From 6b0587615fd0099261d049be17f12eae9f92ae85 Mon Sep 17 00:00:00 2001 From: Jason Kridner Date: Fri, 5 Aug 2011 18:07:09 +0000 -Subject: [PATCH 2/3] omap3: beagle: added lcd driver +Subject: [PATCH 2/4] omap3: beagle: added lcd driver This enables the tfc_s9700_panel by default. Needs to be extended to redefine the driver name at boot time. diff --git a/recipes-kernel/linux/linux-3.0/ulcd/0003-Make-fbset-show-correct-timing-values.patch b/recipes-kernel/linux/linux-3.0/ulcd/0003-Make-fbset-show-correct-timing-values.patch deleted file mode 100644 index e362c595..00000000 --- a/recipes-kernel/linux/linux-3.0/ulcd/0003-Make-fbset-show-correct-timing-values.patch +++ /dev/null @@ -1,40 +0,0 @@ -From cddc76248e1bec4d8cd345c72fcb0ff7c0e22054 Mon Sep 17 00:00:00 2001 -From: Joel A Fernandes -Date: Wed, 17 Aug 2011 00:28:49 -0500 -Subject: [PATCH 3/3] Make fbset show correct timing values - -Signed-off-by: Joel A Fernandes -Cc: "Monk, Roger" ---- - .../omap2/displays/panel-tfc-s9700rtwv35tr01b.c | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -diff --git a/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c b/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c -index c2a1a19..6afd4e3 100644 ---- a/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c -+++ b/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c -@@ -88,6 +88,12 @@ static int tfc_panel_resume(struct omap_dss_device *dssdev) - return tfc_panel_enable(dssdev); - } - -+static void tfc_panel_get_timings(struct omap_dss_device *dssdev, -+ struct omap_video_timings *timings) -+{ -+ *timings = dssdev->panel.timings; -+} -+ - static struct omap_dss_driver tfc_s9700_driver = { - .probe = tfc_panel_probe, - .remove = tfc_panel_remove, -@@ -96,7 +102,7 @@ static struct omap_dss_driver tfc_s9700_driver = { - .disable = tfc_panel_disable, - .suspend = tfc_panel_suspend, - .resume = tfc_panel_resume, -- -+ .get_timings = tfc_panel_get_timings, - .driver = { - .name = "tfc_s9700_panel", - .owner = THIS_MODULE, --- -1.6.6.1 - diff --git a/recipes-kernel/linux/linux-3.0/ulcd/0003-lcd-Set-LCD-power-enable-GPIO-in-board-file.patch b/recipes-kernel/linux/linux-3.0/ulcd/0003-lcd-Set-LCD-power-enable-GPIO-in-board-file.patch new file mode 100644 index 00000000..ccc510f0 --- /dev/null +++ b/recipes-kernel/linux/linux-3.0/ulcd/0003-lcd-Set-LCD-power-enable-GPIO-in-board-file.patch @@ -0,0 +1,49 @@ +From 4b175ec2e08d1fa4a0bbaeb79ee2381164572fba Mon Sep 17 00:00:00 2001 +From: Joel A Fernandes +Date: Thu, 18 Aug 2011 16:19:40 -0500 +Subject: [PATCH 3/4] lcd: Set LCD power-enable GPIO in board file + +With this, the ULCD-lite display works with the 3.0 kernel + +v2 changes: +Fixed the beagle_config structure + +Signed-off-by: Joel A Fernandes +--- + arch/arm/mach-omap2/board-omap3beagle.c | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index b525a5e..6b0afda 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -85,12 +85,14 @@ static struct { + int reset_gpio; + int usr_button_gpio; + char *lcd_driver_name; ++ int lcd_pwren; + } beagle_config = { + .mmc1_gpio_wp = -EINVAL, + .usb_pwr_level = GPIOF_OUT_INIT_LOW, + .reset_gpio = 129, + .usr_button_gpio = 4, + .lcd_driver_name = "", ++ .lcd_pwren = 156 + }; + + static struct gpio omap3_beagle_rev_gpios[] __initdata = { +@@ -423,6 +425,11 @@ static void __init beagle_display_init(void) + { + int r; + ++ r = gpio_request_one(beagle_config.lcd_pwren, GPIOF_OUT_INIT_LOW, ++ "LCD power"); ++ if (r < 0) ++ printk(KERN_ERR "Unable to get LCD power enable GPIO\n"); ++ + r = gpio_request_one(beagle_dvi_device.reset_gpio, GPIOF_OUT_INIT_LOW, + "DVI reset"); + if (r < 0) +-- +1.6.6.1 + diff --git a/recipes-kernel/linux/linux-3.0/ulcd/0004-Make-fbset-show-correct-timing-values.patch b/recipes-kernel/linux/linux-3.0/ulcd/0004-Make-fbset-show-correct-timing-values.patch new file mode 100644 index 00000000..fb37e96a --- /dev/null +++ b/recipes-kernel/linux/linux-3.0/ulcd/0004-Make-fbset-show-correct-timing-values.patch @@ -0,0 +1,40 @@ +From 1d70480dca0c7648f5f51fad5ffb0e191212615a Mon Sep 17 00:00:00 2001 +From: Joel A Fernandes +Date: Wed, 17 Aug 2011 00:28:49 -0500 +Subject: [PATCH 4/4] Make fbset show correct timing values + +Signed-off-by: Joel A Fernandes +Cc: "Monk, Roger" +--- + .../omap2/displays/panel-tfc-s9700rtwv35tr01b.c | 8 +++++++- + 1 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c b/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c +index c2a1a19..6afd4e3 100644 +--- a/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c ++++ b/drivers/video/omap2/displays/panel-tfc-s9700rtwv35tr01b.c +@@ -88,6 +88,12 @@ static int tfc_panel_resume(struct omap_dss_device *dssdev) + return tfc_panel_enable(dssdev); + } + ++static void tfc_panel_get_timings(struct omap_dss_device *dssdev, ++ struct omap_video_timings *timings) ++{ ++ *timings = dssdev->panel.timings; ++} ++ + static struct omap_dss_driver tfc_s9700_driver = { + .probe = tfc_panel_probe, + .remove = tfc_panel_remove, +@@ -96,7 +102,7 @@ static struct omap_dss_driver tfc_s9700_driver = { + .disable = tfc_panel_disable, + .suspend = tfc_panel_suspend, + .resume = tfc_panel_resume, +- ++ .get_timings = tfc_panel_get_timings, + .driver = { + .name = "tfc_s9700_panel", + .owner = THIS_MODULE, +-- +1.6.6.1 + diff --git a/recipes-kernel/linux/linux_3.0.bb b/recipes-kernel/linux/linux_3.0.bb index 5d559553..18f0b384 100644 --- a/recipes-kernel/linux/linux_3.0.bb +++ b/recipes-kernel/linux/linux_3.0.bb @@ -10,7 +10,7 @@ PV = "3.0.3" SRCREV_pn-${PN} = "d31bf2883542cd3414674238f94123bd1d9c0b9f" # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc -MACHINE_KERNEL_PR_append = "a" +MACHINE_KERNEL_PR_append = "b" FILESPATH =. "${FILE_DIRNAME}/linux-3.0:${FILE_DIRNAME}/linux-3.0/${MACHINE}:" @@ -219,7 +219,8 @@ SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-3.0.y.git \ file://ulcd/0001-omap2-displays-Add-support-for-ThreeFiveCorp-S9700-D.patch \ file://ulcd/0002-omap3-beagle-added-lcd-driver.patch \ - file://ulcd/0003-Make-fbset-show-correct-timing-values.patch \ + file://ulcd/0003-lcd-Set-LCD-power-enable-GPIO-in-board-file.patch \ + file://ulcd/0004-Make-fbset-show-correct-timing-values.patch \ \ file://omap4/0001-OMAP-Fix-linking-error-in-twl-common.c-for-OMAP2-3-4.patch \ \ -- cgit v1.2.3-54-g00ecf