Commit 4e8a780e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (34 commits)
  ARM: mach-shmobile: mackerel: add renesas_usbhs support for USB1
  ARM: mach-shmobile: Correct the G4EVM SDHI0 I/O range.
  ARM: arch-shmobile: sh7372: add renesas_usbhs irq support
  ARM: mach-shmobile: sh73a0: mark DMA slave ID 0 as invalid
  ARM: mach-shmobile: mark DMA slave ID 0 as invalid
  ARM: mach-shmobile: Enable DMAEngine for SDHI on AG5EVM
  ARM: mach-shmobile: Enable DMAEngine for MMCIF on AG5EVM
  ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC
  dmaengine: shdma: Update SH_DMAC_MAX_CHANNELS to 20
  dmaengine: shdma: Fix SH_DMAC_MAX_CHANNELS handling
  dmaengine: shdma: Make second memory window optional
  ARM: mach-shmobile: Tidy up after SH7372 pm changes.
  ARM: mach-shmobile: sh7372 Core Standby CPUIdle
  ARM: mach-shmobile: CPUIdle support
  ARM: mach-shmobile: sh7372 Core Standby Suspend-to-RAM
  ARM: mach-shmobile: Suspend-to-RAM support
  mailmap: Add entry for Damian Hobson-Garcia.
  ARM: switch mackerel to dynamically manage the platform camera
  ARM: mach-shmobile: Add SDHI support for AG5EVM and sh73a0
  ARM: arch-shmobile: Use multiple irq vectors for SDHI
  ...
parents 90ff1f30 66ee3bef

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ Brian Avery <b.avery@hp.com> 
Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>

Corey Minyard <minyard@acm.org>

Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

David Woodhouse <dwmw2@shinybook.infradead.org>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

arch/arm/mach-shmobile/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ obj-$(CONFIG_ARCH_SH7377) += entry-intc.o 
obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o

obj-$(CONFIG_ARCH_SH73A0)	+= entry-gic.o



# PM objects

obj-$(CONFIG_SUSPEND)		+= suspend.o

obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

obj-$(CONFIG_ARCH_SH7372)	+= pm-sh7372.o sleep-sh7372.o



# Board objects

obj-$(CONFIG_MACH_G3EVM)	+= board-g3evm.o

obj-$(CONFIG_MACH_G4EVM)	+= board-g4evm.o

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

+118 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include <linux/input/sh_keysc.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mmcif.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mfd/tmio.h>

#include <linux/sh_clk.h>

#include <video/sh_mobile_lcdc.h>

#include <video/sh_mipi_dsi.h>
@@ -156,10 +158,19 @@ static struct resource sh_mmcif_resources[] = { 
	},

};



static struct sh_mmcif_dma sh_mmcif_dma = {

	.chan_priv_rx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_RX,

	},

	.chan_priv_tx	= {

		.slave_id	= SHDMA_SLAVE_MMCIF_TX,

	},

};

static struct sh_mmcif_plat_data sh_mmcif_platdata = {

	.sup_pclk	= 0,

	.ocr		= MMC_VDD_165_195,

	.caps		= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,

	.dma		= &sh_mmcif_dma,

};



static struct platform_device mmc_device = {
@@ -296,11 +307,13 @@ static struct platform_device lcdc0_device = { 
/* MIPI-DSI */

static struct resource mipidsi0_resources[] = {

	[0] = {

		.name	= "DSI0",

		.start  = 0xfeab0000,

		.end    = 0xfeab3fff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.name	= "DSI0",

		.start  = 0xfeab4000,

		.end    = 0xfeab7fff,

		.flags  = IORESOURCE_MEM,
@@ -325,6 +338,89 @@ static struct platform_device mipidsi0_device = { 
	},

};



static struct sh_mobile_sdhi_info sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI0_RX,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

	.tmio_ocr_mask	= MMC_VDD_27_28 | MMC_VDD_28_29,

};



static struct resource sdhi0_resources[] = {

	[0] = {

		.name	= "SDHI0",

		.start	= 0xee100000,

		.end	= 0xee1000ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= gic_spi(83),

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= gic_spi(84),

		.flags	= IORESOURCE_IRQ,

	},

	[3] = {

		.start	= gic_spi(85),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device sdhi0_device = {

	.name		= "sh_mobile_sdhi",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(sdhi0_resources),

	.resource	= sdhi0_resources,

	.dev	= {

		.platform_data	= &sdhi0_info,

	},

};



void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state)

{

	gpio_set_value(GPIO_PORT114, state);

}



static struct sh_mobile_sdhi_info sh_sdhi1_platdata = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI1_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI1_RX,

	.tmio_flags	= TMIO_MMC_WRPROTECT_DISABLE,

	.tmio_caps	= MMC_CAP_NONREMOVABLE,

	.tmio_ocr_mask	= MMC_VDD_32_33 | MMC_VDD_33_34,

	.set_pwr	= ag5evm_sdhi1_set_pwr,

};



static struct resource sdhi1_resources[] = {

	[0] = {

		.name	= "SDHI1",

		.start	= 0xee120000,

		.end	= 0xee1200ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= gic_spi(87),

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= gic_spi(88),

		.flags	= IORESOURCE_IRQ,

	},

	[3] = {

		.start	= gic_spi(89),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device sdhi1_device = {

	.name		= "sh_mobile_sdhi",

	.id		= 1,

	.dev		= {

		.platform_data	= &sh_sdhi1_platdata,

	},

	.num_resources	= ARRAY_SIZE(sdhi1_resources),

	.resource	= sdhi1_resources,

};



static struct platform_device *ag5evm_devices[] __initdata = {

	&eth_device,

	&keysc_device,
@@ -333,6 +429,8 @@ static struct platform_device *ag5evm_devices[] __initdata = { 
	&irda_device,

	&lcdc0_device,

	&mipidsi0_device,

	&sdhi0_device,

	&sdhi1_device,

};



static struct map_desc ag5evm_io_desc[] __initdata = {
@@ -454,6 +552,26 @@ static void __init ag5evm_init(void) 
	/* MIPI-DSI clock setup */

	__raw_writel(0x2a809010, DSI0PHYCR);



	/* enable SDHI0 on CN15 [SD I/F] */

	gpio_request(GPIO_FN_SDHICD0, NULL);

	gpio_request(GPIO_FN_SDHIWP0, NULL);

	gpio_request(GPIO_FN_SDHICMD0, NULL);

	gpio_request(GPIO_FN_SDHICLK0, NULL);

	gpio_request(GPIO_FN_SDHID0_3, NULL);

	gpio_request(GPIO_FN_SDHID0_2, NULL);

	gpio_request(GPIO_FN_SDHID0_1, NULL);

	gpio_request(GPIO_FN_SDHID0_0, NULL);



	/* enable SDHI1 on CN4 [WLAN I/F] */

	gpio_request(GPIO_FN_SDHICLK1, NULL);

	gpio_request(GPIO_FN_SDHICMD1_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_3_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_2_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_1_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_0_PU, NULL);

	gpio_request(GPIO_PORT114, "sdhi1_power");

	gpio_direction_output(GPIO_PORT114, 0);



#ifdef CONFIG_CACHE_L2X0

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

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

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

+21 −9
Original line number Diff line number Diff line
@@ -316,7 +316,15 @@ static struct resource sdhi0_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = evt2irq(0x0e00) /* SDHI0 */,

		.start	= evt2irq(0x0e00) /* SDHI0_SDHI0I0 */,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= evt2irq(0x0e20) /* SDHI0_SDHI0I1 */,

		.flags	= IORESOURCE_IRQ,

	},

	[3] = {

		.start	= evt2irq(0x0e40) /* SDHI0_SDHI0I2 */,

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -349,7 +357,15 @@ static struct resource sdhi1_resources[] = { 
		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = evt2irq(0x0e80),

		.start	= evt2irq(0x0e80), /* SDHI1_SDHI1I0 */

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */

		.flags	= IORESOURCE_IRQ,

	},

	[3] = {

		.start	= evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */

		.flags	= IORESOURCE_IRQ,

	},

};
@@ -980,11 +996,6 @@ static void __init hdmi_init_pm_clock(void) 
		goto out;

	}



	ret = clk_enable(&sh7372_pllc2_clk);

	if (ret < 0) {

		pr_err("Cannot enable pllc2 clock\n");

		goto out;

	}

	pr_debug("PLLC2 set frequency %lu\n", rate);



	ret = clk_set_parent(hdmi_ick, &sh7372_pllc2_clk);
@@ -1343,6 +1354,7 @@ static void __init ap4evb_init(void) 


	hdmi_init_pm_clock();

	fsi_init_pm_clock();

	sh7372_pm_init();

}



static void __init ap4evb_timer_init(void)

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

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static struct resource sdhi0_resources[] = { 
	[0] = {

		.name	= "SDHI0",

		.start  = 0xe6d50000,

		.end    = 0xe6d50nff,

		.end    = 0xe6d500ff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE