Skip to content

Commit e0d5333

Browse files
committed
Merge tag 'ti-k3-config-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/defconfig
TI K3 defconfig updates for v6.20 - Enable configurations for Kontron SMARC-sAM67 module support * tag 'ti-k3-config-for-v6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: arm64: defconfig: Enable configurations for Kontron SMARC-sAM67 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents b8b1011 + 6542848 commit e0d5333

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

arch/arm64/configs/defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ CONFIG_PCIE_XILINX=y
240240
CONFIG_PCIE_XILINX_DMA_PL=y
241241
CONFIG_PCIE_XILINX_NWL=y
242242
CONFIG_PCIE_XILINX_CPM=y
243+
CONFIG_PCI_J721E_HOST=m
243244
CONFIG_PCI_IMX6_HOST=y
244245
CONFIG_PCI_LAYERSCAPE=y
245246
CONFIG_PCI_HISI=y
@@ -490,6 +491,7 @@ CONFIG_INPUT_BBNSM_PWRKEY=m
490491
CONFIG_INPUT_PM8941_PWRKEY=y
491492
CONFIG_INPUT_PM8XXX_VIBRATOR=m
492493
CONFIG_INPUT_TPS65219_PWRBUTTON=m
494+
CONFIG_INPUT_TPS6594_PWRBUTTON=m
493495
CONFIG_INPUT_PWM_BEEPER=m
494496
CONFIG_INPUT_PWM_VIBRA=m
495497
CONFIG_INPUT_RK805_PWRKEY=m
@@ -753,6 +755,7 @@ CONFIG_SENSORS_LM75=m
753755
CONFIG_SENSORS_LM90=m
754756
CONFIG_SENSORS_PWM_FAN=m
755757
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
758+
CONFIG_SENSORS_SA67MCU=m
756759
CONFIG_SENSORS_SL28CPLD=m
757760
CONFIG_SENSORS_INA2XX=m
758761
CONFIG_SENSORS_INA3221=m

0 commit comments

Comments
 (0)