Skip to content

Commit 1c4c5c5

Browse files
committed
Merge tag 'ti-k3-config-for-v7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/defconfig
TI K3 defconfig updates for v7.1 Generic Fixes/Cleanups: - Remove SENSORS_SA67MCU as the driver is dropped Board Specific Features and Fixes: AM69: - Enable configurations for Toradex Aquila AM69 AM64 / AM62: - Enable DP83TG720 PHY driver * tag 'ti-k3-config-for-v7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: arm64: defconfig: Enable DP83TG720 PHY driver arm64: defconfig: Enable configurations for Toradex Aquila AM69 arm64: defconfig: remove SENSORS_SA67MCU Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 757b23c + 079a2e1 commit 1c4c5c5

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

arch/arm64/configs/defconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ CONFIG_REALTEK_PHY=y
422422
CONFIG_ROCKCHIP_PHY=y
423423
CONFIG_DP83867_PHY=y
424424
CONFIG_DP83869_PHY=m
425+
CONFIG_DP83TG720_PHY=m
425426
CONFIG_DP83TD510_PHY=y
426427
CONFIG_VITESSE_PHY=y
427428
CONFIG_XILINX_GMII2RGMII=m
@@ -734,6 +735,8 @@ CONFIG_GPIO_MACSMC=m
734735
CONFIG_GPIO_MAX77620=y
735736
CONFIG_GPIO_SL28CPLD=m
736737
CONFIG_GPIO_AGGREGATOR=m
738+
CONFIG_POWER_RESET_GPIO=y
739+
CONFIG_POWER_RESET_GPIO_RESTART=y
737740
CONFIG_POWER_RESET_MACSMC=m
738741
CONFIG_POWER_RESET_MSM=y
739742
CONFIG_POWER_RESET_QCOM_PON=m
@@ -760,8 +763,8 @@ CONFIG_SENSORS_LM75=m
760763
CONFIG_SENSORS_LM90=m
761764
CONFIG_SENSORS_PWM_FAN=m
762765
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
763-
CONFIG_SENSORS_SA67MCU=m
764766
CONFIG_SENSORS_SL28CPLD=m
767+
CONFIG_SENSORS_AMC6821=m
765768
CONFIG_SENSORS_INA2XX=m
766769
CONFIG_SENSORS_INA3221=m
767770
CONFIG_SENSORS_TMP102=m

0 commit comments

Comments
 (0)