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

Commit 241eb956 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (34 commits)
  sh: Convert to generic show_interrupts.
  sh: Wire up new fhandle and clock_adjtime syscalls.
  sh: modify platform_device for sh_eth driver
  sh: add GETHER's platform_device in board-sh7757lcr
  sh: update sh7757lcr_defconfig
  sh: add platform_device of tmio_mmc and sh_mmcif to sh7757lcr
  sh: dmaengine support for SH7757
  sh: add mmc clock in clock-sh7757
  sh: add spi_board_info in sh7757lcr
  sh: add platform_device for SPI
  sh: add USB_ARCH_HAS_EHCI and OHCI for SH7757
  sh: Rename cpuidle states to fit general conventions
  serial: sh-sci: fix deadlock when resuming from S3 sleep
  sh: Enable CONFIG_GCOV_PROFILE_ALL for sh
  sh: Fix up async PCIe probing on SMP.
  serial: sh-sci: Kill off the special earlyprintk device.
  serial: sh-sci: Use dev_name() for region reservations.
  serial: sh-sci: Fix up earlyprintk port mapping.
  serial: sh-sci: Limit early console to one device.
  serial: sh-sci: Fix up break timer scheduling race.
  ...
parents fd34b0de 3d44ae40

arch/sh/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ config SUPERH 
	select GENERIC_ATOMIC64

	# Support the deprecated APIs until MFD and GPIOLIB catch up.

	select GENERIC_HARDIRQS_NO_DEPRECATED if !MFD_SUPPORT && !GPIOLIB

	select GENERIC_IRQ_SHOW

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  and consumer electronics; it was also used in the Sega Dreamcast
@@ -434,6 +435,8 @@ config CPU_SUBTYPE_SH7757 
	select CPU_SH4A

	select CPU_SHX2

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select USB_ARCH_HAS_OHCI

	select USB_ARCH_HAS_EHCI

	help

	  Select SH7757 if you have a SH4A SH7757 CPU.

arch/sh/boards/board-espt.c

+7 −0
Original line number Diff line number Diff line
@@ -66,6 +66,11 @@ static struct resource sh_eth_resources[] = { 
		.end    = 0xFEE00F7C - 1,

		.flags  = IORESOURCE_MEM,

	}, {

		.start  = 0xFEE01800,   /* TSU */

		.end    = 0xFEE01FFF,

		.flags  = IORESOURCE_MEM,

	}, {



		.start  = 57,   /* irq number */

		.flags  = IORESOURCE_IRQ,

	},
@@ -74,6 +79,8 @@ static struct resource sh_eth_resources[] = { 
static struct sh_eth_plat_data sh7763_eth_pdata = {

	.phy = 0,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_GIGABIT,

	.phy_interface = PHY_INTERFACE_MODE_MII,

};



static struct platform_device espt_eth_device = {

arch/sh/boards/board-sh7757lcr.c

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

#include <linux/spi/flash.h>

#include <linux/io.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mmcif.h>

#include <linux/mfd/sh_mobile_sdhi.h>

#include <cpu/sh7757.h>

#include <asm/sh_eth.h>

#include <asm/heartbeat.h>
@@ -44,6 +47,17 @@ static struct platform_device heartbeat_device = { 
};



/* Fast Ethernet */

#define GBECONT		0xffc10100

#define GBECONT_RMII1	BIT(17)

#define GBECONT_RMII0	BIT(16)

static void sh7757_eth_set_mdio_gate(unsigned long addr)

{

	if ((addr & 0x00000fff) < 0x0800)

		writel(readl(GBECONT) | GBECONT_RMII0, GBECONT);

	else

		writel(readl(GBECONT) | GBECONT_RMII1, GBECONT);

}



static struct resource sh_eth0_resources[] = {

	{

		.start  = 0xfef00000,
@@ -59,6 +73,8 @@ static struct resource sh_eth0_resources[] = { 
static struct sh_eth_plat_data sh7757_eth0_pdata = {

	.phy = 1,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_FAST_SH4,

	.set_mdio_gate = sh7757_eth_set_mdio_gate,

};



static struct platform_device sh7757_eth0_device = {
@@ -86,6 +102,8 @@ static struct resource sh_eth1_resources[] = { 
static struct sh_eth_plat_data sh7757_eth1_pdata = {

	.phy = 1,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_FAST_SH4,

	.set_mdio_gate = sh7757_eth_set_mdio_gate,

};



static struct platform_device sh7757_eth1_device = {
@@ -98,10 +116,173 @@ static struct platform_device sh7757_eth1_device = { 
	},

};



static void sh7757_eth_giga_set_mdio_gate(unsigned long addr)

{

	if ((addr & 0x00000fff) < 0x0800) {

		gpio_set_value(GPIO_PTT4, 1);

		writel(readl(GBECONT) & ~GBECONT_RMII0, GBECONT);

	} else {

		gpio_set_value(GPIO_PTT4, 0);

		writel(readl(GBECONT) & ~GBECONT_RMII1, GBECONT);

	}

}



static struct resource sh_eth_giga0_resources[] = {

	{

		.start  = 0xfee00000,

		.end    = 0xfee007ff,

		.flags  = IORESOURCE_MEM,

	}, {

		/* TSU */

		.start  = 0xfee01800,

		.end    = 0xfee01fff,

		.flags  = IORESOURCE_MEM,

	}, {

		.start  = 315,

		.end    = 315,

		.flags  = IORESOURCE_IRQ,

	},

};



static struct sh_eth_plat_data sh7757_eth_giga0_pdata = {

	.phy = 18,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_GIGABIT,

	.set_mdio_gate = sh7757_eth_giga_set_mdio_gate,

	.phy_interface = PHY_INTERFACE_MODE_RGMII_ID,

};



static struct platform_device sh7757_eth_giga0_device = {

	.name		= "sh-eth",

	.resource	= sh_eth_giga0_resources,

	.id		= 2,

	.num_resources	= ARRAY_SIZE(sh_eth_giga0_resources),

	.dev		= {

		.platform_data = &sh7757_eth_giga0_pdata,

	},

};



static struct resource sh_eth_giga1_resources[] = {

	{

		.start  = 0xfee00800,

		.end    = 0xfee00fff,

		.flags  = IORESOURCE_MEM,

	}, {

		.start  = 316,

		.end    = 316,

		.flags  = IORESOURCE_IRQ,

	},

};



static struct sh_eth_plat_data sh7757_eth_giga1_pdata = {

	.phy = 19,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_GIGABIT,

	.set_mdio_gate = sh7757_eth_giga_set_mdio_gate,

	.phy_interface = PHY_INTERFACE_MODE_RGMII_ID,

};



static struct platform_device sh7757_eth_giga1_device = {

	.name		= "sh-eth",

	.resource	= sh_eth_giga1_resources,

	.id		= 3,

	.num_resources	= ARRAY_SIZE(sh_eth_giga1_resources),

	.dev		= {

		.platform_data = &sh7757_eth_giga1_pdata,

	},

};



/* SH_MMCIF */

static struct resource sh_mmcif_resources[] = {

	[0] = {

		.start	= 0xffcb0000,

		.end	= 0xffcb00ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= 211,

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= 212,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct sh_mmcif_dma sh7757lcr_mmcif_dma = {

	.chan_priv_tx	= SHDMA_SLAVE_MMCIF_TX,

	.chan_priv_rx	= SHDMA_SLAVE_MMCIF_RX,

};



static struct sh_mmcif_plat_data sh_mmcif_plat = {

	.dma		= &sh7757lcr_mmcif_dma,

	.sup_pclk	= 0x0f,

	.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,

	.ocr		= MMC_VDD_32_33 | MMC_VDD_33_34,

};



static struct platform_device sh_mmcif_device = {

	.name		= "sh_mmcif",

	.id		= 0,

	.dev		= {

		.platform_data		= &sh_mmcif_plat,

	},

	.num_resources	= ARRAY_SIZE(sh_mmcif_resources),

	.resource	= sh_mmcif_resources,

};



/* SDHI0 */

static struct sh_mobile_sdhi_info sdhi_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI_TX,

	.dma_slave_rx	= SHDMA_SLAVE_SDHI_RX,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

};



static struct resource sdhi_resources[] = {

	[0] = {

		.start  = 0xffe50000,

		.end    = 0xffe501ff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = 20,

		.flags  = IORESOURCE_IRQ,

	},

};



static struct platform_device sdhi_device = {

	.name           = "sh_mobile_sdhi",

	.num_resources  = ARRAY_SIZE(sdhi_resources),

	.resource       = sdhi_resources,

	.id             = 0,

	.dev	= {

		.platform_data	= &sdhi_info,

	},

};



static struct platform_device *sh7757lcr_devices[] __initdata = {

	&heartbeat_device,

	&sh7757_eth0_device,

	&sh7757_eth1_device,

	&sh7757_eth_giga0_device,

	&sh7757_eth_giga1_device,

	&sh_mmcif_device,

	&sdhi_device,

};



static struct flash_platform_data spi_flash_data = {

	.name = "m25p80",

	.type = "m25px64",

};



static struct spi_board_info spi_board_info[] = {

	{

		.modalias = "m25p80",

		.max_speed_hz = 25000000,

		.bus_num = 0,

		.chip_select = 1,

		.platform_data = &spi_flash_data,

	},

};



static int __init sh7757lcr_devices_setup(void)
@@ -332,6 +513,10 @@ static int __init sh7757lcr_devices_setup(void) 
	gpio_request(GPIO_PTT5, NULL);		/* eMMC_PRST# */

	gpio_direction_output(GPIO_PTT5, 1);



	/* register SPI device information */

	spi_register_board_info(spi_board_info,

				ARRAY_SIZE(spi_board_info));



	/* General platform */

	return platform_add_devices(sh7757lcr_devices,

				    ARRAY_SIZE(sh7757lcr_devices));

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

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,8 @@ static struct resource sh_eth_resources[] = { 
static struct sh_eth_plat_data sh_eth_plat = {

	.phy = 0x1f, /* SMSC LAN8700 */

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_FAST_SH4,

	.phy_interface = PHY_INTERFACE_MODE_MII,

	.ether_link_active_low = 1

};

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

+6 −0
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ static struct resource sh_eth_resources[] = { 
		.start  = 0xFEE00800,   /* use eth1 */

		.end    = 0xFEE00F7C - 1,

		.flags  = IORESOURCE_MEM,

	}, {

		.start  = 0xFEE01800,   /* TSU */

		.end    = 0xFEE01FFF,

		.flags  = IORESOURCE_MEM,

	}, {

		.start  = 57,   /* irq number */

		.flags  = IORESOURCE_IRQ,
@@ -83,6 +87,8 @@ static struct resource sh_eth_resources[] = { 
static struct sh_eth_plat_data sh7763_eth_pdata = {

	.phy = 1,

	.edmac_endian = EDMAC_LITTLE_ENDIAN,

	.register_type = SH_ETH_REG_GIGABIT,

	.phy_interface = PHY_INTERFACE_MODE_MII,

};



static struct platform_device sh7763rdp_eth_device = {