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

Commit 9abf29ed authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'board' of... 

Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas into late/board

From "Rafael J. Wysocki" <rjw@sisk.pl>:

updates for Renesas ARM-based boards for v3.6.  Included are:

* Regulator support changes for multiple boards from Guennadi Liakhovetski.
* armadillo800eva and kzm9g support updates from Kuninori Morimoto
  and Tetsuyuki Kobayashi.
* GPIO support update for multiple boards from Kuninori Morimoto.
* defconfig updates from Magnus Damm and Simon Horman.

This is based on the 'soc' branch I've just sent a pull request for and on
the following topic branch from the Mark Brown's regulator tree:

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git tags/topic/fixed

which is requisite for the merge.

* 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/renesas

: (35 commits)
  ARM: shmobile: kzm9g: defconfig enable INOTIFY_USER
  ARM: mach-shmobile: armadillo800eva: defconfig Allow use of armhf userspace
  ARM: shmobile: armadillo800eva: A3SP domain includes USB
  ARM: shmobile: armadillo800eva: A4LC domain includes LCDC
  ARM: shmobile: armadillo800eva: USB Func enables external IRQ mode
  ARM: mach-shmobile: kzm9d: Add defconfig
  ARM: mach-shmobile: select the fixed regulator driver on several boards
  ARM: mach-shmobile: add SDHI2 to the 2.8V fixed regulator consumers on kzm9g
  ARM: mach-shmobile: add fixed voltage regulators to marzen
  ARM: mach-shmobile: add fixed voltage regulators to kzm9g
  ARM: mach-shmobile: add fixed voltage regulators to kzm9d
  ARM: mach-shmobile: add fixed voltage regulators to kota2
  ARM: mach-shmobile: add fixed voltage regulators to g4evm
  ARM: mach-shmobile: add fixed voltage regulators to bonito
  ARM: mach-shmobile: add fixed voltage regulators to armadillo800eva
  ARM: mach-shmobile: add fixed voltage regulators to ap4evb
  ARM: mach-shmobile: add fixed voltage regulators to ag5evm
  ARM: mach-shmobile: add 3.3V and 1.8V fixed regulators to mackerel
  ARM: shmobile: use common extra gpio functions on g4evm
  ARM: shmobile: use common extra gpio functions on ap4evb
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3c89963d 45c7a01f

arch/arm/configs/armadillo800eva_defconfig

+15 −10
Original line number Diff line number Diff line
@@ -5,10 +5,7 @@ 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_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SLAB=y

CONFIG_MODULES=y
@@ -21,7 +18,7 @@ CONFIG_ARCH_SHMOBILE=y 
CONFIG_ARCH_R8A7740=y

CONFIG_MACH_ARMADILLO800EVA=y

# CONFIG_SH_TIMER_TMU is not set

# CONFIG_ARM_THUMB is not set

CONFIG_ARM_THUMB=y

CONFIG_CPU_BPREDICT_DISABLE=y

# CONFIG_CACHE_L2X0 is not set

CONFIG_ARM_ERRATA_430973=y
@@ -39,6 +36,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096"

CONFIG_CMDLINE_FORCE=y

CONFIG_KEXEC=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

CONFIG_NET=y
@@ -89,26 +87,32 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y 
CONFIG_I2C=y

CONFIG_I2C_SH_MOBILE=y

# CONFIG_HWMON is not set

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

# CONFIG_RC_CORE is not set

# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set

# CONFIG_V4L_USB_DRIVERS is not set

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_MT9T112=y

CONFIG_VIDEO_SH_MOBILE_CEU=y

# CONFIG_RADIO_ADAPTERS is not set

CONFIG_FB=y

CONFIG_FB_MODE_HELPERS=y

CONFIG_FB_SH_MOBILE_LCDC=y

CONFIG_FB_SH_MOBILE_HDMI=y

CONFIG_LCD_CLASS_DEVICE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

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

CONFIG_SND_SOC_SH4_FSI=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB=y

# CONFIG_USB_DEVICE_CLASS is not set

CONFIG_USB_RENESAS_USBHS=y

CONFIG_USB_GADGET=y

CONFIG_USB_RENESAS_USBHS_UDC=y
@@ -116,6 +120,8 @@ CONFIG_USB_ETH=m 
CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_DNOTIFY is not set
@@ -124,7 +130,6 @@ 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

arch/arm/configs/kzm9d_defconfig

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

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=16

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_EMBEDDED=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_EMEV2=y

CONFIG_MACH_KZM9D=y

CONFIG_MEMORY_START=0x40000000

CONFIG_MEMORY_SIZE=0x10000000

# CONFIG_SH_TIMER_TMU is not set

# CONFIG_SWP_EMULATE is not set

# CONFIG_CACHE_L2X0 is not set

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_HOTPLUG_CPU=y

# CONFIG_LOCAL_TIMERS is not set

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

# CONFIG_CROSS_MEMORY_ATTACH is not set

CONFIG_FORCE_MAX_ZONEORDER=13

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_ARM_APPENDED_DTB=y

CONFIG_CMDLINE="console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096"

CONFIG_CMDLINE_FORCE=y

CONFIG_VFP=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

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_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_BLK_DEV is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CIRRUS is not set

# CONFIG_NET_VENDOR_FARADAY is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_NET_VENDOR_WIZNET is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_EM=y

# CONFIG_HW_RANDOM is not set

CONFIG_GPIOLIB=y

CONFIG_GPIO_EM=y

# CONFIG_HWMON is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

# CONFIG_FTRACE is not set

arch/arm/configs/kzm9g_defconfig

+7 −1
Original line number Diff line number Diff line
@@ -100,7 +100,12 @@ CONFIG_SND_SOC_SH4_FSI=y 
CONFIG_USB=y

CONFIG_USB_DEVICEFS=y

CONFIG_USB_R8A66597_HCD=y

CONFIG_USB_RENESAS_USBHS=y

CONFIG_USB_STORAGE=y

CONFIG_USB_GADGET=y

CONFIG_USB_RENESAS_USBHS_UDC=y

CONFIG_USB_ETH=m

CONFIG_USB_MASS_STORAGE=m

CONFIG_MMC=y

# CONFIG_MMC_BLOCK_BOUNCE is not set

CONFIG_MMC_SDHI=y
@@ -108,12 +113,13 @@ CONFIG_MMC_SH_MMCIF=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_RS5C372=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_INOTIFY_USER=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

# CONFIG_MISC_FILESYSTEMS is not set

arch/arm/mach-shmobile/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 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"
@@ -66,6 +67,7 @@ config MACH_AP4EVB 
	select ARCH_REQUIRE_GPIOLIB

	select SH_LCD_MIPI_DSI

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



choice

	prompt "AP4EVB LCD panel selection"
@@ -84,6 +86,7 @@ config MACH_AG5EVM 
	bool "AG5EVM board"

	select ARCH_REQUIRE_GPIOLIB

	select SH_LCD_MIPI_DSI

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on ARCH_SH73A0



config MACH_MACKEREL
@@ -91,15 +94,18 @@ config MACH_MACKEREL 
	depends on ARCH_SH7372

	select ARCH_REQUIRE_GPIOLIB

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_KOTA2

	bool "KOTA2 board"

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on ARCH_SH73A0



config MACH_BONITO

	bool "bonito board"

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	depends on ARCH_R8A7740



config MACH_ARMADILLO800EVA
@@ -107,22 +113,28 @@ config MACH_ARMADILLO800EVA 
	depends on ARCH_R8A7740

	select ARCH_REQUIRE_GPIOLIB

	select USE_OF

	select REGULATOR_FIXED_VOLTAGE if REGULATOR

	select SND_SOC_WM8978 if SND_SIMPLE_CARD



config MACH_MARZEN

	bool "MARZEN board"

	depends on ARCH_R8A7779

	select ARCH_REQUIRE_GPIOLIB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_KZM9D

	bool "KZM9D board"

	depends on ARCH_EMEV2

	select USE_OF

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_KZM9G

	bool "KZM-A9-GT board"

	depends on ARCH_SH73A0

	select ARCH_REQUIRE_GPIOLIB

	select USE_OF

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



comment "SH-Mobile System Configuration"

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

+79 −3
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#include <linux/delay.h>

#include <linux/io.h>

#include <linux/dma-mapping.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/serial_sci.h>

#include <linux/smsc911x.h>

#include <linux/gpio.h>
@@ -52,6 +54,12 @@ 
#include <asm/hardware/cache-l2x0.h>

#include <asm/traps.h>



/* Dummy supplies, where voltage doesn't matter */

static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

};



static struct resource smsc9220_resources[] = {

	[0] = {

		.start		= 0x14000000,
@@ -142,6 +150,13 @@ static struct platform_device fsi_device = { 
	.resource	= fsi_resources,

};



/* Fixed 1.8V regulator to be used by MMCIF */

static struct regulator_consumer_supply fixed1v8_power_consumers[] =

{

	REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),

	REGULATOR_SUPPLY("vqmmc", "sh_mmcif.0"),

};



static struct resource sh_mmcif_resources[] = {

	[0] = {

		.name	= "MMCIF",
@@ -364,6 +379,13 @@ static struct platform_device mipidsi0_device = { 
	},

};



/* Fixed 2.8V regulators to be used by SDHI0 */

static struct regulator_consumer_supply fixed2v8_power_consumers[] =

{

	REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),

	REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),

};



/* SDHI0 */

static struct sh_mobile_sdhi_info sdhi0_info = {

	.dma_slave_tx	= SHDMA_SLAVE_SDHI0_TX,
@@ -408,8 +430,57 @@ static struct platform_device sdhi0_device = { 
	},

};



void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state)

/* Fixed 3.3V regulator to be used by SDHI1 */

static struct regulator_consumer_supply cn4_power_consumers[] =

{

	REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),

	REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"),

};



static struct regulator_init_data cn4_power_init_data = {

	.constraints = {

		.valid_ops_mask = REGULATOR_CHANGE_STATUS,

	},

	.num_consumer_supplies  = ARRAY_SIZE(cn4_power_consumers),

	.consumer_supplies      = cn4_power_consumers,

};



static struct fixed_voltage_config cn4_power_info = {

	.supply_name = "CN4 SD/MMC Vdd",

	.microvolts = 3300000,

	.gpio = GPIO_PORT114,

	.enable_high = 1,

	.init_data = &cn4_power_init_data,

};



static struct platform_device cn4_power = {

	.name = "reg-fixed-voltage",

	.id   = 2,

	.dev  = {

		.platform_data = &cn4_power_info,

	},

};



static void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state)

{

	static int power_gpio = -EINVAL;



	if (power_gpio < 0) {

		int ret = gpio_request(GPIO_PORT114, "sdhi1_power");

		if (!ret) {

			power_gpio = GPIO_PORT114;

			gpio_direction_output(power_gpio, 0);

		}

	}



	/*

	 * If requesting the GPIO above failed, it means, that the regulator got

	 * probed and grabbed the GPIO, but we don't know, whether the sdhi

	 * driver already uses the regulator. If it doesn't, we have to toggle

	 * the GPIO ourselves, even though it is now owned by the fixed

	 * regulator driver. We have to live with the race in case the driver

	 * gets unloaded and the GPIO freed between these two steps.

	 */

	gpio_set_value(GPIO_PORT114, state);

}
@@ -455,6 +526,7 @@ static struct platform_device sdhi1_device = { 
};



static struct platform_device *ag5evm_devices[] __initdata = {

	&cn4_power,

	&eth_device,

	&keysc_device,

	&fsi_device,
@@ -468,6 +540,12 @@ static struct platform_device *ag5evm_devices[] __initdata = { 


static void __init ag5evm_init(void)

{

	regulator_register_always_on(0, "fixed-1.8V", fixed1v8_power_consumers,

				     ARRAY_SIZE(fixed1v8_power_consumers), 1800000);

	regulator_register_always_on(1, "fixed-2.8V", fixed2v8_power_consumers,

				     ARRAY_SIZE(fixed2v8_power_consumers), 3300000);

	regulator_register_fixed(3, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	sh73a0_pinmux_init();



	/* enable SCIFA2 */
@@ -562,8 +640,6 @@ static void __init ag5evm_init(void) 
	gpio_request(GPIO_FN_SDHID1_2_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_1_PU, NULL);

	gpio_request(GPIO_FN_SDHID1_0_PU, NULL);

	gpio_request(GPIO_PORT114, "sdhi1_power");

	gpio_direction_output(GPIO_PORT114, 0);



#ifdef CONFIG_CACHE_L2X0

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