Merge branches 'sh/pci-express-integration', 'sh/rsk-updates', 'sh/platform-updates...

diff --combined arch/sh/Kconfig
index 739a12d2ffb986f84d966f3a3e793db61eaaf68e,739a12d2ffb986f84d966f3a3e793db61eaaf68e,586cd045e2db213df61a3a9a46a3aaf2ecd08b8d,586cd045e2db213df61a3a9a46a3aaf2ecd08b8d,e487e6d5a4d04c7415d7b11cefce3b08f2ece183..ac1c620d1c7d7bfae7cde2fef9f95a13ff9dc30d
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
--- 3/arch/sh/Kconfig
--- 4/arch/sh/Kconfig
--- 5/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@@@@ -15,7 -15,7 -15,7 -15,7 -15,9 +15,9 @@@@@@ config SUPER
        select HAVE_IOREMAP_PROT if MMU
        select HAVE_ARCH_TRACEHOOK
        select HAVE_DMA_API_DEBUG
++++    select HAVE_PERF_COUNTER
        select RTC_LIB
++++    select GENERIC_ATOMIC64
        help
          The SuperH is a RISC processor targeted for use in embedded systems
          and consumer electronics; it was also used in the Sega Dreamcast
@@@@@@ -50,10 -50,10 -50,6 -50,6 -52,6 +52,10 @@@@@@ config GENERIC_BU
        def_bool y
        depends on BUG && SUPERH32
     
  +++config GENERIC_CSUM
  +++   def_bool y
  +++   depends on SUPERH64
  +++
     config GENERIC_FIND_NEXT_BIT
        def_bool y
     

diff --combined arch/sh/boards/mach-highlander/setup.c
index dd297d87f9348b6a9e3a69734758bee7f7736ce3,20fe72c515d520d732f5b373b93c11c7cac252ff,20fe72c515d520d732f5b373b93c11c7cac252ff,920ea76abac82673eb80221640b985c798bd52d7,20fe72c515d520d732f5b373b93c11c7cac252ff..1639f89150005d588ba96e32d481a78385950c9a
--- 1/arch/sh/boards/mach-highlander/setup.c
--- 2/arch/sh/boards/mach-highlander/setup.c
--- 3/arch/sh/boards/mach-highlander/setup.c
--- 4/arch/sh/boards/mach-highlander/setup.c
--- 5/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@@@@@ -17,9 -17,8 -17,8 -17,10 -17,8 +17,11 @@@@@@
     #include <linux/platform_device.h>
     #include <linux/ata_platform.h>
     #include <linux/types.h>
 ++++#include <linux/mtd/physmap.h>
     #include <linux/i2c.h>
     #include <linux/irq.h>
+++ +#include <linux/interrupt.h>
+++ +#include <linux/usb/r8a66597.h>
     #include <net/ax88796.h>
     #include <asm/machvec.h>
     #include <mach/highlander.h>
@@@@@@ -28,18 -27,18 -27,18 -29,21 -27,18 +30,21 @@@@@@
     #include <asm/io.h>
     #include <asm/io_trapped.h>
     
+++ +static struct r8a66597_platdata r8a66597_data = {
+++ +   .xtal = R8A66597_PLATDATA_XTAL_12MHZ,
+++ +   .vif = 1,
+++ +};
+++ +
     static struct resource r8a66597_usb_host_resources[] = {
        [0] = {
--- -           .name   = "r8a66597_hcd",
                .start  = 0xA4200000,
                .end    = 0xA42000FF,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
--- -           .name   = "r8a66597_hcd",
                .start  = IRQ_EXT1,             /* irq number */
                .end    = IRQ_EXT1,
--- -           .flags  = IORESOURCE_IRQ,
+++ +           .flags  = IORESOURCE_IRQ | IRQF_TRIGGER_LOW,
        },
     };
     
@@@@@@ -49,6 -48,6 -48,6 -53,7 -48,6 +54,7 @@@@@@ static struct platform_device r8a66597_
        .dev = {
                .dma_mask               = NULL,         /* don't use dma */
                .coherent_dma_mask      = 0xffffffff,
+++ +           .platform_data          = &r8a66597_data,
        },
        .num_resources  = ARRAY_SIZE(r8a66597_usb_host_resources),
        .resource       = r8a66597_usb_host_resources,
@@@@@@ -179,53 -178,6 -178,6 -184,6 -178,6 +185,53 @@@@@@ static struct platform_device ax88796_d
        .resource       = ax88796_resources,
     };
     
 ++++static struct mtd_partition nor_flash_partitions[] = {
 ++++   {
 ++++           .name           = "loader",
 ++++           .offset         = 0x00000000,
 ++++           .size           = 512 * 1024,
 ++++   },
 ++++   {
 ++++           .name           = "bootenv",
 ++++           .offset         = MTDPART_OFS_APPEND,
 ++++           .size           = 512 * 1024,
 ++++   },
 ++++   {
 ++++           .name           = "kernel",
 ++++           .offset         = MTDPART_OFS_APPEND,
 ++++           .size           = 4 * 1024 * 1024,
 ++++   },
 ++++   {
 ++++           .name           = "data",
 ++++           .offset         = MTDPART_OFS_APPEND,
 ++++           .size           = MTDPART_SIZ_FULL,
 ++++   },
 ++++};
 ++++
 ++++static struct physmap_flash_data nor_flash_data = {
 ++++   .width          = 4,
 ++++   .parts          = nor_flash_partitions,
 ++++   .nr_parts       = ARRAY_SIZE(nor_flash_partitions),
 ++++};
 ++++
 ++++/* This config is flash board for mass production. */
 ++++static struct resource nor_flash_resources[] = {
 ++++   [0]     = {
 ++++           .start  = PA_NORFLASH_ADDR,
 ++++           .end    = PA_NORFLASH_ADDR + PA_NORFLASH_SIZE - 1,
 ++++           .flags  = IORESOURCE_MEM,
 ++++   }
 ++++};
 ++++
 ++++static struct platform_device nor_flash_device = {
 ++++   .name           = "physmap-flash",
 ++++   .dev            = {
 ++++           .platform_data  = &nor_flash_data,
 ++++   },
 ++++   .num_resources  = ARRAY_SIZE(nor_flash_resources),
 ++++   .resource       = nor_flash_resources,
 ++++};
 ++++
     static struct resource smbus_resources[] = {
        [0] = {
                .start  = PA_SMCR,
@@@@@@ -257,7 -209,6 -209,6 -215,6 -209,6 +263,7 @@@@@@ static struct platform_device *r7780rp_
        &m66592_usb_peripheral_device,
        &heartbeat_device,
        &smbus_device,
 ++++   &nor_flash_device,
     #ifndef CONFIG_SH_R7780RP
        &ax88796_device,
     #endif
@@@@@@ -296,10 -247,9 -247,9 -253,9 -247,9 +302,10 @@@@@@ device_initcall(r7780rp_devices_setup)
     /*
      * Platform specific clocks
      */
 ----static void ivdr_clk_enable(struct clk *clk)
 ++++static int ivdr_clk_enable(struct clk *clk)
     {
        ctrl_outw(ctrl_inw(PA_IVDRCTL) | (1 << IVDR_CK_ON), PA_IVDRCTL);
 ++++   return 0;
     }
     
     static void ivdr_clk_disable(struct clk *clk)