Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas...
authorOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 14:02:52 +0000 (06:02 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 14:03:17 +0000 (06:03 -0800)
Renesas board changes from Simon Horman:

* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove G4EVM machine support
  ARM: shmobile: Remove G3EVM machine support
  ARM: mach-shmobile: Use DT_MACHINE for mackerel
  ARM: shmobile: marzen: add HSPI support
  ARM: shmobile: armadillo800eva: enable restart
  ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2
  ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345
  ARM: shmobile: kzm9g: enable magnetometer ak8975.

Signed-off-by: Olof Johansson <olof@lixom.net>
14 files changed:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/sh7372-mackerel.dts [new file with mode: 0644]
arch/arm/configs/g3evm_defconfig [deleted file]
arch/arm/configs/g4evm_defconfig [deleted file]
arch/arm/configs/kzm9g_defconfig
arch/arm/configs/marzen_defconfig
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-g3evm.c [deleted file]
arch/arm/mach-shmobile/board-g4evm.c [deleted file]
arch/arm/mach-shmobile/board-kzm9g.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/board-marzen.c

index f37cf9fa5fa073318b3c6faad5d0a1480bd99826..a9d8a10d1ac6f81f4ef44f720d6e0f3b099e4aaf 100644 (file)
@@ -77,7 +77,8 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 dtb-$(CONFIG_ARCH_U8500) += snowball.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
        r8a7740-armadillo800eva.dtb \
-       sh73a0-kzm9g.dtb
+       sh73a0-kzm9g.dtb \
+       sh7372-mackerel.dtb
 dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
        spear1340-evb.dtb
 dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
diff --git a/arch/arm/boot/dts/sh7372-mackerel.dts b/arch/arm/boot/dts/sh7372-mackerel.dts
new file mode 100644 (file)
index 0000000..286f0ca
--- /dev/null
@@ -0,0 +1,22 @@
+/*
+ * Device Tree Source for the mackerel board
+ *
+ * Copyright (C) 2012 Renesas Solutions Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "skeleton.dtsi"
+
+/ {
+       model = "Mackerel (AP4 EVM 2nd)";
+       compatible = "renesas,mackerel";
+
+       memory {
+               device_type = "memory";
+               reg = <0x40000000 0x10000000>;
+       };
+};
diff --git a/arch/arm/configs/g3evm_defconfig b/arch/arm/configs/g3evm_defconfig
deleted file mode 100644 (file)
index 4a336ab..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_SLAB=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
-CONFIG_ARCH_SH7367=y
-CONFIG_MACH_G3EVM=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySC1,115200 earlyprintk=sh-sci.1,115200"
-CONFIG_KEXEC=y
-CONFIG_PM=y
-# CONFIG_SUSPEND is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-# CONFIG_BLK_DEV is not set
-# CONFIG_MISC_DEVICES is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=8
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-CONFIG_TMPFS=y
-# CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_FTRACE is not set
-# CONFIG_CRC32 is not set
diff --git a/arch/arm/configs/g4evm_defconfig b/arch/arm/configs/g4evm_defconfig
deleted file mode 100644 (file)
index 21c6d03..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_SLAB=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
-CONFIG_ARCH_SH7377=y
-CONFIG_MACH_G4EVM=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySC4,115200 earlyprintk=sh-sci.4,115200"
-CONFIG_KEXEC=y
-CONFIG_PM=y
-# CONFIG_SUSPEND is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-# CONFIG_BLK_DEV is not set
-# CONFIG_MISC_DEVICES is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=8
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-# CONFIG_HWMON is not set
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-CONFIG_TMPFS=y
-# CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DETECT_SOFTLOCKUP is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_FTRACE is not set
-# CONFIG_CRC32 is not set
index c88b57886e791906f8f21459df939718a95be0b6..ce99e3e00efa1c13e9a6b3f2d9282f94d046c36c 100644 (file)
@@ -74,6 +74,8 @@ CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ST1232=y
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_ADXL34X=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_SH_SCI=y
 CONFIG_SERIAL_SH_SCI_NR_UARTS=9
@@ -119,6 +121,8 @@ CONFIG_DMADEVICES=y
 CONFIG_SH_DMAE=y
 CONFIG_ASYNC_TX_DMA=y
 CONFIG_STAGING=y
+CONFIG_SENSORS_AK8975=y
+CONFIG_IIO=y
 # CONFIG_DNOTIFY is not set
 CONFIG_INOTIFY_USER=y
 CONFIG_VFAT_FS=y
index 53382b6c8bb43345ae75b8f1ea39ab509d161980..5b8215f424c5a72e283fb979b5d4828f1d386738 100644 (file)
@@ -69,6 +69,10 @@ CONFIG_SERIAL_SH_SCI=y
 CONFIG_SERIAL_SH_SCI_NR_UARTS=6
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_RCAR=y
+CONFIG_SPI=y
+CONFIG_SPI_SH_HSPI=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
index 8ae100cc655c12c3cc23d3beb676c0ab9e2c8cfa..f58c3ea9773259d6e944cece0e6e31081eb86c2b 100644 (file)
@@ -50,17 +50,6 @@ config ARCH_EMEV2
 
 comment "SH-Mobile Board Type"
 
-config MACH_G3EVM
-       bool "G3EVM board"
-       depends on ARCH_SH7367
-       select ARCH_REQUIRE_GPIOLIB
-
-config MACH_G4EVM
-       bool "G4EVM board"
-       depends on ARCH_SH7377
-       select ARCH_REQUIRE_GPIOLIB
-       select REGULATOR_FIXED_VOLTAGE if REGULATOR
-
 config MACH_AP4EVB
        bool "AP4EVB board"
        depends on ARCH_SH7372
@@ -95,6 +84,7 @@ config MACH_MACKEREL
        select ARCH_REQUIRE_GPIOLIB
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
        select SND_SOC_AK4642 if SND_SIMPLE_CARD
+       select USE_OF
 
 config MACH_KOTA2
        bool "KOTA2 board"
@@ -146,8 +136,7 @@ menu "Memory configuration"
 
 config MEMORY_START
        hex "Physical memory start address"
-       default "0x50000000" if MACH_G3EVM
-       default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \
+       default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \
                                MACH_MACKEREL || MACH_BONITO || \
                                MACH_ARMADILLO800EVA
        default "0x41000000" if MACH_KOTA2
@@ -159,8 +148,6 @@ config MEMORY_START
 
 config MEMORY_SIZE
        hex "Physical memory size"
-       default "0x08000000" if MACH_G3EVM
-       default "0x08000000" if MACH_G4EVM
        default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \
                                MACH_ARMADILLO800EVA
        default "0x1e000000" if MACH_KOTA2
index fe2c97c179d1de40ae6805cce076b46594a22101..bd2633bb175a64780137b1a957e398f8de1ce4b3 100644 (file)
@@ -45,8 +45,6 @@ obj-$(CONFIG_ARCH_R8A7740)    += pm-r8a7740.o
 obj-$(CONFIG_ARCH_R8A7779)     += pm-r8a7779.o
 
 # Board objects
-obj-$(CONFIG_MACH_G3EVM)       += board-g3evm.o
-obj-$(CONFIG_MACH_G4EVM)       += board-g4evm.o
 obj-$(CONFIG_MACH_AP4EVB)      += board-ap4evb.o
 obj-$(CONFIG_MACH_AG5EVM)      += board-ag5evm.o
 obj-$(CONFIG_MACH_MACKEREL)    += board-mackerel.o
index 3cc8b1c21da9edffc4dfc7dd8a0d2288a4f69e05..499e6e3766660817fef28cc9022596ab11633dd3 100644 (file)
@@ -1229,6 +1229,13 @@ static void __init eva_add_early_devices(void)
        shmobile_timer.init = eva_earlytimer_init;
 }
 
+#define RESCNT2 IOMEM(0xe6188020)
+static void eva_restart(char mode, const char *cmd)
+{
+       /* Do soft power on reset */
+       writel((1 << 31), RESCNT2);
+}
+
 static const char *eva_boards_compat_dt[] __initdata = {
        "renesas,armadillo800eva",
        NULL,
@@ -1243,4 +1250,5 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva")
        .init_late      = shmobile_init_late,
        .timer          = &shmobile_timer,
        .dt_compat      = eva_boards_compat_dt,
+       .restart        = eva_restart,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-g3evm.c b/arch/arm/mach-shmobile/board-g3evm.c
deleted file mode 100644 (file)
index b179d4c..0000000
+++ /dev/null
@@ -1,343 +0,0 @@
-/*
- * G3EVM board support
- *
- * Copyright (C) 2010  Magnus Damm
- * Copyright (C) 2008  Yoshihiro Shimoda
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/mtd/sh_flctl.h>
-#include <linux/usb/r8a66597.h>
-#include <linux/io.h>
-#include <linux/gpio.h>
-#include <linux/input.h>
-#include <linux/input/sh_keysc.h>
-#include <linux/dma-mapping.h>
-#include <mach/irqs.h>
-#include <mach/sh7367.h>
-#include <mach/common.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-/*
- * IrDA
- *
- * S67: 5bit : ON  power
- *    : 6bit : ON  remote control
- *             OFF IrDA
- */
-
-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_ro",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 8 * 1024 * 1024,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-       {
-               .name           = "kernel",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 8 * 1024 * 1024,
-       },
-       {
-               .name           = "data",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct physmap_flash_data nor_flash_data = {
-       .width          = 2,
-       .parts          = nor_flash_partitions,
-       .nr_parts       = ARRAY_SIZE(nor_flash_partitions),
-};
-
-static struct resource nor_flash_resources[] = {
-       [0]     = {
-               .start  = 0x00000000,
-               .end    = 0x08000000 - 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,
-};
-
-/* USBHS */
-static void usb_host_port_power(int port, int power)
-{
-       if (!power) /* only power-on supported for now */
-               return;
-
-       /* set VBOUT/PWEN and EXTLP0 in DVSTCTR */
-       __raw_writew(__raw_readw(IOMEM(0xe6890008)) | 0x600, IOMEM(0xe6890008));
-}
-
-static struct r8a66597_platdata usb_host_data = {
-       .on_chip = 1,
-       .port_power = usb_host_port_power,
-};
-
-static struct resource usb_host_resources[] = {
-       [0] = {
-               .name   = "USBHS",
-               .start  = 0xe6890000,
-               .end    = 0xe68900e5,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = evt2irq(0xa20), /* USBHS_USHI0 */
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device usb_host_device = {
-       .name           = "r8a66597_hcd",
-       .id             = 0,
-       .dev = {
-               .platform_data          = &usb_host_data,
-               .dma_mask               = NULL,
-               .coherent_dma_mask      = 0xffffffff,
-       },
-       .num_resources  = ARRAY_SIZE(usb_host_resources),
-       .resource       = usb_host_resources,
-};
-
-/* KEYSC */
-static struct sh_keysc_info keysc_info = {
-       .mode           = SH_KEYSC_MODE_5,
-       .scan_timing    = 3,
-       .delay          = 100,
-       .keycodes = {
-               KEY_A, KEY_B, KEY_C, KEY_D, KEY_E, KEY_F, KEY_G,
-               KEY_H, KEY_I, KEY_J, KEY_K, KEY_L, KEY_M, KEY_N,
-               KEY_O, KEY_P, KEY_Q, KEY_R, KEY_S, KEY_T, KEY_U,
-               KEY_V, KEY_W, KEY_X, KEY_Y, KEY_Z, KEY_HOME, KEY_SLEEP,
-               KEY_WAKEUP, KEY_COFFEE, KEY_0, KEY_1, KEY_2, KEY_3, KEY_4,
-               KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_STOP, KEY_COMPUTER,
-       },
-};
-
-static struct resource keysc_resources[] = {
-       [0] = {
-               .name   = "KEYSC",
-               .start  = 0xe61b0000,
-               .end    = 0xe61b000f,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = evt2irq(0xbe0), /* KEYSC_KEY */
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device keysc_device = {
-       .name           = "sh_keysc",
-       .num_resources  = ARRAY_SIZE(keysc_resources),
-       .resource       = keysc_resources,
-       .dev    = {
-               .platform_data  = &keysc_info,
-       },
-};
-
-static struct mtd_partition nand_partition_info[] = {
-       {
-               .name   = "system",
-               .offset = 0,
-               .size   = 64 * 1024 * 1024,
-       },
-       {
-               .name   = "userdata",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = 128 * 1024 * 1024,
-       },
-       {
-               .name   = "cache",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = 64 * 1024 * 1024,
-       },
-};
-
-static struct resource nand_flash_resources[] = {
-       [0] = {
-               .start  = 0xe6a30000,
-               .end    = 0xe6a3009b,
-               .flags  = IORESOURCE_MEM,
-       }
-};
-
-static struct sh_flctl_platform_data nand_flash_data = {
-       .parts          = nand_partition_info,
-       .nr_parts       = ARRAY_SIZE(nand_partition_info),
-       .flcmncr_val    = QTSEL_E | FCKSEL_E | TYPESEL_SET | NANWF_E
-                       | SHBUSSEL | SEL_16BIT,
-};
-
-static struct platform_device nand_flash_device = {
-       .name           = "sh_flctl",
-       .resource       = nand_flash_resources,
-       .num_resources  = ARRAY_SIZE(nand_flash_resources),
-       .dev            = {
-               .platform_data = &nand_flash_data,
-       },
-};
-
-static struct resource irda_resources[] = {
-       [0] = {
-               .start  = 0xE6D00000,
-               .end    = 0xE6D01FD4 - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = evt2irq(0x480), /* IRDA */
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device irda_device = {
-       .name           = "sh_irda",
-       .id             = -1,
-       .resource       = irda_resources,
-       .num_resources  = ARRAY_SIZE(irda_resources),
-};
-
-static struct platform_device *g3evm_devices[] __initdata = {
-       &nor_flash_device,
-       &usb_host_device,
-       &keysc_device,
-       &nand_flash_device,
-       &irda_device,
-};
-
-static void __init g3evm_init(void)
-{
-       sh7367_pinmux_init();
-
-       /* Lit DS4 LED */
-       gpio_request(GPIO_PORT22, NULL);
-       gpio_direction_output(GPIO_PORT22, 1);
-       gpio_export(GPIO_PORT22, 0);
-
-       /* Lit DS8 LED */
-       gpio_request(GPIO_PORT23, NULL);
-       gpio_direction_output(GPIO_PORT23, 1);
-       gpio_export(GPIO_PORT23, 0);
-
-       /* Lit DS3 LED */
-       gpio_request(GPIO_PORT24, NULL);
-       gpio_direction_output(GPIO_PORT24, 1);
-       gpio_export(GPIO_PORT24, 0);
-
-       /* SCIFA1 */
-       gpio_request(GPIO_FN_SCIFA1_TXD, NULL);
-       gpio_request(GPIO_FN_SCIFA1_RXD, NULL);
-       gpio_request(GPIO_FN_SCIFA1_CTS, NULL);
-       gpio_request(GPIO_FN_SCIFA1_RTS, NULL);
-
-       /* USBHS */
-       gpio_request(GPIO_FN_VBUS0, NULL);
-       gpio_request(GPIO_FN_PWEN, NULL);
-       gpio_request(GPIO_FN_OVCN, NULL);
-       gpio_request(GPIO_FN_OVCN2, NULL);
-       gpio_request(GPIO_FN_EXTLP, NULL);
-       gpio_request(GPIO_FN_IDIN, NULL);
-
-       /* setup USB phy */
-       __raw_writew(0x0300, IOMEM(0xe605810a));        /* USBCR1 */
-       __raw_writew(0x00e0, IOMEM(0xe60581c0));        /* CPFCH */
-       __raw_writew(0x6010, IOMEM(0xe60581c6));        /* CGPOSR */
-       __raw_writew(0x8a0a, IOMEM(0xe605810c));        /* USBCR2 */
-
-       /* KEYSC @ CN7 */
-       gpio_request(GPIO_FN_PORT42_KEYOUT0, NULL);
-       gpio_request(GPIO_FN_PORT43_KEYOUT1, NULL);
-       gpio_request(GPIO_FN_PORT44_KEYOUT2, NULL);
-       gpio_request(GPIO_FN_PORT45_KEYOUT3, NULL);
-       gpio_request(GPIO_FN_PORT46_KEYOUT4, NULL);
-       gpio_request(GPIO_FN_PORT47_KEYOUT5, NULL);
-       gpio_request(GPIO_FN_PORT48_KEYIN0_PU, NULL);
-       gpio_request(GPIO_FN_PORT49_KEYIN1_PU, NULL);
-       gpio_request(GPIO_FN_PORT50_KEYIN2_PU, NULL);
-       gpio_request(GPIO_FN_PORT55_KEYIN3_PU, NULL);
-       gpio_request(GPIO_FN_PORT56_KEYIN4_PU, NULL);
-       gpio_request(GPIO_FN_PORT57_KEYIN5_PU, NULL);
-       gpio_request(GPIO_FN_PORT58_KEYIN6_PU, NULL);
-
-       /* FLCTL */
-       gpio_request(GPIO_FN_FCE0, NULL);
-       gpio_request(GPIO_FN_D0_ED0_NAF0, NULL);
-       gpio_request(GPIO_FN_D1_ED1_NAF1, NULL);
-       gpio_request(GPIO_FN_D2_ED2_NAF2, NULL);
-       gpio_request(GPIO_FN_D3_ED3_NAF3, NULL);
-       gpio_request(GPIO_FN_D4_ED4_NAF4, NULL);
-       gpio_request(GPIO_FN_D5_ED5_NAF5, NULL);
-       gpio_request(GPIO_FN_D6_ED6_NAF6, NULL);
-       gpio_request(GPIO_FN_D7_ED7_NAF7, NULL);
-       gpio_request(GPIO_FN_D8_ED8_NAF8, NULL);
-       gpio_request(GPIO_FN_D9_ED9_NAF9, NULL);
-       gpio_request(GPIO_FN_D10_ED10_NAF10, NULL);
-       gpio_request(GPIO_FN_D11_ED11_NAF11, NULL);
-       gpio_request(GPIO_FN_D12_ED12_NAF12, NULL);
-       gpio_request(GPIO_FN_D13_ED13_NAF13, NULL);
-       gpio_request(GPIO_FN_D14_ED14_NAF14, NULL);
-       gpio_request(GPIO_FN_D15_ED15_NAF15, NULL);
-       gpio_request(GPIO_FN_WE0_XWR0_FWE, NULL);
-       gpio_request(GPIO_FN_FRB, NULL);
-       /* FOE, FCDE, FSC on dedicated pins */
-       __raw_writel(__raw_readl(IOMEM(0xe6158048)) & ~(1 << 15), IOMEM(0xe6158048));
-
-       /* IrDA */
-       gpio_request(GPIO_FN_IRDA_OUT, NULL);
-       gpio_request(GPIO_FN_IRDA_IN, NULL);
-       gpio_request(GPIO_FN_IRDA_FIRSEL, NULL);
-
-       sh7367_add_standard_devices();
-
-       platform_add_devices(g3evm_devices, ARRAY_SIZE(g3evm_devices));
-}
-
-MACHINE_START(G3EVM, "g3evm")
-       .map_io         = sh7367_map_io,
-       .init_early     = sh7367_add_early_devices,
-       .init_irq       = sh7367_init_irq,
-       .handle_irq     = shmobile_handle_irq_intc,
-       .init_machine   = g3evm_init,
-       .init_late      = shmobile_init_late,
-       .timer          = &shmobile_timer,
-MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-g4evm.c b/arch/arm/mach-shmobile/board-g4evm.c
deleted file mode 100644 (file)
index 35c126c..0000000
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * G4EVM board support
- *
- * Copyright (C) 2010  Magnus Damm
- * Copyright (C) 2008  Yoshihiro Shimoda
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/regulator/fixed.h>
-#include <linux/regulator/machine.h>
-#include <linux/usb/r8a66597.h>
-#include <linux/io.h>
-#include <linux/input.h>
-#include <linux/input/sh_keysc.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/sh_mobile_sdhi.h>
-#include <linux/gpio.h>
-#include <linux/dma-mapping.h>
-#include <mach/irqs.h>
-#include <mach/sh7377.h>
-#include <mach/common.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include "sh-gpio.h"
-
-/*
- * SDHI
- *
- * SDHI0 : card detection is possible
- * SDHI1 : card detection is impossible
- *
- * [G4-MAIN-BOARD]
- * JP74 : short                # DBG_2V8A    for SDHI0
- * JP75 : NC           # DBG_3V3A    for SDHI0
- * JP76 : NC           # DBG_3V3A_SD for SDHI0
- * JP77 : NC           # 3V3A_SDIO   for SDHI1
- * JP78 : short                # DBG_2V8A    for SDHI1
- * JP79 : NC           # DBG_3V3A    for SDHI1
- * JP80 : NC           # DBG_3V3A_SD for SDHI1
- *
- * [G4-CORE-BOARD]
- * S32 : all off       # to dissever from G3-CORE_DBG board
- * S33 : all off       # to dissever from G3-CORE_DBG board
- *
- * [G3-CORE_DBG-BOARD]
- * S1  : all off       # to dissever from G3-CORE_DBG board
- * S3  : all off       # to dissever from G3-CORE_DBG board
- * S4  : all off       # to dissever from G3-CORE_DBG board
- */
-
-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_ro",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 8 * 1024 * 1024,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-       {
-               .name           = "kernel",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 8 * 1024 * 1024,
-       },
-       {
-               .name           = "data",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct physmap_flash_data nor_flash_data = {
-       .width          = 2,
-       .parts          = nor_flash_partitions,
-       .nr_parts       = ARRAY_SIZE(nor_flash_partitions),
-};
-
-static struct resource nor_flash_resources[] = {
-       [0]     = {
-               .start  = 0x00000000,
-               .end    = 0x08000000 - 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,
-};
-
-/* USBHS */
-static void usb_host_port_power(int port, int power)
-{
-       if (!power) /* only power-on supported for now */
-               return;
-
-       /* set VBOUT/PWEN and EXTLP0 in DVSTCTR */
-       __raw_writew(__raw_readw(IOMEM(0xe6890008)) | 0x600, IOMEM(0xe6890008));
-}
-
-static struct r8a66597_platdata usb_host_data = {
-       .on_chip = 1,
-       .port_power = usb_host_port_power,
-};
-
-static struct resource usb_host_resources[] = {
-       [0] = {
-               .name   = "USBHS",
-               .start  = 0xe6890000,
-               .end    = 0xe68900e5,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = evt2irq(0x0a20), /* USBHS_USHI0 */
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device usb_host_device = {
-       .name           = "r8a66597_hcd",
-       .id             = 0,
-       .dev = {
-               .platform_data          = &usb_host_data,
-               .dma_mask               = NULL,
-               .coherent_dma_mask      = 0xffffffff,
-       },
-       .num_resources  = ARRAY_SIZE(usb_host_resources),
-       .resource       = usb_host_resources,
-};
-
-/* KEYSC */
-static struct sh_keysc_info keysc_info = {
-       .mode           = SH_KEYSC_MODE_5,
-       .scan_timing    = 3,
-       .delay          = 100,
-       .keycodes = {
-               KEY_A, KEY_B, KEY_C, KEY_D, KEY_E, KEY_F,
-               KEY_G, KEY_H, KEY_I, KEY_J, KEY_K, KEY_L,
-               KEY_M, KEY_N, KEY_U, KEY_P, KEY_Q, KEY_R,
-               KEY_S, KEY_T, KEY_U, KEY_V, KEY_W, KEY_X,
-               KEY_Y, KEY_Z, KEY_HOME, KEY_SLEEP, KEY_WAKEUP, KEY_COFFEE,
-               KEY_0, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5,
-               KEY_6, KEY_7, KEY_8, KEY_9, KEY_STOP, KEY_COMPUTER,
-       },
-};
-
-static struct resource keysc_resources[] = {
-       [0] = {
-               .name   = "KEYSC",
-               .start  = 0xe61b0000,
-               .end    = 0xe61b000f,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = evt2irq(0x0be0), /* KEYSC_KEY */
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device keysc_device = {
-       .name           = "sh_keysc",
-       .id             = 0, /* keysc0 clock */
-       .num_resources  = ARRAY_SIZE(keysc_resources),
-       .resource       = keysc_resources,
-       .dev    = {
-               .platform_data  = &keysc_info,
-       },
-};
-
-/* Fixed 3.3V regulator to be used by SDHI0 and SDHI1 */
-static struct regulator_consumer_supply fixed3v3_power_consumers[] =
-{
-       REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
-       REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
-       REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),
-       REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"),
-};
-
-/* SDHI */
-static struct sh_mobile_sdhi_info sdhi0_info = {
-       .tmio_caps      = MMC_CAP_SDIO_IRQ,
-};
-
-static struct resource sdhi0_resources[] = {
-       [0] = {
-               .name   = "SDHI0",
-               .start  = 0xe6d50000,
-               .end    = 0xe6d500ff,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = evt2irq(0x0e00), /* SDHI0 */
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device sdhi0_device = {
-       .name           = "sh_mobile_sdhi",
-       .num_resources  = ARRAY_SIZE(sdhi0_resources),
-       .resource       = sdhi0_resources,
-       .id             = 0,
-       .dev    = {
-               .platform_data  = &sdhi0_info,
-       },
-};
-
-static struct sh_mobile_sdhi_info sdhi1_info = {
-       .tmio_caps      = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ,
-};
-
-static struct resource sdhi1_resources[] = {
-       [0] = {
-               .name   = "SDHI1",
-               .start  = 0xe6d60000,
-               .end    = 0xe6d600ff,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = evt2irq(0x0e80), /* SDHI1 */
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device sdhi1_device = {
-       .name           = "sh_mobile_sdhi",
-       .num_resources  = ARRAY_SIZE(sdhi1_resources),
-       .resource       = sdhi1_resources,
-       .id             = 1,
-       .dev    = {
-               .platform_data  = &sdhi1_info,
-       },
-};
-
-static struct platform_device *g4evm_devices[] __initdata = {
-       &nor_flash_device,
-       &usb_host_device,
-       &keysc_device,
-       &sdhi0_device,
-       &sdhi1_device,
-};
-
-#define GPIO_SDHID0_D0 IOMEM(0xe60520fc)
-#define GPIO_SDHID0_D1 IOMEM(0xe60520fd)
-#define GPIO_SDHID0_D2 IOMEM(0xe60520fe)
-#define GPIO_SDHID0_D3 IOMEM(0xe60520ff)
-#define GPIO_SDHICMD0  IOMEM(0xe6052100)
-
-#define GPIO_SDHID1_D0 IOMEM(0xe6052103)
-#define GPIO_SDHID1_D1 IOMEM(0xe6052104)
-#define GPIO_SDHID1_D2 IOMEM(0xe6052105)
-#define GPIO_SDHID1_D3 IOMEM(0xe6052106)
-#define GPIO_SDHICMD1  IOMEM(0xe6052107)
-
-static void __init g4evm_init(void)
-{
-       regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
-                                    ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
-
-       sh7377_pinmux_init();
-
-       /* Lit DS14 LED */
-       gpio_request(GPIO_PORT109, NULL);
-       gpio_direction_output(GPIO_PORT109, 1);
-       gpio_export(GPIO_PORT109, 1);
-
-       /* Lit DS15 LED */
-       gpio_request(GPIO_PORT110, NULL);
-       gpio_direction_output(GPIO_PORT110, 1);
-       gpio_export(GPIO_PORT110, 1);
-
-       /* Lit DS16 LED */
-       gpio_request(GPIO_PORT112, NULL);
-       gpio_direction_output(GPIO_PORT112, 1);
-       gpio_export(GPIO_PORT112, 1);
-
-       /* Lit DS17 LED */
-       gpio_request(GPIO_PORT113, NULL);
-       gpio_direction_output(GPIO_PORT113, 1);
-       gpio_export(GPIO_PORT113, 1);
-
-       /* USBHS */
-       gpio_request(GPIO_FN_VBUS_0, NULL);
-       gpio_request(GPIO_FN_PWEN, NULL);
-       gpio_request(GPIO_FN_OVCN, NULL);
-       gpio_request(GPIO_FN_OVCN2, NULL);
-       gpio_request(GPIO_FN_EXTLP, NULL);
-       gpio_request(GPIO_FN_IDIN, NULL);
-
-       /* setup USB phy */
-       __raw_writew(0x0200, IOMEM(0xe605810a));       /* USBCR1 */
-       __raw_writew(0x00e0, IOMEM(0xe60581c0));       /* CPFCH */
-       __raw_writew(0x6010, IOMEM(0xe60581c6));       /* CGPOSR */
-       __raw_writew(0x8a0a, IOMEM(0xe605810c));       /* USBCR2 */
-
-       /* KEYSC @ CN31 */
-       gpio_request(GPIO_FN_PORT60_KEYOUT5, NULL);
-       gpio_request(GPIO_FN_PORT61_KEYOUT4, NULL);
-       gpio_request(GPIO_FN_PORT62_KEYOUT3, NULL);
-       gpio_request(GPIO_FN_PORT63_KEYOUT2, NULL);
-       gpio_request(GPIO_FN_PORT64_KEYOUT1, NULL);
-       gpio_request(GPIO_FN_PORT65_KEYOUT0, NULL);
-       gpio_request(GPIO_FN_PORT66_KEYIN0_PU, NULL);
-       gpio_request(GPIO_FN_PORT67_KEYIN1_PU, NULL);
-       gpio_request(GPIO_FN_PORT68_KEYIN2_PU, NULL);
-       gpio_request(GPIO_FN_PORT69_KEYIN3_PU, NULL);
-       gpio_request(GPIO_FN_PORT70_KEYIN4_PU, NULL);
-       gpio_request(GPIO_FN_PORT71_KEYIN5_PU, NULL);
-       gpio_request(GPIO_FN_PORT72_KEYIN6_PU, NULL);
-
-       /* SDHI0 */
-       gpio_request(GPIO_FN_SDHICLK0, NULL);
-       gpio_request(GPIO_FN_SDHICD0, NULL);
-       gpio_request(GPIO_FN_SDHID0_0, NULL);
-       gpio_request(GPIO_FN_SDHID0_1, NULL);
-       gpio_request(GPIO_FN_SDHID0_2, NULL);
-       gpio_request(GPIO_FN_SDHID0_3, NULL);
-       gpio_request(GPIO_FN_SDHICMD0, NULL);
-       gpio_request(GPIO_FN_SDHIWP0, NULL);
-       gpio_request_pullup(GPIO_SDHID0_D0);
-       gpio_request_pullup(GPIO_SDHID0_D1);
-       gpio_request_pullup(GPIO_SDHID0_D2);
-       gpio_request_pullup(GPIO_SDHID0_D3);
-       gpio_request_pullup(GPIO_SDHICMD0);
-
-       /* SDHI1 */
-       gpio_request(GPIO_FN_SDHICLK1, NULL);
-       gpio_request(GPIO_FN_SDHID1_0, NULL);
-       gpio_request(GPIO_FN_SDHID1_1, NULL);
-       gpio_request(GPIO_FN_SDHID1_2, NULL);
-       gpio_request(GPIO_FN_SDHID1_3, NULL);
-       gpio_request(GPIO_FN_SDHICMD1, NULL);
-       gpio_request_pullup(GPIO_SDHID1_D0);
-       gpio_request_pullup(GPIO_SDHID1_D1);
-       gpio_request_pullup(GPIO_SDHID1_D2);
-       gpio_request_pullup(GPIO_SDHID1_D3);
-       gpio_request_pullup(GPIO_SDHICMD1);
-
-       sh7377_add_standard_devices();
-
-       platform_add_devices(g4evm_devices, ARRAY_SIZE(g4evm_devices));
-}
-
-MACHINE_START(G4EVM, "g4evm")
-       .map_io         = sh7377_map_io,
-       .init_early     = sh7377_add_early_devices,
-       .init_irq       = sh7377_init_irq,
-       .handle_irq     = shmobile_handle_irq_intc,
-       .init_machine   = g4evm_init,
-       .init_late      = shmobile_init_late,
-       .timer          = &shmobile_timer,
-MACHINE_END
index 0a43f3189c21c176f41f13ee82062f837a9ab6f8..f63f2eeb0205d4361226a95ccb68fb5b34571bfa 100644 (file)
@@ -384,6 +384,8 @@ static struct regulator_consumer_supply fixed2v8_power_consumers[] =
 
 /* SDHI */
 static struct sh_mobile_sdhi_info sdhi0_info = {
+       .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
+       .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
        .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
        .tmio_ocr_mask  = MMC_VDD_27_28 | MMC_VDD_28_29,
@@ -424,6 +426,8 @@ static struct platform_device sdhi0_device = {
 
 /* Micro SD */
 static struct sh_mobile_sdhi_info sdhi2_info = {
+       .dma_slave_tx   = SHDMA_SLAVE_SDHI2_TX,
+       .dma_slave_rx   = SHDMA_SLAVE_SDHI2_RX,
        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT |
                          TMIO_MMC_USE_GPIO_CD |
                          TMIO_MMC_WRPROTECT_DISABLE,
@@ -557,7 +561,15 @@ static struct i2c_board_info i2c0_devices[] = {
        },
        {
                I2C_BOARD_INFO("r2025sd", 0x32),
-       }
+       },
+       {
+               I2C_BOARD_INFO("ak8975", 0x0c),
+               .irq = intcs_evt2irq(0x3380), /* IRQ28 */
+       },
+       {
+               I2C_BOARD_INFO("adxl34x", 0x1d),
+               .irq = intcs_evt2irq(0x3340), /* IRQ26 */
+       },
 };
 
 static struct i2c_board_info i2c1_devices[] = {
index 0c27c810cf99d0906b655f298091ffab257644fc..39b8f2e70638322e60b6463f4a506547ec5b607c 100644 (file)
@@ -1651,7 +1651,12 @@ static void __init mackerel_init(void)
        pm_clk_add(&hdmi_lcdc_device.dev, "hdmi");
 }
 
-MACHINE_START(MACKEREL, "mackerel")
+static const char *mackerel_boards_compat_dt[] __initdata = {
+       "renesas,mackerel",
+       NULL,
+};
+
+DT_MACHINE_START(MACKEREL_DT, "mackerel")
        .map_io         = sh7372_map_io,
        .init_early     = sh7372_add_early_devices,
        .init_irq       = sh7372_init_irq,
@@ -1659,4 +1664,5 @@ MACHINE_START(MACKEREL, "mackerel")
        .init_machine   = mackerel_init,
        .init_late      = sh7372_pm_init_late,
        .timer          = &shmobile_timer,
+       .dt_compat  = mackerel_boards_compat_dt,
 MACHINE_END
index b8a7525a4e2f17a9b4a7ded338fbe22b3b04f3fc..69f7f464eff84bb4446e76500e627d5e03e12d78 100644 (file)
@@ -30,6 +30,8 @@
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/sh_hspi.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mfd/tmio.h>
 #include <mach/hardware.h>
@@ -126,10 +128,27 @@ static struct platform_device thermal_device = {
        .num_resources  = ARRAY_SIZE(thermal_resources),
 };
 
+/* HSPI */
+static struct resource hspi_resources[] = {
+       [0] = {
+               .start          = 0xFFFC7000,
+               .end            = 0xFFFC7018 - 1,
+               .flags          = IORESOURCE_MEM,
+       },
+};
+
+static struct platform_device hspi_device = {
+       .name   = "sh-hspi",
+       .id     = 0,
+       .resource       = hspi_resources,
+       .num_resources  = ARRAY_SIZE(hspi_resources),
+};
+
 static struct platform_device *marzen_devices[] __initdata = {
        &eth_device,
        &sdhi0_device,
        &thermal_device,
+       &hspi_device,
 };
 
 static void __init marzen_init(void)
@@ -163,6 +182,12 @@ static void __init marzen_init(void)
        gpio_request(GPIO_FN_SD0_CD, NULL);
        gpio_request(GPIO_FN_SD0_WP, NULL);
 
+       /* HSPI 0 */
+       gpio_request(GPIO_FN_HSPI_CLK0, NULL);
+       gpio_request(GPIO_FN_HSPI_CS0,  NULL);
+       gpio_request(GPIO_FN_HSPI_TX0,  NULL);
+       gpio_request(GPIO_FN_HSPI_RX0,  NULL);
+
        r8a7779_add_standard_devices();
        platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
This page took 0.042315 seconds and 5 git commands to generate.