diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-09-24 15:36:24 -0700 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-09-24 16:43:21 -0700 |
commit | 239a368d5715d8f5b7733f9400339c2350c49369 (patch) | |
tree | 2953f12b45e590d9e14b6f72f8e4ee7188e41508 /meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-DSS2-Add-Kconfig-option-for-DPI-display-type.patch | |
parent | c5b9525263dac6844d152e40acf8cee4d27b60bc (diff) | |
download | openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.tar.gz openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.tar.bz2 openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.tar.xz openembedded-core-239a368d5715d8f5b7733f9400339c2350c49369.zip |
netbook: Correct netbook build by moving netbook configuration from moblin to meta
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-DSS2-Add-Kconfig-option-for-DPI-display-type.patch')
-rw-r--r-- | meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-DSS2-Add-Kconfig-option-for-DPI-display-type.patch | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-DSS2-Add-Kconfig-option-for-DPI-display-type.patch b/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-DSS2-Add-Kconfig-option-for-DPI-display-type.patch deleted file mode 100644 index c96f97f76..000000000 --- a/meta-moblin/packages/linux/linux-moblin-2.6.33.2/linux-2.6.35-OMAP-DSS2-Add-Kconfig-option-for-DPI-display-type.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 8fe1805debbf54143073a2f85e8568ed7b9ca38b Mon Sep 17 00:00:00 2001 -From: Roger Quadros <roger.quadros@nokia.com> -Date: Wed, 17 Mar 2010 12:35:19 +0000 -Subject: [PATCH 1/10] OMAP: DSS2: Add Kconfig option for DPI display type - -From: Roger Quadros <roger.quadros@nokia.com> - -Patch-mainline: 2.6.35? -Git-repo: http://www.gitorious.org/linux-omap-dss2/linux/commit/36b33efe80eb07e3447107c2bdba3c674c10a41a - -This allows us to disable DPI on systems that do not have it - -Signed-off-by: Roger Quadros <roger.quadros@nokia.com> -Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com> ---- - drivers/video/omap2/dss/Kconfig | 6 ++++++ - drivers/video/omap2/dss/Makefile | 3 ++- - drivers/video/omap2/dss/core.c | 4 ++++ - drivers/video/omap2/dss/display.c | 4 ++++ - 4 files changed, 16 insertions(+), 1 deletions(-) - -diff --git a/drivers/video/omap2/dss/Kconfig b/drivers/video/omap2/dss/Kconfig -index c63ce76..cbe8ea0 100644 ---- a/drivers/video/omap2/dss/Kconfig -+++ b/drivers/video/omap2/dss/Kconfig -@@ -32,6 +32,12 @@ config OMAP2_DSS_COLLECT_IRQ_STATS - help - Collect DSS IRQ statistics, printable via debugfs - -+config OMAP2_DSS_DPI -+ bool "DPI support" -+ default y -+ help -+ DPI Interface. This is the Parallel Display Interface. -+ - config OMAP2_DSS_RFBI - bool "RFBI support" - default n -diff --git a/drivers/video/omap2/dss/Makefile b/drivers/video/omap2/dss/Makefile -index 980c72c..d71b5d9 100644 ---- a/drivers/video/omap2/dss/Makefile -+++ b/drivers/video/omap2/dss/Makefile -@@ -1,5 +1,6 @@ - obj-$(CONFIG_OMAP2_DSS) += omapdss.o --omapdss-y := core.o dss.o dispc.o dpi.o display.o manager.o overlay.o -+omapdss-y := core.o dss.o dispc.o display.o manager.o overlay.o -+omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o - omapdss-$(CONFIG_OMAP2_DSS_RFBI) += rfbi.o - omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o - omapdss-$(CONFIG_OMAP2_DSS_SDI) += sdi.o -diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c -index 82918ee..0988781 100644 ---- a/drivers/video/omap2/dss/core.c -+++ b/drivers/video/omap2/dss/core.c -@@ -473,11 +473,13 @@ static int omap_dss_probe(struct platform_device *pdev) - } - #endif - -+#ifdef CONFIG_OMAP2_DSS_DPI - r = dpi_init(); - if (r) { - DSSERR("Failed to initialize dpi\n"); - goto fail0; - } -+#endif - - r = dispc_init(); - if (r) { -@@ -548,7 +550,9 @@ static int omap_dss_remove(struct platform_device *pdev) - venc_exit(); - #endif - dispc_exit(); -+#ifdef CONFIG_OMAP2_DSS_DPI - dpi_exit(); -+#endif - #ifdef CONFIG_OMAP2_DSS_RFBI - rfbi_exit(); - #endif -diff --git a/drivers/video/omap2/dss/display.c b/drivers/video/omap2/dss/display.c -index 3b92b84..2150f12 100644 ---- a/drivers/video/omap2/dss/display.c -+++ b/drivers/video/omap2/dss/display.c -@@ -405,7 +405,9 @@ void dss_init_device(struct platform_device *pdev, - int r; - - switch (dssdev->type) { -+#ifdef CONFIG_OMAP2_DSS_DPI - case OMAP_DISPLAY_TYPE_DPI: -+#endif - #ifdef CONFIG_OMAP2_DSS_RFBI - case OMAP_DISPLAY_TYPE_DBI: - #endif -@@ -430,9 +432,11 @@ void dss_init_device(struct platform_device *pdev, - dssdev->wait_vsync = default_wait_vsync; - - switch (dssdev->type) { -+#ifdef CONFIG_OMAP2_DSS_DPI - case OMAP_DISPLAY_TYPE_DPI: - r = dpi_init_display(dssdev); - break; -+#endif - #ifdef CONFIG_OMAP2_DSS_RFBI - case OMAP_DISPLAY_TYPE_DBI: - r = rfbi_init_display(dssdev); --- -1.6.0.4 - |