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

Merge branch 'renesas-kzm9d' into renesas-board 

* renesas-kzm9d:
  ARM: mach-shmobile: kzm9d: Add defconfig
  ARM: mach-shmobile: add fixed voltage regulators to kzm9d
parents 633842f1 d252f644

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/mach-shmobile/board-kzm9d.c

+10 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/smsc911x.h>

#include <mach/common.h>

#include <mach/emev2.h>
@@ -28,6 +30,12 @@ 
#include <asm/mach/arch.h>

#include <asm/hardware/gic.h>



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

static struct regulator_consumer_supply dummy_supplies[] = {

	REGULATOR_SUPPLY("vddvario", "smsc911x"),

	REGULATOR_SUPPLY("vdd33a", "smsc911x"),

};



/* Ether */

static struct resource smsc911x_resources[] = {

	[0] = {
@@ -63,6 +71,8 @@ static struct platform_device *kzm9d_devices[] __initdata = { 


void __init kzm9d_add_standard_devices(void)

{

	regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));



	emev2_add_standard_devices();



	platform_add_devices(kzm9d_devices, ARRAY_SIZE(kzm9d_devices));