From 13e001f5c258373c1d7ecd6bfd6e2c5aa4f9dc7d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 8 Oct 2021 19:54:29 +0000 Subject: [PATCH] kernel: config for nanopi r2s some drivers does nozt work as module so they are now compiled into main kernel Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.aarch64-ipfire | 41 +++++++++++----------- config/rootfiles/common/aarch64/linux | 28 +++++++-------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index ca1894a37c..5acb8cb871 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.67-ipfire Kernel Configuration +# Linux/arm64 5.10.70-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y @@ -3513,7 +3513,7 @@ CONFIG_I2C_NOMADIK=y CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PXA=m # CONFIG_I2C_PXA_SLAVE is not set -CONFIG_I2C_RK3X=m +CONFIG_I2C_RK3X=y CONFIG_I2C_SIMTEC=m CONFIG_I2C_VERSATILE=m # CONFIG_I2C_THUNDERX is not set @@ -3597,7 +3597,7 @@ CONFIG_PINCTRL_ROCKCHIP=y CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_SX150X is not set CONFIG_PINCTRL_STMFX=m -CONFIG_PINCTRL_RK805=m +CONFIG_PINCTRL_RK805=y # CONFIG_PINCTRL_OCELOT is not set CONFIG_PINCTRL_BCM2835=y # CONFIG_PINCTRL_AS370 is not set @@ -4018,7 +4018,7 @@ CONFIG_IMX_THERMAL=m CONFIG_IMX8MM_THERMAL=m # CONFIG_QORIQ_THERMAL is not set CONFIG_SUN8I_THERMAL=y -CONFIG_ROCKCHIP_THERMAL=m +CONFIG_ROCKCHIP_THERMAL=y CONFIG_ARMADA_THERMAL=m CONFIG_AMLOGIC_THERMAL=y @@ -4162,7 +4162,7 @@ CONFIG_MFD_RETU=m # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_RT5033 is not set # CONFIG_MFD_RC5T583 is not set -CONFIG_MFD_RK808=m +CONFIG_MFD_RK808=y # CONFIG_MFD_RN5T618 is not set # CONFIG_MFD_SEC_CORE is not set # CONFIG_MFD_SI476X_CORE is not set @@ -4258,9 +4258,9 @@ CONFIG_REGULATOR_PFUZE100=y # CONFIG_REGULATOR_PV88060 is not set # CONFIG_REGULATOR_PV88080 is not set # CONFIG_REGULATOR_PV88090 is not set -# CONFIG_REGULATOR_PWM is not set +CONFIG_REGULATOR_PWM=y # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -CONFIG_REGULATOR_RK808=m +CONFIG_REGULATOR_RK808=y # CONFIG_REGULATOR_RT4801 is not set # CONFIG_REGULATOR_RTMV20 is not set # CONFIG_REGULATOR_SLG51000 is not set @@ -6226,19 +6226,19 @@ CONFIG_MMC_MESON_GX=y # CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_CB710 is not set # CONFIG_MMC_VIA_SDMMC is not set -CONFIG_MMC_DW=m -CONFIG_MMC_DW_PLTFM=m +CONFIG_MMC_DW=y +CONFIG_MMC_DW_PLTFM=y # CONFIG_MMC_DW_BLUEFIELD is not set CONFIG_MMC_DW_EXYNOS=m # CONFIG_MMC_DW_HI3798CV200 is not set CONFIG_MMC_DW_K3=m # CONFIG_MMC_DW_PCI is not set -CONFIG_MMC_DW_ROCKCHIP=m +CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m # CONFIG_MMC_USDHI6ROL0 is not set -# CONFIG_MMC_REALTEK_PCI is not set -# CONFIG_MMC_REALTEK_USB is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_SUNXI=y CONFIG_MMC_CQHCI=m # CONFIG_MMC_HSQ is not set @@ -6363,7 +6363,7 @@ CONFIG_RTC_DRV_DS1374=m CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_HYM8563=m CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RK808=m +CONFIG_RTC_DRV_RK808=y CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m @@ -6597,7 +6597,7 @@ CONFIG_CLK_VEXPRESS_OSC=y # end of Clock driver for ARM Reference designs # CONFIG_COMMON_CLK_MAX9485 is not set -CONFIG_COMMON_CLK_RK808=m +CONFIG_COMMON_CLK_RK808=y # CONFIG_COMMON_CLK_SCMI is not set # CONFIG_COMMON_CLK_SI5341 is not set CONFIG_COMMON_CLK_SI5351=m @@ -6819,8 +6819,9 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y # # CONFIG_ARM_IMX_BUS_DEVFREQ is not set # CONFIG_ARM_IMX8M_DDRC_DEVFREQ is not set -# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set -# CONFIG_PM_DEVFREQ_EVENT is not set +CONFIG_ARM_RK3399_DMC_DEVFREQ=y +CONFIG_PM_DEVFREQ_EVENT=y +CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y CONFIG_EXTCON=y # @@ -6849,7 +6850,7 @@ CONFIG_PWM_BCM2835=y # CONFIG_PWM_IMX_TPM is not set # CONFIG_PWM_MESON is not set # CONFIG_PWM_PCA9685 is not set -CONFIG_PWM_ROCKCHIP=m +CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_SUN4I=m CONFIG_PWM_TWL=m CONFIG_PWM_TWL_LED=m @@ -6930,11 +6931,11 @@ CONFIG_PHY_ROCKCHIP_DP=m CONFIG_PHY_ROCKCHIP_DPHY_RX0=m CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_HDMI=m -CONFIG_PHY_ROCKCHIP_INNO_USB2=m +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m -CONFIG_PHY_ROCKCHIP_PCIE=m +CONFIG_PHY_ROCKCHIP_PCIE=y CONFIG_PHY_ROCKCHIP_TYPEC=m -CONFIG_PHY_ROCKCHIP_USB=m +CONFIG_PHY_ROCKCHIP_USB=y # CONFIG_PHY_SAMSUNG_USB2 is not set # CONFIG_PHY_TUSB1210 is not set # end of PHY Subsystem diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 77dfecaa68..252bfbe966 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -6532,6 +6532,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/arm/pmu/acpi.h #lib/modules/KVER-ipfire/build/include/config/arm/psci #lib/modules/KVER-ipfire/build/include/config/arm/psci/fw.h +#lib/modules/KVER-ipfire/build/include/config/arm/rk3399 +#lib/modules/KVER-ipfire/build/include/config/arm/rk3399/dmc +#lib/modules/KVER-ipfire/build/include/config/arm/rk3399/dmc/devfreq.h #lib/modules/KVER-ipfire/build/include/config/arm/scmi #lib/modules/KVER-ipfire/build/include/config/arm/scmi/power #lib/modules/KVER-ipfire/build/include/config/arm/scmi/power/domain.h @@ -7495,6 +7498,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/dev #lib/modules/KVER-ipfire/build/include/config/dev/coredump.h #lib/modules/KVER-ipfire/build/include/config/devfreq +#lib/modules/KVER-ipfire/build/include/config/devfreq/event +#lib/modules/KVER-ipfire/build/include/config/devfreq/event/rockchip +#lib/modules/KVER-ipfire/build/include/config/devfreq/event/rockchip/dfi.h #lib/modules/KVER-ipfire/build/include/config/devfreq/gov #lib/modules/KVER-ipfire/build/include/config/devfreq/gov/simple #lib/modules/KVER-ipfire/build/include/config/devfreq/gov/simple/ondemand.h @@ -9402,6 +9408,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/mmc/dw/rockchip.h #lib/modules/KVER-ipfire/build/include/config/mmc/meson #lib/modules/KVER-ipfire/build/include/config/mmc/meson/gx.h +#lib/modules/KVER-ipfire/build/include/config/mmc/realtek +#lib/modules/KVER-ipfire/build/include/config/mmc/realtek/pci.h +#lib/modules/KVER-ipfire/build/include/config/mmc/realtek/usb.h #lib/modules/KVER-ipfire/build/include/config/mmc/sdhci #lib/modules/KVER-ipfire/build/include/config/mmc/sdhci.h #lib/modules/KVER-ipfire/build/include/config/mmc/sdhci/io @@ -10412,7 +10421,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/pm #lib/modules/KVER-ipfire/build/include/config/pm.h #lib/modules/KVER-ipfire/build/include/config/pm/clk.h +#lib/modules/KVER-ipfire/build/include/config/pm/devfreq #lib/modules/KVER-ipfire/build/include/config/pm/devfreq.h +#lib/modules/KVER-ipfire/build/include/config/pm/devfreq/event.h #lib/modules/KVER-ipfire/build/include/config/pm/generic #lib/modules/KVER-ipfire/build/include/config/pm/generic/domains #lib/modules/KVER-ipfire/build/include/config/pm/generic/domains.h @@ -10618,6 +10629,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/regulator/gpio.h #lib/modules/KVER-ipfire/build/include/config/regulator/lp8755.h #lib/modules/KVER-ipfire/build/include/config/regulator/pfuze100.h +#lib/modules/KVER-ipfire/build/include/config/regulator/pwm.h #lib/modules/KVER-ipfire/build/include/config/regulator/rk808.h #lib/modules/KVER-ipfire/build/include/config/regulator/twl4030.h #lib/modules/KVER-ipfire/build/include/config/regulator/vexpress.h @@ -19823,7 +19835,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/char/tpm/tpm_vtpm_proxy.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/char/virtio_console.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/clk -#lib/modules/KVER-ipfire/kernel/drivers/clk/clk-rk808.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si5351.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si570.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-twl6040.ko.xz @@ -20057,7 +20068,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-parport.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-pca-platform.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-pxa.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-rk3x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-robotfuzz-osif.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-simtec.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-tiny-usb.ko.xz @@ -20739,7 +20749,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/mfd/lm3533-ctrlbank.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/mt6360-core.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/retu-mfd.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/mfd/rk808.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/sm501.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/stmfx.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/viperboard.ko.xz @@ -20769,9 +20778,8 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/cqhci.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc-exynos.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc-k3.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc-pltfm.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc-rockchip.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/rtsx_pci_sdmmc.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/rtsx_usb_sdmmc.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/sdhci-of-arasan.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/sdhci-pxav3.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/ushc.ko.xz @@ -21453,10 +21461,7 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-emmc.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-inno-hdmi.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-inno-usb2.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-pcie.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-typec.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-usb.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pinctrl #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/freescale #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/freescale/pinctrl-imx.ko.xz @@ -21465,7 +21470,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/freescale/pinctrl-imx8mp.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/freescale/pinctrl-imx8mq.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/pinctrl-axp209.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/pinctrl/pinctrl-rk805.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/pinctrl-stmfx.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/power #lib/modules/KVER-ipfire/kernel/drivers/power/reset @@ -21482,13 +21486,11 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/ptp/ptp_clockmatrix.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/ptp/ptp_idt82p33.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pwm -#lib/modules/KVER-ipfire/kernel/drivers/pwm/pwm-rockchip.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pwm/pwm-sun4i.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pwm/pwm-twl-led.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pwm/pwm-twl.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/regulator #lib/modules/KVER-ipfire/kernel/drivers/regulator/axp20x-regulator.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/regulator/rk808-regulator.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/reset #lib/modules/KVER-ipfire/kernel/drivers/reset/reset-scmi.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc @@ -21523,7 +21525,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-pcf8583.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-pl030.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-pl031.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rk808.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rp5c01.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rs5c372.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rv3029c2.ko.xz @@ -21575,7 +21576,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/thermal/armada_thermal.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/thermal/imx8mm_thermal.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/thermal/imx_thermal.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/thermal/rockchip_thermal.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty #lib/modules/KVER-ipfire/kernel/drivers/tty/n_gsm.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/n_hdlc.ko.xz -- 2.39.5