Commit 84b7290c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6: (55 commits)
  video: udlfb: Kill off special printk wrappers, use pr_fmt().
  video: udlfb: Kill off some magic constants for EDID sizing.
  video: udlfb: deifdefify (yes, that's a word).
  fbdev: modedb: Add a new mode for 864x480 TAAL panels.
  drivers/video/i810/i810-i2c.c: fix i2c bus handling
  video: Fix the HGA framebuffer driver
  drivers/video/carminefb.c: improve error handling
  video: imxfb: Fix the maximum value for yres
  fbdev: sh_mobile_lcdcfb: Enable 32 bpp and 24 bpp support
  fbdev: sh_mipi_dsi: use platform provided register layout and values
  ARM: mach-shmobile: specify sh7372 MIPI DSI register layout
  fbdev: sh_mipi_dsi: support different register layouts
  ARM: mach-shmobile: improve MIPI DSI clock configuration
  fbdev: sh-mobile: implement MIPI DSI runtime PM support
  sisfb: eliminate compiler warnings
  sisfb: delete unused register I/O macros
  sisfb: replace setSISIDXREG with SiS_SetRegANDOR
  sisfb: replace andSISIDXREG with SiS_SetRegAND
  sisfb: replace orSISIDXREG with SiS_SetRegOR
  sisfb: replace outSISIDXREG with SiS_SetReg
  ...
parents 9858a38e 1928e87b

arch/arm/mach-shmobile/board-ap4evb.c

+31 −39
Original line number Diff line number Diff line
@@ -501,7 +501,12 @@ static struct platform_device keysc_device = { 
static struct resource mipidsi0_resources[] = {

	[0] = {

		.start  = 0xffc60000,

		.end    = 0xffc68fff,

		.end    = 0xffc63073,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 0xffc68000,

		.end    = 0xffc680ef,

		.flags  = IORESOURCE_MEM,

	},

};
@@ -509,6 +514,7 @@ static struct resource mipidsi0_resources[] = { 
static struct sh_mipi_dsi_info mipidsi0_info = {

	.data_format	= MIPI_RGB888,

	.lcd_chan	= &lcdc_info.ch[0],

	.vsynw_offset	= 17,

};



static struct platform_device mipidsi0_device = {
@@ -521,44 +527,6 @@ static struct platform_device mipidsi0_device = { 
	},

};



/* This function will disappear when we switch to (runtime) PM */

static int __init ap4evb_init_display_clk(void)

{

	struct clk *lcdc_clk;

	struct clk *dsitx_clk;

	int ret;



	lcdc_clk = clk_get(&lcdc_device.dev, "sh_mobile_lcdc_fb.0");

	if (IS_ERR(lcdc_clk))

		return PTR_ERR(lcdc_clk);



	dsitx_clk = clk_get(&mipidsi0_device.dev, "sh-mipi-dsi.0");

	if (IS_ERR(dsitx_clk)) {

		ret = PTR_ERR(dsitx_clk);

		goto eclkdsitxget;

	}



	ret = clk_enable(lcdc_clk);

	if (ret < 0)

		goto eclklcdcon;



	ret = clk_enable(dsitx_clk);

	if (ret < 0)

		goto eclkdsitxon;



	return 0;



eclkdsitxon:

	clk_disable(lcdc_clk);

eclklcdcon:

	clk_put(dsitx_clk);

eclkdsitxget:

	clk_put(lcdc_clk);



	return ret;

}

device_initcall(ap4evb_init_display_clk);



static struct platform_device *qhd_devices[] __initdata = {

	&mipidsi0_device,

	&keysc_device,
@@ -764,10 +732,15 @@ static struct platform_device lcdc1_device = { 
	},

};



static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,

				unsigned long *parent_freq);





static struct sh_mobile_hdmi_info hdmi_info = {

	.lcd_chan = &sh_mobile_lcdc1_info.ch[0],

	.lcd_dev = &lcdc1_device.dev,

	.flags = HDMI_SND_SRC_SPDIF,

	.clk_optimize_parent = ap4evb_clk_optimize,

};



static struct resource hdmi_resources[] = {
@@ -794,6 +767,25 @@ static struct platform_device hdmi_device = { 
	},

};



static long ap4evb_clk_optimize(unsigned long target, unsigned long *best_freq,

				unsigned long *parent_freq)

{

	struct clk *hdmi_ick = clk_get(&hdmi_device.dev, "ick");

	long error;



	if (IS_ERR(hdmi_ick)) {

		int ret = PTR_ERR(hdmi_ick);

		pr_err("Cannot get HDMI ICK: %d\n", ret);

		return ret;

	}



	error = clk_round_parent(hdmi_ick, target, best_freq, parent_freq, 1, 64);



	clk_put(hdmi_ick);



	return error;

}



static struct gpio_led ap4evb_leds[] = {

	{

		.name			= "led4",

arch/arm/mach-shmobile/clock-sh7372.c

+8 −5
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ enum { MSTP001, 
       MSTP223,

       MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,

       MSTP329, MSTP328, MSTP323, MSTP322, MSTP314, MSTP313, MSTP312,

       MSTP415, MSTP413, MSTP411, MSTP410, MSTP406, MSTP403,

       MSTP423, MSTP415, MSTP413, MSTP411, MSTP410, MSTP406, MSTP403,

       MSTP_NR };



#define MSTP(_parent, _reg, _bit, _flags) \
@@ -543,6 +543,7 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP314] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 14, 0), /* SDHI0 */

	[MSTP313] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 13, 0), /* SDHI1 */

	[MSTP312] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 12, 0), /* MMC */

	[MSTP423] = MSTP(&div4_clks[DIV4_B], SMSTPCR4, 23, 0), /* DSITX1 */

	[MSTP415] = MSTP(&div4_clks[DIV4_HP], SMSTPCR4, 15, 0), /* SDHI2 */

	[MSTP413] = MSTP(&pllc1_div2_clk, SMSTPCR4, 13, 0), /* HDMI */

	[MSTP411] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR4, 11, 0), /* IIC3 */
@@ -596,9 +597,10 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("spu_clk", &div6_clks[DIV6_SPU]),

	CLKDEV_CON_ID("vou_clk", &div6_clks[DIV6_VOU]),

	CLKDEV_CON_ID("hdmi_clk", &div6_reparent_clks[DIV6_HDMI]),

	CLKDEV_CON_ID("dsit_clk", &div6_clks[DIV6_DSIT]),

	CLKDEV_CON_ID("dsi0p_clk", &div6_clks[DIV6_DSI0P]),

	CLKDEV_CON_ID("dsi1p_clk", &div6_clks[DIV6_DSI1P]),

	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSIT]),

	CLKDEV_ICK_ID("dsit_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSIT]),

	CLKDEV_ICK_ID("dsi0p_clk", "sh-mipi-dsi.0", &div6_clks[DIV6_DSI0P]),

	CLKDEV_ICK_ID("dsi1p_clk", "sh-mipi-dsi.1", &div6_clks[DIV6_DSI1P]),



	/* MSTP32 clocks */

	CLKDEV_DEV_ID("i2c-sh_mobile.2", &mstp_clks[MSTP001]), /* IIC2 */
@@ -610,7 +612,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-mobile-csi2.0", &mstp_clks[MSTP126]), /* CSI2 */

	CLKDEV_DEV_ID("sh_tmu.0", &mstp_clks[MSTP125]), /* TMU00 */

	CLKDEV_DEV_ID("sh_tmu.1", &mstp_clks[MSTP125]), /* TMU01 */

	CLKDEV_DEV_ID("sh-mipi-dsi.0", &mstp_clks[MSTP118]), /* DSITX */

	CLKDEV_DEV_ID("sh-mipi-dsi.0", &mstp_clks[MSTP118]), /* DSITX0 */

	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.1", &mstp_clks[MSTP117]), /* LCDC1 */

	CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[MSTP116]), /* IIC0 */

	CLKDEV_DEV_ID("uio_pdrv_genirq.5", &mstp_clks[MSTP106]), /* JPU */
@@ -633,6 +635,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */

	CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), /* SDHI1 */

	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP312]), /* MMC */

	CLKDEV_DEV_ID("sh-mipi-dsi.1", &mstp_clks[MSTP423]), /* DSITX1 */

	CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP415]), /* SDHI2 */

	CLKDEV_DEV_ID("sh-mobile-hdmi", &mstp_clks[MSTP413]), /* HDMI */

	CLKDEV_DEV_ID("i2c-sh_mobile.3", &mstp_clks[MSTP411]), /* IIC3 */

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -111,8 +111,6 @@ source "drivers/staging/vt6655/Kconfig" 


source "drivers/staging/vt6656/Kconfig"



source "drivers/staging/udlfb/Kconfig"



source "drivers/staging/hv/Kconfig"



source "drivers/staging/vme/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2) += quatech_usb2/ 
obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/

obj-$(CONFIG_VT6655)		+= vt6655/

obj-$(CONFIG_VT6656)		+= vt6656/

obj-$(CONFIG_FB_UDL)		+= udlfb/

obj-$(CONFIG_HYPERV)		+= hv/

obj-$(CONFIG_VME_BUS)		+= vme/

obj-$(CONFIG_MRST_RAR_HANDLER)	+= memrar/

CRA Git | Maintained and supported by SUSTech CRA and CCSE