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

Commit 8348ad7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rmobile-fixes-for-linus' of... 

Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  ARM: mach-shmobile: AG5EVM LCDC / MIPI-DSI platform data
  ARM: mach-shmobile: sh73a0 CPGA fix for PLL CFG bit
  ARM: mach-shmobile: mackerel: clarify shdi/mmcif switch settings
  ARM: mach-shmobile: sh73a0 CPGA fix for IrDA MSTP
  ARM: mach-shmobile: sh73a0 CPGA fix for FRQCRA M3
  ARM: mach-shmobile: remove sh7367 on-chip set_irq_type()
  ARM: mach-shmobile: sh7372 INTCS MFIS2 interrupt update
  ARM: mach-shmobile: ag5evm: Add IrDA support
  ARM: mach-shmobile: clock-sh7372: fixup pllc2 set_rate
  mmc: sh_mmcif: Convert to __raw_xxx() I/O accessors.
  ARM: mach-shmobile: ag5evm requires GPIOLIB
  ARM: mach-shmobile: fix cpu_base of gic_init() on sh73a0
parents 9948d378 170c7ab5

arch/arm/mach-shmobile/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ endchoice 


config MACH_AG5EVM

	bool "AG5EVM board"

	select ARCH_REQUIRE_GPIOLIB

	select SH_LCD_MIPI_DSI

	depends on ARCH_SH73A0



config MACH_MACKEREL

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

+178 −2
Original line number Diff line number Diff line
@@ -34,9 +34,10 @@ 
#include <linux/input/sh_keysc.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mmcif.h>



#include <linux/sh_clk.h>

#include <video/sh_mobile_lcdc.h>

#include <video/sh_mipi_dsi.h>

#include <sound/sh_fsi.h>



#include <mach/hardware.h>

#include <mach/sh73a0.h>

#include <mach/common.h>
@@ -183,11 +184,165 @@ static struct platform_device mmc_device = { 
	.resource	= sh_mmcif_resources,

};



/* IrDA */

static struct resource irda_resources[] = {

	[0] = {

		.start	= 0xE6D00000,

		.end	= 0xE6D01FD4 - 1,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start	= gic_spi(95),

		.flags  = IORESOURCE_IRQ,

	},

};



static struct platform_device irda_device = {

	.name           = "sh_irda",

	.id		= 0,

	.resource       = irda_resources,

	.num_resources  = ARRAY_SIZE(irda_resources),

};



static unsigned char lcd_backlight_seq[3][2] = {

	{ 0x04, 0x07 },

	{ 0x23, 0x80 },

	{ 0x03, 0x01 },

};



static void lcd_backlight_on(void)

{

	struct i2c_adapter *a;

	struct i2c_msg msg;

	int k;



	a = i2c_get_adapter(1);

	for (k = 0; a && k < 3; k++) {

		msg.addr = 0x6d;

		msg.buf = &lcd_backlight_seq[k][0];

		msg.len = 2;

		msg.flags = 0;

		if (i2c_transfer(a, &msg, 1) != 1)

			break;

	}

}



static void lcd_backlight_reset(void)

{

	gpio_set_value(GPIO_PORT235, 0);

	mdelay(24);

	gpio_set_value(GPIO_PORT235, 1);

}



static void lcd_on(void *board_data, struct fb_info *info)

{

	lcd_backlight_on();

}



static void lcd_off(void *board_data)

{

	lcd_backlight_reset();

}



/* LCDC0 */

static const struct fb_videomode lcdc0_modes[] = {

	{

		.name		= "R63302(QHD)",

		.xres		= 544,

		.yres		= 961,

		.left_margin	= 72,

		.right_margin	= 600,

		.hsync_len	= 16,

		.upper_margin	= 8,

		.lower_margin	= 8,

		.vsync_len	= 2,

		.sync		= FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,

	},

};



static struct sh_mobile_lcdc_info lcdc0_info = {

	.clock_source = LCDC_CLK_PERIPHERAL,

	.ch[0] = {

		.chan = LCDC_CHAN_MAINLCD,

		.interface_type = RGB24,

		.clock_divider = 1,

		.flags = LCDC_FLAGS_DWPOL,

		.lcd_size_cfg.width = 44,

		.lcd_size_cfg.height = 79,

		.bpp = 16,

		.lcd_cfg = lcdc0_modes,

		.num_cfg = ARRAY_SIZE(lcdc0_modes),

		.board_cfg = {

			.display_on = lcd_on,

			.display_off = lcd_off,

		},

	}

};



static struct resource lcdc0_resources[] = {

	[0] = {

		.name	= "LCDC0",

		.start	= 0xfe940000, /* P4-only space */

		.end	= 0xfe943fff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= intcs_evt2irq(0x580),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device lcdc0_device = {

	.name		= "sh_mobile_lcdc_fb",

	.num_resources	= ARRAY_SIZE(lcdc0_resources),

	.resource	= lcdc0_resources,

	.id             = 0,

	.dev	= {

		.platform_data	= &lcdc0_info,

		.coherent_dma_mask = ~0,

	},

};



/* MIPI-DSI */

static struct resource mipidsi0_resources[] = {

	[0] = {

		.start  = 0xfeab0000,

		.end    = 0xfeab3fff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 0xfeab4000,

		.end    = 0xfeab7fff,

		.flags  = IORESOURCE_MEM,

	},

};



static struct sh_mipi_dsi_info mipidsi0_info = {

	.data_format	= MIPI_RGB888,

	.lcd_chan	= &lcdc0_info.ch[0],

	.vsynw_offset	= 20,

	.clksrc		= 1,

	.flags		= SH_MIPI_DSI_HSABM,

};



static struct platform_device mipidsi0_device = {

	.name           = "sh-mipi-dsi",

	.num_resources  = ARRAY_SIZE(mipidsi0_resources),

	.resource       = mipidsi0_resources,

	.id             = 0,

	.dev	= {

		.platform_data	= &mipidsi0_info,

	},

};



static struct platform_device *ag5evm_devices[] __initdata = {

	&eth_device,

	&keysc_device,

	&fsi_device,

	&mmc_device,

	&irda_device,

	&lcdc0_device,

	&mipidsi0_device,

};



static struct map_desc ag5evm_io_desc[] __initdata = {
@@ -224,6 +379,8 @@ void __init ag5evm_init_irq(void) 
	__raw_writew(__raw_readw(PINTCR0A) | (2<<10), PINTCR0A);

}



#define DSI0PHYCR	0xe615006c



static void __init ag5evm_init(void)

{

	sh73a0_pinmux_init();
@@ -287,6 +444,25 @@ static void __init ag5evm_init(void) 
	gpio_request(GPIO_FN_FSIAISLD, NULL);

	gpio_request(GPIO_FN_FSIAOSLD, NULL);



	/* IrDA */

	gpio_request(GPIO_FN_PORT241_IRDA_OUT, NULL);

	gpio_request(GPIO_FN_PORT242_IRDA_IN,  NULL);

	gpio_request(GPIO_FN_PORT243_IRDA_FIRSEL, NULL);



	/* LCD panel */

	gpio_request(GPIO_PORT217, NULL); /* RESET */

	gpio_direction_output(GPIO_PORT217, 0);

	mdelay(1);

	gpio_set_value(GPIO_PORT217, 1);



	/* LCD backlight controller */

	gpio_request(GPIO_PORT235, NULL); /* RESET */

	gpio_direction_output(GPIO_PORT235, 0);

	lcd_backlight_reset();



	/* MIPI-DSI clock setup */

	__raw_writel(0x2a809010, DSI0PHYCR);



#ifdef CONFIG_CACHE_L2X0

	/* Shared attribute override enable, 64K*8way */

	l2x0_init(__io(0xf0100000), 0x00460000, 0xc2000fff);

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

+0 −1
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ static void __init g3evm_init(void) 
	gpio_request(GPIO_FN_IRDA_OUT, NULL);

	gpio_request(GPIO_FN_IRDA_IN, NULL);

	gpio_request(GPIO_FN_IRDA_FIRSEL, NULL);

	set_irq_type(evt2irq(0x480), IRQ_TYPE_LEVEL_LOW);



	sh7367_add_standard_devices();

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

+2 −3
Original line number Diff line number Diff line
@@ -169,9 +169,8 @@ 
 *	SW1	|	SW33

 *		| bit1 | bit2 | bit3 | bit4

 * -------------+------+------+------+-------

 * MMC0	  OFF	|  OFF |  ON  |  ON  |  X

 * MMC1	  ON	|  OFF |  ON  |  X   | ON

 * SDHI1  OFF	|  ON  |   X  |  OFF | ON

 * MMC0   OFF	|  OFF |   X  |  ON  |  X       (Use MMCIF)

 * SDHI1  OFF	|  ON  |   X  |  OFF |  X       (Use MFD_SH_MOBILE_SDHI)

 *

 */

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

+3 −1
Original line number Diff line number Diff line
@@ -234,7 +234,9 @@ static int pllc2_set_rate(struct clk *clk, unsigned long rate) 


	value = __raw_readl(PLLC2CR) & ~(0x3f << 24);



	__raw_writel((value & ~0x80000000) | ((idx + 19) << 24), PLLC2CR);

	__raw_writel(value | ((idx + 19) << 24), PLLC2CR);



	clk->rate = clk->freq_table[idx].frequency;



	return 0;

}