Skip to content

Commit d919514

Browse files
committed
Merge tag 'qcom-arm64-defconfig-for-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into soc/defconfig
Qualcomm ARM64 defconfig updates for v6.7 This enables the NB7VPQ904M SuperSpeed redriver driver, used in SM8550, the LPASS pinctrl driver for SM6115 and SM8350 and the M31 USB phy driver found in IPQ5332. * tag 'qcom-arm64-defconfig-for-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux: arm64: defconfig: Enable M31 USB phy driver arm64: defconfig: enable Qualcomm SM6115 LPASS pinctrl arm64: defconfig: enable Qualcomm SM8350 LPASS pinctrl arm64: defconfig: enable NB7VPQ904M driver as module Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9b9a554 + b46d856 commit d919514

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,13 +599,15 @@ CONFIG_PINCTRL_SDM660=y
599599
CONFIG_PINCTRL_SDM670=y
600600
CONFIG_PINCTRL_SDM845=y
601601
CONFIG_PINCTRL_SM6115=y
602+
CONFIG_PINCTRL_SM6115_LPASS_LPI=m
602603
CONFIG_PINCTRL_SM6125=y
603604
CONFIG_PINCTRL_SM6350=y
604605
CONFIG_PINCTRL_SM6375=y
605606
CONFIG_PINCTRL_SM8150=y
606607
CONFIG_PINCTRL_SM8250=y
607608
CONFIG_PINCTRL_SM8250_LPASS_LPI=m
608609
CONFIG_PINCTRL_SM8350=y
610+
CONFIG_PINCTRL_SM8350_LPASS_LPI=m
609611
CONFIG_PINCTRL_SM8450=y
610612
CONFIG_PINCTRL_SM8450_LPASS_LPI=m
611613
CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m
@@ -1041,6 +1043,7 @@ CONFIG_TYPEC_TPS6598X=m
10411043
CONFIG_TYPEC_HD3SS3220=m
10421044
CONFIG_TYPEC_UCSI=m
10431045
CONFIG_TYPEC_MUX_FSA4480=m
1046+
CONFIG_TYPEC_MUX_NB7VPQ904M=m
10441047
CONFIG_UCSI_CCG=m
10451048
CONFIG_TYPEC_MUX_GPIO_SBU=m
10461049
CONFIG_MMC=y
@@ -1426,6 +1429,7 @@ CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m
14261429
CONFIG_PHY_QCOM_USB_HS_28NM=m
14271430
CONFIG_PHY_QCOM_USB_SS=m
14281431
CONFIG_PHY_QCOM_SGMII_ETH=m
1432+
CONFIG_PHY_QCOM_M31_USB=m
14291433
CONFIG_PHY_R8A779F0_ETHERNET_SERDES=y
14301434
CONFIG_PHY_RCAR_GEN3_PCIE=y
14311435
CONFIG_PHY_RCAR_GEN3_USB2=y

0 commit comments

Comments
 (0)