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

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

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

* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Ensure all PG_dcache_dirty pages are written back.
  sh: mach-ecovec24: setup.c detailed correction
  serial: sh-sci: Convert tremaining ctrl_xxx I/O routines to __raw_xxx.
  serial: sh-sci: earlyprintk zero uartclk fix
  sh: Only use bl bit toggling for sleeping idle.
  sh: Restore bl bit toggling in idle loop.
  sh: Fix up MAX_DMA_CHANNELS definition when DMA is disabled.
  sh: dmaengine support for SH7785
  sh: dmaengine support for sh7724.
parents 43104716 f34548cb

arch/sh/boards/mach-ecovec24/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,6 @@ static struct platform_device nor_flash_device = { 


/* SH Eth */

#define SH_ETH_ADDR	(0xA4600000)

#define SH_ETH_MAHR	(SH_ETH_ADDR + 0x1C0)

#define SH_ETH_MALR	(SH_ETH_ADDR + 0x1C8)

static struct resource sh_eth_resources[] = {

	[0] = {

		.start = SH_ETH_ADDR,
@@ -509,6 +507,7 @@ static struct platform_device sdhi1_device = { 


#else



/* MMC SPI */

static int mmc_spi_get_ro(struct device *dev)

{

	return gpio_get_value(GPIO_PTY6);
@@ -542,6 +541,7 @@ static struct spi_board_info spi_bus[] = { 
	},

};



/* MSIOF0 */

static struct sh_msiof_spi_info msiof0_data = {

	.num_chipselect = 1,

};

arch/sh/include/asm/dma.h

+4 −2
Original line number Diff line number Diff line
@@ -20,8 +20,10 @@ 


#ifdef CONFIG_NR_DMA_CHANNELS

#  define MAX_DMA_CHANNELS	(CONFIG_NR_DMA_CHANNELS)

#else

#elif defined(CONFIG_NR_ONCHIP_DMA_CHANNELS)

#  define MAX_DMA_CHANNELS	(CONFIG_NR_ONCHIP_DMA_CHANNELS)

#else

#  define MAX_DMA_CHANNELS	0

#endif



/*

arch/sh/include/cpu-sh4/cpu/dma-sh4a.h

+4 −4
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ 
#elif defined(CONFIG_CPU_SUBTYPE_SH7723) || \

      defined(CONFIG_CPU_SUBTYPE_SH7724)

#define DMTE0_IRQ	48	/* DMAC0A*/

#define DMTE4_IRQ	40	/* DMAC0B */

#define DMTE6_IRQ	42

#define DMTE8_IRQ	76	/* DMAC1A */

#define DMTE9_IRQ	77

#define DMTE4_IRQ	76	/* DMAC0B */

#define DMTE6_IRQ	40

#define DMTE8_IRQ	42	/* DMAC1A */

#define DMTE9_IRQ	43

#define DMTE10_IRQ	72	/* DMAC1B */

#define DMTE11_IRQ	73

#define DMAE0_IRQ	78	/* DMA Error IRQ*/

arch/sh/kernel/cpu/sh4a/setup-sh7724.c

+15 −0
Original line number Diff line number Diff line
@@ -23,9 +23,23 @@ 
#include <linux/notifier.h>

#include <asm/suspend.h>

#include <asm/clock.h>

#include <asm/dma-sh.h>

#include <asm/mmzone.h>

#include <cpu/sh7724.h>



/* DMA */

static struct sh_dmae_pdata dma_platform_data = {

	.mode = SHDMA_DMAOR1,

};



static struct platform_device dma_device = {

	.name	= "sh-dma-engine",

	.id		= -1,

	.dev	= {

		.platform_data	= &dma_platform_data,

	},

};



/* Serial */

static struct plat_sci_port scif0_platform_data = {

	.mapbase        = 0xffe00000,
@@ -649,6 +663,7 @@ static struct platform_device *sh7724_devices[] __initdata = { 
	&tmu3_device,

	&tmu4_device,

	&tmu5_device,

	&dma_device,

	&rtc_device,

	&iic0_device,

	&iic1_device,

arch/sh/kernel/cpu/sh4a/setup-sh7785.c

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/io.h>

#include <linux/mm.h>

#include <linux/sh_timer.h>

#include <asm/dma-sh.h>

#include <asm/mmzone.h>



static struct plat_sci_port scif0_platform_data = {
@@ -294,6 +295,18 @@ static struct platform_device tmu5_device = { 
	.num_resources	= ARRAY_SIZE(tmu5_resources),

};



static struct sh_dmae_pdata dma_platform_data = {

	.mode = (SHDMA_MIX_IRQ | SHDMA_DMAOR1),

};



static struct platform_device dma_device = {

	.name           = "sh-dma-engine",

	.id             = -1,

	.dev            = {

		.platform_data  = &dma_platform_data,

	},

};



static struct platform_device *sh7785_devices[] __initdata = {

	&scif0_device,

	&scif1_device,
@@ -307,6 +320,7 @@ static struct platform_device *sh7785_devices[] __initdata = { 
	&tmu3_device,

	&tmu4_device,

	&tmu5_device,

	&dma_device,

};



static int __init sh7785_devices_setup(void)