From cf97e78acb7bb31b1ca5379685db8ea72d792a61 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 24 Oct 2022 10:36:43 -0500 Subject: linux-imx: Upgrade 5.15.32 -> 5.15.52 For i.MX 6 & 7, there is no change in imx-nxp-bsp/defconfig since there is no change in kernel source arch/arm/configs/imx_v7_defconfig. For i.MX 8, replace mx8-nxp-bsp/defconfig from kernel source arch/arm64/configs/imx_v8_defconfig: ``` 208fcb8de1ee LF-6247-4: arm64: configs: imx_v8_defconfig: build module for PCA995X cad25206bbdd MLK-25920-3 configs: imx_v8_defconfig: enable imx93 DDR PerfMon 50817f6ddb03 LF-6257-12: arm64: imx_v8_defconfig: build-in AP1302 driver as default 54cf49b98fde LF-6257-10: arm64: imx_v8_defconfig: build-in DWC MIPI CSI2 as default 025890534db2 MLK-25940-2 arm64: imx_v8_defconfig: build module for EXC3000 multi-touch 52575a93dfce arm64: defconfig: amphion: enable vpu driver 5975f5bb56a1 LF-6264-3 arm64: imx_v8_defconfig: Build in i.MX93 LDB drm encoder driver cf8907b022cb LF-6256 arm64: imx_v8_defconfig: Build in Synopsys DesignWare MIPI DSI bridge driver 97340f85a15f LF-6251-3 arm64: imx_v8_defconfig: Build in i.MX93 Synopsys DesignWare MIPI DSI driver 862305517982 LF-6250-3 arm64: imx_v8_defconfig: Build in i.MX93 Synopsys DesignWare MIPI DPHY driver a7e35e75e29c LF-6285-3 arm64: imx_v8_defconfig: build-in Ethos-U driver as default 5f745341a2a0 MLK-25922-2 arm64: imx_v8_defconfig: Build in adp5585 pwm driver f38c48568d78 MLK-25918-2 arm64: configs: imx_v8_defconfig: default build in imx93_adc driver 61069f94b76a MLK-25917-3 arm64: imx_v8_defconfig: Build in adp5585 mfd and gpio driver 0c6c9e418a7d MLK-25903-1 driver: soc: imx9: add i.MX93 SoC device register function 1b68506258fb MLK-25896-04 arm64: configs: Enable bbnsm rtc & pwrkey by default cb963f6113ed MLK-25892-10 arm64: configs: Enable imx93 clock & pinctrl by default ``` Signed-off-by: Tom Hochstein (cherry picked from commit aaa28ea91532bd242b88ff31fa083b889ccb33c8) --- recipes-kernel/linux/linux-imx.inc | 2 +- .../linux/linux-imx/mx8-nxp-bsp/defconfig | 21 +++++++++++++++++++++ recipes-kernel/linux/linux-imx_5.15.bb | 6 +++--- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/recipes-kernel/linux/linux-imx.inc b/recipes-kernel/linux/linux-imx.inc index ee438fed..b386e058 100644 --- a/recipes-kernel/linux/linux-imx.inc +++ b/recipes-kernel/linux/linux-imx.inc @@ -14,7 +14,7 @@ SRCBRANCH ?= "" # Set the PV to the correct kernel version to satisfy the kernel version sanity check PV = "${LINUX_VERSION}+git${SRCPV}" -SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx;protocol=https;branch=${SRCBRANCH} \ +SRC_URI = "git://github.com/nxp-imx/linux-imx;protocol=https;branch=${SRCBRANCH} \ file://defconfig \ " diff --git a/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig index 74dc82cb..1ef259ee 100644 --- a/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig +++ b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig @@ -356,6 +356,7 @@ CONFIG_KEYBOARD_ADC=m CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_RPMSG=y CONFIG_KEYBOARD_SNVS_PWRKEY=y +CONFIG_KEYBOARD_BBNSM_PWRKEY=y CONFIG_KEYBOARD_IMX_SC_PWRKEY=y CONFIG_KEYBOARD_CROS_EC=y CONFIG_INPUT_TOUCHSCREEN=y @@ -363,6 +364,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_EDT_FT5X06=m CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=m +CONFIG_TOUCHSCREEN_EXC3000=m CONFIG_INPUT_MISC=y CONFIG_INPUT_PWM_VIBRA=m # CONFIG_SERIO_SERPORT is not set @@ -431,6 +433,7 @@ CONFIG_PINCTRL_IMX8QM=y CONFIG_PINCTRL_IMX8QXP=y CONFIG_PINCTRL_IMX8DXL=y CONFIG_PINCTRL_IMX8ULP=y +CONFIG_PINCTRL_IMX93=y CONFIG_PINCTRL_S32V234=y CONFIG_GPIO_ALTERA=m CONFIG_GPIO_DWAPB=y @@ -443,6 +446,7 @@ CONFIG_GPIO_XGENE=y CONFIG_GPIO_MAX732X=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y +CONFIG_GPIO_ADP5585=y CONFIG_GPIO_BD9571MWV=m CONFIG_GPIO_MAX77620=y CONFIG_GPIO_SL28CPLD=m @@ -481,6 +485,7 @@ CONFIG_IMX_SC_WDT=y CONFIG_IMX7ULP_WDT=y CONFIG_ARM_SMC_WATCHDOG=y CONFIG_XEN_WDT=y +CONFIG_MFD_ADP5585=y CONFIG_MFD_BD9571MWV=y CONFIG_MFD_AXP20X_I2C=y CONFIG_MFD_IMX_MIX=y @@ -544,13 +549,16 @@ CONFIG_VIDEO_MXC_CAPTURE=y CONFIG_VIDEO_MX8_CAPTURE=y CONFIG_VIDEO_MXC_CSI_CAMERA=y CONFIG_MXC_MIPI_CSI=y +CONFIG_DWC_MIPI_CSI2_HOST=y CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_IMX8_JPEG=m +CONFIG_VIDEO_AMPHION_VPU=y CONFIG_SDR_PLATFORM_DRIVERS=y CONFIG_VIDEO_IMX219=m CONFIG_VIDEO_OV5640=y CONFIG_VIDEO_OV5645=m +CONFIG_VIDEO_AP1302=y CONFIG_IMX_DPU_CORE=y CONFIG_IMX_LCDIF_CORE=y CONFIG_IMX_LCDIFV3_CORE=y @@ -591,6 +599,7 @@ CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_I2S_AUDIO=m CONFIG_DRM_DW_HDMI_GP_AUDIO=y CONFIG_DRM_DW_HDMI_CEC=m +CONFIG_DRM_DW_MIPI_DSI=y CONFIG_DRM_ITE_IT6263=y CONFIG_DRM_ITE_IT6161=y CONFIG_DRM_IMX=y @@ -601,6 +610,8 @@ CONFIG_DRM_IMX_LDB=y CONFIG_DRM_IMX8QM_LDB=y CONFIG_DRM_IMX8QXP_LDB=y CONFIG_DRM_IMX8MP_LDB=y +CONFIG_DRM_IMX93_LDB=y +CONFIG_DRM_IMX_DW_MIPI_DSI=y CONFIG_DRM_IMX_HDMI=y CONFIG_DRM_IMX_SEC_DSIM=y CONFIG_DRM_IMX_DCNANO=y @@ -776,6 +787,7 @@ CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_LM3692X=m CONFIG_LEDS_PCA9532=m +CONFIG_LEDS_PCA995X=m CONFIG_LEDS_GPIO=y CONFIG_LEDS_PWM=y CONFIG_LEDS_SYSCON=y @@ -807,6 +819,7 @@ CONFIG_RTC_DRV_CROS_EC=y CONFIG_RTC_DRV_FSL_FTM_ALARM=m CONFIG_RTC_DRV_PL031=y CONFIG_RTC_DRV_SNVS=y +CONFIG_RTC_DRV_BBNSM=y CONFIG_RTC_DRV_IMX_SC=y CONFIG_RTC_DRV_IMX_RPMSG=y CONFIG_DMADEVICES=y @@ -869,6 +882,7 @@ CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y CONFIG_CLK_IMX8QXP=y CONFIG_CLK_IMX8ULP=y +CONFIG_CLK_IMX93=y CONFIG_HWSPINLOCK=y CONFIG_ARM_MHU=y CONFIG_IMX_MBOX=y @@ -897,6 +911,7 @@ CONFIG_EXTCON_USBC_CROS_EC=y CONFIG_IIO=y CONFIG_FXLS8962AF_I2C=m CONFIG_IMX8QXP_ADC=y +CONFIG_IMX93_ADC=y CONFIG_MAX9611=m CONFIG_QCOM_SPMI_VADC=m CONFIG_QCOM_SPMI_ADC5=m @@ -913,6 +928,7 @@ CONFIG_IIO_ST_MAGN_3AXIS=m CONFIG_IIO_CROS_EC_BARO=m CONFIG_MPL3115=y CONFIG_PWM=y +CONFIG_PWM_ADP5585=y CONFIG_PWM_CROS_EC=m CONFIG_PWM_FSL_FTM=m CONFIG_PWM_IMX27=y @@ -926,12 +942,14 @@ CONFIG_PHY_MIXEL_LVDS=y CONFIG_PHY_MIXEL_LVDS_COMBO=y CONFIG_PHY_CADENCE_SALVO=y CONFIG_PHY_FSL_IMX8MP_LVDS=y +CONFIG_PHY_FSL_IMX93_MIPI_DPHY=y CONFIG_PHY_MIXEL_MIPI_DPHY=y CONFIG_PHY_SAMSUNG_HDMI_PHY=y CONFIG_PHY_QCOM_USB_HS=y CONFIG_PHY_SAMSUNG_USB2=y CONFIG_ARM_SMMU_V3_PMU=m CONFIG_FSL_IMX8_DDR_PMU=y +CONFIG_FSL_IMX9_DDR_PMU=y CONFIG_HISI_PMU=y CONFIG_NVMEM_IMX_OCOTP=y CONFIG_NVMEM_IMX_OCOTP_SCU=y @@ -1048,3 +1066,6 @@ CONFIG_TRUSTED_KEYS=m CONFIG_TRUSTED_KEYS_TPM=n CONFIG_TRUSTED_KEYS_TEE=n CONFIG_TRUSTED_KEYS_CAAM=y + +CONFIG_SOC_IMX9=y +CONFIG_ETHOSU=y diff --git a/recipes-kernel/linux/linux-imx_5.15.bb b/recipes-kernel/linux/linux-imx_5.15.bb index 67f644b6..17c83032 100644 --- a/recipes-kernel/linux/linux-imx_5.15.bb +++ b/recipes-kernel/linux/linux-imx_5.15.bb @@ -24,15 +24,15 @@ DEPENDS += "lzop-native bc-native" # | arch/arm/configs/imx_v7_defconfig | linux-imx/imx-nxp-bsp/defconfig | # | arch/arm64/configs/imx_v8_defconfig | linux-imx/mx8-nxp-bsp/defconfig | SRCBRANCH = "lf-5.15.y" -LOCALVERSION = "-5.15.32-2.0.0" -SRCREV = "fa6c3168595c02bd9d5366fcc28c9e7304947a3d" +LOCALVERSION = "-5.15.52-2.1.0" +SRCREV = "36363d8623ba60858e2632b7d2b70dae932c9a8b" # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition # required by kernel-yocto.bbclass. # # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and # should be updated once patchlevel is merged. -LINUX_VERSION = "5.15.32" +LINUX_VERSION = "5.15.52" DEFAULT_PREFERENCE = "1" -- cgit v1.2.3-54-g00ecf