From 04f7c38b2e3a4f332d5b5802ac36ba984bcd2086 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Fri, 16 Jun 2023 17:52:12 +0200 Subject: [PATCH] linux-postmarketos-rockchip: enable configs for Quartz64 A/B models (MR 4178) These configs were taken from https://wiki.pine64.org/wiki/Quartz64_Development#Linux_Kernel_Config_Options These configs are also needed for the GPU hardware acceleration. CONFIG_ARM_SCMI_PROTOCOL=m CONFIG_COMMON_CLK_SCMI=m --- .../linux-postmarketos-rockchip/APKBUILD | 4 +- .../config-postmarketos-rockchip.aarch64 | 42 ++++++++++++------- 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/device/community/linux-postmarketos-rockchip/APKBUILD b/device/community/linux-postmarketos-rockchip/APKBUILD index 8bd2df1bc..2005b7c95 100644 --- a/device/community/linux-postmarketos-rockchip/APKBUILD +++ b/device/community/linux-postmarketos-rockchip/APKBUILD @@ -11,7 +11,7 @@ pkgname=linux-postmarketos-rockchip pkgver=6.2 -pkgrel=9 +pkgrel=10 pkgdesc="Mainline kernel for rockchip devices" arch="aarch64" _carch="arm64" @@ -82,5 +82,5 @@ package() { sha512sums=" a01bee0b968b95183934fe3504516be7ef5811944a061f5aed05ecebaa27b5eb64e33232fd0a8dd622b3c8743bfe462ef7e464d381734d111a0ad6a6d9f66ddd linux-6.2.tar.xz -2d3ab1b09d34473cdf8a09c3490d0bfe252cad2fc5d94f03acca344b0ca95de6a8ca1e693a7c1f2a5f3e5d082ca2bef5c621aa1e8303934c1df62f0d6dfd44c2 config-postmarketos-rockchip.aarch64 +5d8791a867b6bbe5884e70e985e6550df163b013553f428b9808785603172e052c37f883265a839d569986d60df70f3117d6a156eb98042c06acdf5efa512534 config-postmarketos-rockchip.aarch64 " diff --git a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 index 07e5f6c14..59b4edec9 100644 --- a/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 +++ b/device/community/linux-postmarketos-rockchip/config-postmarketos-rockchip.aarch64 @@ -2,14 +2,14 @@ # Automatically generated file; DO NOT EDIT. # Linux/arm64 6.2.0 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.2.1_git20231014) 13.2.1 20231014" +CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 13.1.1_git20230722) 13.1.1 20230722" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130201 +CONFIG_GCC_VERSION=130101 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=24100 +CONFIG_AS_VERSION=24000 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=24100 +CONFIG_LD_VERSION=24000 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y @@ -565,6 +565,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPUFREQ_DT=m CONFIG_CPUFREQ_DT_PLATDEV=y CONFIG_ARM_SCPI_CPUFREQ=m +# CONFIG_ARM_SCMI_CPUFREQ is not set # end of CPU Frequency scaling # end of CPU Power Management @@ -1794,7 +1795,7 @@ CONFIG_PCIE_DW_HOST=y CONFIG_PCIE_DW_PLAT=y CONFIG_PCIE_DW_PLAT_HOST=y CONFIG_PCI_HISI=y -# CONFIG_PCIE_ROCKCHIP_DW_HOST is not set +CONFIG_PCIE_ROCKCHIP_DW_HOST=y # CONFIG_PCIE_KIRIN is not set # CONFIG_PCI_MESON is not set # CONFIG_PCIE_AL is not set @@ -1892,7 +1893,15 @@ CONFIG_CONNECTOR=m # # ARM System Control and Management Interface Protocol # -# CONFIG_ARM_SCMI_PROTOCOL is not set +CONFIG_ARM_SCMI_PROTOCOL=m +CONFIG_ARM_SCMI_HAVE_TRANSPORT=y +CONFIG_ARM_SCMI_HAVE_SHMEM=y +CONFIG_ARM_SCMI_TRANSPORT_MAILBOX=y +CONFIG_ARM_SCMI_TRANSPORT_SMC=y +# CONFIG_ARM_SCMI_TRANSPORT_SMC_ATOMIC_ENABLE is not set +# CONFIG_ARM_SCMI_TRANSPORT_VIRTIO is not set +CONFIG_ARM_SCMI_POWER_DOMAIN=m +# CONFIG_ARM_SCMI_POWER_CONTROL is not set # end of ARM System Control and Management Interface Protocol CONFIG_ARM_SCPI_PROTOCOL=m @@ -2673,7 +2682,7 @@ CONFIG_AX88796B_PHY=m CONFIG_MICROCHIP_PHY=m # CONFIG_MICROCHIP_T1_PHY is not set # CONFIG_MICROSEMI_PHY is not set -# CONFIG_MOTORCOMM_PHY is not set +CONFIG_MOTORCOMM_PHY=m # CONFIG_NATIONAL_PHY is not set # CONFIG_NXP_C45_TJA11XX_PHY is not set # CONFIG_NXP_TJA11XX_PHY is not set @@ -3671,7 +3680,7 @@ CONFIG_CHARGER_GPIO=y # CONFIG_CHARGER_BQ25890 is not set # CONFIG_CHARGER_BQ25980 is not set # CONFIG_CHARGER_BQ256XX is not set -# CONFIG_CHARGER_RK817 is not set +CONFIG_CHARGER_RK817=m # CONFIG_CHARGER_SMB347 is not set # CONFIG_CHARGER_TPS65090 is not set # CONFIG_BATTERY_GAUGE_LTC2941 is not set @@ -3711,6 +3720,7 @@ CONFIG_SENSORS_ADT7475=m # CONFIG_SENSORS_AS370 is not set CONFIG_SENSORS_ASC7621=m # CONFIG_SENSORS_AXI_FAN_CONTROL is not set +# CONFIG_SENSORS_ARM_SCMI is not set CONFIG_SENSORS_ARM_SCPI=m CONFIG_SENSORS_ATXP1=m # CONFIG_SENSORS_CORSAIR_CPRO is not set @@ -4107,6 +4117,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_REGULATOR_88PG86X is not set # CONFIG_REGULATOR_ACT8865 is not set # CONFIG_REGULATOR_AD5398 is not set +# CONFIG_REGULATOR_ARM_SCMI is not set # CONFIG_REGULATOR_AS3711 is not set # CONFIG_REGULATOR_AS3722 is not set CONFIG_REGULATOR_AXP20X=y @@ -4589,7 +4600,7 @@ CONFIG_DRM_VGEM=m # CONFIG_DRM_VKMS is not set CONFIG_DRM_ROCKCHIP=y CONFIG_ROCKCHIP_VOP=y -# CONFIG_ROCKCHIP_VOP2 is not set +CONFIG_ROCKCHIP_VOP2=y CONFIG_ROCKCHIP_ANALOGIX_DP=y CONFIG_ROCKCHIP_CDN_DP=y CONFIG_ROCKCHIP_DW_HDMI=y @@ -5148,7 +5159,7 @@ CONFIG_SND_SOC_MAX98357A=m # CONFIG_SND_SOC_PCM512x_I2C is not set # CONFIG_SND_SOC_PCM512x_SPI is not set CONFIG_SND_SOC_RK3328=m -# CONFIG_SND_SOC_RK817 is not set +CONFIG_SND_SOC_RK817=m CONFIG_SND_SOC_RL6231=m CONFIG_SND_SOC_RT5514=m CONFIG_SND_SOC_RT5514_SPI=m @@ -6235,6 +6246,7 @@ CONFIG_COMMON_CLK=y # CONFIG_COMMON_CLK_MAX77686 is not set # CONFIG_COMMON_CLK_MAX9485 is not set CONFIG_COMMON_CLK_RK808=y +CONFIG_COMMON_CLK_SCMI=m CONFIG_COMMON_CLK_SCPI=m # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -6258,7 +6270,7 @@ CONFIG_CLK_RK3308=y CONFIG_CLK_RK3328=y CONFIG_CLK_RK3368=y CONFIG_CLK_RK3399=y -# CONFIG_CLK_RK3568 is not set +CONFIG_CLK_RK3568=y CONFIG_CLK_RK3588=y # CONFIG_XILINX_VCU is not set # CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set @@ -6619,6 +6631,7 @@ CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m # # IIO SCMI Sensors # +# CONFIG_IIO_SCMI is not set # end of IIO SCMI Sensors # @@ -6998,6 +7011,7 @@ CONFIG_PARTITION_PERCPU=y # CONFIG_IPACK_BUS is not set CONFIG_ARCH_HAS_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_SCMI=m # CONFIG_RESET_TI_SYSCON is not set # CONFIG_RESET_TI_TPS380X is not set @@ -7033,9 +7047,9 @@ CONFIG_PHY_ROCKCHIP_DPHY_RX0=y CONFIG_PHY_ROCKCHIP_EMMC=y CONFIG_PHY_ROCKCHIP_INNO_HDMI=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y -# CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY is not set -# CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY is not set -# CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY is not set +CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY=m +CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m CONFIG_PHY_ROCKCHIP_PCIE=y # CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set CONFIG_PHY_ROCKCHIP_TYPEC=y