summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2014-11-20 10:14:22 (GMT)
committerMaciej Wereski <m.wereski@partner.samsung.com>2015-03-30 11:43:00 (GMT)
commit05a346e9878805cf0dd42c8118dd73a4af0662f8 (patch)
tree65f82554b3510ff0dabb6a6f93a971bf21a1161f /arch
parent28a6da519418db168447a3c91ced88b823ad72e5 (diff)
downloadlinux-3.10-05a346e9878805cf0dd42c8118dd73a4af0662f8.zip
linux-3.10-05a346e9878805cf0dd42c8118dd73a4af0662f8.tar.gz
linux-3.10-05a346e9878805cf0dd42c8118dd73a4af0662f8.tar.bz2
arm: tizen_defconfig: enable Odroid X2/U3 support with single kernel imagerefs/changes/58/30558/3
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Change-Id: I92a8db74b9bcfcd55ae8d005f91ed52c844cf833
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/tizen_defconfig60
1 files changed, 36 insertions, 24 deletions
diff --git a/arch/arm/configs/tizen_defconfig b/arch/arm/configs/tizen_defconfig
index faebbc4..132ac9f 100644
--- a/arch/arm/configs/tizen_defconfig
+++ b/arch/arm/configs/tizen_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.51 Kernel Configuration
+# Linux/arm 3.10.52 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -333,7 +333,6 @@ CONFIG_SAMSUNG_DMADEV=y
# CONFIG_SAMSUNG_PM_CHECK is not set
CONFIG_S5P_PM=y
CONFIG_S5P_SLEEP=y
-CONFIG_DEBUG_S3C_UART=2
# CONFIG_PLAT_SPEAR is not set
#
@@ -548,6 +547,7 @@ CONFIG_CPU_FREQ_TABLE=y
CONFIG_CPU_FREQ_GOV_COMMON=y
CONFIG_CPU_FREQ_BOOST_SW=y
CONFIG_CPU_FREQ_STAT=y
+CONFIG_NR_CPU_LOAD_STORAGE=10
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
@@ -1020,7 +1020,7 @@ CONFIG_BT_HIDP=y
#
# Bluetooth device drivers
#
-# CONFIG_BT_HCIBTUSB is not set
+CONFIG_BT_HCIBTUSB=y
# CONFIG_BT_HCIBTSDIO is not set
CONFIG_BT_HCIUART=y
CONFIG_BT_HCIUART_H4=y
@@ -1033,6 +1033,7 @@ CONFIG_BT_HCIUART_H4=y
# CONFIG_BT_HCIBFUSB is not set
# CONFIG_BT_HCIVHCI is not set
# CONFIG_BT_MRVL is not set
+# CONFIG_BT_ATH3K is not set
# CONFIG_AF_RXRPC is not set
CONFIG_FIB_RULES=y
CONFIG_WIRELESS=y
@@ -1586,7 +1587,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
CONFIG_SERIAL_SAMSUNG=y
CONFIG_SERIAL_SAMSUNG_UARTS_4=y
CONFIG_SERIAL_SAMSUNG_UARTS=4
-# CONFIG_SERIAL_SAMSUNG_DEBUG is not set
CONFIG_SERIAL_SAMSUNG_CONSOLE=y
# CONFIG_SERIAL_MAX3100 is not set
# CONFIG_SERIAL_MAX310X is not set
@@ -1780,7 +1780,6 @@ CONFIG_POWER_SUPPLY=y
CONFIG_BATTERY_MAX17040=y
CONFIG_BATTERY_MAX17042=y
# CONFIG_BATTERY_S3C_ADC is not set
-# CONFIG_CHARGER_ISP1704 is not set
# CONFIG_CHARGER_MAX8903 is not set
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
@@ -1906,6 +1905,7 @@ CONFIG_SENSORS_NTC_THERMISTOR=y
# CONFIG_SENSORS_W83627EHF is not set
CONFIG_THERMAL=y
CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_OF=y
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
@@ -2289,6 +2289,8 @@ CONFIG_DRM_EXYNOS_G2D=y
CONFIG_DRM_EXYNOS_IPP=y
CONFIG_DRM_EXYNOS_FIMC=y
CONFIG_DRM_EXYNOS_ROTATOR=y
+# CONFIG_DRM_EXYNOS_GSC is not set
+# CONFIG_DRM_EXYNOS_SC is not set
# CONFIG_DRM_UDL is not set
# CONFIG_DRM_TILCDC is not set
CONFIG_DRM_PANEL=y
@@ -2432,10 +2434,12 @@ CONFIG_SND_SAMSUNG_I2S=y
# CONFIG_SND_SOC_SMDK_WM8994_PCM is not set
CONFIG_SND_SOC_TRATS=y
CONFIG_SND_SOC_SAMSUNG_TRATS2_WM1811=y
-# CONFIG_SND_SOC_ODROIDX2 is not set
+CONFIG_SND_SOC_ODROIDX2=y
+# CONFIG_SND_SOC_RINATO_YMU831 is not set
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_WM_HUBS=y
+CONFIG_SND_SOC_MAX98090=y
CONFIG_SND_SOC_WM8994=y
# CONFIG_SND_SOC_YAMAHA_YMU831 is not set
CONFIG_SND_SOC_MC1N2=y
@@ -2557,7 +2561,12 @@ CONFIG_USB_EHCI_S5P=y
# CONFIG_USB_ISP116X_HCD is not set
# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_ISP1362_HCD is not set
-# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_EXYNOS=y
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
# CONFIG_USB_MUSB_HDRC is not set
@@ -2578,7 +2587,21 @@ CONFIG_USB_EHCI_S5P=y
#
# also be needed; see USB_STORAGE Help for more info
#
-# CONFIG_USB_STORAGE is not set
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_REALTEK is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_ENE_UB6250 is not set
#
# USB Imaging devices
@@ -2617,17 +2640,8 @@ CONFIG_USB_EHCI_S5P=y
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_YUREX is not set
# CONFIG_USB_EZUSB_FX2 is not set
-# CONFIG_USB_HSIC_USB3503 is not set
-CONFIG_USB_PHY=y
-# CONFIG_NOP_USB_XCEIV is not set
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
-# CONFIG_SAMSUNG_USB2PHY is not set
-# CONFIG_SAMSUNG_USB3PHY is not set
-# CONFIG_USB_GPIO_VBUS is not set
-# CONFIG_USB_ISP1301 is not set
-# CONFIG_USB_RCAR_PHY is not set
-# CONFIG_USB_ULPI is not set
+CONFIG_USB_HSIC_USB3503=y
+# CONFIG_USB_PHY is not set
CONFIG_USB_GADGET=y
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
@@ -3484,18 +3498,16 @@ CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_STRICT_DEVMEM is not set
CONFIG_ARM_UNWIND=y
CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
+# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_S3C_UART0 is not set
# CONFIG_DEBUG_S3C_UART1 is not set
-CONFIG_DEBUG_S3C_UART2=y
+# CONFIG_DEBUG_S3C_UART2 is not set
# CONFIG_DEBUG_S3C_UART3 is not set
# CONFIG_DEBUG_LL_UART_NONE is not set
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_SEMIHOSTING is not set
-CONFIG_DEBUG_EXYNOS_UART=y
-CONFIG_DEBUG_LL_INCLUDE="debug/exynos.S"
+CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
-CONFIG_EARLY_PRINTK=y
# CONFIG_OC_ETM is not set
# CONFIG_PID_IN_CONTEXTIDR is not set