Merge "ARM: msm: vp-ipa simulation platform changes."

# CONFIG_ARM_PATCH_PHYS_VIRT is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_NAMESPACES=y

# CONFIG_UTS_NS is not set

# CONFIG_IPC_NS is not set

# CONFIG_PID_NS is not set

CONFIG_RELAY=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_RD_BZIP2=y

CONFIG_RD_LZMA=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_PANIC_TIMEOUT=5

CONFIG_KALLSYMS_ALL=y

CONFIG_EMBEDDED=y

CONFIG_PROFILING=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSMVPIPA=y

# CONFIG_MSM_STACKED_MEMORY is not set

CONFIG_CPU_HAS_L2_PMU=y

CONFIG_MSM_UARTDM_Core_v14=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_GOV_POWERSAVE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=y

CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y

CONFIG_CPU_IDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_PM_AUTOSLEEP=y

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_MROUTE=y

CONFIG_IP_MROUTE_MULTIPLE_TABLES=y

CONFIG_IP_PIMSM_V2=y

CONFIG_IPV6=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_IPV6_MROUTE=y

CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y

CONFIG_IPV6_PIMSM_V2=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_NETFILTER_NETLINK_QUEUE=y

CONFIG_NETFILTER_NETLINK_LOG=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y

CONFIG_NF_CONNTRACK_TIMESTAMP=y

CONFIG_NF_CT_PROTO_UDPLITE=y

CONFIG_NF_CONNTRACK_AMANDA=y

CONFIG_NF_CONNTRACK_FTP=y

CONFIG_NF_CONNTRACK_H323=y

CONFIG_NF_CONNTRACK_IRC=y

CONFIG_NF_CONNTRACK_NETBIOS_NS=y

CONFIG_NF_CONNTRACK_SNMP=y

CONFIG_NF_CONNTRACK_PPTP=y

CONFIG_NF_CONNTRACK_SIP=y

CONFIG_NF_CONNTRACK_TFTP=y

CONFIG_NF_CT_NETLINK=y

CONFIG_NF_CT_NETLINK_TIMEOUT=y

CONFIG_NF_CT_NETLINK_HELPER=y

CONFIG_NETFILTER_NETLINK_QUEUE_CT=y

CONFIG_NETFILTER_XT_MARK=y

CONFIG_NETFILTER_XT_TARGET_LOG=y

CONFIG_NETFILTER_XT_TARGET_TRACE=y

CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y

CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y

CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y

CONFIG_NETFILTER_XT_MATCH_CONNMARK=y

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y

CONFIG_NETFILTER_XT_MATCH_DSCP=y

CONFIG_NETFILTER_XT_MATCH_ESP=y

CONFIG_NETFILTER_XT_MATCH_IPRANGE=y

CONFIG_NETFILTER_XT_MATCH_LIMIT=y

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_IP_SET=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y

CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_TARGET_REJECT_SKERR=y

CONFIG_IP_NF_TARGET_ULOG=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NATTYPE_MODULE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_TARGET_ECN=y

CONFIG_IP_NF_TARGET_TTL=y

CONFIG_IP_NF_RAW=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_MATCH_AH=y

CONFIG_IP6_NF_MATCH_FRAG=y

CONFIG_IP6_NF_MATCH_OPTS=y

CONFIG_IP6_NF_MATCH_HL=y

CONFIG_IP6_NF_MATCH_IPV6HEADER=y

CONFIG_IP6_NF_MATCH_MH=y

CONFIG_IP6_NF_MATCH_RT=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IP6_NF_TARGET_REJECT_SKERR=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_BRIDGE_EBT_T_FILTER=y

CONFIG_BRIDGE_EBT_IP=y

CONFIG_BRIDGE_EBT_IP6=y

CONFIG_BRIDGE=y

CONFIG_RMNET_DATA=y

CONFIG_RMNET_DATA_DEBUG_PKT=y

CONFIG_CFG80211=y

CONFIG_NL80211_TESTMODE=y

CONFIG_CFG80211_INTERNAL_REGDB=y

CONFIG_IPC_ROUTER=y

CONFIG_CMA=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_NETDEVICES=y

# CONFIG_NET_VENDOR_BROADCOM 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_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

# CONFIG_NET_VENDOR_SMSC is not set

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_MISC=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=m

CONFIG_SERIO_LIBPS2=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM_HS=y

CONFIG_SERIAL_MSM_HSL=y

CONFIG_SERIAL_MSM_HSL_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_MSM=y

CONFIG_DEBUG_GPIO=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_SUPPLY=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_MSM=y

CONFIG_MSM_DLOAD_MODE=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_STUB=y

CONFIG_RTC_CLASS=y

CONFIG_STAGING=y

CONFIG_ANDROID=y

CONFIG_SPS=y

CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_IPA=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_QMI_INTERFACE=y

CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG=y

CONFIG_MSM_MEMORY_DUMP=y

CONFIG_MSM_WATCHDOG_V2=y

CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_PIL=y

CONFIG_MSM_PIL_MSS_QDSP6V5=y

CONFIG_EXT3_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_YAFFS_FS=y

CONFIG_YAFFS_DISABLE_TAGS_ECC=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_MAGIC_SYSRQ=y

# CONFIG_SYSRQ_SCHED_DEBUG is not set

CONFIG_SCHEDSTATS=y

CONFIG_TIMER_STATS=y

CONFIG_DEBUG_KMEMLEAK=y

CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_ATOMIC_SLEEP=y

CONFIG_DEBUG_STACK_USAGE=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_DEBUG_LIST=y

CONFIG_FAULT_INJECTION=y

CONFIG_FAIL_PAGE_ALLOC=y

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_MSM_RTB=y

CONFIG_IPC_LOGGING=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_PANIC_ON_DATA_CORRUPTION=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

	select MSM_RPM_LOG

	select MSM_RPM_STATS_LOG

config ARCH_MSMVPIPA

	bool "MSMVPIPA"

	select ARM_GIC

	select CPU_V7

	select REGULATOR

	select HAVE_ARM_ARCH_TIMER

	select MSM_SPM_V2

	select MSM_NOPM

	select MEMORY_HOLE_CARVEOUT

	select QMI_ENCDEC

	select MSM_CORTEX_A7

	select PINCTRL

	select PINCTRL_MSM_TLMM

	select USE_PINCTRL_IRQ

	select MSM_IRQ

config ARCH_MDMFERRUM

	bool "MDMFERRUM"

	select ARM_GIC

	default "0x0b600000" if ARCH_FSM9010

	default "0x00000000" if ARCH_MDM9630

	default "0x80000000" if ARCH_MDM9640

	default "0x80000000" if ARCH_MSMVPIPA

	default "0x00200000" if !MSM_STACKED_MEMORY

	default "0x10000000"

		  This is useful as this makes kernel to print console message

		  early.

	config DEBUG_MSMVPIPA_UART

		bool "Kernel low-level debugging messages via MSM VPIPA UART"

		depends on ARCH_MSMVPIPA

		select MSM_HAS_DEBUG_UART_HS_V14

		help

		  Say Y here if you want the debug print routines to direct

		  their output to the serial port on MSM VPIPA devices.

		  This is useful as this makes kernel to print console message

		  early.

	config DEBUG_MDMFERRUM_UART

		bool "Kernel low-level debugging messages via MDM FERRUM UART"

		depends on ARCH_MDMFERRUM

obj-$(CONFIG_ARCH_MDM9630) += clock-9630.o

obj-$(CONFIG_ARCH_MDM9640) += board-9640.o

obj-$(CONFIG_ARCH_MDMFERRUM) += board-8909.o

obj-$(CONFIG_ARCH_MSMVPIPA) += board-vpipa.o

obj-$(CONFIG_MSM_PM) += ext-buck-control.o

CFLAGS_msm_vibrator.o += -Idrivers/staging/android

# MDM9640

   zreladdr-$(CONFIG_ARCH_MDM9640)	:= 0x80008000

# MSMVPIPA

   zreladdr-$(CONFIG_ARCH_MSMVPIPA)	:= 0x80008000

# MSM8226

   zreladdr-$(CONFIG_ARCH_MSM8226)	:= 0x00008000

/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

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

 */

#include <linux/kernel.h>

#include <asm/mach/map.h>

#include <asm/mach/arch.h>

#include <mach/board.h>

#include <mach/msm_iomap.h>

#include "board-dt.h"

static void __init msmvpipa_map_io(void)

{

	msm_map_msmvpipa_io();

}

static const char *msmvpipa_dt_match[] __initconst = {

	"qcom,msmvpipa",

	NULL

};

static void __init msmvpipa_init(void)

{

	board_dt_populate(NULL);

}

DT_MACHINE_START(MSMVPIPA_DT,

		"Qualcomm Technologies, Inc. MSM VPIPA (Flattened Device Tree)")

	.init_machine		= msmvpipa_init,

	.dt_compat		= msmvpipa_dt_match,

	.map_io			= msmvpipa_map_io,

MACHINE_END