diff options
author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/aux-files/linux-libre/5.11-arm64.conf | |
parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
download | guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar guix-patches-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
Diffstat (limited to 'gnu/packages/aux-files/linux-libre/5.11-arm64.conf')
-rw-r--r-- | gnu/packages/aux-files/linux-libre/5.11-arm64.conf | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/gnu/packages/aux-files/linux-libre/5.11-arm64.conf b/gnu/packages/aux-files/linux-libre/5.11-arm64.conf index 46acc0ea36..1d88003d99 100644 --- a/gnu/packages/aux-files/linux-libre/5.11-arm64.conf +++ b/gnu/packages/aux-files/linux-libre/5.11-arm64.conf @@ -542,12 +542,12 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_ATTR_SET=y CONFIG_CPU_FREQ_GOV_COMMON=y CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m @@ -4088,7 +4088,7 @@ CONFIG_SPI_MESON_SPIFC=m # CONFIG_SPI_ORION is not set # CONFIG_SPI_PL022 is not set # CONFIG_SPI_PXA2XX is not set -# CONFIG_SPI_ROCKCHIP is not set +CONFIG_SPI_ROCKCHIP=m # CONFIG_SPI_QCOM_QSPI is not set CONFIG_SPI_QUP=m # CONFIG_SPI_QCOM_GENI is not set @@ -4446,7 +4446,7 @@ CONFIG_AXP288_FUEL_GAUGE=m # CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set -# CONFIG_CHARGER_GPIO is not set +CONFIG_CHARGER_GPIO=m # CONFIG_CHARGER_MANAGER is not set # CONFIG_CHARGER_LT3651 is not set # CONFIG_CHARGER_DETECTOR_MAX14656 is not set @@ -4657,7 +4657,7 @@ CONFIG_IMX8MM_THERMAL=m # CONFIG_MAX77620_THERMAL is not set # CONFIG_QORIQ_THERMAL is not set CONFIG_SUN8I_THERMAL=m -# CONFIG_ROCKCHIP_THERMAL is not set +CONFIG_ROCKCHIP_THERMAL=m CONFIG_ARMADA_THERMAL=m CONFIG_AMLOGIC_THERMAL=y @@ -6072,6 +6072,12 @@ CONFIG_DRM_LEGACY=y CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y +CONFIG_DRM_ROCKCHIP=m +CONFIG_ROCKCHIP_CDN_DP=y +CONFIG_ROCKCHIP_DW_MIPI_DSI=y +CONFIG_ROCKCHIP_ANALOGIX_DP=y +CONFIG_ROCKCHIP_DW_HDMI=y + # # Frame buffer Devices @@ -6469,7 +6475,11 @@ CONFIG_SND_SOC_QDSP6_ASM_DAI=m CONFIG_SND_SOC_QDSP6=m CONFIG_SND_SOC_MSM8996=m CONFIG_SND_SOC_SC7180=m -# CONFIG_SND_SOC_ROCKCHIP is not set +CONFIG_SND_SOC_ROCKCHIP=m +CONFIG_SND_SOC_ROCKCHIP_I2S=m +CONFIG_SND_SOC_ROCKCHIP_SPDIF=m +CONFIG_SND_SOC_ROCKCHIP_RT5645=m + # CONFIG_SND_SOC_SOF_TOPLEVEL is not set # @@ -7209,7 +7219,9 @@ CONFIG_USB_G_SERIAL=m CONFIG_USB_RAW_GADGET=m # end of USB Gadget precomposed configurations -# CONFIG_TYPEC is not set +CONFIG_TYPEC=m +CONFIG_TYPEC_TCPM=m +CONFIG_TYPEC_FUSB302=m CONFIG_USB_ROLE_SWITCH=m CONFIG_MMC=y CONFIG_PWRSEQ_EMMC=y @@ -8063,7 +8075,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y CONFIG_OF_IOMMU=y CONFIG_IOMMU_DMA=y CONFIG_IOMMU_SVA_LIB=y -# CONFIG_ROCKCHIP_IOMMU is not set +CONFIG_ROCKCHIP_IOMMU=y CONFIG_SUN50I_IOMMU=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_ARM_SMMU=y @@ -8825,15 +8837,16 @@ CONFIG_PHY_QCOM_USB_HSIC=m CONFIG_PHY_QCOM_USB_HS_28NM=m CONFIG_PHY_QCOM_USB_SS=m # CONFIG_PHY_QCOM_IPQ806X_USB is not set -# CONFIG_PHY_ROCKCHIP_DP is not set +CONFIG_PHY_ROCKCHIP_DP=m CONFIG_PHY_ROCKCHIP_DPHY_RX0=m CONFIG_PHY_ROCKCHIP_EMMC=m -# CONFIG_PHY_ROCKCHIP_INNO_HDMI is not set +CONFIG_PHY_ROCKCHIP_INNO_HDMI=m CONFIG_PHY_ROCKCHIP_INNO_USB2=m # CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set CONFIG_PHY_ROCKCHIP_PCIE=m -# CONFIG_PHY_ROCKCHIP_TYPEC is not set -# CONFIG_PHY_ROCKCHIP_USB is not set +CONFIG_PHY_ROCKCHIP_TYPEC=m +CONFIG_PHY_ROCKCHIP_USB=m + # CONFIG_PHY_SAMSUNG_USB2 is not set CONFIG_PHY_TEGRA_XUSB=m CONFIG_PHY_TEGRA194_P2U=m @@ -8895,7 +8908,7 @@ CONFIG_NVMEM_IMX_OCOTP=m CONFIG_NVMEM_IMX_OCOTP_SCU=m CONFIG_QCOM_QFPROM=m CONFIG_NVMEM_SPMI_SDAM=m -# CONFIG_ROCKCHIP_EFUSE is not set +CONFIG_ROCKCHIP_EFUSE=m CONFIG_ROCKCHIP_OTP=m CONFIG_NVMEM_SUNXI_SID=m # CONFIG_MESON_EFUSE is not set |