diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-09-02 04:50:03 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-09-02 09:06:11 -0400 |
commit | 7cc5f270ee6e271df466f9d3c1c4522593002ac4 (patch) | |
tree | d99177aed6aa1101f9d1476d638fc03a87090aa9 /arch/arm/configs/sama5_defconfig | |
parent | c92e99f0bc1cd9feefaa93ce9245db8abdeca836 (diff) |
ARM: at91: sama5: update defconfig
Update defconfig, adding:
- PWM support using the generic framework
- generic PWM leds
- Power/reset
and removing deprecated config options.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/configs/sama5_defconfig')
-rw-r--r-- | arch/arm/configs/sama5_defconfig | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index 36021f29d160..96c15b775d57 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig | |||
@@ -21,7 +21,6 @@ CONFIG_SOC_SAM_V7=y | |||
21 | CONFIG_SOC_SAMA5D3=y | 21 | CONFIG_SOC_SAMA5D3=y |
22 | CONFIG_MACH_SAMA5_DT=y | 22 | CONFIG_MACH_SAMA5_DT=y |
23 | CONFIG_AEABI=y | 23 | CONFIG_AEABI=y |
24 | # CONFIG_OABI_COMPAT is not set | ||
25 | CONFIG_UACCESS_WITH_MEMCPY=y | 24 | CONFIG_UACCESS_WITH_MEMCPY=y |
26 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 25 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
27 | CONFIG_ZBOOT_ROM_BSS=0x0 | 26 | CONFIG_ZBOOT_ROM_BSS=0x0 |
@@ -73,7 +72,6 @@ CONFIG_MTD_NAND_ATMEL=y | |||
73 | CONFIG_MTD_SPI_NOR=y | 72 | CONFIG_MTD_SPI_NOR=y |
74 | CONFIG_MTD_UBI=y | 73 | CONFIG_MTD_UBI=y |
75 | CONFIG_MTD_UBI_GLUEBI=y | 74 | CONFIG_MTD_UBI_GLUEBI=y |
76 | CONFIG_PROC_DEVICETREE=y | ||
77 | CONFIG_BLK_DEV_LOOP=y | 75 | CONFIG_BLK_DEV_LOOP=y |
78 | CONFIG_BLK_DEV_RAM=y | 76 | CONFIG_BLK_DEV_RAM=y |
79 | CONFIG_BLK_DEV_RAM_COUNT=4 | 77 | CONFIG_BLK_DEV_RAM_COUNT=4 |
@@ -83,10 +81,8 @@ CONFIG_ATMEL_SSC=y | |||
83 | CONFIG_EEPROM_AT24=y | 81 | CONFIG_EEPROM_AT24=y |
84 | CONFIG_SCSI=y | 82 | CONFIG_SCSI=y |
85 | CONFIG_BLK_DEV_SD=y | 83 | CONFIG_BLK_DEV_SD=y |
86 | CONFIG_SCSI_MULTI_LUN=y | ||
87 | # CONFIG_SCSI_LOWLEVEL is not set | 84 | # CONFIG_SCSI_LOWLEVEL is not set |
88 | CONFIG_NETDEVICES=y | 85 | CONFIG_NETDEVICES=y |
89 | CONFIG_MII=y | ||
90 | CONFIG_MACB=y | 86 | CONFIG_MACB=y |
91 | # CONFIG_NET_VENDOR_BROADCOM is not set | 87 | # CONFIG_NET_VENDOR_BROADCOM is not set |
92 | # CONFIG_NET_VENDOR_CIRRUS is not set | 88 | # CONFIG_NET_VENDOR_CIRRUS is not set |
@@ -135,6 +131,8 @@ CONFIG_SPI=y | |||
135 | CONFIG_SPI_ATMEL=y | 131 | CONFIG_SPI_ATMEL=y |
136 | CONFIG_SPI_GPIO=y | 132 | CONFIG_SPI_GPIO=y |
137 | CONFIG_GPIO_SYSFS=y | 133 | CONFIG_GPIO_SYSFS=y |
134 | CONFIG_POWER_SUPPLY=y | ||
135 | CONFIG_POWER_RESET=y | ||
138 | # CONFIG_HWMON is not set | 136 | # CONFIG_HWMON is not set |
139 | CONFIG_SSB=m | 137 | CONFIG_SSB=m |
140 | CONFIG_REGULATOR=y | 138 | CONFIG_REGULATOR=y |
@@ -170,6 +168,7 @@ CONFIG_MMC_ATMELMCI=y | |||
170 | CONFIG_NEW_LEDS=y | 168 | CONFIG_NEW_LEDS=y |
171 | CONFIG_LEDS_CLASS=y | 169 | CONFIG_LEDS_CLASS=y |
172 | CONFIG_LEDS_GPIO=y | 170 | CONFIG_LEDS_GPIO=y |
171 | CONFIG_LEDS_PWM=y | ||
173 | CONFIG_LEDS_TRIGGER_TIMER=y | 172 | CONFIG_LEDS_TRIGGER_TIMER=y |
174 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 173 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
175 | CONFIG_LEDS_TRIGGER_GPIO=y | 174 | CONFIG_LEDS_TRIGGER_GPIO=y |
@@ -179,6 +178,8 @@ CONFIG_DMADEVICES=y | |||
179 | # CONFIG_IOMMU_SUPPORT is not set | 178 | # CONFIG_IOMMU_SUPPORT is not set |
180 | CONFIG_IIO=y | 179 | CONFIG_IIO=y |
181 | CONFIG_AT91_ADC=y | 180 | CONFIG_AT91_ADC=y |
181 | CONFIG_PWM=y | ||
182 | CONFIG_PWM_ATMEL=y | ||
182 | CONFIG_EXT4_FS=y | 183 | CONFIG_EXT4_FS=y |
183 | CONFIG_FANOTIFY=y | 184 | CONFIG_FANOTIFY=y |
184 | CONFIG_VFAT_FS=y | 185 | CONFIG_VFAT_FS=y |
@@ -193,8 +194,8 @@ CONFIG_NLS_ISO8859_1=y | |||
193 | CONFIG_NLS_UTF8=y | 194 | CONFIG_NLS_UTF8=y |
194 | CONFIG_STRIP_ASM_SYMS=y | 195 | CONFIG_STRIP_ASM_SYMS=y |
195 | CONFIG_DEBUG_FS=y | 196 | CONFIG_DEBUG_FS=y |
196 | # CONFIG_SCHED_DEBUG is not set | ||
197 | CONFIG_DEBUG_MEMORY_INIT=y | 197 | CONFIG_DEBUG_MEMORY_INIT=y |
198 | # CONFIG_SCHED_DEBUG is not set | ||
198 | # CONFIG_FTRACE is not set | 199 | # CONFIG_FTRACE is not set |
199 | CONFIG_DEBUG_USER=y | 200 | CONFIG_DEBUG_USER=y |
200 | CONFIG_DEBUG_LL=y | 201 | CONFIG_DEBUG_LL=y |