Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux (e9ab3207) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/mach-omap2/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -187,16 +187,19 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
		hsmmc.o
		obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom.o \
		board-zoom-peripherals.o \
		board-zoom-display.o \
		board-flash.o \
		hsmmc.o \
		board-zoom-debugboard.o
		obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom.o \
		board-zoom-peripherals.o \
		board-zoom-display.o \
		board-flash.o \
		hsmmc.o \
		board-zoom-debugboard.o
		obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \
		board-zoom-peripherals.o \
		board-zoom-display.o \
		board-flash.o \
		hsmmc.o
		obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \

arch/arm/mach-omap2/board-3430sdp.c

+9 −3

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@
		#include <plat/dma.h>
		#include <plat/gpmc.h>
		#include <plat/display.h>
		#include <plat/panel-generic-dpi.h>

		#include <plat/gpmc-smc91x.h>

		@@ -270,13 +271,18 @@ static struct omap_dss_device sdp3430_lcd_device = {
		.platform_disable = sdp3430_panel_disable_lcd,
		};

		static struct panel_generic_dpi_data dvi_panel = {
		.name = "generic",
		.platform_enable = sdp3430_panel_enable_dvi,
		.platform_disable = sdp3430_panel_disable_dvi,
		};

		static struct omap_dss_device sdp3430_dvi_device = {
		.name = "dvi",
		.driver_name = "generic_panel",
		.type = OMAP_DISPLAY_TYPE_DPI,
		.driver_name = "generic_dpi_panel",
		.data = &dvi_panel,
		.phy.dpi.data_lines = 24,
		.platform_enable = sdp3430_panel_enable_dvi,
		.platform_disable = sdp3430_panel_disable_dvi,
		};

		static struct omap_dss_device sdp3430_tv_device = {

arch/arm/mach-omap2/board-3630sdp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -207,6 +207,7 @@ static void __init omap_sdp_init(void)
		{
		omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
		zoom_peripherals_init();
		zoom_display_init();
		board_smc91x_init();
		board_flash_init(sdp_flash_partitions, chip_sel_sdp);
		enable_board_wakeup_source();

arch/arm/mach-omap2/board-am3517evm.c

+17 −6

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include <plat/common.h>
		#include <plat/usb.h>
		#include <plat/display.h>
		#include <plat/panel-generic-dpi.h>

		#include "mux.h"
		#include "control.h"
		@@ -303,13 +304,18 @@ static void am3517_evm_panel_disable_lcd(struct omap_dss_device *dssdev)
		lcd_enabled = 0;
		}

		static struct panel_generic_dpi_data lcd_panel = {
		.name = "sharp_lq",
		.platform_enable = am3517_evm_panel_enable_lcd,
		.platform_disable = am3517_evm_panel_disable_lcd,
		};

		static struct omap_dss_device am3517_evm_lcd_device = {
		.type = OMAP_DISPLAY_TYPE_DPI,
		.name = "lcd",
		.driver_name = "sharp_lq_panel",
		.driver_name = "generic_dpi_panel",
		.data = &lcd_panel,
		.phy.dpi.data_lines = 16,
		.platform_enable = am3517_evm_panel_enable_lcd,
		.platform_disable = am3517_evm_panel_disable_lcd,
		};

		static int am3517_evm_panel_enable_tv(struct omap_dss_device *dssdev)
		@@ -346,13 +352,18 @@ static void am3517_evm_panel_disable_dvi(struct omap_dss_device *dssdev)
		dvi_enabled = 0;
		}

		static struct panel_generic_dpi_data dvi_panel = {
		.name = "generic",
		.platform_enable = am3517_evm_panel_enable_dvi,
		.platform_disable = am3517_evm_panel_disable_dvi,
		};

		static struct omap_dss_device am3517_evm_dvi_device = {
		.type = OMAP_DISPLAY_TYPE_DPI,
		.name = "dvi",
		.driver_name = "generic_panel",
		.driver_name = "generic_dpi_panel",
		.data = &dvi_panel,
		.phy.dpi.data_lines = 24,
		.platform_enable = am3517_evm_panel_enable_dvi,
		.platform_disable = am3517_evm_panel_disable_dvi,
		};

		static struct omap_dss_device *am3517_evm_dss_devices[] = {

arch/arm/mach-omap2/board-cm-t35.c

+17 −6

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@
		#include <plat/gpmc.h>
		#include <plat/usb.h>
		#include <plat/display.h>
		#include <plat/panel-generic-dpi.h>
		#include <plat/mcspi.h>

		#include <mach/hardware.h>
		@@ -351,22 +352,32 @@ static void cm_t35_panel_disable_tv(struct omap_dss_device *dssdev)
		{
		}

		static struct panel_generic_dpi_data lcd_panel = {
		.name = "toppoly_tdo35s",
		.platform_enable = cm_t35_panel_enable_lcd,
		.platform_disable = cm_t35_panel_disable_lcd,
		};

		static struct omap_dss_device cm_t35_lcd_device = {
		.name = "lcd",
		.driver_name = "toppoly_tdo35s_panel",
		.type = OMAP_DISPLAY_TYPE_DPI,
		.driver_name = "generic_dpi_panel",
		.data = &lcd_panel,
		.phy.dpi.data_lines = 18,
		.platform_enable = cm_t35_panel_enable_lcd,
		.platform_disable = cm_t35_panel_disable_lcd,
		};

		static struct panel_generic_dpi_data dvi_panel = {
		.name = "generic",
		.platform_enable = cm_t35_panel_enable_dvi,
		.platform_disable = cm_t35_panel_disable_dvi,
		};

		static struct omap_dss_device cm_t35_dvi_device = {
		.name = "dvi",
		.driver_name = "generic_panel",
		.type = OMAP_DISPLAY_TYPE_DPI,
		.driver_name = "generic_dpi_panel",
		.data = &dvi_panel,
		.phy.dpi.data_lines = 24,
		.platform_enable = cm_t35_panel_enable_dvi,
		.platform_disable = cm_t35_panel_disable_dvi,
		};

		static struct omap_dss_device cm_t35_tv_device = {