chromeos: Enable PLATFORM_ENABLE_IOMMU

Also renormalized other config options with defaults.

Change-Id: I8fbd1280075f6583b3477fea7d63848e31e06385
Signed-off-by: Andrew Chew <achew@nvidia.com>
Reviewed-on: http://git-master/r/192214
Reviewed-by: Christopher Freeman <cfreeman@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Allen Martin <amartin@nvidia.com>

8 files changed, 35 insertions, 6 deletions

diff --git a/chromeos/config/armel/chromeos-tegra11.flavour.config b/chromeos/config/armel/chromeos-tegra11.flavour.config
index 5be2d9ac08dd..15cf7a7c446f 100644
--- a/chromeos/config/armel/chromeos-tegra11.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra11.flavour.config
@@ -26,6 +26,7 @@ CONFIG_ARCH_TEGRA_HAS_DUAL_CPU_CLUSTERS=y
 CONFIG_ARCH_TEGRA_HAS_SYMMETRIC_CPU_PWR_GATE=y
 # CONFIG_ARCNET is not set
 CONFIG_ARM_ARCH_TIMER=y
+CONFIG_ARM_DMA_USE_IOMMU=y
 # CONFIG_ARM_ERRATA_716044 is not set
 # CONFIG_ARM_ERRATA_720789 is not set
 CONFIG_ARM_ERRATA_742230=y
@@ -38,8 +39,10 @@ CONFIG_ARM_ERRATA_752520=y
 # CONFIG_ARM_ERRATA_764369 is not set
 # CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
 CONFIG_ARM_FLUSH_CONSOLE_ON_RESTART=y
+CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_NR_BANKS=16
-# CONFIG_ARM_SAVE_DEBUG_CONTEXT is not set
+CONFIG_ARM_SAVE_DEBUG_CONTEXT=y
+# CONFIG_ARM_SAVE_DEBUG_CONTEXT_NO_LOCK is not set
 # CONFIG_ARM_THUMBEE is not set
 # CONFIG_ATH_COMMON is not set
 # CONFIG_ATL1 is not set
@@ -58,11 +61,20 @@ CONFIG_BATTERY_BQ27x00=y
 CONFIG_BATTERY_GAUGE_TPS8003X=y
 CONFIG_BATTERY_MAX17048=y
 CONFIG_BATTERY_SBS=y
+# CONFIG_BCM2079X_NFC is not set
 # CONFIG_BCM4329_RFKILL is not set
 CONFIG_BCMDHD=m
 CONFIG_BCMDHD_CFG80211=y
-CONFIG_BCMDHD_CSCAN_ENABLE=y
+CONFIG_BCMDHD_CLAIM_BCM4319=y
+CONFIG_BCMDHD_CLAIM_BCM43239=y
+CONFIG_BCMDHD_CLAIM_BCM4324=y
+CONFIG_BCMDHD_CLAIM_BCM4325=y
+CONFIG_BCMDHD_CLAIM_BCM4325_SDGWB=y
+CONFIG_BCMDHD_CLAIM_BCM4330=y
+CONFIG_BCMDHD_CLAIM_BCM4334=y
+CONFIG_BCMDHD_CLAIM_SDIO_CLASS_NONE=y
 CONFIG_BCMDHD_CUSTOM_REGULATORY_DOMAIN=y
+# CONFIG_BCMDHD_DISABLE_P2P_SYSFS_DEVICE_NODE is not set
 CONFIG_BCMDHD_FW_PATH="/lib/firmware/bcm/bcm.bin"
 CONFIG_BCMDHD_HW_OOB=y
 CONFIG_BCMDHD_INSMOD_NO_FW_LOAD=y
@@ -317,6 +329,7 @@ CONFIG_HZ=1000
 # CONFIG_I2C_ALGOBIT is not set
 # CONFIG_I2C_ALGOPCA is not set
 # CONFIG_I2C_ALGOPCF is not set
+CONFIG_I2C_ALGO_BUSCLEAR=y
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
 # CONFIG_I2C_ALI15X3 is not set
@@ -382,6 +395,7 @@ CONFIG_INPUT_UINPUT=y
 # CONFIG_INTEL_MID_PTI is not set
 CONFIG_INV_AK8975=m
 CONFIG_INV_MPU=m
+CONFIG_IOMMU_API=y
 # CONFIG_IOSCHED_CFQ is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IP1000 is not set
@@ -550,6 +564,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_NCP_FS is not set
 # CONFIG_NE2K_PCI is not set
 CONFIG_NEED_MACH_IO_H=y
+CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEON=y
 CONFIG_NETFILTER_ADVANCED=y
 # CONFIG_NETFILTER_NETLINK_ACCT is not set
@@ -765,6 +780,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCNET32 is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_PHYLIB is not set
+CONFIG_PLATFORM_ENABLE_IOMMU=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_DEVFREQ=y
 CONFIG_PM_WAKELOCKS=y
@@ -1094,6 +1110,7 @@ CONFIG_TEGRA_DYNAMIC_PWRDET=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 CONFIG_TEGRA_EMC_TO_DDR_CLOCK=1
 CONFIG_TEGRA_ERRATA_1157520=y
+CONFIG_TEGRA_ERRATA_977223=y
 # CONFIG_TEGRA_FIQ_DEBUGGER is not set
 # CONFIG_TEGRA_FPGA_PLATFORM is not set
 CONFIG_TEGRA_GADGET_BOOST_CPU_FREQ=0
@@ -1102,10 +1119,7 @@ CONFIG_TEGRA_GRHOST_DEFAULT_TIMEOUT=30000
 CONFIG_TEGRA_GRHOST_USE_DMABUF=y
 CONFIG_TEGRA_GRHOST_USE_NVMAP=y
 # CONFIG_TEGRA_HDMI_74MHZ_LIMIT is not set
-# CONFIG_TEGRA_IOMMU_SMMU is not set
-CONFIG_TEGRA_IOVMM=y
-CONFIG_TEGRA_IOVMM_SMMU=y
-# CONFIG_TEGRA_IOVMM_SMMU_SYSFS is not set
+CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_TEGRA_ISOMGR=y
 CONFIG_TEGRA_ISOMGR_DEBUG=y
 CONFIG_TEGRA_ISOMGR_POOL_KB_PER_SEC=0
@@ -1139,6 +1153,7 @@ CONFIG_TEGRA_SILICON_PLATFORM=y
 # CONFIG_TEGRA_SOCTHERM is not set
 CONFIG_TEGRA_SYSTEM_DMA=y
 CONFIG_TEGRA_THERMAL_THROTTLE=y
+CONFIG_TEGRA_THERMAL_THROTTLE_EXACT_FREQ=y
 CONFIG_TEGRA_THROUGHPUT=y
 CONFIG_TEGRA_TIMER_HZ=1000
 CONFIG_TEGRA_USB_MODEM_POWER=y
@@ -1146,6 +1161,7 @@ CONFIG_TEGRA_USE_DFLL_RANGE=1
 # CONFIG_TEGRA_VIRTUAL_CPUID is not set
 # CONFIG_TEGRA_WAKEUP_MONITOR is not set
 # CONFIG_TEGRA_WDT_RECOVERY is not set
+# CONFIG_TEGRA_XUSB_PLATFORM is not set
 # CONFIG_TEHUTI is not set
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_BM=y
diff --git a/chromeos/config/armel/chromeos-tegra2.flavour.config b/chromeos/config/armel/chromeos-tegra2.flavour.config
index 8054249e2732..bdcf81d78ef1 100644
--- a/chromeos/config/armel/chromeos-tegra2.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra2.flavour.config
@@ -302,6 +302,7 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HZ=1000
+CONFIG_I2C_ALGO_BUSCLEAR=y
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
 # CONFIG_I2C_ALI15X3 is not set
@@ -1013,6 +1014,7 @@ CONFIG_TEGRA_SILICON_PLATFORM=y
 # CONFIG_TEGRA_STAT_MON is not set
 CONFIG_TEGRA_SYSTEM_DMA=y
 CONFIG_TEGRA_THERMAL_THROTTLE=y
+# CONFIG_TEGRA_THERMAL_THROTTLE_EXACT_FREQ is not set
 CONFIG_TEGRA_TIMER_HZ=1000
 # CONFIG_TEGRA_USB_MODEM_POWER is not set
 # CONFIG_TEGRA_WAKEUP_MONITOR is not set
diff --git a/chromeos/config/armel/chromeos-tegra3.flavour.config b/chromeos/config/armel/chromeos-tegra3.flavour.config
index 688d973ecf25..1e52a1922787 100644
--- a/chromeos/config/armel/chromeos-tegra3.flavour.config
+++ b/chromeos/config/armel/chromeos-tegra3.flavour.config
@@ -62,6 +62,7 @@ CONFIG_BATTERY_BQ27x00=y
 CONFIG_BATTERY_GAUGE_TPS8003X=y
 # CONFIG_BATTERY_MAX17048 is not set
 # CONFIG_BATTERY_SBS is not set
+# CONFIG_BCM2079X_NFC is not set
 CONFIG_BCM4329_RFKILL=y
 # CONFIG_BCMDHD is not set
 # CONFIG_BE2ISCSI is not set
@@ -323,6 +324,7 @@ CONFIG_HID_SONY=y
 # CONFIG_HP_ILO is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_HZ=1000
+CONFIG_I2C_ALGO_BUSCLEAR=y
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
 # CONFIG_I2C_ALI15X3 is not set
@@ -1240,11 +1242,13 @@ CONFIG_TEGRA_SILICON_PLATFORM=y
 CONFIG_TEGRA_SLOW_CSITE=y
 CONFIG_TEGRA_SYSTEM_DMA=y
 CONFIG_TEGRA_THERMAL_THROTTLE=y
+# CONFIG_TEGRA_THERMAL_THROTTLE_EXACT_FREQ is not set
 CONFIG_TEGRA_THROUGHPUT=y
 CONFIG_TEGRA_TIMER_HZ=1000
 CONFIG_TEGRA_USB_MODEM_POWER=y
 # CONFIG_TEGRA_WAKEUP_MONITOR is not set
 # CONFIG_TEGRA_WDT_RECOVERY is not set
+# CONFIG_TEGRA_XUSB_PLATFORM is not set
 # CONFIG_TEHUTI is not set
 CONFIG_TEXTSEARCH=y
 CONFIG_TEXTSEARCH_BM=y
diff --git a/chromeos/config/armel/chromiumos-arm.flavour.config b/chromeos/config/armel/chromiumos-arm.flavour.config
index 05ef2a252df8..e1591e86fd07 100644
--- a/chromeos/config/armel/chromiumos-arm.flavour.config
+++ b/chromeos/config/armel/chromiumos-arm.flavour.config
@@ -302,6 +302,7 @@ CONFIG_HOSTAP_FIRMWARE_NVRAM=y
 CONFIG_HW_RANDOM=y
 # CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HZ=1000
+CONFIG_I2C_ALGO_BUSCLEAR=y
 # CONFIG_I2C_ALI1535 is not set
 # CONFIG_I2C_ALI1563 is not set
 # CONFIG_I2C_ALI15X3 is not set
@@ -1013,6 +1014,7 @@ CONFIG_TEGRA_SILICON_PLATFORM=y
 # CONFIG_TEGRA_STAT_MON is not set
 CONFIG_TEGRA_SYSTEM_DMA=y
 CONFIG_TEGRA_THERMAL_THROTTLE=y
+# CONFIG_TEGRA_THERMAL_THROTTLE_EXACT_FREQ is not set
 CONFIG_TEGRA_TIMER_HZ=1000
 # CONFIG_TEGRA_USB_MODEM_POWER is not set
 # CONFIG_TEGRA_WAKEUP_MONITOR is not set
diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index 05de402b7cf3..c0bbc8208108 100644
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -211,6 +211,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_REGULATOR_ISL6271A is not set
 # CONFIG_REGULATOR_LP3971 is not set
 # CONFIG_REGULATOR_LP3972 is not set
+# CONFIG_REGULATOR_LP8755 is not set
 # CONFIG_REGULATOR_MAX1586 is not set
 # CONFIG_REGULATOR_MAX8649 is not set
 # CONFIG_REGULATOR_MAX8660 is not set
diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index a77eaa8429ae..4f32b7daa3dc 100644
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -1205,8 +1205,10 @@ CONFIG_SYSVIPC_SYSCTL=y
 # CONFIG_TEST_POWER is not set
 CONFIG_THERMAL=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_PID is not set
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_GOV_PID is not set
 CONFIG_THERMAL_HWMON=y
 # CONFIG_THERM_EST is not set
 CONFIG_TICK_ONESHOT=y
diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 7a70b100b6a0..92d66b4337e8 100644
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -1281,6 +1281,7 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_CONG_YEAH is not set
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TEGRA_CRYPTO_DEV is not set
+# CONFIG_TEGRA_XUSB_PLATFORM is not set
 # CONFIG_TELCLOCK is not set
 # CONFIG_THINKPAD_ACPI is not set
 # CONFIG_TIFM_CORE is not set
diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index 2cab2d9aacb1..87e7f71ea90d 100644
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -1311,6 +1311,7 @@ CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_CONG_YEAH is not set
 CONFIG_TCP_MD5SIG=y
 # CONFIG_TEGRA_CRYPTO_DEV is not set
+# CONFIG_TEGRA_XUSB_PLATFORM is not set
 # CONFIG_TELCLOCK is not set
 # CONFIG_THINKPAD_ACPI is not set
 # CONFIG_TIFM_CORE is not set