Skip to content

Commit 9ca65b6

Browse files
committed
Merge tag 'tegra-for-5.17-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/defconfig
ARM: tegra: Default configuration changes for v5.17-rc1 These patches enable various drivers used by new and existing boards in both the Tegra default configuration and the multi-v7 configuration. * tag 'tegra-for-5.17-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: config: multi v7: Enable NVIDIA Tegra20 APB DMA driver ARM: config: multi v7: Enable NVIDIA Tegra20 S/PDIF driver ARM: tegra_defconfig: Enable S/PDIF driver ARM: config: multi v7: Enable display drivers used by Tegra devices ARM: tegra_defconfig: Enable drivers wanted by Acer Chromebooks and ASUS tablets Link: https://lore.kernel.org/r/20211217162253.1801077-6-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents a60c67f + 8ed567f commit 9ca65b6

2 files changed

Lines changed: 20 additions & 0 deletions

File tree

arch/arm/configs/multi_v7_defconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ CONFIG_TCG_TPM=m
382382
CONFIG_TCG_TIS_I2C_INFINEON=m
383383
CONFIG_I2C_CHARDEV=y
384384
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
385+
CONFIG_I2C_MUX_GPIO=y
385386
CONFIG_I2C_MUX_PCA954x=y
386387
CONFIG_I2C_MUX_PINCTRL=y
387388
CONFIG_I2C_DEMUX_PINCTRL=y
@@ -680,19 +681,23 @@ CONFIG_DRM_FSL_DCU=m
680681
CONFIG_DRM_TEGRA=y
681682
CONFIG_DRM_STM=m
682683
CONFIG_DRM_STM_DSI=m
684+
CONFIG_DRM_PANEL_LVDS=m
683685
CONFIG_DRM_PANEL_SIMPLE=y
684686
CONFIG_DRM_PANEL_EDP=y
685687
CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
688+
CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
686689
CONFIG_DRM_PANEL_ORISETECH_OTM8009A=m
687690
CONFIG_DRM_PANEL_RAYDIUM_RM68200=m
688691
CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m
689692
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
693+
CONFIG_DRM_LVDS_CODEC=m
690694
CONFIG_DRM_NXP_PTN3460=m
691695
CONFIG_DRM_PARADE_PS8622=m
692696
CONFIG_DRM_SII902X=m
693697
CONFIG_DRM_SII9234=m
694698
CONFIG_DRM_SIMPLE_BRIDGE=m
695699
CONFIG_DRM_TOSHIBA_TC358764=m
700+
CONFIG_DRM_TOSHIBA_TC358768=m
696701
CONFIG_DRM_I2C_ADV7511=m
697702
CONFIG_DRM_I2C_ADV7511_AUDIO=y
698703
CONFIG_DRM_STI=m
@@ -757,6 +762,7 @@ CONFIG_SND_SOC_STM32_DFSDM=m
757762
CONFIG_SND_SUN4I_CODEC=m
758763
CONFIG_SND_SOC_TEGRA=m
759764
CONFIG_SND_SOC_TEGRA20_I2S=m
765+
CONFIG_SND_SOC_TEGRA20_SPDIF=m
760766
CONFIG_SND_SOC_TEGRA30_I2S=m
761767
CONFIG_SND_SOC_TEGRA_RT5640=m
762768
CONFIG_SND_SOC_TEGRA_WM8753=m
@@ -952,6 +958,7 @@ CONFIG_ST_FDMA=m
952958
CONFIG_STM32_DMA=y
953959
CONFIG_STM32_DMAMUX=y
954960
CONFIG_STM32_MDMA=y
961+
CONFIG_TEGRA20_APB_DMA=y
955962
CONFIG_UNIPHIER_MDMAC=y
956963
CONFIG_XILINX_DMA=y
957964
CONFIG_QCOM_BAM_DMA=y

arch/arm/configs/tegra_defconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ CONFIG_USB_USBNET=y
104104
CONFIG_USB_NET_SMSC75XX=y
105105
CONFIG_USB_NET_SMSC95XX=y
106106
CONFIG_BRCMFMAC=m
107+
CONFIG_MWIFIEX=m
108+
CONFIG_MWIFIEX_SDIO=m
107109
CONFIG_RT2X00=y
108110
CONFIG_RT2800USB=m
109111
CONFIG_INPUT_JOYDEV=y
@@ -112,6 +114,8 @@ CONFIG_KEYBOARD_GPIO=y
112114
CONFIG_KEYBOARD_TEGRA=y
113115
CONFIG_KEYBOARD_CROS_EC=y
114116
CONFIG_KEYBOARD_CAP11XX=y
117+
CONFIG_MOUSE_ELAN_I2C=m
118+
CONFIG_MOUSE_ELAN_I2C_SMBUS=y
115119
CONFIG_MOUSE_PS2_ELANTECH=y
116120
CONFIG_INPUT_TOUCHSCREEN=y
117121
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
@@ -131,6 +135,7 @@ CONFIG_SERIAL_DEV_BUS=y
131135
# CONFIG_HW_RANDOM is not set
132136
# CONFIG_I2C_COMPAT is not set
133137
CONFIG_I2C_CHARDEV=y
138+
CONFIG_I2C_MUX_GPIO=y
134139
CONFIG_I2C_MUX_PCA954x=y
135140
CONFIG_I2C_MUX_PINCTRL=y
136141
CONFIG_I2C_TEGRA=y
@@ -151,7 +156,9 @@ CONFIG_GPIO_TPS65910=y
151156
CONFIG_POWER_RESET=y
152157
CONFIG_POWER_RESET_AS3722=y
153158
CONFIG_POWER_RESET_GPIO=y
159+
CONFIG_POWER_RESET_GPIO_RESTART=y
154160
CONFIG_BATTERY_SBS=y
161+
CONFIG_CHARGER_BQ24735=y
155162
CONFIG_BATTERY_BQ27XXX=y
156163
CONFIG_CHARGER_GPIO=y
157164
CONFIG_CHARGER_SMB347=y
@@ -200,7 +207,9 @@ CONFIG_DRM_TEGRA_STAGING=y
200207
CONFIG_DRM_PANEL_LVDS=y
201208
CONFIG_DRM_PANEL_SIMPLE=y
202209
CONFIG_DRM_PANEL_EDP=y
210+
CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=y
203211
CONFIG_DRM_LVDS_CODEC=y
212+
CONFIG_DRM_TOSHIBA_TC358768=y
204213
CONFIG_FB=y
205214
CONFIG_BACKLIGHT_CLASS_DEVICE=y
206215
CONFIG_BACKLIGHT_PWM=y
@@ -222,6 +231,7 @@ CONFIG_SND_HDA_CODEC_HDMI=y
222231
CONFIG_SND_SOC=y
223232
CONFIG_SND_SOC_TEGRA=y
224233
CONFIG_SND_SOC_TEGRA20_I2S=y
234+
CONFIG_SND_SOC_TEGRA20_SPDIF=y
225235
CONFIG_SND_SOC_TEGRA30_I2S=y
226236
CONFIG_SND_SOC_TEGRA_RT5640=y
227237
CONFIG_SND_SOC_TEGRA_WM8753=y
@@ -279,6 +289,9 @@ CONFIG_STAGING_MEDIA=y
279289
CONFIG_TEGRA_VDE=y
280290
CONFIG_CHROME_PLATFORMS=y
281291
CONFIG_CROS_EC=y
292+
CONFIG_CROS_EC_I2C=m
293+
CONFIG_CROS_EC_SPI=m
294+
CONFIG_I2C_CROS_EC_TUNNEL=m
282295
CONFIG_TEGRA_IOMMU_GART=y
283296
CONFIG_TEGRA_IOMMU_SMMU=y
284297
CONFIG_ARCH_TEGRA_2x_SOC=y

0 commit comments

Comments
 (0)