Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43753826 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6 

Pull fbdev updates for 3.4 from Florian Tobias Schandinat:
 - drivers for Samsung Exynos MIPI DSI and display port
 - i740fb to support those old Intel chips
 - large updates to OMAP, viafb and sh_mobile_lcdcfb
 - some updates to s3c-fb and udlfb, few patches to others

Fix up conflicts in drivers/video/udlfb.c due to Key Sievers' fix making
it in twice.

* tag 'fbdev-updates-for-3.4' of git://github.com/schandinat/linux-2.6: (156 commits)
  Revert "video:uvesafb: Fix oops that uvesafb try to execute NX-protected page"
  OMAPDSS: register dss drivers in module init
  video: pxafb: add clk_prepare/clk_unprepare calls
  fbdev: bfin_adv7393fb: Drop needless include
  fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info
  fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC
  Revert "MAINTAINERS: add entry for exynos mipi display drivers"
  fbdev: da8xx: add support for SP10Q010 display
  fbdev: da8xx:: fix reporting of the display timing info
  drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible
  OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update
  fbdev: sh_mobile_meram: Implement system suspend/resume
  fbdev: sh_mobile_meram: Remove unneeded sanity checks
  fbdev: sh_mobile_meram: Don't perform update in register operation
  arm: mach-shmobile: Constify sh_mobile_meram_cfg structures
  fbdev: sh_mobile_lcdc: Don't store copy of platform data
  fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields
  arm: mach-shmobile: Don't set MERAM ICB numbers in platform data
  fbdev: sh_mobile_meram: Allocate ICBs automatically
  fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation
  ...
parents 9586c959 6bff98b4

MAINTAINERS

+24 −9
Original line number Diff line number Diff line
@@ -2257,6 +2257,15 @@ F: Documentation/filesystems/quota.txt 
F:	fs/quota/

F:	include/linux/quota*.h



DISPLAYLINK USB 2.0 FRAMEBUFFER DRIVER (UDLFB)

M:	Bernie Thompson <bernie@plugable.com>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

W:	http://plugable.com/category/projects/udlfb/

F:	drivers/video/udlfb.c

F:	include/video/udlfb.h

F:	Documentation/fb/udlfb.txt



DISTRIBUTED LOCK MANAGER (DLM)

M:	Christine Caulfield <ccaulfie@redhat.com>

M:	David Teigland <teigland@redhat.com>
@@ -2378,15 +2387,6 @@ S: Supported 
F:	drivers/gpu/drm/exynos

F:	include/drm/exynos*



EXYNOS MIPI DISPLAY DRIVERS

M:	Inki Dae <inki.dae@samsung.com>

M:	Donghwa Lee <dh09.lee@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/exynos/exynos_mipi*

F:	include/video/exynos_mipi*



DSCC4 DRIVER

M:	Francois Romieu <romieu@fr.zoreil.com>

L:	netdev@vger.kernel.org
@@ -2667,6 +2667,21 @@ M: Mimi Zohar <zohar@us.ibm.com> 
S:	Supported

F:	security/integrity/evm/



EXYNOS DP DRIVER

M:	Jingoo Han <jg1.han@samsung.com>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/exynos/exynos_dp*



EXYNOS MIPI DISPLAY DRIVERS

M:	Inki Dae <inki.dae@samsung.com>

M:	Donghwa Lee <dh09.lee@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/exynos/exynos_mipi*

F:	include/video/exynos_mipi*



F71805F HARDWARE MONITORING DRIVER

M:	Jean Delvare <khali@linux-fr.org>

L:	lm-sensors@lm-sensors.org

arch/arm/mach-omap1/board-ams-delta.c

+3 −6
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/export.h>

#include <linux/omapfb.h>



#include <media/soc_camera.h>
@@ -169,10 +170,6 @@ static struct omap_usb_config ams_delta_usb_config __initdata = { 
	.pins[0]	= 2,

};



static struct omap_board_config_kernel ams_delta_config[] __initdata = {

	{ OMAP_TAG_LCD,		&ams_delta_lcd_config },

};



static struct resource ams_delta_nand_resources[] = {

	[0] = {

		.start	= OMAP1_MPUIO_BASE,
@@ -302,8 +299,6 @@ static void __init ams_delta_init(void) 
	omap_cfg_reg(J19_1610_CAM_D6);

	omap_cfg_reg(J18_1610_CAM_D7);



	omap_board_config = ams_delta_config;

	omap_board_config_size = ARRAY_SIZE(ams_delta_config);

	omap_serial_init();

	omap_register_i2c_bus(1, 100, NULL, 0);
@@ -321,6 +316,8 @@ static void __init ams_delta_init(void) 
	ams_delta_init_fiq();



	omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1);



	omapfb_set_lcd_config(&ams_delta_lcd_config);

}



static struct plat_serial8250_port ams_delta_modem_ports[] = {

arch/arm/mach-omap1/board-fsample.c

+3 −12
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/mtd/physmap.h>

#include <linux/input.h>

#include <linux/smc91x.h>

#include <linux/omapfb.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -273,27 +274,17 @@ static struct platform_device kp_device = { 
	.resource	= kp_resources,

};



static struct platform_device lcd_device = {

	.name		= "lcd_p2",

	.id		= -1,

};



static struct platform_device *devices[] __initdata = {

	&nor_device,

	&nand_device,

	&smc91x_device,

	&kp_device,

	&lcd_device,

};



static struct omap_lcd_config fsample_lcd_config = {

	.ctrl_name	= "internal",

};



static struct omap_board_config_kernel fsample_config[] __initdata = {

	{ OMAP_TAG_LCD,		&fsample_lcd_config },

};



static void __init omap_fsample_init(void)

{

	/* Early, board-dependent init */
@@ -352,10 +343,10 @@ static void __init omap_fsample_init(void) 


	platform_add_devices(devices, ARRAY_SIZE(devices));



	omap_board_config = fsample_config;

	omap_board_config_size = ARRAY_SIZE(fsample_config);

	omap_serial_init();

	omap_register_i2c_bus(1, 100, NULL, 0);



	omapfb_set_lcd_config(&fsample_lcd_config);

}



/* Only FPGA needs to be mapped here. All others are done with ioremap */

arch/arm/mach-omap1/board-h2.c

+3 −12
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/input.h>

#include <linux/i2c/tps65010.h>

#include <linux/smc91x.h>

#include <linux/omapfb.h>



#include <mach/hardware.h>
@@ -325,18 +326,12 @@ static struct platform_device h2_irda_device = { 
	.resource	= h2_irda_resources,

};



static struct platform_device h2_lcd_device = {

	.name		= "lcd_h2",

	.id		= -1,

};



static struct platform_device *h2_devices[] __initdata = {

	&h2_nor_device,

	&h2_nand_device,

	&h2_smc91x_device,

	&h2_irda_device,

	&h2_kp_device,

	&h2_lcd_device,

};



static void __init h2_init_smc91x(void)
@@ -391,10 +386,6 @@ static struct omap_lcd_config h2_lcd_config __initdata = { 
	.ctrl_name	= "internal",

};



static struct omap_board_config_kernel h2_config[] __initdata = {

	{ OMAP_TAG_LCD,		&h2_lcd_config },

};



static void __init h2_init(void)

{

	h2_init_smc91x();
@@ -438,13 +429,13 @@ static void __init h2_init(void) 
	omap_cfg_reg(N19_1610_KBR5);



	platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));

	omap_board_config = h2_config;

	omap_board_config_size = ARRAY_SIZE(h2_config);

	omap_serial_init();

	omap_register_i2c_bus(1, 100, h2_i2c_board_info,

			      ARRAY_SIZE(h2_i2c_board_info));

	omap1_usb_init(&h2_usb_config);

	h2_mmc_init();



	omapfb_set_lcd_config(&h2_lcd_config);

}



MACHINE_START(OMAP_H2, "TI-H2")

arch/arm/mach-omap1/board-h3.c

+3 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/spi/spi.h>

#include <linux/i2c/tps65010.h>

#include <linux/smc91x.h>

#include <linux/omapfb.h>



#include <asm/setup.h>

#include <asm/page.h>
@@ -370,10 +371,6 @@ static struct omap_lcd_config h3_lcd_config __initdata = { 
	.ctrl_name	= "internal",

};



static struct omap_board_config_kernel h3_config[] __initdata = {

	{ OMAP_TAG_LCD,		&h3_lcd_config },

};



static struct i2c_board_info __initdata h3_i2c_board_info[] = {

       {

		I2C_BOARD_INFO("tps65013", 0x48),
@@ -426,13 +423,13 @@ static void __init h3_init(void) 
	platform_add_devices(devices, ARRAY_SIZE(devices));

	spi_register_board_info(h3_spi_board_info,

				ARRAY_SIZE(h3_spi_board_info));

	omap_board_config = h3_config;

	omap_board_config_size = ARRAY_SIZE(h3_config);

	omap_serial_init();

	omap_register_i2c_bus(1, 100, h3_i2c_board_info,

			      ARRAY_SIZE(h3_i2c_board_info));

	omap1_usb_init(&h3_usb_config);

	h3_mmc_init();



	omapfb_set_lcd_config(&h3_lcd_config);

}



MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")