diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 12:31:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-02 12:31:45 -0400 |
commit | 97b1007a2924aaa9126398623f6755a8c3c6a616 (patch) | |
tree | b65c6edb631256e64bb3c72f083fa1be048de097 /arch/arm/configs | |
parent | dfab34aa61a0f8c14a67d7b4c1dae28e57ba592d (diff) | |
parent | e0d20b69d3fa74a21ec363989612bddd58b930b8 (diff) |
Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates from Olof Johansson:
"This branch contains part 1 of the platform updates for 3.10. Among
the highlights:
- Support for the new Atmel Cortex-A5 based platforms (SAMA5D3)
- New support for CSR SiRFatlas6 SoCs
- A handful of updates for NVidia T114 (a.k.a. Tegra 4)
- A bunch of updates for the shmobile platforms
- A handful of updates for davinci
- A few updates for Qualcomm MSM
- Plus a handful of other patches, defconfig updates, etc."
* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (135 commits)
ARM: tegra: pm: fix build error w/o PM_SLEEP
ARM: davinci: ensure global variables are declared
ARM: davinci: sram.c: fix incorrect type in assignment
ARM: davinci: da8xx dt: make file local symbols static
ARM: davinci: da8xx: add remoteproc support
ARM: socfpga: Upgrade clk driver for socfpga to make use of dts clock entries
ARM: socfpga: Add clock entries into device tree
ARM: socfpga: Enable soft reset
ARM: EXYNOS: replace cpumask by the corresponding macro
ARM: EXYNOS: handle properly the return values
ARM: EXYNOS: factor out the idle states
ARM: OMAP4: Enable fix for Cortex-A9 erratas
ARM: OMAP2+: Export SoC information to userspace
ARM: OMAP2+: SoC name and revision unification
ARM: OMAP2+: Move common part of late init into common function
ARM: tegra: pm: remove duplicated include from pm.c
ARM: davinci: da850: override mmc DT node device name
ARM: davinci: da850: add mmc DT entries
mmc: davinci_mmc: add DT support
ARM: SAMSUNG: check processor type before cache restoration in resume
...
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/ape6evm_defconfig | 95 | ||||
-rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 8 | ||||
-rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 9 | ||||
-rw-r--r-- | arch/arm/configs/kzm9g_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/lpc32xx_defconfig | 21 | ||||
-rw-r--r-- | arch/arm/configs/mackerel_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/marzen_defconfig | 8 | ||||
-rw-r--r-- | arch/arm/configs/mxs_defconfig | 5 | ||||
-rw-r--r-- | arch/arm/configs/sama5_defconfig | 181 | ||||
-rw-r--r-- | arch/arm/configs/tegra_defconfig | 18 | ||||
-rw-r--r-- | arch/arm/configs/u8500_defconfig | 4 |
11 files changed, 333 insertions, 22 deletions
diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig new file mode 100644 index 000000000000..dab5a7dfadc6 --- /dev/null +++ b/arch/arm/configs/ape6evm_defconfig | |||
@@ -0,0 +1,95 @@ | |||
1 | CONFIG_SYSVIPC=y | ||
2 | CONFIG_POSIX_MQUEUE=y | ||
3 | CONFIG_NO_HZ=y | ||
4 | CONFIG_HIGH_RES_TIMERS=y | ||
5 | CONFIG_BSD_PROCESS_ACCT=y | ||
6 | CONFIG_IKCONFIG=y | ||
7 | CONFIG_IKCONFIG_PROC=y | ||
8 | CONFIG_LOG_BUF_SHIFT=16 | ||
9 | CONFIG_CGROUPS=y | ||
10 | CONFIG_CGROUP_SCHED=y | ||
11 | CONFIG_KALLSYMS_ALL=y | ||
12 | CONFIG_EMBEDDED=y | ||
13 | CONFIG_PERF_EVENTS=y | ||
14 | CONFIG_SLAB=y | ||
15 | # CONFIG_BLOCK is not set | ||
16 | CONFIG_ARCH_SHMOBILE=y | ||
17 | CONFIG_ARCH_R8A73A4=y | ||
18 | CONFIG_MACH_APE6EVM=y | ||
19 | # CONFIG_ARM_THUMB is not set | ||
20 | CONFIG_CPU_BPREDICT_DISABLE=y | ||
21 | CONFIG_PL310_ERRATA_588369=y | ||
22 | CONFIG_ARM_ERRATA_754322=y | ||
23 | CONFIG_SMP=y | ||
24 | CONFIG_SCHED_MC=y | ||
25 | CONFIG_HAVE_ARM_ARCH_TIMER=y | ||
26 | CONFIG_NR_CPUS=8 | ||
27 | CONFIG_AEABI=y | ||
28 | CONFIG_HIGHMEM=y | ||
29 | CONFIG_HIGHPTE=y | ||
30 | # CONFIG_HW_PERF_EVENTS is not set | ||
31 | # CONFIG_COMPACTION is not set | ||
32 | # CONFIG_CROSS_MEMORY_ATTACH is not set | ||
33 | CONFIG_ARM_APPENDED_DTB=y | ||
34 | CONFIG_VFP=y | ||
35 | CONFIG_NEON=y | ||
36 | CONFIG_BINFMT_MISC=y | ||
37 | CONFIG_NET=y | ||
38 | CONFIG_PACKET=y | ||
39 | CONFIG_UNIX=y | ||
40 | CONFIG_XFRM_USER=y | ||
41 | CONFIG_NET_KEY=y | ||
42 | CONFIG_NET_KEY_MIGRATE=y | ||
43 | CONFIG_INET=y | ||
44 | CONFIG_IP_MULTICAST=y | ||
45 | CONFIG_IP_PNP=y | ||
46 | CONFIG_IP_PNP_DHCP=y | ||
47 | # CONFIG_INET_LRO is not set | ||
48 | # CONFIG_IPV6_SIT is not set | ||
49 | CONFIG_NETFILTER=y | ||
50 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
51 | # CONFIG_FW_LOADER_USER_HELPER is not set | ||
52 | CONFIG_NETDEVICES=y | ||
53 | # CONFIG_NET_CADENCE is not set | ||
54 | CONFIG_SMC91X=y | ||
55 | CONFIG_SMSC911X=y | ||
56 | # CONFIG_INPUT_MOUSEDEV is not set | ||
57 | # CONFIG_INPUT_KEYBOARD is not set | ||
58 | # CONFIG_INPUT_MOUSE is not set | ||
59 | # CONFIG_SERIO is not set | ||
60 | CONFIG_SERIAL_NONSTANDARD=y | ||
61 | CONFIG_SERIAL_SH_SCI=y | ||
62 | CONFIG_SERIAL_SH_SCI_NR_UARTS=12 | ||
63 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
64 | CONFIG_GPIO_SH_PFC=y | ||
65 | CONFIG_GPIOLIB=y | ||
66 | # CONFIG_HWMON is not set | ||
67 | CONFIG_THERMAL=y | ||
68 | CONFIG_RCAR_THERMAL=y | ||
69 | CONFIG_REGULATOR=y | ||
70 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | ||
71 | CONFIG_REGULATOR_GPIO=y | ||
72 | # CONFIG_HID is not set | ||
73 | # CONFIG_USB_SUPPORT is not set | ||
74 | # CONFIG_IOMMU_SUPPORT is not set | ||
75 | # CONFIG_DNOTIFY is not set | ||
76 | CONFIG_TMPFS=y | ||
77 | # CONFIG_MISC_FILESYSTEMS is not set | ||
78 | CONFIG_NFS_FS=y | ||
79 | CONFIG_NFS_V3_ACL=y | ||
80 | CONFIG_NFS_V4=y | ||
81 | CONFIG_NFS_V4_1=y | ||
82 | CONFIG_ROOT_NFS=y | ||
83 | CONFIG_MAGIC_SYSRQ=y | ||
84 | CONFIG_ENABLE_DEFAULT_TRACERS=y | ||
85 | CONFIG_CRYPTO_CBC=y | ||
86 | CONFIG_CRYPTO_ECB=y | ||
87 | CONFIG_CRYPTO_MD5=y | ||
88 | CONFIG_CRYPTO_MICHAEL_MIC=y | ||
89 | CONFIG_CRYPTO_TWOFISH=y | ||
90 | CONFIG_CRC_CCITT=y | ||
91 | CONFIG_CRC16=y | ||
92 | CONFIG_CRC_T10DIF=y | ||
93 | CONFIG_CRC_ITU_T=y | ||
94 | CONFIG_CRC7=y | ||
95 | CONFIG_LIBCRC32C=y | ||
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 0b98100d2ae7..0f2d80da7378 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig | |||
@@ -20,15 +20,19 @@ CONFIG_ARCH_R8A7740=y | |||
20 | CONFIG_MACH_ARMADILLO800EVA=y | 20 | CONFIG_MACH_ARMADILLO800EVA=y |
21 | # CONFIG_SH_TIMER_TMU is not set | 21 | # CONFIG_SH_TIMER_TMU is not set |
22 | CONFIG_ARM_THUMB=y | 22 | CONFIG_ARM_THUMB=y |
23 | CONFIG_CPU_BPREDICT_DISABLE=y | ||
24 | CONFIG_CACHE_L2X0=y | 23 | CONFIG_CACHE_L2X0=y |
25 | CONFIG_ARM_ERRATA_430973=y | 24 | CONFIG_ARM_ERRATA_430973=y |
26 | CONFIG_ARM_ERRATA_458693=y | 25 | CONFIG_ARM_ERRATA_458693=y |
27 | CONFIG_ARM_ERRATA_460075=y | 26 | CONFIG_ARM_ERRATA_460075=y |
27 | CONFIG_PL310_ERRATA_588369=y | ||
28 | CONFIG_ARM_ERRATA_720789=y | 28 | CONFIG_ARM_ERRATA_720789=y |
29 | CONFIG_PL310_ERRATA_727915=y | ||
29 | CONFIG_ARM_ERRATA_743622=y | 30 | CONFIG_ARM_ERRATA_743622=y |
30 | CONFIG_ARM_ERRATA_751472=y | 31 | CONFIG_ARM_ERRATA_751472=y |
32 | CONFIG_PL310_ERRATA_753970=y | ||
31 | CONFIG_ARM_ERRATA_754322=y | 33 | CONFIG_ARM_ERRATA_754322=y |
34 | CONFIG_PL310_ERRATA_769419=y | ||
35 | CONFIG_ARM_ERRATA_775420=y | ||
32 | CONFIG_AEABI=y | 36 | CONFIG_AEABI=y |
33 | # CONFIG_OABI_COMPAT is not set | 37 | # CONFIG_OABI_COMPAT is not set |
34 | CONFIG_FORCE_MAX_ZONEORDER=13 | 38 | CONFIG_FORCE_MAX_ZONEORDER=13 |
@@ -37,6 +41,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 | |||
37 | CONFIG_ARM_APPENDED_DTB=y | 41 | CONFIG_ARM_APPENDED_DTB=y |
38 | CONFIG_KEXEC=y | 42 | CONFIG_KEXEC=y |
39 | CONFIG_VFP=y | 43 | CONFIG_VFP=y |
44 | CONFIG_NEON=y | ||
40 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 45 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
41 | CONFIG_PM_RUNTIME=y | 46 | CONFIG_PM_RUNTIME=y |
42 | CONFIG_NET=y | 47 | CONFIG_NET=y |
@@ -88,6 +93,7 @@ CONFIG_I2C=y | |||
88 | CONFIG_I2C_GPIO=y | 93 | CONFIG_I2C_GPIO=y |
89 | CONFIG_I2C_SH_MOBILE=y | 94 | CONFIG_I2C_SH_MOBILE=y |
90 | # CONFIG_HWMON is not set | 95 | # CONFIG_HWMON is not set |
96 | CONFIG_REGULATOR=y | ||
91 | CONFIG_MEDIA_SUPPORT=y | 97 | CONFIG_MEDIA_SUPPORT=y |
92 | CONFIG_VIDEO_DEV=y | 98 | CONFIG_VIDEO_DEV=y |
93 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 99 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index af472e4ed451..abc7c8d4631b 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig | |||
@@ -59,10 +59,13 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
59 | CONFIG_SERIAL_AMBA_PL011=y | 59 | CONFIG_SERIAL_AMBA_PL011=y |
60 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 60 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
61 | CONFIG_TTY_PRINTK=y | 61 | CONFIG_TTY_PRINTK=y |
62 | # CONFIG_HW_RANDOM is not set | 62 | CONFIG_HW_RANDOM=y |
63 | CONFIG_HW_RANDOM_BCM2835=y | ||
63 | CONFIG_I2C=y | 64 | CONFIG_I2C=y |
64 | CONFIG_I2C_CHARDEV=y | 65 | CONFIG_I2C_CHARDEV=y |
65 | CONFIG_I2C_BCM2835=y | 66 | CONFIG_I2C_BCM2835=y |
67 | CONFIG_SPI=y | ||
68 | CONFIG_SPI_BCM2835=y | ||
66 | CONFIG_GPIO_SYSFS=y | 69 | CONFIG_GPIO_SYSFS=y |
67 | # CONFIG_HWMON is not set | 70 | # CONFIG_HWMON is not set |
68 | # CONFIG_USB_SUPPORT is not set | 71 | # CONFIG_USB_SUPPORT is not set |
@@ -108,9 +111,5 @@ CONFIG_TEST_KSTRTOX=y | |||
108 | CONFIG_STRICT_DEVMEM=y | 111 | CONFIG_STRICT_DEVMEM=y |
109 | CONFIG_DEBUG_LL=y | 112 | CONFIG_DEBUG_LL=y |
110 | CONFIG_EARLY_PRINTK=y | 113 | CONFIG_EARLY_PRINTK=y |
111 | # CONFIG_XZ_DEC_X86 is not set | ||
112 | # CONFIG_XZ_DEC_POWERPC is not set | ||
113 | # CONFIG_XZ_DEC_IA64 is not set | ||
114 | # CONFIG_XZ_DEC_ARM is not set | 114 | # CONFIG_XZ_DEC_ARM is not set |
115 | # CONFIG_XZ_DEC_ARMTHUMB is not set | 115 | # CONFIG_XZ_DEC_ARMTHUMB is not set |
116 | # CONFIG_XZ_DEC_SPARC is not set | ||
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig index 670c3b60f936..f6e585b353a4 100644 --- a/arch/arm/configs/kzm9g_defconfig +++ b/arch/arm/configs/kzm9g_defconfig | |||
@@ -33,7 +33,6 @@ CONFIG_NO_HZ=y | |||
33 | CONFIG_HIGH_RES_TIMERS=y | 33 | CONFIG_HIGH_RES_TIMERS=y |
34 | CONFIG_SMP=y | 34 | CONFIG_SMP=y |
35 | CONFIG_SCHED_MC=y | 35 | CONFIG_SCHED_MC=y |
36 | CONFIG_PREEMPT=y | ||
37 | CONFIG_AEABI=y | 36 | CONFIG_AEABI=y |
38 | # CONFIG_OABI_COMPAT is not set | 37 | # CONFIG_OABI_COMPAT is not set |
39 | CONFIG_HIGHMEM=y | 38 | CONFIG_HIGHMEM=y |
@@ -86,7 +85,6 @@ CONFIG_I2C_SH_MOBILE=y | |||
86 | CONFIG_GPIO_PCF857X=y | 85 | CONFIG_GPIO_PCF857X=y |
87 | # CONFIG_HWMON is not set | 86 | # CONFIG_HWMON is not set |
88 | CONFIG_REGULATOR=y | 87 | CONFIG_REGULATOR=y |
89 | CONFIG_REGULATOR_DUMMY=y | ||
90 | CONFIG_FB=y | 88 | CONFIG_FB=y |
91 | CONFIG_FB_SH_MOBILE_LCDC=y | 89 | CONFIG_FB_SH_MOBILE_LCDC=y |
92 | CONFIG_FRAMEBUFFER_CONSOLE=y | 90 | CONFIG_FRAMEBUFFER_CONSOLE=y |
diff --git a/arch/arm/configs/lpc32xx_defconfig b/arch/arm/configs/lpc32xx_defconfig index afa7249fac6e..398a367ffce8 100644 --- a/arch/arm/configs/lpc32xx_defconfig +++ b/arch/arm/configs/lpc32xx_defconfig | |||
@@ -1,4 +1,3 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_SYSVIPC=y | 1 | CONFIG_SYSVIPC=y |
3 | CONFIG_NO_HZ=y | 2 | CONFIG_NO_HZ=y |
4 | CONFIG_HIGH_RES_TIMERS=y | 3 | CONFIG_HIGH_RES_TIMERS=y |
@@ -18,6 +17,7 @@ CONFIG_MODULE_UNLOAD=y | |||
18 | # CONFIG_BLK_DEV_BSG is not set | 17 | # CONFIG_BLK_DEV_BSG is not set |
19 | CONFIG_PARTITION_ADVANCED=y | 18 | CONFIG_PARTITION_ADVANCED=y |
20 | CONFIG_ARCH_LPC32XX=y | 19 | CONFIG_ARCH_LPC32XX=y |
20 | CONFIG_GPIO_PCA953X=y | ||
21 | CONFIG_KEYBOARD_GPIO_POLLED=y | 21 | CONFIG_KEYBOARD_GPIO_POLLED=y |
22 | CONFIG_PREEMPT=y | 22 | CONFIG_PREEMPT=y |
23 | CONFIG_AEABI=y | 23 | CONFIG_AEABI=y |
@@ -48,6 +48,8 @@ CONFIG_IPV6=y | |||
48 | CONFIG_IPV6_PRIVACY=y | 48 | CONFIG_IPV6_PRIVACY=y |
49 | # CONFIG_WIRELESS is not set | 49 | # CONFIG_WIRELESS is not set |
50 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 50 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
51 | CONFIG_DEVTMPFS=y | ||
52 | CONFIG_DEVTMPFS_MOUNT=y | ||
51 | # CONFIG_FW_LOADER is not set | 53 | # CONFIG_FW_LOADER is not set |
52 | CONFIG_MTD=y | 54 | CONFIG_MTD=y |
53 | CONFIG_MTD_CMDLINE_PARTS=y | 55 | CONFIG_MTD_CMDLINE_PARTS=y |
@@ -55,7 +57,6 @@ CONFIG_MTD_CHAR=y | |||
55 | CONFIG_MTD_BLOCK=y | 57 | CONFIG_MTD_BLOCK=y |
56 | CONFIG_MTD_M25P80=y | 58 | CONFIG_MTD_M25P80=y |
57 | CONFIG_MTD_NAND=y | 59 | CONFIG_MTD_NAND=y |
58 | CONFIG_MTD_NAND_MUSEUM_IDS=y | ||
59 | CONFIG_MTD_NAND_SLC_LPC32XX=y | 60 | CONFIG_MTD_NAND_SLC_LPC32XX=y |
60 | CONFIG_MTD_NAND_MLC_LPC32XX=y | 61 | CONFIG_MTD_NAND_MLC_LPC32XX=y |
61 | CONFIG_BLK_DEV_LOOP=y | 62 | CONFIG_BLK_DEV_LOOP=y |
@@ -70,7 +71,6 @@ CONFIG_BLK_DEV_SD=y | |||
70 | CONFIG_NETDEVICES=y | 71 | CONFIG_NETDEVICES=y |
71 | CONFIG_MII=y | 72 | CONFIG_MII=y |
72 | # CONFIG_NET_VENDOR_BROADCOM is not set | 73 | # CONFIG_NET_VENDOR_BROADCOM is not set |
73 | # CONFIG_NET_VENDOR_CHELSIO is not set | ||
74 | # CONFIG_NET_VENDOR_CIRRUS is not set | 74 | # CONFIG_NET_VENDOR_CIRRUS is not set |
75 | # CONFIG_NET_VENDOR_FARADAY is not set | 75 | # CONFIG_NET_VENDOR_FARADAY is not set |
76 | # CONFIG_NET_VENDOR_INTEL is not set | 76 | # CONFIG_NET_VENDOR_INTEL is not set |
@@ -84,7 +84,6 @@ CONFIG_LPC_ENET=y | |||
84 | # CONFIG_NET_VENDOR_STMICRO is not set | 84 | # CONFIG_NET_VENDOR_STMICRO is not set |
85 | CONFIG_SMSC_PHY=y | 85 | CONFIG_SMSC_PHY=y |
86 | # CONFIG_WLAN is not set | 86 | # CONFIG_WLAN is not set |
87 | CONFIG_INPUT_MATRIXKMAP=y | ||
88 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 87 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
89 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=240 | 88 | CONFIG_INPUT_MOUSEDEV_SCREEN_X=240 |
90 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 | 89 | CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 |
@@ -108,6 +107,19 @@ CONFIG_I2C_PNX=y | |||
108 | CONFIG_SPI=y | 107 | CONFIG_SPI=y |
109 | CONFIG_SPI_PL022=y | 108 | CONFIG_SPI_PL022=y |
110 | CONFIG_GPIO_SYSFS=y | 109 | CONFIG_GPIO_SYSFS=y |
110 | CONFIG_GPIO_GENERIC_PLATFORM=y | ||
111 | CONFIG_GPIO_EM=y | ||
112 | CONFIG_GPIO_PL061=y | ||
113 | CONFIG_GPIO_MAX7300=y | ||
114 | CONFIG_GPIO_MAX732X=y | ||
115 | CONFIG_GPIO_PCF857X=y | ||
116 | CONFIG_GPIO_SX150X=y | ||
117 | CONFIG_GPIO_ADP5588=y | ||
118 | CONFIG_GPIO_ADNP=y | ||
119 | CONFIG_GPIO_MAX7301=y | ||
120 | CONFIG_GPIO_MCP23S08=y | ||
121 | CONFIG_GPIO_MC33880=y | ||
122 | CONFIG_GPIO_74X164=y | ||
111 | CONFIG_SENSORS_DS620=y | 123 | CONFIG_SENSORS_DS620=y |
112 | CONFIG_SENSORS_MAX6639=y | 124 | CONFIG_SENSORS_MAX6639=y |
113 | CONFIG_WATCHDOG=y | 125 | CONFIG_WATCHDOG=y |
@@ -144,6 +156,7 @@ CONFIG_USB_G_SERIAL=m | |||
144 | CONFIG_MMC=y | 156 | CONFIG_MMC=y |
145 | # CONFIG_MMC_BLOCK_BOUNCE is not set | 157 | # CONFIG_MMC_BLOCK_BOUNCE is not set |
146 | CONFIG_MMC_ARMMMCI=y | 158 | CONFIG_MMC_ARMMMCI=y |
159 | CONFIG_MMC_SPI=y | ||
147 | CONFIG_NEW_LEDS=y | 160 | CONFIG_NEW_LEDS=y |
148 | CONFIG_LEDS_CLASS=y | 161 | CONFIG_LEDS_CLASS=y |
149 | CONFIG_LEDS_PCA9532=y | 162 | CONFIG_LEDS_PCA9532=y |
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index 7594b3aff259..9fb11895b2e2 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig | |||
@@ -75,6 +75,7 @@ CONFIG_I2C=y | |||
75 | CONFIG_I2C_SH_MOBILE=y | 75 | CONFIG_I2C_SH_MOBILE=y |
76 | # CONFIG_HWMON is not set | 76 | # CONFIG_HWMON is not set |
77 | # CONFIG_MFD_SUPPORT is not set | 77 | # CONFIG_MFD_SUPPORT is not set |
78 | CONFIG_REGULATOR=y | ||
78 | CONFIG_FB=y | 79 | CONFIG_FB=y |
79 | CONFIG_FB_MODE_HELPERS=y | 80 | CONFIG_FB_MODE_HELPERS=y |
80 | CONFIG_FB_SH_MOBILE_LCDC=y | 81 | CONFIG_FB_SH_MOBILE_LCDC=y |
@@ -94,6 +95,9 @@ CONFIG_USB_RENESAS_USBHS=y | |||
94 | CONFIG_USB_STORAGE=y | 95 | CONFIG_USB_STORAGE=y |
95 | CONFIG_USB_GADGET=y | 96 | CONFIG_USB_GADGET=y |
96 | CONFIG_USB_RENESAS_USBHS_UDC=y | 97 | CONFIG_USB_RENESAS_USBHS_UDC=y |
98 | CONFIG_MMC=y | ||
99 | CONFIG_MMC_SDHI=y | ||
100 | CONFIG_MMC_SH_MMCIF=y | ||
97 | CONFIG_DMADEVICES=y | 101 | CONFIG_DMADEVICES=y |
98 | CONFIG_SH_DMAE=y | 102 | CONFIG_SH_DMAE=y |
99 | CONFIG_EXT2_FS=y | 103 | CONFIG_EXT2_FS=y |
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index afb17d630d44..494e70aeb9e1 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig | |||
@@ -49,6 +49,10 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
49 | # CONFIG_FW_LOADER is not set | 49 | # CONFIG_FW_LOADER is not set |
50 | CONFIG_SCSI=y | 50 | CONFIG_SCSI=y |
51 | CONFIG_BLK_DEV_SD=y | 51 | CONFIG_BLK_DEV_SD=y |
52 | CONFIG_ATA=y | ||
53 | CONFIG_ATA_SFF=y | ||
54 | CONFIG_ATA_BMDMA=y | ||
55 | CONFIG_SATA_RCAR=y | ||
52 | CONFIG_NETDEVICES=y | 56 | CONFIG_NETDEVICES=y |
53 | # CONFIG_NET_VENDOR_BROADCOM is not set | 57 | # CONFIG_NET_VENDOR_BROADCOM is not set |
54 | # CONFIG_NET_VENDOR_FARADAY is not set | 58 | # CONFIG_NET_VENDOR_FARADAY is not set |
@@ -75,6 +79,7 @@ CONFIG_I2C_RCAR=y | |||
75 | CONFIG_SPI=y | 79 | CONFIG_SPI=y |
76 | CONFIG_SPI_SH_HSPI=y | 80 | CONFIG_SPI_SH_HSPI=y |
77 | CONFIG_GPIO_SYSFS=y | 81 | CONFIG_GPIO_SYSFS=y |
82 | CONFIG_GPIO_RCAR=y | ||
78 | # CONFIG_HWMON is not set | 83 | # CONFIG_HWMON is not set |
79 | CONFIG_THERMAL=y | 84 | CONFIG_THERMAL=y |
80 | CONFIG_RCAR_THERMAL=y | 85 | CONFIG_RCAR_THERMAL=y |
@@ -88,6 +93,9 @@ CONFIG_USB_OHCI_HCD=y | |||
88 | CONFIG_USB_OHCI_HCD_PLATFORM=y | 93 | CONFIG_USB_OHCI_HCD_PLATFORM=y |
89 | CONFIG_USB_EHCI_HCD_PLATFORM=y | 94 | CONFIG_USB_EHCI_HCD_PLATFORM=y |
90 | CONFIG_USB_STORAGE=y | 95 | CONFIG_USB_STORAGE=y |
96 | CONFIG_NEW_LEDS=y | ||
97 | CONFIG_LEDS_CLASS=y | ||
98 | CONFIG_LEDS_GPIO=y | ||
91 | CONFIG_UIO=y | 99 | CONFIG_UIO=y |
92 | CONFIG_UIO_PDRV_GENIRQ=y | 100 | CONFIG_UIO_PDRV_GENIRQ=y |
93 | # CONFIG_IOMMU_SUPPORT is not set | 101 | # CONFIG_IOMMU_SUPPORT is not set |
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index 87924d671115..7ba48d22bcd9 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig | |||
@@ -75,7 +75,7 @@ CONFIG_REALTEK_PHY=y | |||
75 | CONFIG_MICREL_PHY=y | 75 | CONFIG_MICREL_PHY=y |
76 | # CONFIG_WLAN is not set | 76 | # CONFIG_WLAN is not set |
77 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 77 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
78 | CONFIG_INPUT_EVDEV=m | 78 | CONFIG_INPUT_EVDEV=y |
79 | # CONFIG_INPUT_KEYBOARD is not set | 79 | # CONFIG_INPUT_KEYBOARD is not set |
80 | # CONFIG_INPUT_MOUSE is not set | 80 | # CONFIG_INPUT_MOUSE is not set |
81 | CONFIG_INPUT_TOUCHSCREEN=y | 81 | CONFIG_INPUT_TOUCHSCREEN=y |
@@ -99,6 +99,8 @@ CONFIG_SPI_MXS=y | |||
99 | CONFIG_DEBUG_GPIO=y | 99 | CONFIG_DEBUG_GPIO=y |
100 | CONFIG_GPIO_SYSFS=y | 100 | CONFIG_GPIO_SYSFS=y |
101 | # CONFIG_HWMON is not set | 101 | # CONFIG_HWMON is not set |
102 | CONFIG_WATCHDOG=y | ||
103 | CONFIG_STMP3XXX_RTC_WATCHDOG=y | ||
102 | CONFIG_REGULATOR=y | 104 | CONFIG_REGULATOR=y |
103 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 105 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
104 | CONFIG_FB=y | 106 | CONFIG_FB=y |
@@ -123,6 +125,7 @@ CONFIG_USB_STORAGE=y | |||
123 | CONFIG_USB_PHY=y | 125 | CONFIG_USB_PHY=y |
124 | CONFIG_USB_MXS_PHY=y | 126 | CONFIG_USB_MXS_PHY=y |
125 | CONFIG_MMC=y | 127 | CONFIG_MMC=y |
128 | CONFIG_MMC_UNSAFE_RESUME=y | ||
126 | CONFIG_MMC_MXS=y | 129 | CONFIG_MMC_MXS=y |
127 | CONFIG_NEW_LEDS=y | 130 | CONFIG_NEW_LEDS=y |
128 | CONFIG_LEDS_CLASS=y | 131 | CONFIG_LEDS_CLASS=y |
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig new file mode 100644 index 000000000000..4d0dc3c16063 --- /dev/null +++ b/arch/arm/configs/sama5_defconfig | |||
@@ -0,0 +1,181 @@ | |||
1 | # CONFIG_LOCALVERSION_AUTO is not set | ||
2 | # CONFIG_SWAP is not set | ||
3 | CONFIG_SYSVIPC=y | ||
4 | CONFIG_IRQ_DOMAIN_DEBUG=y | ||
5 | CONFIG_LOG_BUF_SHIFT=14 | ||
6 | CONFIG_SYSFS_DEPRECATED=y | ||
7 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
8 | CONFIG_BLK_DEV_INITRD=y | ||
9 | CONFIG_EMBEDDED=y | ||
10 | CONFIG_SLAB=y | ||
11 | CONFIG_MODULES=y | ||
12 | CONFIG_MODULE_FORCE_LOAD=y | ||
13 | CONFIG_MODULE_UNLOAD=y | ||
14 | CONFIG_MODULE_FORCE_UNLOAD=y | ||
15 | # CONFIG_LBDAF is not set | ||
16 | # CONFIG_BLK_DEV_BSG is not set | ||
17 | # CONFIG_IOSCHED_DEADLINE is not set | ||
18 | # CONFIG_IOSCHED_CFQ is not set | ||
19 | CONFIG_ARCH_AT91=y | ||
20 | CONFIG_SOC_SAM_V7=y | ||
21 | CONFIG_SOC_SAMA5D3=y | ||
22 | CONFIG_MACH_SAMA5_DT=y | ||
23 | CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | ||
24 | CONFIG_AEABI=y | ||
25 | # CONFIG_OABI_COMPAT is not set | ||
26 | CONFIG_UACCESS_WITH_MEMCPY=y | ||
27 | CONFIG_ZBOOT_ROM_TEXT=0x0 | ||
28 | CONFIG_ZBOOT_ROM_BSS=0x0 | ||
29 | CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" | ||
30 | CONFIG_AUTO_ZRELADDR=y | ||
31 | CONFIG_VFP=y | ||
32 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
33 | CONFIG_PM_RUNTIME=y | ||
34 | CONFIG_PM_DEBUG=y | ||
35 | CONFIG_PM_ADVANCED_DEBUG=y | ||
36 | CONFIG_NET=y | ||
37 | CONFIG_PACKET=y | ||
38 | CONFIG_UNIX=y | ||
39 | CONFIG_INET=y | ||
40 | CONFIG_IP_MULTICAST=y | ||
41 | CONFIG_IP_PNP=y | ||
42 | # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
43 | # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
44 | # CONFIG_INET_XFRM_MODE_BEET is not set | ||
45 | # CONFIG_INET_LRO is not set | ||
46 | # CONFIG_INET_DIAG is not set | ||
47 | CONFIG_IPV6=y | ||
48 | # CONFIG_INET6_XFRM_MODE_TRANSPORT is not set | ||
49 | # CONFIG_INET6_XFRM_MODE_TUNNEL is not set | ||
50 | # CONFIG_INET6_XFRM_MODE_BEET is not set | ||
51 | CONFIG_IPV6_SIT_6RD=y | ||
52 | CONFIG_CAN=y | ||
53 | CONFIG_CAN_AT91=y | ||
54 | CONFIG_CFG80211=y | ||
55 | CONFIG_MAC80211=y | ||
56 | CONFIG_MAC80211_LEDS=y | ||
57 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
58 | CONFIG_DEVTMPFS=y | ||
59 | CONFIG_DEVTMPFS_MOUNT=y | ||
60 | # CONFIG_STANDALONE is not set | ||
61 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | ||
62 | CONFIG_MTD=y | ||
63 | CONFIG_MTD_CMDLINE_PARTS=y | ||
64 | CONFIG_MTD_CHAR=y | ||
65 | CONFIG_MTD_BLOCK=y | ||
66 | CONFIG_MTD_CFI=y | ||
67 | CONFIG_MTD_M25P80=y | ||
68 | CONFIG_MTD_NAND=y | ||
69 | CONFIG_MTD_NAND_ATMEL=y | ||
70 | CONFIG_MTD_UBI=y | ||
71 | CONFIG_BLK_DEV_LOOP=y | ||
72 | CONFIG_BLK_DEV_RAM=y | ||
73 | CONFIG_BLK_DEV_RAM_COUNT=4 | ||
74 | CONFIG_BLK_DEV_RAM_SIZE=8192 | ||
75 | CONFIG_ATMEL_TCLIB=y | ||
76 | CONFIG_ATMEL_SSC=y | ||
77 | CONFIG_EEPROM_AT24=y | ||
78 | CONFIG_SCSI=y | ||
79 | CONFIG_BLK_DEV_SD=y | ||
80 | CONFIG_SCSI_MULTI_LUN=y | ||
81 | # CONFIG_SCSI_LOWLEVEL is not set | ||
82 | CONFIG_NETDEVICES=y | ||
83 | CONFIG_MII=y | ||
84 | CONFIG_MACB=y | ||
85 | # CONFIG_NET_VENDOR_BROADCOM is not set | ||
86 | # CONFIG_NET_VENDOR_CIRRUS is not set | ||
87 | # CONFIG_NET_VENDOR_FARADAY is not set | ||
88 | # CONFIG_NET_VENDOR_INTEL is not set | ||
89 | # CONFIG_NET_VENDOR_MARVELL is not set | ||
90 | # CONFIG_NET_VENDOR_MICREL is not set | ||
91 | # CONFIG_NET_VENDOR_MICROCHIP is not set | ||
92 | # CONFIG_NET_VENDOR_NATSEMI is not set | ||
93 | # CONFIG_NET_VENDOR_SEEQ is not set | ||
94 | # CONFIG_NET_VENDOR_SMSC is not set | ||
95 | # CONFIG_NET_VENDOR_STMICRO is not set | ||
96 | # CONFIG_NET_VENDOR_WIZNET is not set | ||
97 | CONFIG_MICREL_PHY=y | ||
98 | # CONFIG_WLAN is not set | ||
99 | # CONFIG_INPUT_MOUSEDEV is not set | ||
100 | CONFIG_INPUT_EVDEV=y | ||
101 | # CONFIG_KEYBOARD_ATKBD is not set | ||
102 | CONFIG_KEYBOARD_QT1070=y | ||
103 | CONFIG_KEYBOARD_GPIO=y | ||
104 | # CONFIG_INPUT_MOUSE is not set | ||
105 | CONFIG_INPUT_TOUCHSCREEN=y | ||
106 | CONFIG_TOUCHSCREEN_ATMEL_MXT=y | ||
107 | CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y | ||
108 | # CONFIG_SERIO is not set | ||
109 | CONFIG_LEGACY_PTY_COUNT=4 | ||
110 | CONFIG_SERIAL_ATMEL=y | ||
111 | CONFIG_SERIAL_ATMEL_CONSOLE=y | ||
112 | CONFIG_HW_RANDOM=y | ||
113 | CONFIG_I2C=y | ||
114 | CONFIG_I2C_CHARDEV=y | ||
115 | CONFIG_I2C_AT91=y | ||
116 | CONFIG_I2C_GPIO=y | ||
117 | CONFIG_SPI=y | ||
118 | CONFIG_SPI_ATMEL=y | ||
119 | CONFIG_SPI_GPIO=y | ||
120 | CONFIG_GPIO_SYSFS=y | ||
121 | # CONFIG_HWMON is not set | ||
122 | CONFIG_SSB=m | ||
123 | CONFIG_FB=y | ||
124 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
125 | # CONFIG_LCD_CLASS_DEVICE is not set | ||
126 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
127 | # CONFIG_BACKLIGHT_GENERIC is not set | ||
128 | CONFIG_FRAMEBUFFER_CONSOLE=y | ||
129 | # CONFIG_HID_GENERIC is not set | ||
130 | CONFIG_USB=y | ||
131 | CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
132 | CONFIG_USB_EHCI_HCD=y | ||
133 | CONFIG_USB_OHCI_HCD=y | ||
134 | CONFIG_USB_ACM=y | ||
135 | CONFIG_USB_STORAGE=y | ||
136 | CONFIG_USB_GADGET=y | ||
137 | CONFIG_USB_AT91=y | ||
138 | CONFIG_USB_MASS_STORAGE=m | ||
139 | CONFIG_MMC=y | ||
140 | # CONFIG_MMC_BLOCK_BOUNCE is not set | ||
141 | CONFIG_MMC_ATMELMCI=y | ||
142 | CONFIG_NEW_LEDS=y | ||
143 | CONFIG_LEDS_CLASS=y | ||
144 | CONFIG_LEDS_GPIO=y | ||
145 | CONFIG_LEDS_TRIGGER_TIMER=y | ||
146 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
147 | CONFIG_LEDS_TRIGGER_GPIO=y | ||
148 | CONFIG_RTC_CLASS=y | ||
149 | CONFIG_RTC_DRV_AT91RM9200=y | ||
150 | CONFIG_DMADEVICES=y | ||
151 | # CONFIG_IOMMU_SUPPORT is not set | ||
152 | CONFIG_IIO=y | ||
153 | CONFIG_AT91_ADC=y | ||
154 | CONFIG_EXT2_FS=y | ||
155 | CONFIG_FANOTIFY=y | ||
156 | CONFIG_VFAT_FS=y | ||
157 | CONFIG_TMPFS=y | ||
158 | CONFIG_JFFS2_FS=y | ||
159 | CONFIG_JFFS2_SUMMARY=y | ||
160 | CONFIG_UBIFS_FS=y | ||
161 | CONFIG_NFS_FS=y | ||
162 | CONFIG_ROOT_NFS=y | ||
163 | CONFIG_NLS_CODEPAGE_437=y | ||
164 | CONFIG_NLS_CODEPAGE_850=y | ||
165 | CONFIG_NLS_ISO8859_1=y | ||
166 | CONFIG_STRIP_ASM_SYMS=y | ||
167 | CONFIG_DEBUG_FS=y | ||
168 | # CONFIG_SCHED_DEBUG is not set | ||
169 | CONFIG_DEBUG_MEMORY_INIT=y | ||
170 | # CONFIG_FTRACE is not set | ||
171 | CONFIG_DEBUG_USER=y | ||
172 | CONFIG_DEBUG_LL=y | ||
173 | CONFIG_EARLY_PRINTK=y | ||
174 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
175 | CONFIG_CRYPTO_USER_API_HASH=m | ||
176 | CONFIG_CRYPTO_USER_API_SKCIPHER=m | ||
177 | CONFIG_CRYPTO_DEV_ATMEL_AES=y | ||
178 | CONFIG_CRYPTO_DEV_ATMEL_TDES=y | ||
179 | CONFIG_CRYPTO_DEV_ATMEL_SHA=y | ||
180 | CONFIG_CRC_CCITT=m | ||
181 | CONFIG_CRC_ITU_T=m | ||
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index aba4881d20e5..a5f0485133cf 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig | |||
@@ -1,4 +1,3 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_NO_HZ=y | 1 | CONFIG_NO_HZ=y |
3 | CONFIG_HIGH_RES_TIMERS=y | 2 | CONFIG_HIGH_RES_TIMERS=y |
4 | CONFIG_IKCONFIG=y | 3 | CONFIG_IKCONFIG=y |
@@ -20,15 +19,14 @@ CONFIG_MODULE_UNLOAD=y | |||
20 | CONFIG_MODULE_FORCE_UNLOAD=y | 19 | CONFIG_MODULE_FORCE_UNLOAD=y |
21 | # CONFIG_BLK_DEV_BSG is not set | 20 | # CONFIG_BLK_DEV_BSG is not set |
22 | CONFIG_PARTITION_ADVANCED=y | 21 | CONFIG_PARTITION_ADVANCED=y |
23 | CONFIG_EFI_PARTITION=y | ||
24 | # CONFIG_IOSCHED_DEADLINE is not set | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
25 | # CONFIG_IOSCHED_CFQ is not set | 23 | # CONFIG_IOSCHED_CFQ is not set |
26 | CONFIG_ARCH_TEGRA=y | 24 | CONFIG_ARCH_TEGRA=y |
27 | CONFIG_GPIO_PCA953X=y | 25 | CONFIG_GPIO_PCA953X=y |
28 | CONFIG_ARCH_TEGRA_2x_SOC=y | 26 | CONFIG_ARCH_TEGRA_2x_SOC=y |
29 | CONFIG_ARCH_TEGRA_3x_SOC=y | 27 | CONFIG_ARCH_TEGRA_3x_SOC=y |
28 | CONFIG_ARCH_TEGRA_114_SOC=y | ||
30 | CONFIG_TEGRA_PCI=y | 29 | CONFIG_TEGRA_PCI=y |
31 | CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA=y | ||
32 | CONFIG_TEGRA_EMC_SCALING_ENABLE=y | 30 | CONFIG_TEGRA_EMC_SCALING_ENABLE=y |
33 | CONFIG_SMP=y | 31 | CONFIG_SMP=y |
34 | CONFIG_PREEMPT=y | 32 | CONFIG_PREEMPT=y |
@@ -37,8 +35,8 @@ CONFIG_AEABI=y | |||
37 | CONFIG_HIGHMEM=y | 35 | CONFIG_HIGHMEM=y |
38 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 36 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
39 | CONFIG_ZBOOT_ROM_BSS=0x0 | 37 | CONFIG_ZBOOT_ROM_BSS=0x0 |
40 | CONFIG_AUTO_ZRELADDR=y | ||
41 | CONFIG_KEXEC=y | 38 | CONFIG_KEXEC=y |
39 | CONFIG_AUTO_ZRELADDR=y | ||
42 | CONFIG_CPU_FREQ=y | 40 | CONFIG_CPU_FREQ=y |
43 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y | 41 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
44 | CONFIG_CPU_IDLE=y | 42 | CONFIG_CPU_IDLE=y |
@@ -108,6 +106,7 @@ CONFIG_RT2X00=y | |||
108 | CONFIG_RT2800USB=m | 106 | CONFIG_RT2800USB=m |
109 | CONFIG_INPUT_EVDEV=y | 107 | CONFIG_INPUT_EVDEV=y |
110 | CONFIG_KEYBOARD_TEGRA=y | 108 | CONFIG_KEYBOARD_TEGRA=y |
109 | CONFIG_KEYBOARD_GPIO=y | ||
111 | CONFIG_INPUT_MISC=y | 110 | CONFIG_INPUT_MISC=y |
112 | CONFIG_INPUT_MPU3050=y | 111 | CONFIG_INPUT_MPU3050=y |
113 | # CONFIG_LEGACY_PTYS is not set | 112 | # CONFIG_LEGACY_PTYS is not set |
@@ -117,7 +116,6 @@ CONFIG_SERIAL_8250_CONSOLE=y | |||
117 | CONFIG_SERIAL_TEGRA=y | 116 | CONFIG_SERIAL_TEGRA=y |
118 | CONFIG_SERIAL_OF_PLATFORM=y | 117 | CONFIG_SERIAL_OF_PLATFORM=y |
119 | # CONFIG_HW_RANDOM is not set | 118 | # CONFIG_HW_RANDOM is not set |
120 | CONFIG_I2C=y | ||
121 | # CONFIG_I2C_COMPAT is not set | 119 | # CONFIG_I2C_COMPAT is not set |
122 | CONFIG_I2C_MUX=y | 120 | CONFIG_I2C_MUX=y |
123 | CONFIG_I2C_MUX_PINCTRL=y | 121 | CONFIG_I2C_MUX_PINCTRL=y |
@@ -126,6 +124,7 @@ CONFIG_SPI=y | |||
126 | CONFIG_SPI_TEGRA20_SFLASH=y | 124 | CONFIG_SPI_TEGRA20_SFLASH=y |
127 | CONFIG_SPI_TEGRA20_SLINK=y | 125 | CONFIG_SPI_TEGRA20_SLINK=y |
128 | CONFIG_GPIO_PCA953X_IRQ=y | 126 | CONFIG_GPIO_PCA953X_IRQ=y |
127 | CONFIG_GPIO_PALMAS=y | ||
129 | CONFIG_GPIO_TPS6586X=y | 128 | CONFIG_GPIO_TPS6586X=y |
130 | CONFIG_GPIO_TPS65910=y | 129 | CONFIG_GPIO_TPS65910=y |
131 | CONFIG_POWER_SUPPLY=y | 130 | CONFIG_POWER_SUPPLY=y |
@@ -136,12 +135,17 @@ CONFIG_SENSORS_LM90=y | |||
136 | CONFIG_MFD_TPS6586X=y | 135 | CONFIG_MFD_TPS6586X=y |
137 | CONFIG_MFD_TPS65910=y | 136 | CONFIG_MFD_TPS65910=y |
138 | CONFIG_MFD_MAX8907=y | 137 | CONFIG_MFD_MAX8907=y |
138 | CONFIG_MFD_TPS65090=y | ||
139 | CONFIG_MFD_PALMAS=y | ||
139 | CONFIG_REGULATOR=y | 140 | CONFIG_REGULATOR=y |
140 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 141 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
141 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y | 142 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y |
142 | CONFIG_REGULATOR_GPIO=y | 143 | CONFIG_REGULATOR_GPIO=y |
143 | CONFIG_REGULATOR_MAX8907=y | 144 | CONFIG_REGULATOR_MAX8907=y |
145 | CONFIG_REGULATOR_PALMAS=y | ||
146 | CONFIG_REGULATOR_TPS51632=y | ||
144 | CONFIG_REGULATOR_TPS62360=y | 147 | CONFIG_REGULATOR_TPS62360=y |
148 | CONFIG_REGULATOR_TPS65090=y | ||
145 | CONFIG_REGULATOR_TPS6586X=y | 149 | CONFIG_REGULATOR_TPS6586X=y |
146 | CONFIG_REGULATOR_TPS65910=y | 150 | CONFIG_REGULATOR_TPS65910=y |
147 | CONFIG_MEDIA_SUPPORT=y | 151 | CONFIG_MEDIA_SUPPORT=y |
@@ -187,10 +191,8 @@ CONFIG_LEDS_GPIO=y | |||
187 | CONFIG_LEDS_TRIGGERS=y | 191 | CONFIG_LEDS_TRIGGERS=y |
188 | CONFIG_LEDS_TRIGGER_GPIO=y | 192 | CONFIG_LEDS_TRIGGER_GPIO=y |
189 | CONFIG_RTC_CLASS=y | 193 | CONFIG_RTC_CLASS=y |
190 | CONFIG_RTC_INTF_SYSFS=y | ||
191 | CONFIG_RTC_INTF_PROC=y | ||
192 | CONFIG_RTC_INTF_DEV=y | ||
193 | CONFIG_RTC_DRV_MAX8907=y | 194 | CONFIG_RTC_DRV_MAX8907=y |
195 | CONFIG_RTC_DRV_PALMAS=y | ||
194 | CONFIG_RTC_DRV_TPS6586X=y | 196 | CONFIG_RTC_DRV_TPS6586X=y |
195 | CONFIG_RTC_DRV_TPS65910=y | 197 | CONFIG_RTC_DRV_TPS65910=y |
196 | CONFIG_RTC_DRV_EM3027=y | 198 | CONFIG_RTC_DRV_EM3027=y |
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 426270fe080d..c037aa1065b7 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig | |||
@@ -5,7 +5,6 @@ CONFIG_BLK_DEV_INITRD=y | |||
5 | CONFIG_KALLSYMS_ALL=y | 5 | CONFIG_KALLSYMS_ALL=y |
6 | CONFIG_MODULES=y | 6 | CONFIG_MODULES=y |
7 | CONFIG_MODULE_UNLOAD=y | 7 | CONFIG_MODULE_UNLOAD=y |
8 | # CONFIG_LBDAF is not set | ||
9 | # CONFIG_BLK_DEV_BSG is not set | 8 | # CONFIG_BLK_DEV_BSG is not set |
10 | CONFIG_ARCH_U8500=y | 9 | CONFIG_ARCH_U8500=y |
11 | CONFIG_MACH_HREFV60=y | 10 | CONFIG_MACH_HREFV60=y |
@@ -90,6 +89,8 @@ CONFIG_LEDS_CLASS=y | |||
90 | CONFIG_LEDS_LM3530=y | 89 | CONFIG_LEDS_LM3530=y |
91 | CONFIG_LEDS_LP5521=y | 90 | CONFIG_LEDS_LP5521=y |
92 | CONFIG_LEDS_GPIO=y | 91 | CONFIG_LEDS_GPIO=y |
92 | CONFIG_LEDS_TRIGGERS=y | ||
93 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
93 | CONFIG_RTC_CLASS=y | 94 | CONFIG_RTC_CLASS=y |
94 | CONFIG_RTC_DRV_AB8500=y | 95 | CONFIG_RTC_DRV_AB8500=y |
95 | CONFIG_RTC_DRV_PL031=y | 96 | CONFIG_RTC_DRV_PL031=y |
@@ -103,6 +104,7 @@ CONFIG_EXT2_FS_XATTR=y | |||
103 | CONFIG_EXT2_FS_POSIX_ACL=y | 104 | CONFIG_EXT2_FS_POSIX_ACL=y |
104 | CONFIG_EXT2_FS_SECURITY=y | 105 | CONFIG_EXT2_FS_SECURITY=y |
105 | CONFIG_EXT3_FS=y | 106 | CONFIG_EXT3_FS=y |
107 | CONFIG_EXT4_FS=y | ||
106 | CONFIG_VFAT_FS=y | 108 | CONFIG_VFAT_FS=y |
107 | CONFIG_TMPFS=y | 109 | CONFIG_TMPFS=y |
108 | CONFIG_TMPFS_POSIX_ACL=y | 110 | CONFIG_TMPFS_POSIX_ACL=y |