Skip to content

Commit 69cd52b

Browse files
glneonmenon
authored andcommitted
ARM: multi_v7_defconfig: Add more TI Keystone support
The Keystone platforms used their own keystone_defconfig mostly to enable CONFIG_ARM_LPAE which could not be added to the multi_v7 config. Now that we have multi_v7_lpae_defconfig/lpae.config target we can and should use that defconfig for Keystone. Add the remaining must-have options for Keystone support to multi_v7_defconfig. TI_SCI_*: TI_MESSAGE_MANAGER: Allows TI-SCI communication with system control firmware (PMMC) on K2G. TI_KEYSTONE_NETCP*: KEYSTONE_NAVIGATOR*: Network driver, needed for NFS boot. PCI_KEYSTONE*: CAN_C_CAN*: INPUT_GPIO_DECODER: SPI_CADENCE_QUADSPI: PWM_TIECAP: Miscellaneous on-chip peripherals. Added as modules where possible. RESET_TI*: Used by DSP Remoteproc driver. bloat-o-meter: add/remove: 387/0 grow/shrink: 6/0 up/down: 130945/0 (130945) Total: Before=22791863, After=22922808, chg +0.57% Signed-off-by: Andrew Davis <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Nishanth Menon <[email protected]>
1 parent 6613476 commit 69cd52b

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ CONFIG_PCIE_RCAR_HOST=y
183183
CONFIG_PCI_RCAR_GEN2=y
184184
CONFIG_PCI_LAYERSCAPE=y
185185
CONFIG_PCI_DRA7XX_EP=y
186+
CONFIG_PCI_KEYSTONE_HOST=y
186187
CONFIG_PCI_ENDPOINT=y
187188
CONFIG_PCI_ENDPOINT_CONFIGFS=y
188189
CONFIG_PCI_EPF_TEST=m
@@ -191,6 +192,7 @@ CONFIG_DEVTMPFS_MOUNT=y
191192
CONFIG_OMAP_OCP2SCP=y
192193
CONFIG_ARM_SCMI_PROTOCOL=y
193194
CONFIG_RASPBERRYPI_FIRMWARE=y
195+
CONFIG_TI_SCI_PROTOCOL=y
194196
CONFIG_TRUSTED_FOUNDATIONS=y
195197
CONFIG_BCM47XX_NVRAM=y
196198
CONFIG_BCM47XX_SPROM=y
@@ -280,6 +282,8 @@ CONFIG_DWMAC_DWC_QOS_ETH=y
280282
CONFIG_TI_CPSW=y
281283
CONFIG_TI_CPSW_SWITCHDEV=y
282284
CONFIG_TI_CPTS=y
285+
CONFIG_TI_KEYSTONE_NETCP=y
286+
CONFIG_TI_KEYSTONE_NETCP_ETHSS=y
283287
CONFIG_XILINX_EMACLITE=y
284288
CONFIG_SFP=m
285289
CONFIG_BROADCOM_PHY=y
@@ -292,6 +296,8 @@ CONFIG_CAN_AT91=m
292296
CONFIG_CAN_FLEXCAN=m
293297
CONFIG_CAN_SUN4I=y
294298
CONFIG_CAN_XILINXCAN=y
299+
CONFIG_CAN_C_CAN=m
300+
CONFIG_CAN_C_CAN_PLATFORM=m
295301
CONFIG_CAN_RCAR=m
296302
CONFIG_CAN_MCP251X=y
297303
CONFIG_MDIO_MSCC_MIIM=m
@@ -335,6 +341,7 @@ CONFIG_INPUT_MISC=y
335341
CONFIG_INPUT_PM8941_PWRKEY=y
336342
CONFIG_INPUT_MAX77693_HAPTIC=m
337343
CONFIG_INPUT_MAX8997_HAPTIC=m
344+
CONFIG_INPUT_GPIO_DECODER=m
338345
CONFIG_INPUT_CPCAP_PWRBUTTON=m
339346
CONFIG_INPUT_AXP20X_PEK=m
340347
CONFIG_INPUT_DA9063_ONKEY=m
@@ -436,6 +443,7 @@ CONFIG_SPI_ATMEL_QUADSPI=m
436443
CONFIG_SPI_BCM2835=y
437444
CONFIG_SPI_BCM2835AUX=y
438445
CONFIG_SPI_CADENCE=y
446+
CONFIG_SPI_CADENCE_QUADSPI=y
439447
CONFIG_SPI_DAVINCI=y
440448
CONFIG_SPI_FSL_QUADSPI=m
441449
CONFIG_SPI_GXP=m
@@ -1073,6 +1081,7 @@ CONFIG_HWSPINLOCK_OMAP=y
10731081
CONFIG_HWSPINLOCK_QCOM=y
10741082
CONFIG_OMAP2PLUS_MBOX=y
10751083
CONFIG_BCM2835_MBOX=y
1084+
CONFIG_TI_MESSAGE_MANAGER=y
10761085
CONFIG_QCOM_APCS_IPC=y
10771086
CONFIG_STM32_IPCC=m
10781087
CONFIG_QCOM_IPCC=y
@@ -1133,11 +1142,15 @@ CONFIG_ARCH_TEGRA_2x_SOC=y
11331142
CONFIG_ARCH_TEGRA_3x_SOC=y
11341143
CONFIG_ARCH_TEGRA_114_SOC=y
11351144
CONFIG_ARCH_TEGRA_124_SOC=y
1145+
CONFIG_SOC_TI=y
1146+
CONFIG_KEYSTONE_NAVIGATOR_QMSS=y
1147+
CONFIG_KEYSTONE_NAVIGATOR_DMA=y
11361148
CONFIG_RASPBERRYPI_POWER=y
11371149
CONFIG_QCOM_CPR=y
11381150
CONFIG_QCOM_RPMHPD=y
11391151
CONFIG_QCOM_RPMPD=y
11401152
CONFIG_ROCKCHIP_PM_DOMAINS=y
1153+
CONFIG_TI_SCI_PM_DOMAINS=y
11411154
CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
11421155
CONFIG_ARM_TEGRA_DEVFREQ=m
11431156
CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
@@ -1193,10 +1206,13 @@ CONFIG_PWM_STM32=m
11931206
CONFIG_PWM_STM32_LP=m
11941207
CONFIG_PWM_SUN4I=y
11951208
CONFIG_PWM_TEGRA=y
1209+
CONFIG_PWM_TIECAP=m
11961210
CONFIG_PWM_VT8500=y
11971211
CONFIG_KEYSTONE_IRQ=y
11981212
CONFIG_RESET_MCHP_SPARX5=y
11991213
CONFIG_RESET_SCMI=y
1214+
CONFIG_RESET_TI_SCI=m
1215+
CONFIG_RESET_TI_SYSCON=m
12001216
CONFIG_PHY_SUN4I_USB=y
12011217
CONFIG_PHY_SUN9I_USB=y
12021218
CONFIG_PHY_BRCM_USB=m

0 commit comments

Comments
 (0)