Skip to content

Commit b528ded

Browse files
committed
Merge tag 'at91-defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91 defconfig for 5.15: - add defconfig entries for new SoC: SAMA7G5 - dedicated sama7_defconfig which avoids having to carry older drivers and dependencies from the sama5 family: CACHE_L2X0, CAN_AT91, TOUCHSCREEN_ADC, AT91SAM9X_WATCHDOG, VIDEO_ATMEL_ISI, SND_ATMEL_SOC_I2S, MMC_ATMELMCI, AT_HDMAC, AT91_ADC, REGULATOR_ACT* Addition of new drivers that are not part of any sama5 SoC: SND_MCHP_SOC_I2S_MCC, SND_MCHP_SOC_SPDIFTX|RX, MICROCHIP_PIT64B plus upcoming MIPI pipeline, audio sample rate converter, ... It also maintains both sama5 and sama7 defconfig tailored for their respective families and easy to identify. - addition to the generic multi_v7_defconfig * tag 'at91-defconfig-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: multi_v7_defconfig: add sama7g5 SoC ARM: configs: at91: add defconfig for sama7 family of SoCs Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents c500bee + b62869d commit b528ded

File tree

2 files changed

+211
-0
lines changed

2 files changed

+211
-0
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ CONFIG_ARCH_AT91=y
1616
CONFIG_SOC_SAMA5D2=y
1717
CONFIG_SOC_SAMA5D3=y
1818
CONFIG_SOC_SAMA5D4=y
19+
CONFIG_SOC_SAMA7G5=y
1920
CONFIG_ARCH_BCM=y
2021
CONFIG_ARCH_BCM_CYGNUS=y
2122
CONFIG_ARCH_BCM_HR2=y
@@ -996,6 +997,7 @@ CONFIG_APQ_MMCC_8084=y
996997
CONFIG_MSM_GCC_8660=y
997998
CONFIG_MSM_MMCC_8960=y
998999
CONFIG_MSM_MMCC_8974=y
1000+
CONFIG_MICROCHIP_PIT64B=y
9991001
CONFIG_BCM2835_MBOX=y
10001002
CONFIG_ROCKCHIP_IOMMU=y
10011003
CONFIG_TEGRA_IOMMU_GART=y

arch/arm/configs/sama7_defconfig

Lines changed: 209 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,209 @@
1+
# CONFIG_LOCALVERSION_AUTO is not set
2+
# CONFIG_SWAP is not set
3+
CONFIG_SYSVIPC=y
4+
CONFIG_NO_HZ_IDLE=y
5+
CONFIG_HIGH_RES_TIMERS=y
6+
CONFIG_LOG_BUF_SHIFT=16
7+
CONFIG_CGROUPS=y
8+
CONFIG_CGROUP_DEBUG=y
9+
CONFIG_NAMESPACES=y
10+
CONFIG_SYSFS_DEPRECATED=y
11+
CONFIG_SYSFS_DEPRECATED_V2=y
12+
CONFIG_BLK_DEV_INITRD=y
13+
# CONFIG_FHANDLE is not set
14+
# CONFIG_IO_URING is not set
15+
CONFIG_KALLSYMS_ALL=y
16+
CONFIG_EMBEDDED=y
17+
# CONFIG_VM_EVENT_COUNTERS is not set
18+
CONFIG_SLAB=y
19+
CONFIG_ARCH_AT91=y
20+
CONFIG_SOC_SAMA7G5=y
21+
CONFIG_ATMEL_CLOCKSOURCE_TCB=y
22+
# CONFIG_CACHE_L2X0 is not set
23+
# CONFIG_ARM_PATCH_IDIV is not set
24+
# CONFIG_CPU_SW_DOMAIN_PAN is not set
25+
CONFIG_FORCE_MAX_ZONEORDER=15
26+
CONFIG_UACCESS_WITH_MEMCPY=y
27+
# CONFIG_ATAGS is not set
28+
CONFIG_CMDLINE="console=ttyS0,115200 earlyprintk ignore_loglevel"
29+
CONFIG_VFP=y
30+
CONFIG_NEON=y
31+
CONFIG_KERNEL_MODE_NEON=y
32+
CONFIG_MODULES=y
33+
CONFIG_MODULE_FORCE_LOAD=y
34+
CONFIG_MODULE_UNLOAD=y
35+
CONFIG_MODULE_FORCE_UNLOAD=y
36+
# CONFIG_BLK_DEV_BSG is not set
37+
CONFIG_PARTITION_ADVANCED=y
38+
# CONFIG_EFI_PARTITION is not set
39+
# CONFIG_COREDUMP is not set
40+
# CONFIG_COMPACTION is not set
41+
CONFIG_CMA=y
42+
CONFIG_NET=y
43+
CONFIG_PACKET=y
44+
CONFIG_UNIX=y
45+
CONFIG_INET=y
46+
CONFIG_IP_MULTICAST=y
47+
CONFIG_IP_PNP=y
48+
CONFIG_IP_PNP_DHCP=y
49+
# CONFIG_INET_DIAG is not set
50+
CONFIG_IPV6_SIT_6RD=y
51+
CONFIG_BRIDGE=m
52+
CONFIG_BRIDGE_VLAN_FILTERING=y
53+
CONFIG_NET_DSA=m
54+
CONFIG_VLAN_8021Q=m
55+
CONFIG_CAN=y
56+
CONFIG_CAN_M_CAN=y
57+
CONFIG_CAN_M_CAN_PLATFORM=y
58+
CONFIG_BT=y
59+
CONFIG_BT_RFCOMM=y
60+
CONFIG_BT_RFCOMM_TTY=y
61+
CONFIG_BT_BNEP=y
62+
CONFIG_BT_BNEP_MC_FILTER=y
63+
CONFIG_BT_BNEP_PROTO_FILTER=y
64+
CONFIG_BT_HIDP=y
65+
CONFIG_BT_HCIBTUSB=y
66+
CONFIG_BT_HCIUART=y
67+
CONFIG_BT_HCIUART_H4=y
68+
CONFIG_BT_HCIVHCI=y
69+
CONFIG_CFG80211=m
70+
# CONFIG_CFG80211_DEFAULT_PS is not set
71+
CONFIG_CFG80211_DEBUGFS=y
72+
CONFIG_CFG80211_WEXT=y
73+
CONFIG_MAC80211=m
74+
CONFIG_MAC80211_LEDS=y
75+
CONFIG_RFKILL=y
76+
CONFIG_RFKILL_INPUT=y
77+
CONFIG_PCCARD=y
78+
CONFIG_DEVTMPFS=y
79+
CONFIG_DEVTMPFS_MOUNT=y
80+
# CONFIG_STANDALONE is not set
81+
# CONFIG_PREVENT_FIRMWARE_BUILD is not set
82+
# CONFIG_ALLOW_DEV_COREDUMP is not set
83+
CONFIG_MTD=y
84+
CONFIG_MTD_TESTS=m
85+
CONFIG_MTD_CMDLINE_PARTS=y
86+
CONFIG_BLK_DEV_LOOP=y
87+
CONFIG_BLK_DEV_RAM=y
88+
CONFIG_BLK_DEV_RAM_COUNT=1
89+
CONFIG_BLK_DEV_RAM_SIZE=8192
90+
CONFIG_EEPROM_AT24=y
91+
CONFIG_SCSI=y
92+
CONFIG_BLK_DEV_SD=y
93+
CONFIG_NETDEVICES=y
94+
CONFIG_MACB=y
95+
CONFIG_MICREL_PHY=y
96+
CONFIG_INPUT_EVDEV=y
97+
CONFIG_KEYBOARD_GPIO=y
98+
# CONFIG_INPUT_MOUSE is not set
99+
CONFIG_LEGACY_PTY_COUNT=4
100+
CONFIG_SERIAL_ATMEL=y
101+
CONFIG_SERIAL_ATMEL_CONSOLE=y
102+
CONFIG_HW_RANDOM=y
103+
CONFIG_I2C=y
104+
CONFIG_I2C_CHARDEV=y
105+
CONFIG_I2C_AT91=y
106+
CONFIG_SPI=y
107+
CONFIG_SPI_MEM=y
108+
CONFIG_SPI_ATMEL=y
109+
CONFIG_SPI_GPIO=y
110+
CONFIG_PINCTRL_AT91=y
111+
CONFIG_PINCTRL_AT91PIO4=y
112+
CONFIG_GPIO_SYSFS=y
113+
CONFIG_POWER_RESET=y
114+
CONFIG_POWER_RESET_AT91_RESET=y
115+
CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y
116+
# CONFIG_HWMON is not set
117+
CONFIG_WATCHDOG=y
118+
CONFIG_SAMA5D4_WATCHDOG=y
119+
CONFIG_MFD_ATMEL_FLEXCOM=y
120+
CONFIG_REGULATOR=y
121+
CONFIG_REGULATOR_FIXED_VOLTAGE=y
122+
CONFIG_REGULATOR_MCP16502=y
123+
CONFIG_MEDIA_SUPPORT=y
124+
CONFIG_MEDIA_SUPPORT_FILTER=y
125+
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
126+
CONFIG_MEDIA_CAMERA_SUPPORT=y
127+
CONFIG_MEDIA_PLATFORM_SUPPORT=y
128+
CONFIG_V4L_PLATFORM_DRIVERS=y
129+
CONFIG_VIDEO_IMX219=m
130+
CONFIG_VIDEO_IMX274=m
131+
CONFIG_VIDEO_OV5647=m
132+
CONFIG_SOUND=y
133+
CONFIG_SND=y
134+
CONFIG_SND_SOC=y
135+
CONFIG_SND_ATMEL_SOC=y
136+
CONFIG_SND_SOC_MIKROE_PROTO=m
137+
CONFIG_SND_MCHP_SOC_I2S_MCC=y
138+
CONFIG_SND_MCHP_SOC_SPDIFTX=y
139+
CONFIG_SND_MCHP_SOC_SPDIFRX=y
140+
CONFIG_SND_SOC_PCM5102A=y
141+
CONFIG_SND_SOC_SPDIF=y
142+
CONFIG_SND_SIMPLE_CARD=y
143+
CONFIG_USB=y
144+
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
145+
CONFIG_USB_DYNAMIC_MINORS=y
146+
CONFIG_USB_EHCI_HCD=y
147+
CONFIG_USB_OHCI_HCD=y
148+
CONFIG_USB_STORAGE=y
149+
CONFIG_USB_UAS=y
150+
CONFIG_USB_GADGET=y
151+
CONFIG_U_SERIAL_CONSOLE=y
152+
CONFIG_USB_ATMEL_USBA=m
153+
CONFIG_USB_CONFIGFS=y
154+
CONFIG_USB_CONFIGFS_ACM=y
155+
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
156+
CONFIG_USB_CONFIGFS_F_UVC=y
157+
CONFIG_USB_G_SERIAL=m
158+
CONFIG_MMC=y
159+
CONFIG_MMC_SDHCI=y
160+
CONFIG_MMC_SDHCI_PLTFM=y
161+
CONFIG_MMC_SDHCI_OF_AT91=y
162+
CONFIG_NEW_LEDS=y
163+
CONFIG_LEDS_CLASS=y
164+
CONFIG_LEDS_GPIO=y
165+
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
166+
CONFIG_RTC_CLASS=y
167+
# CONFIG_RTC_NVMEM is not set
168+
CONFIG_RTC_DRV_AT91RM9200=y
169+
CONFIG_RTC_DRV_AT91SAM9=y
170+
CONFIG_DMADEVICES=y
171+
CONFIG_AT_XDMAC=y
172+
CONFIG_DMATEST=y
173+
CONFIG_STAGING=y
174+
CONFIG_MICROCHIP_PIT64B=y
175+
# CONFIG_IOMMU_SUPPORT is not set
176+
# CONFIG_ATMEL_EBI is not set
177+
CONFIG_IIO=y
178+
CONFIG_IIO_SW_TRIGGER=y
179+
CONFIG_AT91_SAMA5D2_ADC=y
180+
CONFIG_PWM=y
181+
CONFIG_PWM_ATMEL=y
182+
CONFIG_EXT2_FS=y
183+
CONFIG_EXT3_FS=y
184+
CONFIG_FANOTIFY=y
185+
CONFIG_VFAT_FS=y
186+
CONFIG_TMPFS=y
187+
CONFIG_NFS_FS=y
188+
CONFIG_ROOT_NFS=y
189+
CONFIG_NLS_CODEPAGE_437=y
190+
CONFIG_NLS_CODEPAGE_850=y
191+
CONFIG_NLS_ISO8859_1=y
192+
CONFIG_NLS_UTF8=y
193+
CONFIG_LSM="N"
194+
CONFIG_CRYPTO_DEFLATE=y
195+
CONFIG_CRYPTO_LZO=y
196+
# CONFIG_CRYPTO_HW is not set
197+
CONFIG_CRC_CCITT=y
198+
CONFIG_CRC_ITU_T=y
199+
CONFIG_DMA_CMA=y
200+
CONFIG_CMA_SIZE_MBYTES=32
201+
CONFIG_CMA_ALIGNMENT=9
202+
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
203+
CONFIG_DEBUG_FS=y
204+
# CONFIG_DEBUG_MISC is not set
205+
# CONFIG_SCHED_DEBUG is not set
206+
CONFIG_STACKTRACE=y
207+
# CONFIG_FTRACE is not set
208+
CONFIG_DEBUG_USER=y
209+
# CONFIG_RUNTIME_TESTING_MENU is not set

0 commit comments

Comments
 (0)