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

Commit a515be1c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'renesas-kzm9g' into renesas-board-new 

* renesas-kzm9g:
  ARM: mach-shmobile: kzm9g: enable SMP boot
  ARM: mach-shmobile: kzm9g: defconfig update
  ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key
  ARM: mach-shmobile: kzm9g: add SDHI support
  ARM: mach-shmobile: kzm9g: add MMCIF support
  ARM: mach-shmobile: kzm9g: correct screen direction
  ARM: mach-shmobile: sh73a0.h: add GPIO_NR
  ARM: mach-shmobile: pfc-sh73a0: fixup MSEL2CR MSEL18 for I2C-3
  ARM: mach-shmobile: kzm9g: add ST1232 Touchscreen support
  ARM: mach-shmobile: kzm9g: add LCDC support
  ARM: mach-shmobile: kzm9g: add external USB Host support
  ARM: mach-shmobile: kzm9g: add SMSC 9221 support
  ARM: mach-shmobile: kzm9g: add defconfig
  ARM: mach-shmobile: add KZM-A9-GT board support

Conflicts:
	arch/arm/mach-shmobile/Makefile
parents 9183857d fecf84c1

arch/arm/configs/kzm9g_defconfig

0 → 100644
+139 −0
Original line number Diff line number Diff line 
# CONFIG_ARM_PATCH_PHYS_VIRT is not set

CONFIG_EXPERIMENTAL=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_PID_NS is not set

# CONFIG_NET_NS is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_FORCE_LOAD=y

CONFIG_MODULE_UNLOAD=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_KEYBOARD_GPIO_POLLED=y

CONFIG_ARCH_SH73A0=y

CONFIG_MACH_KZM9G=y

CONFIG_MEMORY_START=0x41000000

CONFIG_MEMORY_SIZE=0x1f000000

CONFIG_ARM_ERRATA_743622=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200"

CONFIG_KEXEC=y

CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_IRDA=y

CONFIG_SH_IRDA=y

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

CONFIG_SMSC911X=y

# CONFIG_WLAN is not set

CONFIG_INPUT_SPARSEKMAP=y

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_KEYBOARD_ATKBD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_ST1232=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=9

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_SH_MOBILE=y

CONFIG_GPIO_PCF857X=y

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

CONFIG_FB_SH_MOBILE_MERAM=y

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_SUPPORT_OLD_API is not set

# CONFIG_SND_VERBOSE_PROCFS is not set

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_ARM is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_SOC_SH4_FSI=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_R8A66597_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

# CONFIG_MMC_BLOCK_BOUNCE is not set

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_ASYNC_TX_DMA=y

CONFIG_STAGING=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_V4_1=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_PREEMPT is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_FTRACE is not set

# CONFIG_ARM_UNWIND is not set

CONFIG_CRYPTO=y

CONFIG_CRYPTO_CBC=y

CONFIG_CRYPTO_MD5=y

CONFIG_CRYPTO_DES=y

CONFIG_CRC16=y

arch/arm/mach-shmobile/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -103,6 +103,11 @@ config MACH_MARZEN 
	depends on ARCH_R8A7779

	select ARCH_REQUIRE_GPIOLIB



config MACH_KZM9G

	bool "KZM-A9-GT board"

	depends on ARCH_SH73A0

	select ARCH_REQUIRE_GPIOLIB



comment "SH-Mobile System Configuration"



config CPU_HAS_INTEVT

arch/arm/mach-shmobile/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ obj-$(CONFIG_MACH_KOTA2) += board-kota2.o 
obj-$(CONFIG_MACH_BONITO)	+= board-bonito.o

obj-$(CONFIG_MACH_MARZEN)	+= board-marzen.o

obj-$(CONFIG_MACH_ARMADILLO800EVA)	+= board-armadillo800eva.o

obj-$(CONFIG_MACH_KZM9G)	+= board-kzm9g.o



# Framework support

obj-$(CONFIG_SMP)		+= $(smp-y)

arch/arm/mach-shmobile/board-kzm9g.c

0 → 100644
+454 −0
Original line number Diff line number Diff line 
/*

 * KZM-A9-GT board support

 *

 * Copyright (C) 2012	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 *

 * 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/delay.h>

#include <linux/gpio.h>

#include <linux/gpio_keys.h>

#include <linux/io.h>

#include <linux/irq.h>

#include <linux/i2c.h>

#include <linux/i2c/pcf857x.h>

#include <linux/input.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mmcif.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mfd/tmio.h>

#include <linux/platform_device.h>

#include <linux/smsc911x.h>

#include <linux/usb/r8a66597.h>

#include <linux/videodev2.h>

#include <mach/irqs.h>

#include <mach/sh73a0.h>

#include <mach/common.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/hardware/gic.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <video/sh_mobile_lcdc.h>



/*

 * external GPIO

 */

#define GPIO_PCF8575_BASE	(GPIO_NR)

#define GPIO_PCF8575_PORT10	(GPIO_NR + 8)

#define GPIO_PCF8575_PORT11	(GPIO_NR + 9)

#define GPIO_PCF8575_PORT12	(GPIO_NR + 10)

#define GPIO_PCF8575_PORT13	(GPIO_NR + 11)

#define GPIO_PCF8575_PORT14	(GPIO_NR + 12)

#define GPIO_PCF8575_PORT15	(GPIO_NR + 13)

#define GPIO_PCF8575_PORT16	(GPIO_NR + 14)



/* SMSC 9221 */

static struct resource smsc9221_resources[] = {

	[0] = {

		.start	= 0x10000000, /* CS4 */

		.end	= 0x100000ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= intcs_evt2irq(0x260), /* IRQ3 */

		.flags	= IORESOURCE_IRQ,

	},

};



static struct smsc911x_platform_config smsc9221_platdata = {

	.flags		= SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,

	.phy_interface	= PHY_INTERFACE_MODE_MII,

	.irq_polarity	= SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.irq_type	= SMSC911X_IRQ_TYPE_PUSH_PULL,

};



static struct platform_device smsc_device = {

	.name		= "smsc911x",

	.dev  = {

		.platform_data = &smsc9221_platdata,

	},

	.resource	= smsc9221_resources,

	.num_resources	= ARRAY_SIZE(smsc9221_resources),

};



/* USB external chip */

static struct r8a66597_platdata usb_host_data = {

	.on_chip	= 0,

	.xtal		= R8A66597_PLATDATA_XTAL_48MHZ,

};



static struct resource usb_resources[] = {

	[0] = {

		.start	= 0x10010000,

		.end	= 0x1001ffff - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= intcs_evt2irq(0x220), /* IRQ1 */

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device usb_host_device = {

	.name	= "r8a66597_hcd",

	.dev = {

		.platform_data		= &usb_host_data,

		.dma_mask		= NULL,

		.coherent_dma_mask	= 0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(usb_resources),

	.resource	= usb_resources,

};



/* LCDC */

static struct fb_videomode kzm_lcdc_mode = {

	.name		= "WVGA Panel",

	.xres		= 800,

	.yres		= 480,

	.left_margin	= 220,

	.right_margin	= 110,

	.hsync_len	= 70,

	.upper_margin	= 20,

	.lower_margin	= 5,

	.vsync_len	= 5,

	.sync		= 0,

};



static struct sh_mobile_lcdc_info lcdc_info = {

	.clock_source = LCDC_CLK_BUS,

	.ch[0] = {

		.chan		= LCDC_CHAN_MAINLCD,

		.fourcc		= V4L2_PIX_FMT_RGB565,

		.interface_type	= RGB24,

		.lcd_modes	= &kzm_lcdc_mode,

		.num_modes	= 1,

		.clock_divider	= 5,

		.flags		= 0,

		.panel_cfg = {

			.width	= 152,

			.height	= 91,

		},

	}

};



static struct resource lcdc_resources[] = {

	[0] = {

		.name	= "LCDC",

		.start	= 0xfe940000,

		.end	= 0xfe943fff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= intcs_evt2irq(0x580),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device lcdc_device = {

	.name		= "sh_mobile_lcdc_fb",

	.num_resources	= ARRAY_SIZE(lcdc_resources),

	.resource	= lcdc_resources,

	.dev	= {

		.platform_data	= &lcdc_info,

		.coherent_dma_mask = ~0,

	},

};



/* MMCIF */

static struct resource sh_mmcif_resources[] = {

	[0] = {

		.name	= "MMCIF",

		.start	= 0xe6bd0000,

		.end	= 0xe6bd00ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= gic_spi(141),

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.start	= gic_spi(140),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct sh_mmcif_plat_data sh_mmcif_platdata = {

	.ocr		= MMC_VDD_165_195,

	.caps		= MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,

};



static struct platform_device mmc_device = {

	.name		= "sh_mmcif",

	.dev		= {

		.dma_mask		= NULL,

		.coherent_dma_mask	= 0xffffffff,

		.platform_data		= &sh_mmcif_platdata,

	},

	.num_resources	= ARRAY_SIZE(sh_mmcif_resources),

	.resource	= sh_mmcif_resources,

};



/* SDHI */

static struct sh_mobile_sdhi_info sdhi0_info = {

	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT,

	.tmio_caps	= MMC_CAP_SD_HIGHSPEED,

	.tmio_ocr_mask	= MMC_VDD_27_28 | MMC_VDD_28_29,

};



static struct resource sdhi0_resources[] = {

	[0] = {

		.name	= "SDHI0",

		.start	= 0xee100000,

		.end	= 0xee1000ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.name	= SH_MOBILE_SDHI_IRQ_CARD_DETECT,

		.start	= gic_spi(83),

		.flags	= IORESOURCE_IRQ,

	},

	[2] = {

		.name	= SH_MOBILE_SDHI_IRQ_SDCARD,

		.start	= gic_spi(84),

		.flags	= IORESOURCE_IRQ,

	},

	[3] = {

		.name	= SH_MOBILE_SDHI_IRQ_SDIO,

		.start	= gic_spi(85),

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device sdhi0_device = {

	.name		= "sh_mobile_sdhi",

	.num_resources	= ARRAY_SIZE(sdhi0_resources),

	.resource	= sdhi0_resources,

	.dev	= {

		.platform_data	= &sdhi0_info,

	},

};



/* KEY */

#define GPIO_KEY(c, g, d) { .code = c, .gpio = g, .desc = d, .active_low = 1 }



static struct gpio_keys_button gpio_buttons[] = {

	GPIO_KEY(KEY_BACK,	GPIO_PCF8575_PORT10,	"SW3"),

	GPIO_KEY(KEY_RIGHT,	GPIO_PCF8575_PORT11,	"SW2-R"),

	GPIO_KEY(KEY_LEFT,	GPIO_PCF8575_PORT12,	"SW2-L"),

	GPIO_KEY(KEY_ENTER,	GPIO_PCF8575_PORT13,	"SW2-P"),

	GPIO_KEY(KEY_UP,	GPIO_PCF8575_PORT14,	"SW2-U"),

	GPIO_KEY(KEY_DOWN,	GPIO_PCF8575_PORT15,	"SW2-D"),

	GPIO_KEY(KEY_HOME,	GPIO_PCF8575_PORT16,	"SW1"),

};



static struct gpio_keys_platform_data gpio_key_info = {

	.buttons	= gpio_buttons,

	.nbuttons	= ARRAY_SIZE(gpio_buttons),

	.poll_interval	= 250, /* poling at this point */

};



static struct platform_device gpio_keys_device = {

	/* gpio-pcf857x.c driver doesn't support gpio_to_irq() */

	.name	= "gpio-keys-polled",

	.dev	= {

		.platform_data  = &gpio_key_info,

	},

};



/* I2C */

static struct pcf857x_platform_data pcf8575_pdata = {

	.gpio_base	= GPIO_PCF8575_BASE,

};



static struct i2c_board_info i2c1_devices[] = {

	{

		I2C_BOARD_INFO("st1232-ts", 0x55),

		.irq = intcs_evt2irq(0x300), /* IRQ8 */

	},

};



static struct i2c_board_info i2c3_devices[] = {

	{

		I2C_BOARD_INFO("pcf8575", 0x20),

		.platform_data = &pcf8575_pdata,

	},

};



static struct platform_device *kzm_devices[] __initdata = {

	&smsc_device,

	&usb_host_device,

	&lcdc_device,

	&mmc_device,

	&sdhi0_device,

	&gpio_keys_device,

};



/*

 * FIXME

 *

 * This is quick hack for enabling LCDC backlight

 */

static int __init as3711_enable_lcdc_backlight(void)

{

	struct i2c_adapter *a = i2c_get_adapter(0);

	struct i2c_msg msg;

	int i, ret;

	__u8 magic[] = {

		0x40, 0x2a,

		0x43, 0x3c,

		0x44, 0x3c,

		0x45, 0x3c,

		0x54, 0x03,

		0x51, 0x00,

		0x51, 0x01,

		0xff, 0x00, /* wait */

		0x43, 0xf0,

		0x44, 0xf0,

		0x45, 0xf0,

	};



	if (!machine_is_kzm9g())

		return 0;



	if (!a)

		return 0;



	msg.addr	= 0x40;

	msg.len		= 2;

	msg.flags	= 0;



	for (i = 0; i < ARRAY_SIZE(magic); i += 2) {

		msg.buf = magic + i;



		if (0xff == msg.buf[0]) {

			udelay(500);

			continue;

		}



		ret = i2c_transfer(a, &msg, 1);

		if (ret < 0) {

			pr_err("i2c transfer fail\n");

			break;

		}

	}



	return 0;

}

device_initcall(as3711_enable_lcdc_backlight);



static void __init kzm_init(void)

{

	sh73a0_pinmux_init();



	/* enable SCIFA4 */

	gpio_request(GPIO_FN_SCIFA4_TXD, NULL);

	gpio_request(GPIO_FN_SCIFA4_RXD, NULL);

	gpio_request(GPIO_FN_SCIFA4_RTS_, NULL);

	gpio_request(GPIO_FN_SCIFA4_CTS_, NULL);



	/* CS4 for SMSC/USB */

	gpio_request(GPIO_FN_CS4_, NULL); /* CS4 */



	/* SMSC */

	gpio_request(GPIO_PORT224, NULL); /* IRQ3 */

	gpio_direction_input(GPIO_PORT224);



	/* LCDC */

	gpio_request(GPIO_FN_LCDD23,	NULL);

	gpio_request(GPIO_FN_LCDD22,	NULL);

	gpio_request(GPIO_FN_LCDD21,	NULL);

	gpio_request(GPIO_FN_LCDD20,	NULL);

	gpio_request(GPIO_FN_LCDD19,	NULL);

	gpio_request(GPIO_FN_LCDD18,	NULL);

	gpio_request(GPIO_FN_LCDD17,	NULL);

	gpio_request(GPIO_FN_LCDD16,	NULL);

	gpio_request(GPIO_FN_LCDD15,	NULL);

	gpio_request(GPIO_FN_LCDD14,	NULL);

	gpio_request(GPIO_FN_LCDD13,	NULL);

	gpio_request(GPIO_FN_LCDD12,	NULL);

	gpio_request(GPIO_FN_LCDD11,	NULL);

	gpio_request(GPIO_FN_LCDD10,	NULL);

	gpio_request(GPIO_FN_LCDD9,	NULL);

	gpio_request(GPIO_FN_LCDD8,	NULL);

	gpio_request(GPIO_FN_LCDD7,	NULL);

	gpio_request(GPIO_FN_LCDD6,	NULL);

	gpio_request(GPIO_FN_LCDD5,	NULL);

	gpio_request(GPIO_FN_LCDD4,	NULL);

	gpio_request(GPIO_FN_LCDD3,	NULL);

	gpio_request(GPIO_FN_LCDD2,	NULL);

	gpio_request(GPIO_FN_LCDD1,	NULL);

	gpio_request(GPIO_FN_LCDD0,	NULL);

	gpio_request(GPIO_FN_LCDDISP,	NULL);

	gpio_request(GPIO_FN_LCDDCK,	NULL);



	gpio_request(GPIO_PORT222,	NULL); /* LCDCDON */

	gpio_request(GPIO_PORT226,	NULL); /* SC */

	gpio_direction_output(GPIO_PORT222, 1);

	gpio_direction_output(GPIO_PORT226, 1);



	/* Touchscreen */

	gpio_request(GPIO_PORT223, NULL); /* IRQ8 */

	gpio_direction_input(GPIO_PORT223);



	/* enable MMCIF */

	gpio_request(GPIO_FN_MMCCLK0,		NULL);

	gpio_request(GPIO_FN_MMCCMD0_PU,	NULL);

	gpio_request(GPIO_FN_MMCD0_0_PU,	NULL);

	gpio_request(GPIO_FN_MMCD0_1_PU,	NULL);

	gpio_request(GPIO_FN_MMCD0_2_PU,	NULL);

	gpio_request(GPIO_FN_MMCD0_3_PU,	NULL);

	gpio_request(GPIO_FN_MMCD0_4_PU,	NULL);

	gpio_request(GPIO_FN_MMCD0_5_PU,	NULL);

	gpio_request(GPIO_FN_MMCD0_6_PU,	NULL);

	gpio_request(GPIO_FN_MMCD0_7_PU,	NULL);



	/* enable SD */

	gpio_request(GPIO_FN_SDHIWP0,		NULL);

	gpio_request(GPIO_FN_SDHICD0,		NULL);

	gpio_request(GPIO_FN_SDHICMD0,		NULL);

	gpio_request(GPIO_FN_SDHICLK0,		NULL);

	gpio_request(GPIO_FN_SDHID0_3,		NULL);

	gpio_request(GPIO_FN_SDHID0_2,		NULL);

	gpio_request(GPIO_FN_SDHID0_1,		NULL);

	gpio_request(GPIO_FN_SDHID0_0,		NULL);

	gpio_request(GPIO_FN_SDHI0_VCCQ_MC0_ON,	NULL);

	gpio_request(GPIO_PORT15, NULL);

	gpio_direction_output(GPIO_PORT15, 1); /* power */



	/* I2C 3 */

	gpio_request(GPIO_FN_PORT27_I2C_SCL3, NULL);

	gpio_request(GPIO_FN_PORT28_I2C_SDA3, NULL);



#ifdef CONFIG_CACHE_L2X0

	/* Early BRESP enable, Shared attribute override enable, 64K*8way */

	l2x0_init(IOMEM(0xf0100000), 0x40460000, 0x82000fff);

#endif



	i2c_register_board_info(1, i2c1_devices, ARRAY_SIZE(i2c1_devices));

	i2c_register_board_info(3, i2c3_devices, ARRAY_SIZE(i2c3_devices));



	sh73a0_add_standard_devices();

	platform_add_devices(kzm_devices, ARRAY_SIZE(kzm_devices));

}



MACHINE_START(KZM9G, "kzm9g")

	.map_io		= sh73a0_map_io,

	.init_early	= sh73a0_add_early_devices,

	.nr_irqs	= NR_IRQS_LEGACY,

	.init_irq	= sh73a0_init_irq,

	.handle_irq	= gic_handle_irq,

	.init_machine	= kzm_init,

	.timer		= &shmobile_timer,

MACHINE_END

arch/arm/mach-shmobile/include/mach/sh73a0.h

+3 −0
Original line number Diff line number Diff line
@@ -482,6 +482,9 @@ enum { 
	GPIO_FN_FSIAILR_PU,

	GPIO_FN_FSIAIBT_PU,

	GPIO_FN_FSIAISLD_PU,



	/* end of GPIO */

	GPIO_NR,

};



/* DMA slave IDs */