ARM: shmobile: Remove G3EVM machine support
authorNobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Mon, 29 Oct 2012 06:05:57 +0000 (15:05 +0900)
committerSimon Horman <horms@verge.net.au>
Tue, 30 Oct 2012 07:25:56 +0000 (15:25 +0800)
This machine is using old CPU of shmobile (SH7367) and cannot obtain
machine, either.
Therefore, remove G3EVM support.

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
arch/arm/configs/g3evm_defconfig [deleted file]
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-g3evm.c [deleted file]

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
index 0750d9c7f00dae5ee1c827d0bb0d85098bfd23a6..73c20213f0cde1086fc5c7e1feeb4d26e009e2a9 100644 (file)
@@ -50,11 +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
@@ -147,7 +142,6 @@ 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 || \
                                MACH_MACKEREL || MACH_BONITO || \
                                MACH_ARMADILLO800EVA
@@ -160,7 +154,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
index fe2c97c179d1de40ae6805cce076b46594a22101..30a6c83df455ff6fa54d77eabad396b71d10ff51 100644 (file)
@@ -45,7 +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
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