ARM: tegra: remove obsolete curacao/dolak files
Matt Craighead [Tue, 3 Sep 2013 18:51:57 +0000 (13:51 -0500)]
Change-Id: I4af94ad829d40ac87fa53fc429ded9669e324302
Signed-off-by: Matt Craighead <mcraighead@nvidia.com>
Reviewed-on: http://git-master/r/269647
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Allen Martin <amartin@nvidia.com>

15 files changed:
arch/arm/boot/dts/tegra114-curacao.dts [deleted file]
arch/arm/configs/tegra_curacao_android_defconfig [deleted file]
arch/arm/configs/tegra_curacao_defconfig [deleted file]
arch/arm/configs/tegra_curacao_mods_defconfig [deleted file]
arch/arm/configs/tegra_curacao_sim_android_defconfig [deleted file]
arch/arm/mach-tegra/Kconfig
arch/arm/mach-tegra/Makefile
arch/arm/mach-tegra/board-curacao-memory.c [deleted file]
arch/arm/mach-tegra/board-curacao-panel.c [deleted file]
arch/arm/mach-tegra/board-curacao-pinmux.c [deleted file]
arch/arm/mach-tegra/board-curacao-power.c [deleted file]
arch/arm/mach-tegra/board-curacao-sdhci.c [deleted file]
arch/arm/mach-tegra/board-curacao-sensors.c [deleted file]
arch/arm/mach-tegra/board-curacao.c [deleted file]
arch/arm/mach-tegra/board-curacao.h [deleted file]

diff --git a/arch/arm/boot/dts/tegra114-curacao.dts b/arch/arm/boot/dts/tegra114-curacao.dts
deleted file mode 100644 (file)
index 740960a..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/dts-v1/;
-
-/include/ "tegra114.dtsi"
-
-/ {
-       model = "NVIDIA Tegra114 curacao evaluation board";
-       compatible = "nvidia,curacao", "nvidia,tegra114";
-
-       clocks {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               clk32k_in: clock {
-                       compatible = "fixed-clock";
-                       reg=<0>;
-                       #clock-cells = <0>;
-                       clock-frequency = <32768>;
-               };
-       };
-};
diff --git a/arch/arm/configs/tegra_curacao_android_defconfig b/arch/arm/configs/tegra_curacao_android_defconfig
deleted file mode 100644 (file)
index 54baa48..0000000
+++ /dev/null
@@ -1,294 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_CROSS_COMPILE="arm-eabi-"
-# CONFIG_SWAP is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_TEGRA_11x_SOC=y
-CONFIG_MACH_CURACAO=y
-CONFIG_TEGRA_FPGA_PLATFORM=y
-CONFIG_TEGRA_DEBUG_UARTA=y
-CONFIG_TEGRA_PWM=y
-CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_SMP=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_HIGHMEM=y
-CONFIG_USE_OF=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="tegraid=35.1.1.0.0 initrd=0x85000000,6724352 mem=512M@2048M vmalloc=256M console=ttyS0,115200n8 video=tegrafb earlyprintk init=/bin/ash"
-CONFIG_CPU_IDLE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_INET_ESP=y
-# 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=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_TUNNEL=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_SCTP=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_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-CONFIG_NF_CONNTRACK_SIP=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=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_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARP_MANGLE=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
-CONFIG_NET_CLS_U32=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=y
-CONFIG_NET_ACT_MIRRED=y
-CONFIG_RFKILL=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_UEVENT=y
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
-CONFIG_SMC91X=y
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_TEGRA=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_TEGRA=y
-CONFIG_SPI=y
-CONFIG_SPI_TEGRA=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_CHARGER_GPIO=y
-# CONFIG_HWMON is not set
-CONFIG_THERMAL=y
-CONFIG_MFD_MAX77663=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_MAX77663=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_VIDEO_DEV=y
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-CONFIG_V4L_PLATFORM_DRIVERS=y
-# CONFIG_TEGRA_AVP is not set
-# CONFIG_TEGRA_MEDIASERVER is not set
-CONFIG_TEGRA_NVAVP=y
-CONFIG_TEGRA_NVAVP_AUDIO=y
-CONFIG_VIDEO_OV5650=y
-CONFIG_VIDEO_OV14810=y
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_TEGRA_GRHOST=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_ACM=y
-CONFIG_USB_WDM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_LIBUSUAL=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_TEGRA=y
-CONFIG_USB_G_ANDROID=y
-CONFIG_MMC=y
-CONFIG_MMC_EMBEDDED_SDIO=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_TEGRA=y
-CONFIG_SWITCH=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_TEGRA=y
-CONFIG_STAGING=y
-CONFIG_IIO=y
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ASHMEM=y
-CONFIG_ANDROID_LOGGER=y
-CONFIG_ANDROID_RAM_CONSOLE=y
-CONFIG_ANDROID_TIMED_GPIO=y
-CONFIG_ANDROID_LOW_MEMORY_KILLER=y
-CONFIG_PM_DEVFREQ=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=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_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_PRINTK_TIME=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_FS=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_ICEDCC=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_TWOFISH=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_TEGRA_SE=y
-CONFIG_CRC_CCITT=y
diff --git a/arch/arm/configs/tegra_curacao_defconfig b/arch/arm/configs/tegra_curacao_defconfig
deleted file mode 100644 (file)
index 545403d..0000000
+++ /dev/null
@@ -1,319 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_CROSS_COMPILE="arm-eabi-"
-# CONFIG_LOCALVERSION_AUTO is not set
-# CONFIG_SWAP is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_ASHMEM=y
-CONFIG_EMBEDDED=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_TEGRA_11x_SOC=y
-CONFIG_MACH_CURACAO=y
-CONFIG_TEGRA_FPGA_PLATFORM=y
-CONFIG_TEGRA_DEBUG_UARTA=y
-CONFIG_TEGRA_PWM=y
-CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
-CONFIG_SWP_EMULATE=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_SMP=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="tegraid=35.1.1.0.0 initrd=0x85000000,6724352 mem=512M@2048M vmalloc=256M console=ttyS0,115200n8 video=tegrafb earlyprintk init=/bin/ash"
-CONFIG_CPU_IDLE=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_IP_PNP_RARP=y
-CONFIG_INET_ESP=y
-# 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=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_TUNNEL=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_SCTP=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_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-CONFIG_NF_CONNTRACK_SIP=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NETFILTER_TPROXY=y
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_SOCKET=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=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_LOG=y
-CONFIG_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_MANGLE=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARP_MANGLE=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
-CONFIG_NET_CLS_U32=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=y
-CONFIG_NET_ACT_MIRRED=y
-CONFIG_RFKILL=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_MISC_DEVICES=y
-CONFIG_MPU_SENSORS_TIMERIRQ=y
-CONFIG_MPU_SENSORS_MPU6050B1=m
-CONFIG_MPU_SENSORS_MPU6050_ACCEL=m
-CONFIG_MPU_SENSORS_AK8975=m
-CONFIG_MPU_SENSORS_AK8972=m
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_MD=y
-CONFIG_BLK_DEV_DM=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_UEVENT=y
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMC91X=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-CONFIG_USB_USBNET=y
-# CONFIG_USB_NET_CDCETHER is not set
-# CONFIG_USB_NET_CDC_NCM is not set
-# CONFIG_USB_NET_NET1080 is not set
-# CONFIG_USB_NET_CDC_SUBSET is not set
-# CONFIG_USB_NET_ZAURUS is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_TEGRA=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_TEGRA=y
-CONFIG_I2C_SLAVE_TEGRA=y
-CONFIG_SPI=y
-CONFIG_SPI_TEGRA=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_CHARGER_GPIO=y
-# CONFIG_HWMON is not set
-CONFIG_MFD_MAX77663=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_MAX77663=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_VIDEO_DEV=y
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_TEGRA_AVP is not set
-# CONFIG_TEGRA_MEDIASERVER is not set
-CONFIG_TEGRA_NVAVP=y
-CONFIG_VIDEO_OV5650=y
-CONFIG_VIDEO_OV14810=y
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_TEGRA_GRHOST=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-# CONFIG_HID_SUPPORT is not set
-CONFIG_USB=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_ACM=y
-CONFIG_USB_WDM=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_LIBUSUAL=y
-CONFIG_USB_SERIAL=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VBUS_DRAW=500
-CONFIG_USB_TEGRA=y
-CONFIG_USB_G_ANDROID=y
-CONFIG_MMC=y
-CONFIG_MMC_EMBEDDED_SDIO=y
-CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
-CONFIG_MMC_SDHCI_TEGRA=y
-CONFIG_SWITCH=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_TEGRA=y
-CONFIG_STAGING=y
-CONFIG_IIO=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=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_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=y
-CONFIG_ISO9660_FS=y
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_NFSD=y
-CONFIG_NFSD_V3=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_EFI_PARTITION=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_PRINTK_TIME=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_FS=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_ICEDCC=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_TWOFISH=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRYPTO_DEV_TEGRA_SE=y
-CONFIG_CRC_CCITT=y
-CONFIG_PM_DEVFREQ=y
diff --git a/arch/arm/configs/tegra_curacao_mods_defconfig b/arch/arm/configs/tegra_curacao_mods_defconfig
deleted file mode 100644 (file)
index f4d938f..0000000
+++ /dev/null
@@ -1,224 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_CROSS_COMPILE="arm-eabi-"
-# CONFIG_SWAP is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_TEGRA_11x_SOC=y
-CONFIG_MACH_CURACAO=y
-CONFIG_TEGRA_FPGA_PLATFORM=y
-CONFIG_TEGRA_DEBUG_UARTA=y
-CONFIG_TEGRA_PWM=y
-CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
-CONFIG_SWP_EMULATE=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="mem=448@2048M console=ttyS0,115200n8 earlyprintk init=/bin/ash"
-CONFIG_VFP=y
-CONFIG_NEON=y
-# CONFIG_SUSPEND is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_INET_ESP=y
-# 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=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_TUNNEL=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_SCTP=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_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-CONFIG_NF_CONNTRACK_SIP=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NF_CT_NETLINK=y
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=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_LOG=y
-CONFIG_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARP_MANGLE=y
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
-CONFIG_NET_CLS_U32=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=y
-CONFIG_NET_ACT_MIRRED=y
-CONFIG_RFKILL=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMC91X=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=y
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_TEGRA=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_SPI=y
-CONFIG_SPI_TEGRA=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-# CONFIG_MFD_SUPPORT is not set
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_VIDEO_DEV=y
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_SWITCH=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_TEGRA=y
-CONFIG_STAGING=y
-CONFIG_IIO=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=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_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_EFI_PARTITION=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_PRINTK_TIME=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_FS=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_ICEDCC=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_TWOFISH=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRC_CCITT=y
-CONFIG_PM_DEVFREQ=y
diff --git a/arch/arm/configs/tegra_curacao_sim_android_defconfig b/arch/arm/configs/tegra_curacao_sim_android_defconfig
deleted file mode 100644 (file)
index 22af56e..0000000
+++ /dev/null
@@ -1,249 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_CROSS_COMPILE="arm-eabi-"
-# CONFIG_SWAP is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_CGROUPS=y
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_DEV_INITRD=y
-# CONFIG_ELF_CORE is not set
-CONFIG_EMBEDDED=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_TEGRA_11x_SOC=y
-CONFIG_MACH_CURACAO=y
-CONFIG_TEGRA_SIMULATION_PLATFORM=y
-CONFIG_TEGRA_DEBUG_UARTA=y
-CONFIG_TEGRA_PWM=y
-CONFIG_TEGRA_CLOCK_DEBUG_WRITE=y
-CONFIG_TEGRA_TIMER_HZ=100
-# CONFIG_TEGRA_SOCTHERM is not set
-CONFIG_SWP_EMULATE=y
-# CONFIG_CACHE_L2X0 is not set
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="mem=448@2048M console=ttyS0,115200n8 earlyprintk init=/bin/ash"
-CONFIG_VFP=y
-CONFIG_NEON=y
-# CONFIG_SUSPEND is not set
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_NET_KEY=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_BOOTP=y
-CONFIG_INET_ESP=y
-# 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=y
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_IPV6_MIP6=y
-CONFIG_IPV6_TUNNEL=y
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_NETFILTER=y
-CONFIG_NETFILTER_NETLINK_LOG=y
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=y
-CONFIG_NF_CT_PROTO_SCTP=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_PPTP=y
-CONFIG_NF_CONNTRACK_SANE=y
-CONFIG_NF_CONNTRACK_SIP=y
-CONFIG_NF_CONNTRACK_TFTP=y
-CONFIG_NF_CT_NETLINK=y
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
-CONFIG_NETFILTER_XT_TARGET_MARK=y
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
-CONFIG_NETFILTER_XT_MATCH_COMMENT=y
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=y
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=y
-CONFIG_NETFILTER_XT_MATCH_HELPER=y
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=y
-CONFIG_NETFILTER_XT_MATCH_LENGTH=y
-CONFIG_NETFILTER_XT_MATCH_LIMIT=y
-CONFIG_NETFILTER_XT_MATCH_MAC=y
-CONFIG_NETFILTER_XT_MATCH_MARK=y
-CONFIG_NETFILTER_XT_MATCH_OWNER=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_QUOTA=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=y
-CONFIG_NETFILTER_XT_MATCH_STRING=y
-CONFIG_NETFILTER_XT_MATCH_TIME=y
-CONFIG_NETFILTER_XT_MATCH_U32=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_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_TARGET_NETMAP=y
-CONFIG_IP_NF_TARGET_REDIRECT=y
-CONFIG_IP_NF_ARPTABLES=y
-CONFIG_IP_NF_ARPFILTER=y
-CONFIG_IP_NF_ARP_MANGLE=y
-CONFIG_NET_SCHED=y
-CONFIG_NET_SCH_HTB=y
-CONFIG_NET_SCH_INGRESS=y
-CONFIG_NET_CLS_U32=y
-CONFIG_NET_EMATCH=y
-CONFIG_NET_EMATCH_U32=y
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=y
-CONFIG_NET_ACT_GACT=y
-CONFIG_NET_ACT_MIRRED=y
-# CONFIG_WIRELESS is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_BLK_DEV_SR=y
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_NETDEVICES=y
-CONFIG_DUMMY=y
-CONFIG_SMC91X=y
-CONFIG_SMSC911X=y
-# CONFIG_WLAN is not set
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-# CONFIG_VT is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_TEGRA=y
-CONFIG_SPI=y
-CONFIG_SPI_TEGRA=y
-CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
-CONFIG_THERMAL=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_VIDEO_DEV=y
-# CONFIG_MEDIA_TUNER_SIMPLE is not set
-# CONFIG_MEDIA_TUNER_TDA8290 is not set
-# CONFIG_MEDIA_TUNER_TDA827X is not set
-# CONFIG_MEDIA_TUNER_TDA18271 is not set
-# CONFIG_MEDIA_TUNER_TDA9887 is not set
-# CONFIG_MEDIA_TUNER_TEA5761 is not set
-# CONFIG_MEDIA_TUNER_TEA5767 is not set
-# CONFIG_MEDIA_TUNER_MT20XX is not set
-# CONFIG_MEDIA_TUNER_MT2060 is not set
-# CONFIG_MEDIA_TUNER_MT2266 is not set
-# CONFIG_MEDIA_TUNER_MT2131 is not set
-# CONFIG_MEDIA_TUNER_QT1010 is not set
-# CONFIG_MEDIA_TUNER_XC2028 is not set
-# CONFIG_MEDIA_TUNER_XC5000 is not set
-# CONFIG_MEDIA_TUNER_MXL5005S is not set
-# CONFIG_MEDIA_TUNER_MXL5007T is not set
-# CONFIG_MEDIA_TUNER_MC44S803 is not set
-# CONFIG_MEDIA_TUNER_MAX2165 is not set
-# CONFIG_RADIO_ADAPTERS is not set
-CONFIG_VIDEO_OUTPUT_CONTROL=y
-CONFIG_FB=y
-CONFIG_TEGRA_GRHOST=y
-CONFIG_TEGRA_DC=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_SWITCH=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_TEGRA=y
-CONFIG_STAGING=y
-CONFIG_IIO=y
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
-CONFIG_ASHMEM=y
-CONFIG_ANDROID_LOGGER=y
-CONFIG_ANDROID_RAM_CONSOLE=y
-CONFIG_TEGRA_IOMMU_SMMU=y
-CONFIG_PM_DEVFREQ=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=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_EXT4_FS=y
-# CONFIG_DNOTIFY is not set
-CONFIG_FUSE_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_PRINTK_TIME=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_FS=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_LL=y
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_AES=y
-CONFIG_CRYPTO_ARC4=y
-CONFIG_CRYPTO_TWOFISH=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-CONFIG_CRC_CCITT=y
index a133ff7..2a22b19 100644 (file)
@@ -278,14 +278,6 @@ config TEGRA_AHB
 
 comment "Tegra board type"
 
-config MACH_CURACAO
-       bool "Curacao board"
-       depends on ARCH_TEGRA_11x_SOC
-       select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
-       select TEGRA_FPGA_PLATFORM
-       help
-         Support for NVIDIA Curacao FPGA development platform
-
 config MACH_BONAIRE
        bool "Bonaire board"
        depends on ARCH_TEGRA_12x_SOC
index b19bc30..c79f2d0 100644 (file)
@@ -204,14 +204,6 @@ obj-${CONFIG_MACH_BONAIRE}              += board-bonaire-power.o
 obj-${CONFIG_MACH_BONAIRE}              += board-bonaire-sdhci.o
 obj-${CONFIG_MACH_BONAIRE}              += board-bonaire-sensors.o
 
-obj-${CONFIG_MACH_CURACAO}              += board-curacao.o
-obj-${CONFIG_MACH_CURACAO}              += board-curacao-panel.o
-obj-${CONFIG_MACH_CURACAO}              += board-curacao-pinmux.o
-obj-${CONFIG_MACH_CURACAO}              += board-curacao-power.o
-obj-${CONFIG_MACH_CURACAO}              += board-curacao-sdhci.o
-obj-${CONFIG_MACH_CURACAO}              += board-curacao-sensors.o
-obj-${CONFIG_MACH_CURACAO}              += board-curacao-memory.o
-
 obj-y                                   += board-touch-raydium_spi.o
 obj-y                                   += board-touch-synaptics-spi.o
 
diff --git a/arch/arm/mach-tegra/board-curacao-memory.c b/arch/arm/mach-tegra/board-curacao-memory.c
deleted file mode 100644 (file)
index e5c44ba..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2012 NVIDIA, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License 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.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307, USA
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-
-#include "board.h"
-#include "board-dalmore.h"
-#include "tegra11_emc.h"
-#include "fuse.h"
-#include "devices.h"
-
-int __init curacao_emc_init(void)
-{
-       platform_device_register(&tegra_emc_device);
-       tegra11_emc_init();
-       return 0;
-}
diff --git a/arch/arm/mach-tegra/board-curacao-panel.c b/arch/arm/mach-tegra/board-curacao-panel.c
deleted file mode 100644 (file)
index b8d390f..0000000
+++ /dev/null
@@ -1,573 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-curacao-panel.c
- *
- * Copyright (c) 2011-2013, NVIDIA Corporation. 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 as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/regulator/consumer.h>
-#include <linux/resource.h>
-#include <linux/platform_device.h>
-#include <linux/pwm_backlight.h>
-#include <linux/nvhost.h>
-#include <linux/nvmap.h>
-#include <linux/of.h>
-
-#include <mach/irqs.h>
-#include <mach/iomap.h>
-#include <mach/dc.h>
-#include <mach/fb.h>
-
-#include <asm/mach-types.h>
-
-#include "board.h"
-#include "devices.h"
-#include "gpio-names.h"
-#include "tegra11_host1x_devices.h"
-
-#define TEGRA_DSI_GANGED_MODE 0
-#define PANEL_ENABLE   1
-
-#if PANEL_ENABLE
-
-#if TEGRA_DSI_GANGED_MODE
-#define DSI_PANEL_218  1
-#else
-#define DSI_PANEL_218  0
-#endif
-
-#define DSI_PANEL_RESET        1
-#define DC_CTRL_MODE   TEGRA_DC_OUT_CONTINUOUS_MODE
-
-#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC)
-static atomic_t sd_brightness = ATOMIC_INIT(255);
-#endif
-
-static int curacao_backlight_init(struct device *dev)
-{
-#if DSI_PANEL_218
-       /* TODO: Enable backlight for dsi panel */
-#endif
-       return -ENODEV;
-}
-
-static void curacao_backlight_exit(struct device *dev)
-{
-#if DSI_PANEL_218
-       /* TODO: Exit backlight for dsi panel */
-#endif
-}
-
-static int curacao_backlight_notify(struct device *unused, int brightness)
-{
-#if DSI_PANEL_218
-       /* TODO: Backlight notify for dsi panel */
-#endif
-       return -ENODEV;
-}
-
-static struct platform_pwm_backlight_data curacao_backlight_data = {
-       .pwm_id         = 2,
-       .max_brightness = 255,
-       .dft_brightness = 224,
-       .pwm_period_ns  = 5000000,
-       .pwm_gpio       = TEGRA_GPIO_INVALID,
-       .init           = curacao_backlight_init,
-       .exit           = curacao_backlight_exit,
-       .notify         = curacao_backlight_notify,
-};
-
-static struct platform_device curacao_backlight_device = {
-       .name   = "pwm-backlight",
-       .id     = -1,
-       .dev    = {
-               .platform_data = &curacao_backlight_data,
-       },
-};
-
-#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC)
-static int curacao_panel_enable(struct device *dev)
-{
-#if DSI_PANEL_218
-       /* TODO: DSI panel enable */
-#endif
-       return -ENODEV;
-}
-
-static int curacao_panel_disable(void)
-{
-#if DSI_PANEL_218
-       /* TODO: DSI panel disable */
-#endif
-       return -ENODEV;
-}
-
-#if TEGRA_DSI_GANGED_MODE
-static struct resource curacao_disp1_resources[] = {
-       {
-               .name   = "irq",
-               .start  = INT_DISPLAY_GENERAL,
-               .end    = INT_DISPLAY_GENERAL,
-               .flags  = IORESOURCE_IRQ,
-       },
-       {
-               .name   = "regs",
-               .start  = TEGRA_DISPLAY_BASE,
-               .end    = TEGRA_DISPLAY_BASE + TEGRA_DISPLAY_SIZE-1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "fbmem",
-               .start  = 0,    /* Filled in by curacao_panel_init() */
-               .end    = 0,    /* Filled in by curacao_panel_init() */
-               .flags  = IORESOURCE_MEM,
-       },
-
-#if TEGRA_DSI_GANGED_MODE
-       {
-               .name   = "ganged_dsia_regs",
-               .start  = TEGRA_DSI_BASE,
-               .end    = TEGRA_DSI_BASE + TEGRA_DSI_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "ganged_dsib_regs",
-               .start  = TEGRA_DSIB_BASE,
-               .end    = TEGRA_DSIB_BASE + TEGRA_DSIB_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-#else
-       {
-               .name   = "dsi_regs",
-               .start  = TEGRA_DSI_BASE,
-               .end    = TEGRA_DSI_BASE + TEGRA_DSI_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-
-#endif
-};
-#endif
-
-static struct tegra_dc_sd_settings curacao_sd_settings = {
-       .enable = 0, /* Normal mode operation */
-       .use_auto_pwm = false,
-       .hw_update_delay = 0,
-       .bin_width = -1,
-       .aggressiveness = 1,
-       .use_vid_luma = false,
-       .k_limit_enable = false,
-       .sd_window_enable = false,
-       .soft_clipping_enable = false,
-       /* Default video coefficients */
-       .coeff = {5, 9, 2},
-       .fc = {0, 0},
-       /* Immediate backlight changes */
-       .blp = {1024, 255},
-       /* Gammas: R: 2.2 G: 2.2 B: 2.2 */
-       /* Default BL TF */
-       .bltf = {
-                       {
-                               {57, 65, 73, 82},
-                               {92, 103, 114, 125},
-                               {138, 150, 164, 178},
-                               {193, 208, 224, 241},
-                       },
-               },
-       /* Default LUT */
-       .lut = {
-                       {
-                               {255, 255, 255},
-                               {199, 199, 199},
-                               {153, 153, 153},
-                               {116, 116, 116},
-                               {85, 85, 85},
-                               {59, 59, 59},
-                               {36, 36, 36},
-                               {17, 17, 17},
-                               {0, 0, 0},
-                       }
-               },
-       .sd_brightness = &sd_brightness,
-};
-
-static struct tegra_dc_mode curacao_panel_modes[] = {
-#if !defined(CONFIG_TEGRA_SILICON_PLATFORM) && \
-                       TEGRA_DSI_GANGED_MODE
-       {
-               .pclk = 27000000,
-               .h_ref_to_sync = 1,
-               .v_ref_to_sync = 1,
-               .h_sync_width = 64,
-               .v_sync_width = 2,
-               .h_back_porch = 16,
-               .v_back_porch = 33,
-               .h_active = 640,
-               .v_active = 480,
-               .h_front_porch = 132,
-               .v_front_porch = 10,
-       },
-#else
-       {
-               .pclk = 323000000,
-               .h_ref_to_sync = 11,
-               .v_ref_to_sync = 1,
-               .h_sync_width = 16,
-               .v_sync_width = 4,
-               .h_back_porch = 16,
-               .v_back_porch = 4,
-               .h_active = 864,
-               .v_active = 480,
-               .h_front_porch = 16,
-               .v_front_porch = 4,
-       },
-#endif
-};
-
-static struct tegra_fb_data curacao_fb_data = {
-       .win            = 0,
-#if !defined(CONFIG_TEGRA_SILICON_PLATFORM) && \
-               TEGRA_DSI_GANGED_MODE
-       .xres           = 640,
-       .yres           = 480,
-#else
-       .xres           = 864,
-       .yres           = 480,
-       .bits_per_pixel = 32,
-#endif
-       .flags          = TEGRA_FB_FLIP_ON_PROBE,
-};
-
-static struct tegra_dsi_cmd dsi_init_cmd[] = {
-#if DSI_PANEL_218
-       DSI_CMD_SHORT(0x05, 0x11, 0x00),
-       DSI_DLY_MS(20),
-#if (DC_CTRL_MODE & TEGRA_DC_OUT_ONE_SHOT_MODE)
-       DSI_CMD_SHORT(0x15, 0x35, 0x00),
-#endif
-       DSI_CMD_SHORT(0x05, 0x29, 0x00),
-       DSI_DLY_MS(20),
-#endif
-};
-
-static struct tegra_dsi_cmd dsi_early_suspend_cmd[] = {
-#if DSI_PANEL_218
-       DSI_CMD_SHORT(0x05, 0x28, 0x00),
-       DSI_DLY_MS(20),
-#if (DC_CTRL_MODE & TEGRA_DC_OUT_ONE_SHOT_MODE)
-       DSI_CMD_SHORT(0x05, 0x34, 0x00),
-#endif
-#endif
-};
-
-static struct tegra_dsi_cmd dsi_late_resume_cmd[] = {
-#if DSI_PANEL_218
-#if (DC_CTRL_MODE & TEGRA_DC_OUT_ONE_SHOT_MODE)
-       DSI_CMD_SHORT(0x15, 0x35, 0x00),
-#endif
-       DSI_CMD_SHORT(0x05, 0x29, 0x00),
-       DSI_DLY_MS(20),
-#endif
-};
-
-static struct tegra_dsi_cmd dsi_suspend_cmd[] = {
-#if DSI_PANEL_218
-       DSI_CMD_SHORT(0x05, 0x28, 0x00),
-       DSI_DLY_MS(20),
-#if (DC_CTRL_MODE & TEGRA_DC_OUT_ONE_SHOT_MODE)
-       DSI_CMD_SHORT(0x05, 0x34, 0x00),
-#endif
-       DSI_CMD_SHORT(0x05, 0x10, 0x00),
-       DSI_DLY_MS(5),
-#endif
-};
-
-static struct tegra_dsi_out curacao_dsi = {
-#if DSI_PANEL_218
-       .n_data_lanes = 2,
-#else
-#if TEGRA_DSI_GANGED_MODE
-       .n_data_lanes = 8,
-#else
-       .n_data_lanes = 4,
-#endif
-#endif
-       .pixel_format = TEGRA_DSI_PIXEL_FORMAT_24BIT_P,
-       .refresh_rate = 60,
-       .virtual_channel = TEGRA_DSI_VIRTUAL_CHANNEL_0,
-
-       .dsi_instance = 0,
-       .controller_vs = DSI_VS_1,
-
-       .panel_reset = DSI_PANEL_RESET,
-       .power_saving_suspend = true,
-
-       .n_init_cmd = ARRAY_SIZE(dsi_init_cmd),
-       .dsi_init_cmd = dsi_init_cmd,
-
-       .n_early_suspend_cmd = ARRAY_SIZE(dsi_early_suspend_cmd),
-       .dsi_early_suspend_cmd = dsi_early_suspend_cmd,
-
-       .n_late_resume_cmd = ARRAY_SIZE(dsi_late_resume_cmd),
-       .dsi_late_resume_cmd = dsi_late_resume_cmd,
-
-       .n_suspend_cmd = ARRAY_SIZE(dsi_suspend_cmd),
-       .dsi_suspend_cmd = dsi_suspend_cmd,
-
-       .lp_cmd_mode_freq_khz = 20000,
-
-#if TEGRA_DSI_GANGED_MODE
-       .video_data_type = TEGRA_DSI_VIDEO_TYPE_VIDEO_MODE,
-       .video_burst_mode = TEGRA_DSI_VIDEO_NONE_BURST_MODE,
-       .ganged_type = TEGRA_DSI_GANGED_SYMMETRIC_LEFT_RIGHT,
-#else
-       .video_data_type = TEGRA_DSI_VIDEO_TYPE_COMMAND_MODE,
-#endif
-
-       /* TODO: Get the vender recommended freq */
-       .lp_read_cmd_mode_freq_khz = 200000,
-
-       .fpga_freq_khz = 162000,
-};
-
-#if TEGRA_DSI_GANGED_MODE
-static struct tegra_dc_out curacao_disp1_out = {
-       .sd_settings    = &curacao_sd_settings,
-
-       .type           = TEGRA_DC_OUT_DSI,
-       .dsi            = &curacao_dsi,
-
-       .align          = TEGRA_DC_ALIGN_MSB,
-       .order          = TEGRA_DC_ORDER_RED_BLUE,
-
-       .flags          = DC_CTRL_MODE,
-
-       .modes          = curacao_panel_modes,
-       .n_modes        = ARRAY_SIZE(curacao_panel_modes),
-
-       .enable         = curacao_panel_enable,
-       .disable        = curacao_panel_disable,
-};
-
-static struct tegra_dc_platform_data curacao_disp1_pdata = {
-       .flags          = TEGRA_DC_FLAG_ENABLED,
-       .default_out    = &curacao_disp1_out,
-       .fb             = &curacao_fb_data,
-};
-
-static struct platform_device curacao_disp1_device = {
-       .name           = "tegradc",
-       .id             = 0,
-       .resource       = curacao_disp1_resources,
-       .num_resources  = ARRAY_SIZE(curacao_disp1_resources),
-       .dev = {
-               .platform_data = &curacao_disp1_pdata,
-       },
-};
-#endif
-
-static struct resource curacao_disp2_resources[] = {
-       {
-               .name   = "irq",
-               .start  = INT_DISPLAY_B_GENERAL,
-               .end    = INT_DISPLAY_B_GENERAL,
-               .flags  = IORESOURCE_IRQ,
-       },
-       {
-               .name   = "regs",
-               .start  = TEGRA_DISPLAY2_BASE,
-               .end    = TEGRA_DISPLAY2_BASE + TEGRA_DISPLAY2_SIZE-1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "fbmem",
-               .start  = 0,    /* Filled in by curacao_panel_init() */
-               .end    = 0,    /* Filled in by curacao_panel_init() */
-               .flags  = IORESOURCE_MEM,
-       },
-#if TEGRA_DSI_GANGED_MODE
-       {
-               .name   = "ganged_dsia_regs",
-               .start  = TEGRA_DSI_BASE,
-               .end    = TEGRA_DSI_BASE + TEGRA_DSI_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .name   = "ganged_dsib_regs",
-               .start  = TEGRA_DSIB_BASE,
-               .end    = TEGRA_DSIB_BASE + TEGRA_DSIB_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-#else
-       {
-               .name   = "dsi_regs",
-               .start  = TEGRA_DSI_BASE,
-               .end    = TEGRA_DSI_BASE + TEGRA_DSI_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-
-#endif
-};
-
-static struct tegra_dc_out curacao_disp2_out = {
-       .sd_settings    = &curacao_sd_settings,
-
-       .type           = TEGRA_DC_OUT_DSI,
-       .dsi            = &curacao_dsi,
-
-       .align          = TEGRA_DC_ALIGN_MSB,
-       .order          = TEGRA_DC_ORDER_RED_BLUE,
-
-       .flags          = DC_CTRL_MODE,
-
-       .modes          = curacao_panel_modes,
-       .n_modes        = ARRAY_SIZE(curacao_panel_modes),
-
-       .enable         = curacao_panel_enable,
-       .disable        = curacao_panel_disable,
-};
-
-static struct tegra_dc_platform_data curacao_disp2_pdata = {
-       .flags          = TEGRA_DC_FLAG_ENABLED,
-       .default_out    = &curacao_disp2_out,
-       .fb             = &curacao_fb_data,
-};
-
-static struct platform_device curacao_disp2_device = {
-       .name           = "tegradc",
-       .id             = 0,
-       .resource       = curacao_disp2_resources,
-       .num_resources  = ARRAY_SIZE(curacao_disp2_resources),
-       .dev = {
-               .platform_data = &curacao_disp2_pdata,
-       },
-};
-#endif
-
-static struct nvmap_platform_carveout curacao_carveouts[] = {
-       [0] = {
-               .name           = "iram",
-               .usage_mask     = NVMAP_HEAP_CARVEOUT_IRAM,
-               .base           = TEGRA_IRAM_BASE + TEGRA_RESET_HANDLER_SIZE,
-               .size           = TEGRA_IRAM_SIZE - TEGRA_RESET_HANDLER_SIZE,
-               .buddy_size     = 0, /* no buddy allocation for IRAM */
-       },
-       [1] = {
-               .name           = "generic-0",
-               .usage_mask     = NVMAP_HEAP_CARVEOUT_GENERIC,
-               .base           = 0,    /* Filled in by curacao_panel_init() */
-               .size           = 0,    /* Filled in by curacao_panel_init() */
-               .buddy_size     = SZ_32K,
-       },
-       [2] = {
-               .name           = "vpr",
-               .usage_mask     = NVMAP_HEAP_CARVEOUT_VPR,
-               .base           = 0,    /* Filled in by curacao_panel_init() */
-               .size           = 0,    /* Filled in by curacao_panel_init() */
-               .buddy_size     = SZ_32K,
-       },
-};
-
-static struct nvmap_platform_data curacao_nvmap_data = {
-       .carveouts      = curacao_carveouts,
-       .nr_carveouts   = ARRAY_SIZE(curacao_carveouts),
-};
-
-static struct platform_device curacao_nvmap_device = {
-       .name   = "tegra-nvmap",
-       .id     = -1,
-       .dev    = {
-               .platform_data = &curacao_nvmap_data,
-       },
-};
-
-static struct platform_device *curacao_gfx_devices[] __initdata = {
-       &curacao_nvmap_device,
-       &tegra_pwfm_device,
-       &curacao_backlight_device,
-};
-
-int __init curacao_panel_init(void)
-{
-       int err;
-#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC)
-       struct resource *res;
-#endif
-#if defined(CONFIG_TEGRA_GRHOST)
-       struct platform_device *phost1x = NULL;
-       bool is_dt = of_have_populated_dt();
-#endif
-       curacao_carveouts[1].base = tegra_carveout_start;
-       curacao_carveouts[1].size = tegra_carveout_size;
-       curacao_carveouts[2].base = tegra_vpr_start;
-       curacao_carveouts[2].size = tegra_vpr_size;
-
-       err = platform_add_devices(curacao_gfx_devices,
-               ARRAY_SIZE(curacao_gfx_devices));
-
-#ifdef CONFIG_TEGRA_GRHOST
-       if (!is_dt)
-               phost1x = tegra11_register_host1x_devices();
-       else
-               phost1x = to_platform_device(bus_find_device_by_name(
-                       &platform_bus_type, NULL, "host1x"));
-       if (!phost1x) {
-               pr_err("host1x devices registration failed\n");
-               return -EINVAL;
-       }
-#endif
-
-#if TEGRA_DSI_GANGED_MODE
-#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC)
-       res = platform_get_resource_byname(&curacao_disp1_device,
-                                        IORESOURCE_MEM, "fbmem");
-       res->start = tegra_fb_start;
-       res->end = tegra_fb_start + tegra_fb_size - 1;
-
-       if (!err) {
-               curacao_disp1_device.dev.parent = &phost1x->dev;
-               err = platform_device_register(&curacao_disp1_device);
-       }
-#endif
-#else
-#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_DC)
-       res = platform_get_resource_byname(&curacao_disp2_device,
-                                        IORESOURCE_MEM, "fbmem");
-       res->start = tegra_fb_start;
-       res->end = tegra_fb_start + tegra_fb_size - 1;
-
-       if (!err) {
-               curacao_disp2_device.dev.parent = &phost1x->dev;
-               err = platform_device_register(&curacao_disp2_device);
-       }
-#endif
-#endif
-
-#if defined(CONFIG_TEGRA_GRHOST) && defined(CONFIG_TEGRA_NVAVP)
-       if (!err) {
-               nvavp_device.dev.parent = &phost1x->dev;
-               err = platform_device_register(&nvavp_device);
-       }
-#endif
-       return err;
-}
-#else
-int __init curacao_panel_init(void)
-{
-       return -ENODEV;
-}
-#endif
diff --git a/arch/arm/mach-tegra/board-curacao-pinmux.c b/arch/arm/mach-tegra/board-curacao-pinmux.c
deleted file mode 100644 (file)
index fbd84d5..0000000
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-curacao-pinmux.c
- *
- * Copyright (C) 2010-2012 NVIDIA Corporation
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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 <linux/init.h>
-#include <linux/bug.h>
-#include <mach/pinmux.h>
-#include <mach/pinmux-t11.h>
-
-static __initdata struct tegra_drive_pingroup_config curacao_drive_pinmux[] = {
-       /* DEFAULT_DRIVE(<pin_group>), */
-};
-
-static __initdata struct tegra_pingroup_config curacao_pinmux[] = {
-       DEFAULT_PINMUX(ULPI_DATA0,      ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_DATA1,      ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_DATA2,      ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_DATA3,      ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_DATA4,      ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_DATA5,      ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_DATA6,      ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_DATA7,      ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_CLK,        ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_DIR,        ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_NXT,        ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(ULPI_STP,        ULPI,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP3_FS,         I2S2,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP3_DIN,        I2S2,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP3_DOUT,       I2S2,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP3_SCLK,       I2S2,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PV1,        RSVD1,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC1_CLK,      SDMMC1,          NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(SDMMC1_CMD,      SDMMC1,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC1_DAT3,     SDMMC1,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC1_DAT2,     SDMMC1,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC1_DAT1,     SDMMC1,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC1_DAT0,     SDMMC1,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(CLK2_OUT,        EXTPERIPH2,      NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(CLK2_REQ,        DAP,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DDC_SCL,         I2C4,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DDC_SDA,         I2C4,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(UART2_RXD,       IRDA,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(UART2_TXD,       IRDA,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(UART2_RTS_N,     UARTB,           NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(UART2_CTS_N,     UARTB,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(UART3_TXD,       UARTC,           NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(UART3_RXD,       UARTC,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(UART3_CTS_N,     UARTC,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(UART3_RTS_N,     UARTC,           NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GPIO_PU0,        RSVD2,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PU1,        RSVD2,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PU2,        RSVD2,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PU3,        PWM0,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PU4,        PWM1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PU5,        PWM2,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PU6,        USB,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GEN1_I2C_SDA,    I2C1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GEN1_I2C_SCL,    I2C1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP4_FS,         I2S3,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP4_DIN,        I2S3,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP4_DOUT,       I2S3,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP4_SCLK,       I2S3,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(CLK3_OUT,        EXTPERIPH3,      NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(CLK3_REQ,        DEV3,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_WP_N,        RSVD0,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_IORDY,       RSVD1,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_WAIT,        NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_ADV_N,       NAND,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_CLK,         NAND,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_CS0_N,       NAND,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_CS1_N,       NAND,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_CS2_N,       NAND,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_CS3_N,       NAND,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_CS4_N,       NAND,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_CS6_N,       NAND_ALT,        NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_CS7_N,       NAND_ALT,        NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_AD0,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD1,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD2,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD3,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD4,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD5,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD6,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD7,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD8,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD9,         NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD10,        NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD11,        NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD12,        NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD13,        NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD14,        NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_AD15,        NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_A16,         UARTD,           NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_A17,         UARTD,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_A18,         UARTD,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_A19,         UARTD,           NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_WR_N,        NAND,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_OE_N,        NAND,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(GMI_DQS_P,       NAND,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GMI_RST_N,       GMI,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GEN2_I2C_SCL,    I2C2,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GEN2_I2C_SDA,    I2C2,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_CLK,      SDMMC4,          NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_CMD,      SDMMC4,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_DAT0,     SDMMC4,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_DAT1,     SDMMC4,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_DAT2,     SDMMC4,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_DAT3,     SDMMC4,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_DAT4,     SDMMC4,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_DAT5,     SDMMC4,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_DAT6,     SDMMC4,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC4_DAT7,     SDMMC4,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(CAM_MCLK,        VI,              NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PCC1,       I2S4,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PBB0,       I2S4,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(CAM_I2C_SCL,     I2C3,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(CAM_I2C_SDA,     I2C3,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PBB3,       VGP3,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PBB4,       VGP4,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PBB5,       VGP5,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PBB6,       VGP6,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PBB7,       I2S4,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_PCC2,       I2S4,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(JTAG_RTCK,       RTCK,            NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(PWR_I2C_SCL,     I2CPWR,          NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(PWR_I2C_SDA,     I2CPWR,          NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_ROW0,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_ROW1,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_ROW2,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_ROW3,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_ROW4,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_ROW5,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_ROW6,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_ROW7,         UARTA,           NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(KB_ROW8,         UARTA,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_ROW9,         UARTA,           NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(KB_ROW10,        UARTA,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_COL0,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_COL1,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_COL2,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_COL3,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_COL4,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_COL5,         SDMMC1,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_COL6,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(KB_COL7,         KBC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(CLK_32K_OUT,     BLINK,           NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(SYS_CLK_REQ,     SYSCLK,          NORMAL,    NORMAL,     OUTPUT),
-#ifdef CONFIG_SND_HDA_TEGRA
-       DEFAULT_PINMUX(DAP1_FS,         HDA,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP1_DIN,        HDA,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP1_DOUT,       HDA,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP1_SCLK,       HDA,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(CLK1_REQ,        DAP1,            NORMAL,    NORMAL,     INPUT),
-#else
-       DEFAULT_PINMUX(DAP1_FS,         I2S0,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP1_DIN,        I2S0,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP1_DOUT,       I2S0,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP1_SCLK,       I2S0,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(CLK1_REQ,        DAP,             NORMAL,    NORMAL,     INPUT),
-#endif
-       DEFAULT_PINMUX(CLK1_OUT,        EXTPERIPH1,      NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPDIF_IN,        SPDIF,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SPDIF_OUT,       SPDIF,           NORMAL,    NORMAL,     OUTPUT),
-       DEFAULT_PINMUX(DAP2_FS,         I2S1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP2_DIN,        I2S1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP2_DOUT,       I2S1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DAP2_SCLK,       I2S1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DVFS_PWM,        SPI6,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_X1_AUD,     SPI6,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_X3_AUD,     SPI6,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(DVFS_CLK,        SPI6,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_X4_AUD,     RSVD0,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_X5_AUD,     SPI1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_X6_AUD,     SPI1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_X7_AUD,     SPI1,            NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC3_CLK,      SDMMC3,          NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC3_CMD,      SDMMC3,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC3_DAT0,     SDMMC3,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC3_DAT1,     SDMMC3,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC3_DAT2,     SDMMC3,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC3_DAT3,     SDMMC3,          PULL_UP,   NORMAL,     INPUT),
-       DEFAULT_PINMUX(HDMI_CEC,        CEC,             NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC1_WP_N,     SDMMC1,          NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(SDMMC3_CD_N,     RSVD2,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_W2_AUD,     RSVD1,           NORMAL,    NORMAL,     INPUT),
-       DEFAULT_PINMUX(GPIO_W3_AUD,     SPI1,            NORMAL,    NORMAL,     INPUT),
-};
-
-void __init curacao_pinmux_init(void)
-{
-       tegra11x_default_pinmux();
-       tegra_pinmux_config_table(curacao_pinmux, ARRAY_SIZE(curacao_pinmux));
-       tegra_drive_pinmux_config_table(curacao_drive_pinmux,
-                                       ARRAY_SIZE(curacao_drive_pinmux));
-}
diff --git a/arch/arm/mach-tegra/board-curacao-power.c b/arch/arm/mach-tegra/board-curacao-power.c
deleted file mode 100644 (file)
index ae21be0..0000000
+++ /dev/null
@@ -1,488 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-curacao-power.c
- *
- * Copyright (C) 2011-2012 NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License 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.
- *
- * 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#include <linux/i2c.h>
-#include <linux/pda_power.h>
-#include <linux/platform_device.h>
-#include <linux/resource.h>
-#include <linux/io.h>
-#include <linux/regulator/machine.h>
-#include <linux/gpio.h>
-#include <linux/regulator/driver.h>
-#include <linux/regulator/gpio-regulator.h>
-#include <linux/mfd/max77663-core.h>
-#include <linux/regulator/max77663-regulator.h>
-
-#include <mach/iomap.h>
-#include <mach/irqs.h>
-#include <mach/gpio-tegra.h>
-
-#include "pm.h"
-#include "board.h"
-#include "board-curacao.h"
-#include "tegra_cl_dvfs.h"
-#include "gpio-names.h"
-#include "tegra11_soctherm.h"
-#include "devices.h"
-
-#define PMC_CTRL                0x0
-#define PMC_CTRL_INTR_LOW       (1 << 17)
-
-static struct regulator_consumer_supply max77663_sd0_supply[] = {
-       REGULATOR_SUPPLY("unused_sd0", NULL),
-};
-
-static struct regulator_consumer_supply max77663_sd1_supply[] = {
-       REGULATOR_SUPPLY("unused_sd1", NULL),
-};
-
-static struct regulator_consumer_supply max77663_sd2_supply[] = {
-       REGULATOR_SUPPLY("unused_sd2", NULL),
-};
-
-static struct regulator_consumer_supply max77663_sd3_supply[] = {
-       REGULATOR_SUPPLY("unused_sd3", NULL),
-};
-
-static struct regulator_consumer_supply max77663_ldo0_supply[] = {
-       REGULATOR_SUPPLY("unused_ldo0", NULL),
-};
-
-static struct regulator_consumer_supply max77663_ldo1_supply[] = {
-       REGULATOR_SUPPLY("unused_ldo1", NULL),
-};
-
-static struct regulator_consumer_supply max77663_ldo2_supply[] = {
-       REGULATOR_SUPPLY("unused_ldo2", NULL),
-};
-
-static struct regulator_consumer_supply max77663_ldo3_supply[] = {
-       REGULATOR_SUPPLY("unused_ldo3", NULL),
-};
-
-static struct regulator_consumer_supply max77663_ldo4_supply[] = {
-       REGULATOR_SUPPLY("unused_ldo4", NULL),
-};
-
-static struct regulator_consumer_supply max77663_ldo5_supply[] = {
-       REGULATOR_SUPPLY("unused_ldo5", NULL),
-};
-
-static struct regulator_consumer_supply max77663_ldo6_supply[] = {
-       REGULATOR_SUPPLY("unused_ldo6", NULL),
-};
-
-static struct regulator_consumer_supply max77663_ldo7_supply[] = {
-       REGULATOR_SUPPLY("unused_ldo7", NULL),
-};
-
-static struct regulator_consumer_supply max77663_ldo8_supply[] = {
-       REGULATOR_SUPPLY("unused_ldo8", NULL),
-};
-
-static struct max77663_regulator_fps_cfg max77663_fps_cfgs[] = {
-       {
-               .src = FPS_SRC_0,
-               .en_src = FPS_EN_SRC_EN0,
-               .time_period = FPS_TIME_PERIOD_DEF,
-       },
-       {
-               .src = FPS_SRC_1,
-               .en_src = FPS_EN_SRC_EN1,
-               .time_period = FPS_TIME_PERIOD_DEF,
-       },
-       {
-               .src = FPS_SRC_2,
-               .en_src = FPS_EN_SRC_EN0,
-               .time_period = FPS_TIME_PERIOD_DEF,
-       },
-};
-
-#define MAX77663_PDATA_INIT(_rid, _id, _min_uV, _max_uV, _supply_reg,  \
-               _always_on, _boot_on, _apply_uV,                        \
-               _fps_src, _fps_pu_period, _fps_pd_period, _flags)       \
-       static struct regulator_init_data max77663_regulator_idata_##_id = {  \
-               .supply_regulator = _supply_reg,                        \
-               .constraints = {                                        \
-                       .name = max77663_rails(_id),                    \
-                       .min_uV = _min_uV,                              \
-                       .max_uV = _max_uV,                              \
-                       .valid_modes_mask = (REGULATOR_MODE_NORMAL |    \
-                                            REGULATOR_MODE_STANDBY),   \
-                       .valid_ops_mask = (REGULATOR_CHANGE_MODE |      \
-                                          REGULATOR_CHANGE_STATUS |    \
-                                          REGULATOR_CHANGE_VOLTAGE),   \
-                       .always_on = _always_on,                        \
-                       .boot_on = _boot_on,                            \
-                       .apply_uV = _apply_uV,                          \
-               },                                                      \
-               .num_consumer_supplies =                                \
-                       ARRAY_SIZE(max77663_##_id##_supply),            \
-               .consumer_supplies = max77663_##_id##_supply,           \
-       };                                                              \
-       static struct max77663_regulator_platform_data max77663_regulator_pdata_##_id = \
-       {                                                               \
-               .reg_init_data = &max77663_regulator_idata_##_id,       \
-               .id = MAX77663_REGULATOR_ID_##_rid,                     \
-               .fps_src = _fps_src,                                    \
-               .fps_pu_period = _fps_pu_period,                        \
-               .fps_pd_period = _fps_pd_period,                        \
-               .fps_cfgs = max77663_fps_cfgs,                          \
-               .flags = _flags,                                        \
-       }
-
-MAX77663_PDATA_INIT(SD0, sd0,  600000, 3387500, NULL, 1, 0, 0,
-                   FPS_SRC_NONE, -1, -1, EN2_CTRL_SD0 | SD_FSRADE_DISABLE);
-
-MAX77663_PDATA_INIT(SD1, sd1,  800000, 1587500, NULL, 1, 1, 0,
-                   FPS_SRC_1, -1, -1, SD_FSRADE_DISABLE);
-
-MAX77663_PDATA_INIT(SD2, sd2,  1800000, 1800000, NULL, 1, 1, 0,
-                   FPS_SRC_NONE, -1, -1, 0);
-
-MAX77663_PDATA_INIT(SD3, sd3,  600000, 3387500, NULL, 1, 1, 0,
-                   FPS_SRC_NONE, -1, -1, 0);
-
-MAX77663_PDATA_INIT(LDO0, ldo0, 800000, 2350000, max77663_rails(sd3), 1, 1, 0,
-                   FPS_SRC_1, -1, -1, 0);
-
-MAX77663_PDATA_INIT(LDO1, ldo1, 800000, 2350000, max77663_rails(sd3), 0, 0, 0,
-                   FPS_SRC_NONE, -1, -1, 0);
-
-MAX77663_PDATA_INIT(LDO2, ldo2, 800000, 3950000, NULL, 1, 1, 0,
-                   FPS_SRC_1, -1, -1, 0);
-
-MAX77663_PDATA_INIT(LDO3, ldo3, 800000, 3950000, NULL, 1, 1, 0,
-                   FPS_SRC_NONE, -1, -1, 0);
-
-MAX77663_PDATA_INIT(LDO4, ldo4, 1000000, 1000000, NULL, 0, 1, 0,
-                   FPS_SRC_NONE, -1, -1, LDO4_EN_TRACKING);
-
-MAX77663_PDATA_INIT(LDO5, ldo5, 800000, 2800000, NULL, 0, 1, 0,
-                   FPS_SRC_NONE, -1, -1, 0);
-
-MAX77663_PDATA_INIT(LDO6, ldo6, 800000, 3950000, NULL, 0, 0, 0,
-                   FPS_SRC_NONE, -1, -1, 0);
-
-MAX77663_PDATA_INIT(LDO7, ldo7, 800000, 3950000, max77663_rails(sd3), 0, 0, 0,
-                   FPS_SRC_NONE, -1, -1, 0);
-
-MAX77663_PDATA_INIT(LDO8, ldo8, 800000, 3950000, max77663_rails(sd3), 0, 1, 0,
-                   FPS_SRC_1, -1, -1, 0);
-
-#define MAX77663_REG(_id, _data) &max77663_regulator_pdata_##_data
-
-static struct max77663_regulator_platform_data *max77663_reg_pdata[] = {
-       MAX77663_REG(SD0, sd0),
-       MAX77663_REG(SD1, sd1),
-       MAX77663_REG(SD2, sd2),
-       MAX77663_REG(SD3, sd3),
-       MAX77663_REG(LDO0, ldo0),
-       MAX77663_REG(LDO1, ldo1),
-       MAX77663_REG(LDO2, ldo2),
-       MAX77663_REG(LDO3, ldo3),
-       MAX77663_REG(LDO4, ldo4),
-       MAX77663_REG(LDO5, ldo5),
-       MAX77663_REG(LDO6, ldo6),
-       MAX77663_REG(LDO7, ldo7),
-       MAX77663_REG(LDO8, ldo8),
-};
-
-static struct max77663_gpio_config max77663_gpio_cfgs[] = {
-       {
-               .gpio = MAX77663_GPIO0,
-               .dir = GPIO_DIR_OUT,
-               .dout = GPIO_DOUT_LOW,
-               .out_drv = GPIO_OUT_DRV_PUSH_PULL,
-               .alternate = GPIO_ALT_DISABLE,
-       },
-       {
-               .gpio = MAX77663_GPIO1,
-               .dir = GPIO_DIR_IN,
-               .dout = GPIO_DOUT_LOW,
-               .out_drv = GPIO_OUT_DRV_PUSH_PULL,
-               .alternate = GPIO_ALT_DISABLE,
-       },
-       {
-               .gpio = MAX77663_GPIO2,
-               .dir = GPIO_DIR_OUT,
-               .dout = GPIO_DOUT_HIGH,
-               .out_drv = GPIO_OUT_DRV_OPEN_DRAIN,
-               .alternate = GPIO_ALT_DISABLE,
-       },
-       {
-               .gpio = MAX77663_GPIO3,
-               .dir = GPIO_DIR_OUT,
-               .dout = GPIO_DOUT_HIGH,
-               .out_drv = GPIO_OUT_DRV_OPEN_DRAIN,
-               .alternate = GPIO_ALT_DISABLE,
-       },
-       {
-               .gpio = MAX77663_GPIO4,
-               .dir = GPIO_DIR_OUT,
-               .dout = GPIO_DOUT_HIGH,
-               .out_drv = GPIO_OUT_DRV_PUSH_PULL,
-               .alternate = GPIO_ALT_ENABLE,
-       },
-       {
-               .gpio = MAX77663_GPIO5,
-               .dir = GPIO_DIR_OUT,
-               .dout = GPIO_DOUT_LOW,
-               .out_drv = GPIO_OUT_DRV_PUSH_PULL,
-               .alternate = GPIO_ALT_DISABLE,
-       },
-       {
-               .gpio = MAX77663_GPIO6,
-               .dir = GPIO_DIR_IN,
-               .alternate = GPIO_ALT_DISABLE,
-       },
-       {
-               .gpio = MAX77663_GPIO7,
-               .dir = GPIO_DIR_OUT,
-               .dout = GPIO_DOUT_LOW,
-               .out_drv = GPIO_OUT_DRV_OPEN_DRAIN,
-               .alternate = GPIO_ALT_DISABLE,
-       },
-};
-
-static struct max77663_platform_data max7763_pdata = {
-       .irq_base       = MAX77663_IRQ_BASE,
-       .gpio_base      = MAX77663_GPIO_BASE,
-
-       .num_gpio_cfgs  = ARRAY_SIZE(max77663_gpio_cfgs),
-       .gpio_cfgs      = max77663_gpio_cfgs,
-
-       .regulator_pdata = max77663_reg_pdata,
-       .num_regulator_pdata = ARRAY_SIZE(max77663_reg_pdata),
-
-       .rtc_i2c_addr   = 0x68,
-
-       .use_power_off  = true,
-};
-
-static struct i2c_board_info __initdata max77663_regulators[] = {
-       {
-               /* The I2C address was determined by OTP factory setting */
-               I2C_BOARD_INFO("max77663", 0x3c),
-               .irq            = INT_EXTERNAL_PMU,
-               .platform_data  = &max7763_pdata,
-       },
-};
-
-static int __init curacao_max77663_regulator_init(void)
-{
-       void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
-       u32 pmc_ctrl;
-
-       /* configure the power management controller to trigger PMU
-        * interrupts when low */
-       pmc_ctrl = readl(pmc + PMC_CTRL);
-       writel(pmc_ctrl | PMC_CTRL_INTR_LOW, pmc + PMC_CTRL);
-
-       i2c_register_board_info(4, max77663_regulators,
-                               ARRAY_SIZE(max77663_regulators));
-
-       return 0;
-}
-
-static int ac_online(void)
-{
-       return 1;
-}
-
-static struct regulator_consumer_supply gpio_reg_sdmmc3_vdd_sel_supply[] = {
-       REGULATOR_SUPPLY("vddio_sdmmc", "sdhci-tegra.2"),
-};
-
-static struct gpio_regulator_state gpio_reg_sdmmc3_vdd_sel_states[] = {
-       {
-               .gpios = 0,
-               .value = 1800000,
-       },
-       {
-               .gpios = 1,
-               .value = 3300000,
-       },
-};
-
-static struct gpio gpio_reg_sdmmc3_vdd_sel_gpios[] = {
-       {
-               .gpio = TEGRA_GPIO_PV1,
-               .flags = 0,
-               .label = "sdmmc3_vdd_sel",
-       },
-};
-
-/* Macro for defining gpio regulator device data */
-#define GPIO_REG(_id, _name, _input_supply, _active_high,      \
-               _boot_state, _delay_us, _minmv, _maxmv)         \
-       static struct regulator_init_data ri_data_##_name =     \
-{                                                              \
-       .supply_regulator = NULL,                               \
-       .num_consumer_supplies =                                \
-               ARRAY_SIZE(gpio_reg_##_name##_supply),          \
-       .consumer_supplies = gpio_reg_##_name##_supply,         \
-       .constraints = {                                        \
-               .name = "gpio_reg_"#_name,                      \
-               .min_uV = (_minmv)*1000,                        \
-               .max_uV = (_maxmv)*1000,                        \
-               .valid_modes_mask = (REGULATOR_MODE_NORMAL |    \
-                               REGULATOR_MODE_STANDBY),        \
-               .valid_ops_mask = (REGULATOR_CHANGE_MODE |      \
-                               REGULATOR_CHANGE_STATUS |       \
-                               REGULATOR_CHANGE_VOLTAGE),      \
-       },                                                      \
-};                                                             \
-static struct gpio_regulator_config gpio_reg_##_name##_pdata = \
-{                                                              \
-       .supply_name = "vddio_sdmmc",                           \
-       .enable_gpio = -EINVAL,                                 \
-       .enable_high = _active_high,                            \
-       .enabled_at_boot = _boot_state,                         \
-       .startup_delay = _delay_us,                             \
-       .gpios = gpio_reg_##_name##_gpios,                      \
-       .nr_gpios = ARRAY_SIZE(gpio_reg_##_name##_gpios),       \
-       .states = gpio_reg_##_name##_states,                    \
-       .nr_states = ARRAY_SIZE(gpio_reg_##_name##_states),     \
-       .type = REGULATOR_VOLTAGE,                              \
-       .init_data = &ri_data_##_name,                          \
-};                                                             \
-static struct platform_device gpio_reg_##_name##_dev = {       \
-       .name   = "gpio-regulator",                             \
-       .id = _id,                                              \
-       .dev    = {                                             \
-               .platform_data = &gpio_reg_##_name##_pdata,     \
-       },                                                      \
-}
-GPIO_REG(4, sdmmc3_vdd_sel, NULL,
-               true, true, 0, 1000, 3300);
-
-#define ADD_GPIO_REG(_name) (&gpio_reg_##_name##_dev)
-static struct platform_device *gpio_regs_devices[] = {
-       ADD_GPIO_REG(sdmmc3_vdd_sel),
-};
-
-static struct resource curacao_pda_resources[] = {
-       [0] = {
-               .name   = "ac",
-       },
-};
-
-static struct pda_power_pdata curacao_pda_data = {
-       .is_ac_online   = ac_online,
-};
-
-static struct platform_device curacao_pda_power_device = {
-       .name           = "pda-power",
-       .id             = -1,
-       .resource       = curacao_pda_resources,
-       .num_resources  = ARRAY_SIZE(curacao_pda_resources),
-       .dev    = {
-               .platform_data  = &curacao_pda_data,
-       },
-};
-
-static struct tegra_suspend_platform_data curacao_suspend_data = {
-       .cpu_timer      = 2000,
-       .cpu_off_timer  = 0,
-       .suspend_mode   = TEGRA_SUSPEND_LP1,
-       .core_timer     = 0x7e7e,
-       .core_off_timer = 0,
-       .corereq_high   = false,
-       .sysclkreq_high = true,
-};
-
-/* FIXME: the cl_dvfs data below is bogus, just to enable s/w
-   debugging on FPGA */
-
-/* Board characterization parameters */
-static struct tegra_cl_dvfs_cfg_param curacao_cl_dvfs_param = {
-       .sample_rate = 2250,
-
-       .force_mode = TEGRA_CL_DVFS_FORCE_FIXED,
-       .cf = 16,
-       .ci = 7,
-       .cg = -12,
-
-       .droop_cut_value = 0x8,
-       .droop_restore_ramp = 0x10,
-       .scale_out_ramp = 0x2,
-};
-
-/* PMU data : fixed 12.5mV steps from 600mV to 1400mV, no offset */
-#define PMU_CPU_VDD_MAP_SIZE ((1400000 - 600000) / 12500 + 1)
-static struct voltage_reg_map pmu_cpu_vdd_map[PMU_CPU_VDD_MAP_SIZE];
-static void fill_reg_map(void)
-{
-       int i;
-       for (i = 0; i < PMU_CPU_VDD_MAP_SIZE; i++) {
-               pmu_cpu_vdd_map[i].reg_value = i;
-               pmu_cpu_vdd_map[i].reg_uV = 600000 + 12500 * i;
-       }
-}
-
-static struct tegra_cl_dvfs_platform_data curacao_cl_dvfs_data = {
-       .dfll_clk_name = "dfll_cpu",
-       .pmu_if = TEGRA_CL_DVFS_PMU_I2C,
-       .u.pmu_i2c = {
-               .fs_rate = 50000,
-               .hs_master_code = 0, /* no hs mode support */
-               .slave_addr = 0x78,
-               .reg = 0x16,
-       },
-       .vdd_map = pmu_cpu_vdd_map,
-       .vdd_map_size = PMU_CPU_VDD_MAP_SIZE,
-
-       .cfg_param = &curacao_cl_dvfs_param,
-};
-
-static int __init curacao_cl_dvfs_init(void)
-{
-       fill_reg_map();
-       tegra_cl_dvfs_device.dev.platform_data = &curacao_cl_dvfs_data;
-       platform_device_register(&tegra_cl_dvfs_device);
-
-       return 0;
-}
-
-int __init curacao_regulator_init(void)
-{
-       int ret;
-
-       platform_device_register(&curacao_pda_power_device);
-       ret = curacao_max77663_regulator_init();
-       if (ret < 0)
-               return ret;
-
-       curacao_cl_dvfs_init();
-
-       return platform_add_devices(gpio_regs_devices,
-                       ARRAY_SIZE(gpio_regs_devices));
-}
-
-int __init tegra_get_cvb_alignment_uV(void)
-{
-       return 12500;
-}
-
-int __init curacao_suspend_init(void)
-{
-       tegra_init_suspend(&curacao_suspend_data);
-       return 0;
-}
diff --git a/arch/arm/mach-tegra/board-curacao-sdhci.c b/arch/arm/mach-tegra/board-curacao-sdhci.c
deleted file mode 100644 (file)
index 4d5d609..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-curacao-sdhci.c
- *
- * Copyright (C) 2010 Google, Inc.
- * Copyright (C) 2011-2012 NVIDIA Corporation.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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/resource.h>
-#include <linux/platform_device.h>
-#include <linux/wlan_plat.h>
-#include <linux/delay.h>
-#include <linux/gpio.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/mmc/host.h>
-#include <linux/platform_data/mmc-sdhci-tegra.h>
-
-#include <asm/mach-types.h>
-#include <mach/irqs.h>
-#include <mach/iomap.h>
-#include <mach/sdhci.h>
-
-#include "gpio-names.h"
-#include "board.h"
-
-#define CURACAO_WIFI 0 /* !!!FIXME!!! NOT SUPPORTED YET */
-
-#if CURACAO_WIFI
-
-#define CURACAO_WLAN_PWR       TEGRA_GPIO_PK5
-#define CURACAO_WLAN_RST       TEGRA_GPIO_PK6
-
-static void (*wifi_status_cb)(int card_present, void *dev_id);
-static void *wifi_status_cb_devid;
-static int curacao_wifi_status_register(void (*callback)(int , void *), void *);
-static struct clk *wifi_32k_clk;
-
-static int curacao_wifi_reset(int on);
-static int curacao_wifi_power(int on);
-static int curacao_wifi_set_carddetect(int val);
-
-static struct wifi_platform_data curacao_wifi_control = {
-       .set_power      = curacao_wifi_power,
-       .set_reset      = curacao_wifi_reset,
-       .set_carddetect = curacao_wifi_set_carddetect,
-};
-
-static struct platform_device curacao_wifi_device = {
-       .name           = "bcm4329_wlan",
-       .id             = 1,
-       .dev            = {
-               .platform_data = &curacao_wifi_control,
-       },
-};
-#endif
-
-static struct resource sdhci_resource0[] = {
-       [0] = {
-               .start  = INT_SDMMC1,
-               .end    = INT_SDMMC1,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [1] = {
-               .start  = TEGRA_SDMMC1_BASE,
-               .end    = TEGRA_SDMMC1_BASE + TEGRA_SDMMC1_SIZE-1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct resource sdhci_resource2[] = {
-       [0] = {
-               .start  = INT_SDMMC3,
-               .end    = INT_SDMMC3,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [1] = {
-               .start  = TEGRA_SDMMC3_BASE,
-               .end    = TEGRA_SDMMC3_BASE + TEGRA_SDMMC3_SIZE-1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct resource sdhci_resource3[] = {
-       [0] = {
-               .start  = INT_SDMMC4,
-               .end    = INT_SDMMC4,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [1] = {
-               .start  = TEGRA_SDMMC4_BASE,
-               .end    = TEGRA_SDMMC4_BASE + TEGRA_SDMMC4_SIZE-1,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-
-static struct tegra_sdhci_platform_data tegra_sdhci_platform_data0 = {
-#if CURACAO_WIFI  /* !!!FIXME!!! NOT SUPPORTED YET */
-       .register_status_notify = curacao_wifi_status_register,
-       .cccr   = {
-               .sdio_vsn       = 2,
-               .multi_block    = 1,
-               .low_speed      = 0,
-               .wide_bus       = 0,
-               .high_power     = 1,
-               .high_speed     = 1,
-       },
-       .cis  = {
-               .vendor         = 0x02d0,
-               .device         = 0x4329,
-       },
-#endif
-       .cd_gpio = -1,
-       .wp_gpio = -1,
-       .power_gpio = -1,
-/*     .max_clk = 12000000, */
-};
-
-static struct tegra_sdhci_platform_data tegra_sdhci_platform_data2 = {
-       .cd_gpio = -1,
-       .wp_gpio = -1,
-       .power_gpio = -1,
-/*     .max_clk = 12000000, */
-};
-
-static struct tegra_sdhci_platform_data tegra_sdhci_platform_data3 = {
-       .cd_gpio = -1,
-       .wp_gpio = -1,
-       .power_gpio = -1,
-       .is_8bit = 1,
-       .tap_delay = 0x0F,
-       .mmc_data = {
-               .built_in = 1,
-       }
-/*     .max_clk = 12000000, */
-};
-
-static struct platform_device tegra_sdhci_device0 = {
-       .name           = "sdhci-tegra",
-       .id             = 0,
-       .resource       = sdhci_resource0,
-       .num_resources  = ARRAY_SIZE(sdhci_resource0),
-       .dev = {
-               .platform_data = &tegra_sdhci_platform_data0,
-       },
-};
-
-static struct platform_device tegra_sdhci_device2 = {
-       .name           = "sdhci-tegra",
-       .id             = 2,
-       .resource       = sdhci_resource2,
-       .num_resources  = ARRAY_SIZE(sdhci_resource2),
-       .dev = {
-               .platform_data = &tegra_sdhci_platform_data2,
-       },
-};
-
-static struct platform_device tegra_sdhci_device3 = {
-       .name           = "sdhci-tegra",
-       .id             = 3,
-       .resource       = sdhci_resource3,
-       .num_resources  = ARRAY_SIZE(sdhci_resource3),
-       .dev = {
-               .platform_data = &tegra_sdhci_platform_data3,
-       },
-};
-
-#if CURACAO_WIFI /* !!!FIXME!!! NOT SUPPORTED YET */
-static int curacao_wifi_status_register(
-               void (*callback)(int card_present, void *dev_id),
-               void *dev_id)
-{
-       if (wifi_status_cb)
-               return -EAGAIN;
-       wifi_status_cb = callback;
-       wifi_status_cb_devid = dev_id;
-       return 0;
-}
-
-static int curacao_wifi_set_carddetect(int val)
-{
-       pr_debug("%s: %d\n", __func__, val);
-       if (wifi_status_cb)
-               wifi_status_cb(val, wifi_status_cb_devid);
-       else
-               pr_warning("%s: Nobody to notify\n", __func__);
-       return 0;
-}
-
-static int curacao_wifi_power(int on)
-{
-       pr_debug("%s: %d\n", __func__, on);
-
-       gpio_set_value(CURACAO_WLAN_PWR, on);
-       mdelay(100);
-       gpio_set_value(CURACAO_WLAN_RST, on);
-       mdelay(200);
-
-       if (on)
-               clk_enable(wifi_32k_clk);
-       else
-               clk_disable(wifi_32k_clk);
-
-       return 0;
-}
-
-static int curacao_wifi_reset(int on)
-{
-       pr_debug("%s: do nothing\n", __func__);
-       return 0;
-}
-
-static int __init curacao_wifi_init(void)
-{
-       wifi_32k_clk = clk_get_sys(NULL, "blink");
-       if (IS_ERR(wifi_32k_clk)) {
-               pr_err("%s: unable to get blink clock\n", __func__);
-               return PTR_ERR(wifi_32k_clk);
-       }
-
-       gpio_request(CURACAO_WLAN_PWR, "wlan_power");
-       gpio_request(CURACAO_WLAN_RST, "wlan_rst");
-
-       gpio_direction_output(CURACAO_WLAN_PWR, 0);
-       gpio_direction_output(CURACAO_WLAN_RST, 0);
-
-       platform_device_register(&curacao_wifi_device);
-       return 0;
-}
-#else
-#define curacao_wifi_init() do {} while (0)
-#endif
-
-int __init curacao_sdhci_init(void)
-{
-       platform_device_register(&tegra_sdhci_device3);
-       platform_device_register(&tegra_sdhci_device2);
-       platform_device_register(&tegra_sdhci_device0);
-       return 0;
-}
diff --git a/arch/arm/mach-tegra/board-curacao-sensors.c b/arch/arm/mach-tegra/board-curacao-sensors.c
deleted file mode 100644 (file)
index 73b6af6..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-curacao-sensors.c
- *
- * Copyright (c) 2011-2012 NVIDIA CORPORATION, All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of NVIDIA CORPORATION nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <linux/i2c.h>
-#include <linux/delay.h>
-#include <media/ov5650.h>
-#include <media/ov14810.h>
-#include <media/ov2710.h>
-#include "gpio-names.h"
-#include "board.h"
-
-#include "gpio-names.h"
-#include "board-curacao.h"
-#include "cpu-tegra.h"
-
-static struct board_info board_info;
-
-static int curacao_camera_init(void)
-{
-       return 0;
-}
-
-static int curacao_left_ov5650_power_on(struct device *dev)
-{
-       return 0;
-}
-
-static int curacao_left_ov5650_power_off(struct device *dev)
-{
-       return 0;
-}
-
-struct ov5650_platform_data curacao_ov5650_data = {
-       .power_on = curacao_left_ov5650_power_on,
-       .power_off = curacao_left_ov5650_power_off,
-};
-
-#ifdef CONFIG_VIDEO_OV14810
-static int curacao_ov14810_power_on(struct device *dev)
-{
-       return 0;
-}
-
-static int curacao_ov14810_power_off(struct device *dev)
-{
-       return 0;
-}
-
-struct ov14810_platform_data curacao_ov14810_data = {
-       .power_on = curacao_ov14810_power_on,
-       .power_off = curacao_ov14810_power_off,
-};
-
-struct ov14810_platform_data curacao_ov14810uC_data = {
-       .power_on = NULL,
-       .power_off = NULL,
-};
-
-struct ov14810_platform_data curacao_ov14810SlaveDev_data = {
-       .power_on = NULL,
-       .power_off = NULL,
-};
-
-static struct i2c_board_info curacao_i2c_board_info_e1214[] = {
-       {
-               I2C_BOARD_INFO("ov14810", 0x36),
-               .platform_data = &curacao_ov14810_data,
-       },
-       {
-               I2C_BOARD_INFO("ov14810uC", 0x67),
-               .platform_data = &curacao_ov14810uC_data,
-       },
-       {
-               I2C_BOARD_INFO("ov14810SlaveDev", 0x69),
-               .platform_data = &curacao_ov14810SlaveDev_data,
-       }
-};
-#endif
-
-static int curacao_right_ov5650_power_on(struct device *dev)
-{
-       return 0;
-}
-
-static int curacao_right_ov5650_power_off(struct device *dev)
-{
-       return 0;
-}
-
-static void curacao_ov5650_synchronize_sensors(void)
-{
-       pr_err("%s: UnSupported BoardId\n", __func__);
-}
-
-struct ov5650_platform_data curacao_right_ov5650_data = {
-       .power_on = curacao_right_ov5650_power_on,
-       .power_off = curacao_right_ov5650_power_off,
-       .synchronize_sensors = curacao_ov5650_synchronize_sensors,
-};
-
-static int curacao_ov2710_power_on(struct device *dev)
-{
-       return 0;
-}
-
-static int curacao_ov2710_power_off(struct device *dev)
-{
-       return 0;
-}
-
-struct ov2710_platform_data curacao_ov2710_data = {
-       .power_on = curacao_ov2710_power_on,
-       .power_off = curacao_ov2710_power_off,
-};
-
-static struct i2c_board_info curacao_i2c2_board_info[] = {
-       {
-               I2C_BOARD_INFO("ov5650R", 0x36),
-               .platform_data = &curacao_ov5650_data,
-       },
-};
-
-int __init curacao_sensors_init(void)
-{
-       tegra_get_board_info(&board_info);
-
-       curacao_camera_init();
-
-       i2c_register_board_info(3, curacao_i2c2_board_info,
-               ARRAY_SIZE(curacao_i2c2_board_info));
-
-#ifdef CONFIG_VIDEO_OV14810
-       i2c_register_board_info(3, curacao_i2c_board_info_e1214,
-               ARRAY_SIZE(curacao_i2c_board_info_e1214));
-#endif
-
-       return 0;
-}
diff --git a/arch/arm/mach-tegra/board-curacao.c b/arch/arm/mach-tegra/board-curacao.c
deleted file mode 100644 (file)
index d3b4cd0..0000000
+++ /dev/null
@@ -1,583 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-curacao.c
- *
- * Copyright (c) 2011-2013, NVIDIA Corporation.
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/ctype.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/serial_8250.h>
-#include <linux/i2c.h>
-#include <linux/i2c/panjit_ts.h>
-#include <linux/dma-mapping.h>
-#include <linux/delay.h>
-#include <linux/i2c-tegra.h>
-#include <linux/gpio.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/platform_data/tegra_usb.h>
-#include <linux/of_platform.h>
-#include <linux/usb/tegra_usb_phy.h>
-#include <linux/clk/tegra.h>
-#include <linux/tegra-soc.h>
-
-#include <mach/gpio-tegra.h>
-#include <mach/iomap.h>
-#include <mach/io_dpd.h>
-#include <mach/irqs.h>
-#include <mach/pinmux.h>
-#include <mach/iomap.h>
-#include <mach/i2s.h>
-#include <mach/audio.h>
-#include <mach/nand.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include "board.h"
-#include "board-curacao.h"
-#include "clock.h"
-#include "common.h"
-#include "devices.h"
-#include "fuse.h"
-#include "gpio-names.h"
-#include <mach/i2s.h>
-#include <sound/tegra_wm8903.h>
-#include <sound/wm8903.h>
-
-#define ENABLE_OTG 0
-
-static struct plat_serial8250_port debug_uart_platform_data[] = {
-       {
-               .membase        = IO_ADDRESS(TEGRA_UARTA_BASE),
-               .mapbase        = TEGRA_UARTA_BASE,
-               .irq            = INT_UARTA,
-               .flags          = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
-               .type           = PORT_TEGRA,
-               .iotype         = UPIO_MEM,
-               .regshift       = 2,
-               .uartclk        = 13000000,
-       }, {
-               .flags          = 0,
-       }
-};
-
-static struct platform_device debug_uart = {
-       .name = "serial8250",
-       .id = PLAT8250_DEV_PLATFORM,
-       .dev = {
-               .platform_data = debug_uart_platform_data,
-       },
-};
-
-
-#ifdef CONFIG_BCM4329_RFKILL
-
-static struct resource curacao_bcm4329_rfkill_resources[] = {
-       {
-               .name   = "bcm4329_nreset_gpio",
-               .start  = TEGRA_GPIO_PU0,
-               .end    = TEGRA_GPIO_PU0,
-               .flags  = IORESOURCE_IO,
-       },
-       {
-               .name   = "bcm4329_nshutdown_gpio",
-               .start  = TEGRA_GPIO_PK2,
-               .end    = TEGRA_GPIO_PK2,
-               .flags  = IORESOURCE_IO,
-       },
-};
-
-static struct platform_device curacao_bcm4329_rfkill_device = {
-       .name = "bcm4329_rfkill",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(curacao_bcm4329_rfkill_resources),
-       .resource       = curacao_bcm4329_rfkill_resources,
-};
-
-static noinline void __init curacao_bt_rfkill(void)
-{
-       /*Add Clock Resource*/
-       clk_add_alias("bcm4329_32k_clk", curacao_bcm4329_rfkill_device.name, \
-                               "blink", NULL);
-
-       platform_device_register(&curacao_bcm4329_rfkill_device);
-
-       return;
-}
-#else
-static inline void curacao_bt_rfkill(void) { }
-#endif
-
-static __initdata struct tegra_clk_init_table curacao_clk_init_table[] = {
-       /* name         parent          rate            enabled */
-       { "uarta_dbg",  "clk_m",        13000000,       true},
-       { "uartb_dbg",  "clk_m",        13000000,       true},
-       { "uartc_dbg",  "clk_m",        13000000,       true},
-       { "uartd_dbg",  "clk_m",        13000000,       true},
-       { "uarte_dbg",  "clk_m",        13000000,       true},
-       { "sdmmc1",     "clk_m",        13000000,       false},
-       { "sdmmc3",     "clk_m",        13000000,       false},
-       { "sdmmc4",     "clk_m",        13000000,       false},
-       { "blink",      "clk_32k",      32768,          false},
-       { "pwm",        "clk_32k",      32768,          false},
-       { "blink",      "clk_32k",      32768,          false},
-       { "pll_a",      NULL,           282240000,      true},
-       { "pll_a_out0", NULL,           11289600,       true},
-       { "i2s0",       "clk_m",        13000000,       true},
-       { "i2s1",       "pll_a_out0",   11289600,       true},
-       { "i2s2",       "pll_a_out0",   11289600,       true},
-       { "d_audio",    "pll_a_out0",   11289600,       false},
-       { "audio",      "pll_a_out0",   11289600,       false},
-       { "audio_2x",   "audio",        22579200,       true},
-       { NULL,         NULL,           0,              0},
-};
-
-
-static struct tegra_i2c_platform_data curacao_i2c1_platform_data = {
-       .bus_clk_rate   = 100000,
-       .scl_gpio       = -1,
-       .sda_gpio       = -1,
-};
-
-static struct tegra_i2c_platform_data curacao_i2c2_platform_data = {
-       .bus_clk_rate   = 100000,
-       .scl_gpio       = -1,
-       .sda_gpio       = -1,
-};
-
-static struct tegra_i2c_platform_data curacao_i2c3_platform_data = {
-       .bus_clk_rate   = 100000,
-       .scl_gpio       = -1,
-       .sda_gpio       = -1,
-};
-
-static struct tegra_i2c_platform_data curacao_i2c4_platform_data = {
-       .bus_clk_rate   = 100000,
-       .scl_gpio       = -1,
-       .sda_gpio       = -1,
-};
-
-static struct tegra_i2c_platform_data curacao_i2c5_platform_data = {
-       .bus_clk_rate   = 100000,
-       .scl_gpio       = -1,
-       .sda_gpio       = -1,
-};
-
-static struct wm8903_platform_data curacao_wm8903_pdata = {
-       .irq_active_low = 0,
-       .micdet_cfg = 0,
-       .micdet_delay = 100,
-};
-
-static struct i2c_board_info __initdata wm8903_board_info = {
-       I2C_BOARD_INFO("wm8903", 0x1a),
-       .platform_data = &curacao_wm8903_pdata,
-};
-
-static void curacao_i2c_init(void)
-{
-       tegra11_i2c_device1.dev.platform_data = &curacao_i2c1_platform_data;
-       tegra11_i2c_device2.dev.platform_data = &curacao_i2c2_platform_data;
-       tegra11_i2c_device3.dev.platform_data = &curacao_i2c3_platform_data;
-       tegra11_i2c_device4.dev.platform_data = &curacao_i2c4_platform_data;
-       tegra11_i2c_device5.dev.platform_data = &curacao_i2c5_platform_data;
-
-       i2c_register_board_info(0, &wm8903_board_info, 1);
-
-       platform_device_register(&tegra11_i2c_device5);
-       platform_device_register(&tegra11_i2c_device4);
-       platform_device_register(&tegra11_i2c_device3);
-       platform_device_register(&tegra11_i2c_device2);
-       platform_device_register(&tegra11_i2c_device1);
-}
-
-#define GPIO_KEY(_id, _gpio, _iswake)          \
-       {                                       \
-               .code = _id,                    \
-               .gpio = TEGRA_GPIO_##_gpio,     \
-               .active_low = 1,                \
-               .desc = #_id,                   \
-               .type = EV_KEY,                 \
-               .wakeup = _iswake,              \
-               .debounce_interval = 10,        \
-       }
-
-/* !!!FIXME!!! */
-static struct gpio_keys_button curacao_keys[] = {
-       [0] = GPIO_KEY(KEY_MENU, PQ0, 0),
-       [1] = GPIO_KEY(KEY_HOME, PQ1, 0),
-       [2] = GPIO_KEY(KEY_BACK, PQ2, 0),
-       [3] = GPIO_KEY(KEY_VOLUMEUP, PQ3, 0),
-       [4] = GPIO_KEY(KEY_VOLUMEDOWN, PQ4, 0),
-       [5] = GPIO_KEY(KEY_POWER, PV2, 1),
-};
-
-static struct gpio_keys_platform_data curacao_keys_platform_data = {
-       .buttons        = curacao_keys,
-       .nbuttons       = ARRAY_SIZE(curacao_keys),
-};
-
-static struct platform_device curacao_keys_device = {
-       .name   = "gpio-keys",
-       .id     = 0,
-       .dev    = {
-               .platform_data  = &curacao_keys_platform_data,
-       },
-};
-
-static struct platform_device tegra_camera = {
-       .name = "tegra_camera",
-       .id = -1,
-};
-
-static struct resource tegra_rtc_resources[] = {
-       [0] = {
-               .start = TEGRA_RTC_BASE,
-               .end = TEGRA_RTC_BASE + TEGRA_RTC_SIZE - 1,
-               .flags = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start = INT_RTC,
-               .end = INT_RTC,
-               .flags = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device tegra_rtc_device = {
-       .name = "tegra_rtc",
-       .id   = -1,
-       .resource = tegra_rtc_resources,
-       .num_resources = ARRAY_SIZE(tegra_rtc_resources),
-};
-
-#if defined(CONFIG_MTD_NAND_TEGRA)
-static struct resource nand_resources[] = {
-       [0] = {
-               .start = INT_NANDFLASH,
-               .end   = INT_NANDFLASH,
-               .flags = IORESOURCE_IRQ
-       },
-       [1] = {
-               .start = TEGRA_NAND_BASE,
-               .end = TEGRA_NAND_BASE + TEGRA_NAND_SIZE - 1,
-               .flags = IORESOURCE_MEM
-       }
-};
-
-static struct tegra_nand_chip_parms nand_chip_parms[] = {
-       /* Samsung K5E2G1GACM */
-       [0] = {
-               .vendor_id   = 0xEC,
-               .device_id   = 0xAA,
-               .capacity    = 256,
-               .timing      = {
-                       .trp            = 21,
-                       .trh            = 15,
-                       .twp            = 21,
-                       .twh            = 15,
-                       .tcs            = 31,
-                       .twhr           = 60,
-                       .tcr_tar_trr    = 20,
-                       .twb            = 100,
-                       .trp_resp       = 30,
-                       .tadl           = 100,
-               },
-       },
-       /* Hynix H5PS1GB3EFR */
-       [1] = {
-               .vendor_id   = 0xAD,
-               .device_id   = 0xDC,
-               .capacity    = 512,
-               .timing      = {
-                       .trp            = 12,
-                       .trh            = 10,
-                       .twp            = 12,
-                       .twh            = 10,
-                       .tcs            = 20,
-                       .twhr           = 80,
-                       .tcr_tar_trr    = 20,
-                       .twb            = 100,
-                       .trp_resp       = 20,
-                       .tadl           = 70,
-               },
-       },
-};
-
-struct tegra_nand_platform nand_data = {
-       .max_chips      = 8,
-       .chip_parms     = nand_chip_parms,
-       .nr_chip_parms  = ARRAY_SIZE(nand_chip_parms),
-};
-
-struct platform_device tegra_nand_device = {
-       .name          = "tegra_nand",
-       .id            = -1,
-       .resource      = nand_resources,
-       .num_resources = ARRAY_SIZE(nand_resources),
-       .dev            = {
-               .platform_data = &nand_data,
-       },
-};
-#endif
-
-static struct tegra_wm8903_platform_data curacao_audio_pdata = {
-       .gpio_spkr_en           = -1,
-       .gpio_hp_det            = -1,
-       .gpio_hp_mute           = -1,
-       .gpio_int_mic_en        = -1,
-       .gpio_ext_mic_en        = -1,
-};
-
-static struct platform_device curacao_audio_device = {
-       .name   = "tegra-snd-wm8903",
-       .id     = 0,
-       .dev    = {
-               .platform_data  = &curacao_audio_pdata,
-       },
-};
-
-static struct platform_device *curacao_devices[] __initdata = {
-#if ENABLE_OTG
-       &tegra_otg_device,
-#endif
-       &debug_uart,
-       &tegra_pmu_device,
-       &tegra_rtc_device,
-       &tegra_udc_device,
-       &curacao_keys_device,
-#if defined(CONFIG_SND_HDA_TEGRA)
-       &tegra_hda_device,
-#endif
-       &tegra_avp_device,
-       &tegra_camera,
-#if defined(CONFIG_CRYPTO_DEV_TEGRA_SE)
-       &tegra11_se_device,
-#endif
-       &tegra_ahub_device,
-       &tegra_dam_device0,
-       &tegra_i2s_device0,
-       &curacao_audio_device,
-#if defined(CONFIG_MTD_NAND_TEGRA)
-       &tegra_nand_device,
-#endif
-};
-
-static int __init curacao_touch_init(void)
-{
-       return 0;
-}
-
-
-#if defined(USB_HOST_ONLY)
-static struct tegra_usb_platform_data tegra_ehci1_utmi_pdata = {
-       .port_otg = true,
-       .has_hostpc = true,
-       .unaligned_dma_buf_supported = true,
-       .phy_intf = TEGRA_USB_PHY_INTF_UTMI,
-       .op_mode = TEGRA_USB_OPMODE_HOST,
-       .u_data.host = {
-               .vbus_gpio = -1,
-               .hot_plug = true,
-               .remote_wakeup_supported = true,
-               .power_off_on_suspend = true,
-       },
-       .u_cfg.utmi = {
-               .hssync_start_delay = 0,
-               .elastic_limit = 16,
-               .idle_wait_delay = 17,
-               .term_range_adj = 6,
-               .xcvr_setup = 15,
-               .xcvr_lsfslew = 2,
-               .xcvr_lsrslew = 2,
-               .xcvr_setup_offset = 0,
-               .xcvr_use_fuses = 1,
-       },
-};
-
-
-static void ulpi_link_platform_open(void)
-{
-       int reset_gpio = TEGRA_GPIO_PV1;
-
-       gpio_request(reset_gpio, "ulpi_phy_reset");
-       gpio_direction_output(reset_gpio, 0);
-       msleep(5);
-       gpio_direction_output(reset_gpio, 1);
-}
-
-static struct tegra_usb_phy_platform_ops ulpi_link_plat_ops = {
-       .open = ulpi_link_platform_open,
-};
-
-static struct tegra_usb_platform_data tegra_ehci2_ulpi_link_pdata = {
-       .port_otg = false,
-       .has_hostpc = true,
-       .unaligned_dma_buf_supported = true,
-       .phy_intf = TEGRA_USB_PHY_INTF_ULPI_LINK,
-       .op_mode        = TEGRA_USB_OPMODE_HOST,
-       .u_data.host = {
-               .vbus_gpio = -1,
-               .hot_plug = false,
-               .remote_wakeup_supported = false,
-               .power_off_on_suspend = true,
-       },
-       .u_cfg.ulpi = {
-               .shadow_clk_delay = 10,
-               .clock_out_delay = 1,
-               .data_trimmer = 4,
-               .stpdirnxt_trimmer = 4,
-               .dir_trimmer = 4,
-               .clk = "cdev2",
-       },
-       .ops = &ulpi_link_plat_ops,
-};
-#else
-
-static struct tegra_usb_platform_data tegra_udc_pdata = {
-       .port_otg = true,
-       .has_hostpc = true,
-       .phy_intf = TEGRA_USB_PHY_INTF_UTMI,
-       .op_mode = TEGRA_USB_OPMODE_DEVICE,
-       .u_data.dev = {
-               .vbus_pmu_irq = 0,
-               .vbus_gpio = -1,
-               .charging_supported = false,
-               .remote_wakeup_supported = false,
-       },
-       .u_cfg.utmi = {
-               .hssync_start_delay = 0,
-               .elastic_limit = 16,
-               .idle_wait_delay = 17,
-               .term_range_adj = 6,
-               .xcvr_setup = 8,
-               .xcvr_lsfslew = 2,
-               .xcvr_lsrslew = 2,
-               .xcvr_setup_offset = 0,
-               .xcvr_use_fuses = 1,
-       },
-};
-
-#endif
-
-static void curacao_usb_init(void)
-{
-#if defined(USB_HOST_ONLY)
-       tegra_ehci1_device.dev.platform_data = &tegra_ehci1_utmi_pdata;
-       platform_device_register(&tegra_ehci1_device);
-
-       tegra_ehci2_device.dev.platform_data = &tegra_ehci2_ulpi_link_pdata;
-       platform_device_register(&tegra_ehci2_device);
-#else
-       /* setup the udc platform data */
-       tegra_udc_device.dev.platform_data = &tegra_udc_pdata;
-
-#endif
-}
-
-static struct platform_device *curacao_hs_uart_devices[] __initdata = {
-       &tegra_uartb_device,
-       &tegra_uartc_device,
-       &tegra_uartd_device,
-       &tegra_uarte_device,
-};
-
-static void __init curacao_hs_uart_init(void)
-{
-       platform_add_devices(curacao_hs_uart_devices,
-                               ARRAY_SIZE(curacao_hs_uart_devices));
-}
-
-static void __init tegra_curacao_init(void)
-{
-       tegra_clk_init_from_table(curacao_clk_init_table);
-       tegra_enable_pinmux();
-       curacao_pinmux_init();
-       tegra_soc_device_init("curacao");
-
-       if (tegra_platform_is_qt())
-               debug_uart_platform_data[0].uartclk = tegra_clk_measure_input_freq();
-
-       platform_add_devices(curacao_devices, ARRAY_SIZE(curacao_devices));
-
-       tegra_io_dpd_init();
-       curacao_sdhci_init();
-       curacao_i2c_init();
-       curacao_regulator_init();
-       curacao_emc_init();
-       curacao_suspend_init();
-       curacao_touch_init();
-       curacao_usb_init();
-       curacao_panel_init();
-       curacao_hs_uart_init();
-       curacao_bt_rfkill();
-       curacao_sensors_init();
-}
-
-#ifdef CONFIG_USE_OF
-struct of_dev_auxdata curacao_auxdata_lookup[] __initdata = {
-       OF_DEV_AUXDATA("nvidia,tegra114-host1x", TEGRA_HOST1X_BASE, "host1x",
-               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-gr3d", TEGRA_GR3D_BASE, "gr3d", NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-gr2d", TEGRA_GR2D_BASE, "gr2d", NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-msenc", TEGRA_MSENC_BASE, "msenc",
-               NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-vi", TEGRA_VI_BASE, "vi", NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-isp", TEGRA_ISP_BASE, "isp", NULL),
-       OF_DEV_AUXDATA("nvidia,tegra114-tsec", TEGRA_TSEC_BASE, "tsec", NULL),
-       {}
-};
-#endif
-
-static void __init tegra_curacao_dt_init(void)
-{
-       of_platform_populate(NULL,
-               of_default_bus_match_table, curacao_auxdata_lookup,
-               &platform_bus);
-
-       tegra_curacao_init();
-}
-
-static void __init tegra_curacao_reserve(void)
-{
-#if defined(CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM)
-       tegra_reserve(0, SZ_4M, 0);
-#else
-       tegra_reserve(SZ_32M, SZ_4M, 0);
-#endif
-}
-
-static const char * const curacao_dt_board_compat[] = {
-       "nvidia,curacao",
-       NULL
-};
-
-MACHINE_START(CURACAO, CURACAO_BOARD_NAME)
-       .atag_offset    = 0x80000100,
-       .smp            = smp_ops(tegra_smp_ops),
-       .map_io         = tegra_map_common_io,
-       .reserve        = tegra_curacao_reserve,
-       .init_early     = tegra11x_init_early,
-       .init_irq       = tegra_dt_init_irq,
-       .init_time      = tegra_init_timer,
-       .init_machine   = tegra_curacao_dt_init,
-       .dt_compat      = curacao_dt_board_compat,
-MACHINE_END
diff --git a/arch/arm/mach-tegra/board-curacao.h b/arch/arm/mach-tegra/board-curacao.h
deleted file mode 100644 (file)
index 683a0ee..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-curacao.h
- *
- * Copyright (C) 2011-2012 NVIDIA Corporation.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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 Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#ifndef _MACH_TEGRA_BOARD_CURACAO_H
-#define _MACH_TEGRA_BOARD_CURACAO_H
-
-#include <mach/irqs.h>
-#include <linux/mfd/max77663-core.h>
-#include "gpio-names.h"
-
-/* External peripheral act as gpio */
-/* MAX77663 GPIO */
-#define MAX77663_GPIO_BASE      TEGRA_NR_GPIOS
-#define MAX77663_GPIO_END       (MAX77663_GPIO_BASE + MAX77663_GPIO_NR)
-
-/*****************Interrupt tables ******************/
-/* External peripheral act as interrupt controller */
-/* MAX77663 IRQs */
-#define MAX77663_IRQ_BASE       TEGRA_NR_IRQS
-#define MAX77663_IRQ_END        (MAX77663_IRQ_BASE + MAX77663_IRQ_NR)
-#define MAX77663_IRQ_ACOK_RISING MAX77663_IRQ_ONOFF_ACOK_RISING
-
-int curacao_regulator_init(void);
-int curacao_suspend_init(void);
-
-int curacao_sdhci_init(void);
-int curacao_pinmux_init(void);
-int curacao_panel_init(void);
-int curacao_sensors_init(void);
-int curacao_emc_init(void);
-
-#define CURACAO_BOARD_NAME "curacao"
-
-#endif