diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-09-02 04:49:57 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-09-02 09:04:06 -0400 |
commit | 443c4a4a66bacd314bd407f8e9e634695478b914 (patch) | |
tree | 1830f91ba4ebcd36b0dc37597c973d1b4c89fd5e /arch/arm/configs | |
parent | 2c6fddd061d948733c8c417a9fc11b671b5499b6 (diff) |
ARM: at91: at91_dt: update defconfig
Update defconfig, adding:
- ADC/touchscreen
- 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')
-rw-r--r-- | arch/arm/configs/at91_dt_defconfig | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index bd0a307468e1..3b515c179487 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig | |||
@@ -18,15 +18,14 @@ CONFIG_SOC_AT91RM9200=y | |||
18 | CONFIG_SOC_AT91SAM9260=y | 18 | CONFIG_SOC_AT91SAM9260=y |
19 | CONFIG_SOC_AT91SAM9261=y | 19 | CONFIG_SOC_AT91SAM9261=y |
20 | CONFIG_SOC_AT91SAM9263=y | 20 | CONFIG_SOC_AT91SAM9263=y |
21 | CONFIG_SOC_AT91SAM9RL=y | ||
21 | CONFIG_SOC_AT91SAM9G45=y | 22 | CONFIG_SOC_AT91SAM9G45=y |
22 | CONFIG_SOC_AT91SAM9X5=y | 23 | CONFIG_SOC_AT91SAM9X5=y |
23 | CONFIG_SOC_AT91SAM9N12=y | 24 | CONFIG_SOC_AT91SAM9N12=y |
24 | CONFIG_SOC_AT91SAM9RL=y | ||
25 | CONFIG_MACH_AT91RM9200_DT=y | 25 | CONFIG_MACH_AT91RM9200_DT=y |
26 | CONFIG_MACH_AT91SAM9_DT=y | 26 | CONFIG_MACH_AT91SAM9_DT=y |
27 | CONFIG_AT91_TIMER_HZ=128 | 27 | CONFIG_AT91_TIMER_HZ=128 |
28 | CONFIG_AEABI=y | 28 | CONFIG_AEABI=y |
29 | # CONFIG_OABI_COMPAT is not set | ||
30 | CONFIG_UACCESS_WITH_MEMCPY=y | 29 | CONFIG_UACCESS_WITH_MEMCPY=y |
31 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 30 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
32 | CONFIG_ZBOOT_ROM_BSS=0x0 | 31 | CONFIG_ZBOOT_ROM_BSS=0x0 |
@@ -63,24 +62,20 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
63 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 62 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
64 | CONFIG_MTD=y | 63 | CONFIG_MTD=y |
65 | CONFIG_MTD_CMDLINE_PARTS=y | 64 | CONFIG_MTD_CMDLINE_PARTS=y |
66 | CONFIG_MTD_CHAR=y | ||
67 | CONFIG_MTD_BLOCK=y | 65 | CONFIG_MTD_BLOCK=y |
68 | CONFIG_MTD_DATAFLASH=y | 66 | CONFIG_MTD_DATAFLASH=y |
69 | CONFIG_MTD_NAND=y | 67 | CONFIG_MTD_NAND=y |
70 | CONFIG_MTD_NAND_ATMEL=y | 68 | CONFIG_MTD_NAND_ATMEL=y |
71 | CONFIG_MTD_UBI=y | 69 | CONFIG_MTD_UBI=y |
72 | CONFIG_MTD_UBI_GLUEBI=y | 70 | CONFIG_MTD_UBI_GLUEBI=y |
73 | CONFIG_PROC_DEVICETREE=y | ||
74 | CONFIG_BLK_DEV_LOOP=y | 71 | CONFIG_BLK_DEV_LOOP=y |
75 | CONFIG_BLK_DEV_RAM=y | 72 | CONFIG_BLK_DEV_RAM=y |
76 | CONFIG_BLK_DEV_RAM_COUNT=4 | 73 | CONFIG_BLK_DEV_RAM_COUNT=4 |
77 | CONFIG_BLK_DEV_RAM_SIZE=8192 | 74 | CONFIG_BLK_DEV_RAM_SIZE=8192 |
78 | CONFIG_ATMEL_PWM=y | ||
79 | CONFIG_ATMEL_TCLIB=y | 75 | CONFIG_ATMEL_TCLIB=y |
80 | CONFIG_ATMEL_SSC=y | 76 | CONFIG_ATMEL_SSC=y |
81 | CONFIG_SCSI=y | 77 | CONFIG_SCSI=y |
82 | CONFIG_BLK_DEV_SD=y | 78 | CONFIG_BLK_DEV_SD=y |
83 | CONFIG_SCSI_MULTI_LUN=y | ||
84 | # CONFIG_SCSI_LOWLEVEL is not set | 79 | # CONFIG_SCSI_LOWLEVEL is not set |
85 | CONFIG_NETDEVICES=y | 80 | CONFIG_NETDEVICES=y |
86 | CONFIG_MACB=y | 81 | CONFIG_MACB=y |
@@ -106,9 +101,8 @@ CONFIG_RT2800USB=m | |||
106 | CONFIG_RT2800USB_RT53XX=y | 101 | CONFIG_RT2800USB_RT53XX=y |
107 | CONFIG_RT2800USB_RT55XX=y | 102 | CONFIG_RT2800USB_RT55XX=y |
108 | CONFIG_RT2800USB_UNKNOWN=y | 103 | CONFIG_RT2800USB_UNKNOWN=y |
109 | CONFIG_RTLWIFI=m | ||
110 | # CONFIG_RTLWIFI_DEBUG is not set | ||
111 | CONFIG_RTL8192CU=m | 104 | CONFIG_RTL8192CU=m |
105 | # CONFIG_RTLWIFI_DEBUG is not set | ||
112 | CONFIG_MWIFIEX=m | 106 | CONFIG_MWIFIEX=m |
113 | CONFIG_MWIFIEX_SDIO=m | 107 | CONFIG_MWIFIEX_SDIO=m |
114 | CONFIG_MWIFIEX_USB=m | 108 | CONFIG_MWIFIEX_USB=m |
@@ -133,6 +127,8 @@ CONFIG_I2C_AT91=y | |||
133 | CONFIG_I2C_GPIO=y | 127 | CONFIG_I2C_GPIO=y |
134 | CONFIG_SPI=y | 128 | CONFIG_SPI=y |
135 | CONFIG_SPI_ATMEL=y | 129 | CONFIG_SPI_ATMEL=y |
130 | CONFIG_POWER_SUPPLY=y | ||
131 | CONFIG_POWER_RESET=y | ||
136 | # CONFIG_HWMON is not set | 132 | # CONFIG_HWMON is not set |
137 | CONFIG_WATCHDOG=y | 133 | CONFIG_WATCHDOG=y |
138 | CONFIG_AT91SAM9X_WATCHDOG=y | 134 | CONFIG_AT91SAM9X_WATCHDOG=y |
@@ -146,10 +142,6 @@ CONFIG_BACKLIGHT_ATMEL_LCDC=y | |||
146 | # CONFIG_BACKLIGHT_GENERIC is not set | 142 | # CONFIG_BACKLIGHT_GENERIC is not set |
147 | CONFIG_FRAMEBUFFER_CONSOLE=y | 143 | CONFIG_FRAMEBUFFER_CONSOLE=y |
148 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | 144 | CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y |
149 | CONFIG_FONTS=y | ||
150 | CONFIG_FONT_8x8=y | ||
151 | CONFIG_FONT_ACORN_8x8=y | ||
152 | CONFIG_FONT_MINI_4x6=y | ||
153 | CONFIG_LOGO=y | 145 | CONFIG_LOGO=y |
154 | CONFIG_SOUND=y | 146 | CONFIG_SOUND=y |
155 | CONFIG_SND=y | 147 | CONFIG_SND=y |
@@ -178,6 +170,7 @@ CONFIG_MMC_SPI=y | |||
178 | CONFIG_NEW_LEDS=y | 170 | CONFIG_NEW_LEDS=y |
179 | CONFIG_LEDS_CLASS=y | 171 | CONFIG_LEDS_CLASS=y |
180 | CONFIG_LEDS_GPIO=y | 172 | CONFIG_LEDS_GPIO=y |
173 | CONFIG_LEDS_PWM=y | ||
181 | CONFIG_LEDS_TRIGGERS=y | 174 | CONFIG_LEDS_TRIGGERS=y |
182 | CONFIG_LEDS_TRIGGER_TIMER=y | 175 | CONFIG_LEDS_TRIGGER_TIMER=y |
183 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | 176 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y |
@@ -189,6 +182,10 @@ CONFIG_RTC_DRV_AT91SAM9=y | |||
189 | CONFIG_DMADEVICES=y | 182 | CONFIG_DMADEVICES=y |
190 | CONFIG_AT_HDMAC=y | 183 | CONFIG_AT_HDMAC=y |
191 | # CONFIG_IOMMU_SUPPORT is not set | 184 | # CONFIG_IOMMU_SUPPORT is not set |
185 | CONFIG_IIO=y | ||
186 | CONFIG_AT91_ADC=y | ||
187 | CONFIG_PWM=y | ||
188 | CONFIG_PWM_ATMEL=y | ||
192 | CONFIG_EXT4_FS=y | 189 | CONFIG_EXT4_FS=y |
193 | CONFIG_FANOTIFY=y | 190 | CONFIG_FANOTIFY=y |
194 | CONFIG_VFAT_FS=y | 191 | CONFIG_VFAT_FS=y |
@@ -219,3 +216,7 @@ CONFIG_CRC_CCITT=y | |||
219 | CONFIG_CRC_ITU_T=y | 216 | CONFIG_CRC_ITU_T=y |
220 | CONFIG_CRC7=m | 217 | CONFIG_CRC7=m |
221 | CONFIG_AVERAGE=y | 218 | CONFIG_AVERAGE=y |
219 | CONFIG_FONTS=y | ||
220 | CONFIG_FONT_8x8=y | ||
221 | CONFIG_FONT_ACORN_8x8=y | ||
222 | CONFIG_FONT_MINI_4x6=y | ||