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

Commit 37f5fed5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (22 commits)
  dma-coherent: Restore dma_alloc_from_coherent() large alloc fall back policy.
  dma-coherent: per-device coherent area is in pages, not bytes.
  sh: fix unaligned and nonexistent address handling
  nommu: Stub in vm_map_ram()/vm_unmap_ram()/vm_unmap_aliases().
  sh: fix sh-sci / early printk build on sh7723
  sh: export the sh7343 JPU to user space
  sh: update defconfigs.
  serial: sh-sci: Fix up SH7720/SH7721 SCI build.
  sh: Kill off obsolete busses from arch/sh/Kconfig.
  sh: sh7785lcr/highlander/hp6xx need linux/irq.h.
  sh: Migo-R MMC support using spi_gpio and mmc_spi.
  sh: ap325rxa MMC support using spi_gpio and mmc_spi
  sh: mach-x3proto: needs linux/irq.h.
  sh: Drop the BKL from sys_execve() on SH-5.
  sh: convert rsk7203 to use smsc911x.
  sh: convert magicpanelr2 platform to use smsc911x.
  sh: convert ap325rxa platform to use smsc911x.
  sh: mach-migor: Add tw9910 support.
  sh: mach-migor: Delete soc_camera_platform setup.
  sh: mach-migor: Add ov772x support.
  ...
parents a1c70a75 0609697e

arch/sh/Kconfig

+11 −52
Original line number Diff line number Diff line
@@ -644,49 +644,6 @@ endmenu 


menu "Bus options"



# Even on SuperH devices which don't have an ISA bus,

# this variable helps the PCMCIA modules handle

# IRQ requesting properly -- Greg Banks.

#

# Though we're generally not interested in it when

# we're not using PCMCIA, so we make it dependent on

# PCMCIA outright. -- PFM.

config ISA

	def_bool y

	depends on PCMCIA && HD6446X_SERIES

	help

	  Find out whether you have ISA slots on your motherboard.  ISA is the

	  name of a bus system, i.e. the way the CPU talks to the other stuff

	  inside your box.  Other bus systems are PCI, EISA, MicroChannel

	  (MCA) or VESA.  ISA is an older system, now being displaced by PCI;

	  newer boards don't support it.  If you have ISA, say Y, otherwise N.



config EISA

	bool

	---help---

	  The Extended Industry Standard Architecture (EISA) bus was

	  developed as an open alternative to the IBM MicroChannel bus.



	  The EISA bus provided some of the features of the IBM MicroChannel

	  bus while maintaining backward compatibility with cards made for

	  the older ISA bus.  The EISA bus saw limited use between 1988 and

	  1995 when it was made obsolete by the PCI bus.



	  Say Y here if you are building a kernel for an EISA-based machine.



	  Otherwise, say N.



config MCA

	bool

	help

	  MicroChannel Architecture is found in some IBM PS/2 machines and

	  laptops.  It is a bus system similar to PCI or ISA. See

	  <file:Documentation/mca.txt> (and especially the web page given

	  there) before attempting to build an MCA bus kernel.



config SBUS

	bool



config SUPERHYWAY

	tristate "SuperHyway Bus support"

	depends on CPU_SUBTYPE_SH4_202
@@ -704,6 +661,8 @@ config MAPLE 


source "arch/sh/drivers/pci/Kconfig"



source "drivers/pci/pcie/Kconfig"



source "drivers/pci/Kconfig"



source "drivers/pcmcia/Kconfig"

arch/sh/boards/board-ap325rxa.c

+42 −11
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ 
#include <linux/mtd/sh_flctl.h>

#include <linux/delay.h>

#include <linux/i2c.h>

#include <linux/smc911x.h>

#include <linux/smsc911x.h>

#include <linux/gpio.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi_gpio.h>

#include <media/soc_camera_platform.h>

#include <media/sh_mobile_ceu.h>

#include <video/sh_mobile_lcdc.h>
@@ -27,12 +29,14 @@ 
#include <asm/clock.h>

#include <cpu/sh7723.h>



static struct smc911x_platdata smc911x_info = {

	.flags = SMC911X_USE_32BIT,

	.irq_flags = IRQF_TRIGGER_LOW,

static struct smsc911x_platform_config smsc911x_config = {

	.phy_interface	= PHY_INTERFACE_MODE_MII,

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.irq_type	= SMSC911X_IRQ_TYPE_OPEN_DRAIN,

	.flags		= SMSC911X_USE_32BIT,

};



static struct resource smc9118_resources[] = {

static struct resource smsc9118_resources[] = {

	[0] = {

		.start	= 0xb6080000,

		.end	= 0xb60fffff,
@@ -45,13 +49,13 @@ static struct resource smc9118_resources[] = { 
	}

};



static struct platform_device smc9118_device = {

	.name		= "smc911x",

static struct platform_device smsc9118_device = {

	.name		= "smsc911x",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(smc9118_resources),

	.resource	= smc9118_resources,

	.num_resources	= ARRAY_SIZE(smsc9118_resources),

	.resource	= smsc9118_resources,

	.dev		= {

		.platform_data = &smc911x_info,

		.platform_data = &smsc911x_config,

	},

};
@@ -315,8 +319,22 @@ static struct platform_device ceu_device = { 
	},

};



struct spi_gpio_platform_data sdcard_cn3_platform_data = {

	.sck = GPIO_PTD0,

	.mosi = GPIO_PTD1,

	.miso = GPIO_PTD2,

	.num_chipselect = 1,

};



static struct platform_device sdcard_cn3_device = {

	.name		= "spi_gpio",

	.dev	= {

		.platform_data	= &sdcard_cn3_platform_data,

	},

};



static struct platform_device *ap325rxa_devices[] __initdata = {

	&smc9118_device,

	&smsc9118_device,

	&ap325rxa_nor_flash_device,

	&lcdc_device,

	&ceu_device,
@@ -324,6 +342,7 @@ static struct platform_device *ap325rxa_devices[] __initdata = { 
	&camera_device,

#endif

	&nand_flash_device,

	&sdcard_cn3_device,

};



static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
@@ -332,6 +351,15 @@ static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = { 
	},

};



static struct spi_board_info ap325rxa_spi_devices[] = {

	{

		.modalias = "mmc_spi",

		.max_speed_hz = 5000000,

		.chip_select = 0,

		.controller_data = (void *) GPIO_PTD5,

	},

};



static int __init ap325rxa_devices_setup(void)

{

	/* LD3 and LD4 LEDs */
@@ -429,6 +457,9 @@ static int __init ap325rxa_devices_setup(void) 
	i2c_register_board_info(0, ap325rxa_i2c_devices,

				ARRAY_SIZE(ap325rxa_i2c_devices));



	spi_register_board_info(ap325rxa_spi_devices,

				ARRAY_SIZE(ap325rxa_spi_devices));



	return platform_add_devices(ap325rxa_devices,

				ARRAY_SIZE(ap325rxa_devices));

}

arch/sh/boards/board-magicpanelr2.c

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

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/smsc911x.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>
@@ -242,7 +243,7 @@ static void __init mpr2_setup(char **cmdline_p) 
		printk(KERN_WARNING "Ethernet not ready\n");

}



static struct resource smc911x_resources[] = {

static struct resource smsc911x_resources[] = {

	[0] = {

		.start		= 0xa8000000,

		.end		= 0xabffffff,
@@ -255,11 +256,21 @@ static struct resource smc911x_resources[] = { 
	},

};



static struct platform_device smc911x_device = {

	.name		= "smc911x",

static struct smsc911x_platform_config smsc911x_config = {

	.phy_interface	= PHY_INTERFACE_MODE_MII,

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.irq_type	= SMSC911X_IRQ_TYPE_OPEN_DRAIN,

	.flags		= SMSC911X_USE_32BIT,

};



static struct platform_device smsc911x_device = {

	.name		= "smsc911x",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(smc911x_resources),

	.resource	= smc911x_resources,

	.num_resources	= ARRAY_SIZE(smsc911x_resources),

	.resource	= smsc911x_resources,

	.dev = {

		.platform_data = &smsc911x_config,

	},

};



static struct resource heartbeat_resources[] = {
@@ -360,7 +371,7 @@ static void __init set_mtd_partitions(void) 


static struct platform_device *mpr2_devices[] __initdata = {

	&heartbeat_device,

	&smc911x_device,

	&smsc911x_device,

	&flash_device,

};

arch/sh/boards/board-sh7785lcr.c

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

#include <linux/i2c-pca-platform.h>

#include <linux/i2c-algo-pca.h>

#include <linux/irq.h>

#include <asm/heartbeat.h>

#include <mach/sh7785lcr.h>

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

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

#include <linux/types.h>

#include <linux/i2c.h>

#include <linux/irq.h>

#include <net/ax88796.h>

#include <asm/machvec.h>

#include <mach/highlander.h>