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

Commit 2818b191 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'rmobile/mackerel' into rmobile-latest 



Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/Makefile

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parents 0ae26c8c 25338f2e

arch/arm/configs/mackerel_defconfig

0 → 100644
+138 −0
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

# 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_SLAB=y

CONFIG_MODULES=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_ARCH_SH7372=y

CONFIG_MACH_MACKEREL=y

CONFIG_MEMORY_SIZE=0x10000000

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_FORCE_MAX_ZONEORDER=15

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="console=tty0, console=ttySC0,115200 earlyprintk=sh-sci.0,115200 root=/dev/nfs nfsroot=,tcp,v3 ip=dhcp memchunk.vpu=64m memchunk.veu0=8m memchunk.spu0=2m mem=240m"

CONFIG_KEXEC=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=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_IPV6 is not set

# CONFIG_WIRELESS 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_ADV_OPTIONS=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_ARM_INTEGRATOR=y

CONFIG_MTD_BLOCK2MTD=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMSC911X=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE 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_MFD_SUPPORT is not set

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT2_FS_SECURITY=y

CONFIG_EXT2_FS_XIP=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_MSDOS_FS=y

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_CODEPAGE_737=y

CONFIG_NLS_CODEPAGE_775=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_CODEPAGE_852=y

CONFIG_NLS_CODEPAGE_855=y

CONFIG_NLS_CODEPAGE_857=y

CONFIG_NLS_CODEPAGE_860=y

CONFIG_NLS_CODEPAGE_861=y

CONFIG_NLS_CODEPAGE_862=y

CONFIG_NLS_CODEPAGE_863=y

CONFIG_NLS_CODEPAGE_864=y

CONFIG_NLS_CODEPAGE_865=y

CONFIG_NLS_CODEPAGE_866=y

CONFIG_NLS_CODEPAGE_869=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_2=y

CONFIG_NLS_ISO8859_3=y

CONFIG_NLS_ISO8859_4=y

CONFIG_NLS_ISO8859_5=y

CONFIG_NLS_ISO8859_6=y

CONFIG_NLS_ISO8859_7=y

CONFIG_NLS_ISO8859_9=y

CONFIG_NLS_ISO8859_13=y

CONFIG_NLS_ISO8859_14=y

CONFIG_NLS_ISO8859_15=y

CONFIG_NLS_KOI8_R=y

CONFIG_NLS_KOI8_U=y

CONFIG_NLS_UTF8=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

# CONFIG_ARM_UNWIND is not set

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ANSI_CPRNG=y

arch/arm/mach-shmobile/Kconfig

+6 −3
Original line number Diff line number Diff line
@@ -61,6 +61,10 @@ endchoice 
config MACH_AG5EVM

	bool "AG5EVM board"

	depends on ARCH_SH73A0



config MACH_MACKEREL

	bool "mackerel board"

	depends on ARCH_SH7372

	select ARCH_REQUIRE_GPIOLIB



comment "SH-Mobile System Configuration"
@@ -70,9 +74,8 @@ menu "Memory configuration" 
config MEMORY_START

	hex "Physical memory start address"

	default "0x50000000" if MACH_G3EVM

	default "0x40000000" if MACH_G4EVM

	default "0x40000000" if MACH_AP4EVB

	default "0x40000000" if MACH_AG5EVM

	default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \

				MACH_MACKEREL

	default "0x00000000"

	---help---

	  Tweak this only when porting to a new machine which does not

arch/arm/mach-shmobile/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -23,3 +23,4 @@ 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

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

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

 * mackerel board support

 *

 * Copyright (C) 2010 Renesas Solutions Corp.

 * Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

 *

 * based on ap4evb

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

#include <linux/input.h>

#include <linux/io.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>

#include <linux/smsc911x.h>

#include <linux/usb/r8a66597.h>



#include <video/sh_mobile_lcdc.h>



#include <mach/common.h>

#include <mach/sh7372.h>



#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <asm/mach/map.h>

#include <asm/mach-types.h>



/*

 * Address	Interface		BusWidth	note

 * ------------------------------------------------------------------

 * 0x0000_0000	NOR Flash ROM (MCP)	16bit		SW7 : bit1 = ON

 * 0x0800_0000	user area		-

 * 0x1000_0000	NOR Flash ROM (MCP)	16bit		SW7 : bit1 = OFF

 * 0x1400_0000	Ether (LAN9220)		16bit

 * 0x1600_0000	user area		-		cannot use with NAND

 * 0x1800_0000	user area		-

 * 0x1A00_0000	-

 * 0x4000_0000	LPDDR2-SDRAM (POP)	32bit

 */



/*

 * CPU mode

 *

 * SW4                                     | Boot Area| Master   | Remarks

 *  1  | 2   | 3   | 4   | 5   | 6   | 8   |          | Processor|

 * ----+-----+-----+-----+-----+-----+-----+----------+----------+--------------

 * ON  | ON  | OFF | ON  | ON  | OFF | OFF | External | System   | External ROM

 * ON  | ON  | ON  | ON  | ON  | OFF | OFF | External | System   | ROM Debug

 * ON  | ON  | X   | ON  | OFF | OFF | OFF | Built-in | System   | ROM Debug

 * X   | OFF | X   | X   | X   | X   | OFF | Built-in | System   | MaskROM

 * OFF | X   | X   | X   | X   | X   | OFF | Built-in | System   | MaskROM

 * X   | X   | X   | OFF | X   | X   | OFF | Built-in | System   | MaskROM

 * OFF | ON  | OFF | X   | X   | OFF | ON  | External | System   | Standalone

 * ON  | OFF | OFF | X   | X   | OFF | ON  | External | Realtime | Standalone

*/



/*

 * NOR Flash ROM

 *

 *  SW1  |     SW2    | SW7  | NOR Flash ROM

 *  bit1 | bit1  bit2 | bit1 | Memory allocation

 * ------+------------+------+------------------

 *  OFF  | ON     OFF | ON   |    Area 0

 *  OFF  | ON     OFF | OFF  |    Area 4

 */



/*

 * SMSC 9220

 *

 *  SW1		SMSC 9220

 * -----------------------

 *  ON		access disable

 *  OFF		access enable

 */



/*

 * NAND Flash ROM

 *

 *  SW1  |     SW2    | SW7  | NAND Flash ROM

 *  bit1 | bit1  bit2 | bit2 | Memory allocation

 * ------+------------+------+------------------

 *  OFF  | ON     OFF | ON   |    FCE 0

 *  OFF  | ON     OFF | OFF  |    FCE 1

 */



/*

 * External interrupt pin settings

 *

 * IRQX  | pin setting        | device             | level

 * ------+--------------------+--------------------+-------

 * IRQ0  | ICR1A.IRQ0SA=0010  | SDHI2 card detect  | Low

 * IRQ6  | ICR1A.IRQ6SA=0011  | Ether(LAN9220)     | High

 * IRQ7  | ICR1A.IRQ7SA=0010  | LCD Tuch Panel     | Low

 * IRQ8  | ICR2A.IRQ8SA=0010  | MMC/SD card detect | Low

 * IRQ9  | ICR2A.IRQ9SA=0010  | KEY(TCA6408)       | Low

 * IRQ21 | ICR4A.IRQ21SA=0011 | Sensor(ADXL345)    | High

 * IRQ22 | ICR4A.IRQ22SA=0011 | Sensor(AK8975)     | High

 */



/*

 * USB

 *

 * USB0 : CN22 : Function

 * USB1 : CN31 : Function/Host *1

 *

 * J30 (for CN31) *1

 * ----------+---------------+-------------

 * 1-2 short | VBUS 5V       | Host

 * open      | external VBUS | Function

 *

 * *1

 * CN31 is used as Host in Linux.

 */



/* MTD */

static struct mtd_partition nor_flash_partitions[] = {

	{

		.name		= "loader",

		.offset		= 0x00000000,

		.size		= 512 * 1024,

		.mask_flags	= MTD_WRITEABLE,

	},

	{

		.name		= "bootenv",

		.offset		= MTDPART_OFS_APPEND,

		.size		= 512 * 1024,

		.mask_flags	= MTD_WRITEABLE,

	},

	{

		.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,

};



/* SMSC */

static struct resource smc911x_resources[] = {

	{

		.start	= 0x14000000,

		.end	= 0x16000000 - 1,

		.flags	= IORESOURCE_MEM,

	}, {

		.start	= evt2irq(0x02c0) /* IRQ6A */,

		.flags	= IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,

	},

};



static struct smsc911x_platform_config smsc911x_info = {

	.flags		= SMSC911X_USE_16BIT | SMSC911X_SAVE_MAC_ADDRESS,

	.irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,

	.irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,

};



static struct platform_device smc911x_device = {

	.name           = "smsc911x",

	.id             = -1,

	.num_resources  = ARRAY_SIZE(smc911x_resources),

	.resource       = smc911x_resources,

	.dev            = {

		.platform_data = &smsc911x_info,

	},

};



/* LCDC */

static struct fb_videomode mackerel_lcdc_modes[] = {

	{

		.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,

		.bpp = 16,

		.lcd_cfg = mackerel_lcdc_modes,

		.num_cfg = ARRAY_SIZE(mackerel_lcdc_modes),

		.interface_type		= RGB24,

		.clock_divider		= 2,

		.flags			= 0,

		.lcd_size_cfg.width	= 152,

		.lcd_size_cfg.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,

	},

};



/* USB1 (Host) */

static void usb1_host_port_power(int port, int power)

{

	if (!power) /* only power-on is supported for now */

		return;



	/* set VBOUT/PWEN and EXTLP1 in DVSTCTR */

	__raw_writew(__raw_readw(0xE68B0008) | 0x600, 0xE68B0008);

}



static struct r8a66597_platdata usb1_host_data = {

	.on_chip	= 1,

	.port_power	= usb1_host_port_power,

};



static struct resource usb1_host_resources[] = {

	[0] = {

		.name	= "USBHS",

		.start	= 0xE68B0000,

		.end	= 0xE68B00E6 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= evt2irq(0x1ce0) /* USB1_USB1I0 */,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device usb1_host_device = {

	.name	= "r8a66597_hcd",

	.id	= 1,

	.dev = {

		.dma_mask		= NULL,         /*  not use dma */

		.coherent_dma_mask	= 0xffffffff,

		.platform_data		= &usb1_host_data,

	},

	.num_resources	= ARRAY_SIZE(usb1_host_resources),

	.resource	= usb1_host_resources,

};



static struct platform_device *mackerel_devices[] __initdata = {

	&nor_flash_device,

	&smc911x_device,

	&lcdc_device,

	&usb1_host_device,

};



static struct map_desc mackerel_io_desc[] __initdata = {

	/* create a 1:1 entity map for 0xe6xxxxxx

	 * used by CPGA, INTC and PFC.

	 */

	{

		.virtual	= 0xe6000000,

		.pfn		= __phys_to_pfn(0xe6000000),

		.length		= 256 << 20,

		.type		= MT_DEVICE_NONSHARED

	},

};



static void __init mackerel_map_io(void)

{

	iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));



	/* setup early devices and console here as well */

	sh7372_add_early_devices();

	shmobile_setup_console();

}



static void __init mackerel_init(void)

{

	sh7372_pinmux_init();



	/* enable SCIFA0 */

	gpio_request(GPIO_FN_SCIFA0_TXD, NULL);

	gpio_request(GPIO_FN_SCIFA0_RXD, NULL);



	/* enable SMSC911X */

	gpio_request(GPIO_FN_CS5A,	NULL);

	gpio_request(GPIO_FN_IRQ6_39,	NULL);



	/* 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_PORT31, NULL); /* backlight */

	gpio_direction_output(GPIO_PORT31, 1);



	gpio_request(GPIO_PORT151, NULL); /* LCDDON */

	gpio_direction_output(GPIO_PORT151, 1);



	/* USB enable */

	gpio_request(GPIO_FN_VBUS0_1,    NULL);

	gpio_request(GPIO_FN_IDIN_1_18,  NULL);

	gpio_request(GPIO_FN_PWEN_1_115, NULL);

	gpio_request(GPIO_FN_OVCN_1_114, NULL);

	gpio_request(GPIO_FN_EXTLP_1,    NULL);

	gpio_request(GPIO_FN_OVCN2_1,    NULL);



	/* setup USB phy */

	__raw_writew(0x8a0a, 0xE6058130);	/* USBCR2 */





	sh7372_add_standard_devices();



	platform_add_devices(mackerel_devices, ARRAY_SIZE(mackerel_devices));

}



static void __init mackerel_timer_init(void)

{

	sh7372_clock_init();

	shmobile_timer.init();

}



static struct sys_timer mackerel_timer = {

	.init		= mackerel_timer_init,

};



MACHINE_START(MACKEREL, "mackerel")

	.map_io		= mackerel_map_io,

	.init_irq	= sh7372_init_irq,

	.init_machine	= mackerel_init,

	.timer		= &mackerel_timer,

MACHINE_END