Skip to content

Commit da6212d

Browse files
committed
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: Arnd Bergmann <arnd@arndb.de>
2 parents 8d6b492 + 5eaeb85 commit da6212d

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ CONFIG_PCI_LAYERSCAPE=y
232232
CONFIG_PCI_HISI=y
233233
CONFIG_PCIE_QCOM=y
234234
CONFIG_PCIE_ARMADA_8K=y
235+
CONFIG_PCIE_ROCKCHIP_DW_HOST=y
235236
CONFIG_PCIE_KIRIN=y
236237
CONFIG_PCIE_HISI_STB=y
237238
CONFIG_PCIE_TEGRA194_HOST=m
@@ -300,6 +301,7 @@ CONFIG_ATA=y
300301
CONFIG_SATA_AHCI=y
301302
CONFIG_SATA_AHCI_PLATFORM=y
302303
CONFIG_AHCI_BRCM=m
304+
CONFIG_AHCI_DWC=m
303305
CONFIG_AHCI_CEVA=y
304306
CONFIG_AHCI_MVEBU=y
305307
CONFIG_AHCI_XGENE=y
@@ -438,6 +440,7 @@ CONFIG_INPUT_PM8XXX_VIBRATOR=m
438440
CONFIG_INPUT_TPS65219_PWRBUTTON=m
439441
CONFIG_INPUT_PWM_BEEPER=m
440442
CONFIG_INPUT_PWM_VIBRA=m
443+
CONFIG_INPUT_RK805_PWRKEY=m
441444
CONFIG_INPUT_HISI_POWERKEY=y
442445
# CONFIG_SERIO_SERPORT is not set
443446
CONFIG_SERIO_AMBAKMI=y
@@ -539,6 +542,7 @@ CONFIG_SPI_OMAP24XX=m
539542
CONFIG_SPI_ORION=y
540543
CONFIG_SPI_PL022=y
541544
CONFIG_SPI_ROCKCHIP=y
545+
CONFIG_SPI_ROCKCHIP_SFC=m
542546
CONFIG_SPI_RPCIF=m
543547
CONFIG_SPI_RSPI=m
544548
CONFIG_SPI_RZV2M_CSI=m
@@ -554,6 +558,7 @@ CONFIG_SPI_SPIDEV=m
554558
CONFIG_SPMI=y
555559
CONFIG_SPMI_MTK_PMIF=m
556560
CONFIG_PINCTRL_MAX77620=y
561+
CONFIG_PINCTRL_RK805=m
557562
CONFIG_PINCTRL_SINGLE=y
558563
CONFIG_PINCTRL_OWL=y
559564
CONFIG_PINCTRL_S700=y
@@ -625,6 +630,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
625630
CONFIG_GPIO_BD9571MWV=m
626631
CONFIG_GPIO_MAX77620=y
627632
CONFIG_GPIO_SL28CPLD=m
633+
CONFIG_GPIO_SYSCON=y
628634
CONFIG_POWER_RESET_MSM=y
629635
CONFIG_POWER_RESET_QCOM_PON=m
630636
CONFIG_POWER_RESET_XGENE=y
@@ -637,6 +643,7 @@ CONFIG_BATTERY_MAX17042=m
637643
CONFIG_CHARGER_MT6360=m
638644
CONFIG_CHARGER_BQ25890=m
639645
CONFIG_CHARGER_BQ25980=m
646+
CONFIG_CHARGER_RK817=m
640647
CONFIG_SENSORS_ARM_SCMI=y
641648
CONFIG_SENSORS_ARM_SCPI=y
642649
CONFIG_SENSORS_GPIO_FAN=m
@@ -750,6 +757,7 @@ CONFIG_REGULATOR_VCTRL=m
750757
CONFIG_RC_CORE=m
751758
CONFIG_RC_DECODERS=y
752759
CONFIG_RC_DEVICES=y
760+
CONFIG_IR_GPIO_CIR=m
753761
CONFIG_IR_MESON=m
754762
CONFIG_IR_SUNXI=m
755763
CONFIG_MEDIA_SUPPORT=m
@@ -804,6 +812,7 @@ CONFIG_DRM_EXYNOS_DSI=y
804812
CONFIG_DRM_EXYNOS_HDMI=y
805813
CONFIG_DRM_EXYNOS_MIC=y
806814
CONFIG_DRM_ROCKCHIP=m
815+
CONFIG_ROCKCHIP_VOP2=y
807816
CONFIG_ROCKCHIP_ANALOGIX_DP=y
808817
CONFIG_ROCKCHIP_CDN_DP=y
809818
CONFIG_ROCKCHIP_DW_HDMI=y
@@ -937,6 +946,7 @@ CONFIG_SND_SOC_GTM601=m
937946
CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
938947
CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
939948
CONFIG_SND_SOC_PCM3168A_I2C=m
949+
CONFIG_SND_SOC_RK817=m
940950
CONFIG_SND_SOC_RT5640=m
941951
CONFIG_SND_SOC_J721E_EVM=m
942952
CONFIG_SND_SOC_RT5659=m
@@ -1415,7 +1425,9 @@ CONFIG_PHY_ROCKCHIP_EMMC=y
14151425
CONFIG_PHY_ROCKCHIP_INNO_HDMI=m
14161426
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
14171427
CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m
1428+
CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m
14181429
CONFIG_PHY_ROCKCHIP_PCIE=m
1430+
CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y
14191431
CONFIG_PHY_ROCKCHIP_TYPEC=y
14201432
CONFIG_PHY_SAMSUNG_UFS=y
14211433
CONFIG_PHY_UNIPHIER_USB2=y
@@ -1445,6 +1457,7 @@ CONFIG_NVMEM_MTK_EFUSE=y
14451457
CONFIG_NVMEM_QCOM_QFPROM=y
14461458
CONFIG_NVMEM_RMEM=m
14471459
CONFIG_NVMEM_ROCKCHIP_EFUSE=y
1460+
CONFIG_NVMEM_ROCKCHIP_OTP=y
14481461
CONFIG_NVMEM_SNVS_LPGPR=y
14491462
CONFIG_NVMEM_SPMI_SDAM=m
14501463
CONFIG_NVMEM_SUNXI_SID=y

0 commit comments

Comments
 (0)