Unverified Commit da6212d0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.6-rockchip-defconfig64-1' of... 

Merge tag 'v6.6-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/defconfig

Enable some options needed for Rockchip boards in the main defconfig.

* tag 'v6.6-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: defconfig: Enable drivers for the Odroid-M1 board
  arm64: defconfig: Enable GPIO_SYSCON
  arm64: defconfig: Enable Rockchip OTP memory driver
  arm64: defconfig: Enable PHY_ROCKCHIP_NANENG_COMBO_PHY

Link: https://lore.kernel.org/r/5353918.Isy0gbHreE@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8d6b4927 5eaeb85c

arch/arm64/configs/defconfig

+13 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ CONFIG_PCI_LAYERSCAPE=y 
CONFIG_PCI_HISI=y

CONFIG_PCIE_QCOM=y

CONFIG_PCIE_ARMADA_8K=y

CONFIG_PCIE_ROCKCHIP_DW_HOST=y

CONFIG_PCIE_KIRIN=y

CONFIG_PCIE_HISI_STB=y

CONFIG_PCIE_TEGRA194_HOST=m
@@ -300,6 +301,7 @@ CONFIG_ATA=y 
CONFIG_SATA_AHCI=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_AHCI_BRCM=m

CONFIG_AHCI_DWC=m

CONFIG_AHCI_CEVA=y

CONFIG_AHCI_MVEBU=y

CONFIG_AHCI_XGENE=y
@@ -438,6 +440,7 @@ CONFIG_INPUT_PM8XXX_VIBRATOR=m 
CONFIG_INPUT_TPS65219_PWRBUTTON=m

CONFIG_INPUT_PWM_BEEPER=m

CONFIG_INPUT_PWM_VIBRA=m

CONFIG_INPUT_RK805_PWRKEY=m

CONFIG_INPUT_HISI_POWERKEY=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIO_AMBAKMI=y
@@ -539,6 +542,7 @@ CONFIG_SPI_OMAP24XX=m 
CONFIG_SPI_ORION=y

CONFIG_SPI_PL022=y

CONFIG_SPI_ROCKCHIP=y

CONFIG_SPI_ROCKCHIP_SFC=m

CONFIG_SPI_RPCIF=m

CONFIG_SPI_RSPI=m

CONFIG_SPI_RZV2M_CSI=m
@@ -554,6 +558,7 @@ CONFIG_SPI_SPIDEV=m 
CONFIG_SPMI=y

CONFIG_SPMI_MTK_PMIF=m

CONFIG_PINCTRL_MAX77620=y

CONFIG_PINCTRL_RK805=m

CONFIG_PINCTRL_SINGLE=y

CONFIG_PINCTRL_OWL=y

CONFIG_PINCTRL_S700=y
@@ -625,6 +630,7 @@ CONFIG_GPIO_PCA953X_IRQ=y 
CONFIG_GPIO_BD9571MWV=m

CONFIG_GPIO_MAX77620=y

CONFIG_GPIO_SL28CPLD=m

CONFIG_GPIO_SYSCON=y

CONFIG_POWER_RESET_MSM=y

CONFIG_POWER_RESET_QCOM_PON=m

CONFIG_POWER_RESET_XGENE=y
@@ -637,6 +643,7 @@ CONFIG_BATTERY_MAX17042=m 
CONFIG_CHARGER_MT6360=m

CONFIG_CHARGER_BQ25890=m

CONFIG_CHARGER_BQ25980=m

CONFIG_CHARGER_RK817=m

CONFIG_SENSORS_ARM_SCMI=y

CONFIG_SENSORS_ARM_SCPI=y

CONFIG_SENSORS_GPIO_FAN=m
@@ -750,6 +757,7 @@ CONFIG_REGULATOR_VCTRL=m 
CONFIG_RC_CORE=m

CONFIG_RC_DECODERS=y

CONFIG_RC_DEVICES=y

CONFIG_IR_GPIO_CIR=m

CONFIG_IR_MESON=m

CONFIG_IR_SUNXI=m

CONFIG_MEDIA_SUPPORT=m
@@ -804,6 +812,7 @@ CONFIG_DRM_EXYNOS_DSI=y 
CONFIG_DRM_EXYNOS_HDMI=y

CONFIG_DRM_EXYNOS_MIC=y

CONFIG_DRM_ROCKCHIP=m

CONFIG_ROCKCHIP_VOP2=y

CONFIG_ROCKCHIP_ANALOGIX_DP=y

CONFIG_ROCKCHIP_CDN_DP=y

CONFIG_ROCKCHIP_DW_HDMI=y
@@ -937,6 +946,7 @@ CONFIG_SND_SOC_GTM601=m 
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m

CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m

CONFIG_SND_SOC_PCM3168A_I2C=m

CONFIG_SND_SOC_RK817=m

CONFIG_SND_SOC_RT5640=m

CONFIG_SND_SOC_J721E_EVM=m

CONFIG_SND_SOC_RT5659=m
@@ -1415,7 +1425,9 @@ CONFIG_PHY_ROCKCHIP_EMMC=y 
CONFIG_PHY_ROCKCHIP_INNO_HDMI=m

CONFIG_PHY_ROCKCHIP_INNO_USB2=y

CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m

CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m

CONFIG_PHY_ROCKCHIP_PCIE=m

CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y

CONFIG_PHY_ROCKCHIP_TYPEC=y

CONFIG_PHY_SAMSUNG_UFS=y

CONFIG_PHY_UNIPHIER_USB2=y
@@ -1445,6 +1457,7 @@ CONFIG_NVMEM_MTK_EFUSE=y 
CONFIG_NVMEM_QCOM_QFPROM=y

CONFIG_NVMEM_RMEM=m

CONFIG_NVMEM_ROCKCHIP_EFUSE=y

CONFIG_NVMEM_ROCKCHIP_OTP=y

CONFIG_NVMEM_SNVS_LPGPR=y

CONFIG_NVMEM_SPMI_SDAM=m

CONFIG_NVMEM_SUNXI_SID=y