summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2022-10-24 10:36:43 -0500
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-10-24 17:32:44 +0000
commitcf97e78acb7bb31b1ca5379685db8ea72d792a61 (patch)
treef94d39047805ba68718c69e5472f25b16fb4c77d
parent32bca481b996db405e38d8f2239e3d3bd3bea8ea (diff)
downloadmeta-freescale-cf97e78acb7bb31b1ca5379685db8ea72d792a61.tar.gz
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 <tom.hochstein@nxp.com> (cherry picked from commit aaa28ea91532bd242b88ff31fa083b889ccb33c8)
-rw-r--r--recipes-kernel/linux/linux-imx.inc2
-rw-r--r--recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig21
-rw-r--r--recipes-kernel/linux/linux-imx_5.15.bb6
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 ?= ""
14# Set the PV to the correct kernel version to satisfy the kernel version sanity check 14# Set the PV to the correct kernel version to satisfy the kernel version sanity check
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
17SRC_URI = "git://source.codeaurora.org/external/imx/linux-imx;protocol=https;branch=${SRCBRANCH} \ 17SRC_URI = "git://github.com/nxp-imx/linux-imx;protocol=https;branch=${SRCBRANCH} \
18 file://defconfig \ 18 file://defconfig \
19" 19"
20 20
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
356CONFIG_KEYBOARD_GPIO=y 356CONFIG_KEYBOARD_GPIO=y
357CONFIG_KEYBOARD_RPMSG=y 357CONFIG_KEYBOARD_RPMSG=y
358CONFIG_KEYBOARD_SNVS_PWRKEY=y 358CONFIG_KEYBOARD_SNVS_PWRKEY=y
359CONFIG_KEYBOARD_BBNSM_PWRKEY=y
359CONFIG_KEYBOARD_IMX_SC_PWRKEY=y 360CONFIG_KEYBOARD_IMX_SC_PWRKEY=y
360CONFIG_KEYBOARD_CROS_EC=y 361CONFIG_KEYBOARD_CROS_EC=y
361CONFIG_INPUT_TOUCHSCREEN=y 362CONFIG_INPUT_TOUCHSCREEN=y
@@ -363,6 +364,7 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
363CONFIG_TOUCHSCREEN_GOODIX=m 364CONFIG_TOUCHSCREEN_GOODIX=m
364CONFIG_TOUCHSCREEN_EDT_FT5X06=m 365CONFIG_TOUCHSCREEN_EDT_FT5X06=m
365CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=m 366CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=m
367CONFIG_TOUCHSCREEN_EXC3000=m
366CONFIG_INPUT_MISC=y 368CONFIG_INPUT_MISC=y
367CONFIG_INPUT_PWM_VIBRA=m 369CONFIG_INPUT_PWM_VIBRA=m
368# CONFIG_SERIO_SERPORT is not set 370# CONFIG_SERIO_SERPORT is not set
@@ -431,6 +433,7 @@ CONFIG_PINCTRL_IMX8QM=y
431CONFIG_PINCTRL_IMX8QXP=y 433CONFIG_PINCTRL_IMX8QXP=y
432CONFIG_PINCTRL_IMX8DXL=y 434CONFIG_PINCTRL_IMX8DXL=y
433CONFIG_PINCTRL_IMX8ULP=y 435CONFIG_PINCTRL_IMX8ULP=y
436CONFIG_PINCTRL_IMX93=y
434CONFIG_PINCTRL_S32V234=y 437CONFIG_PINCTRL_S32V234=y
435CONFIG_GPIO_ALTERA=m 438CONFIG_GPIO_ALTERA=m
436CONFIG_GPIO_DWAPB=y 439CONFIG_GPIO_DWAPB=y
@@ -443,6 +446,7 @@ CONFIG_GPIO_XGENE=y
443CONFIG_GPIO_MAX732X=y 446CONFIG_GPIO_MAX732X=y
444CONFIG_GPIO_PCA953X=y 447CONFIG_GPIO_PCA953X=y
445CONFIG_GPIO_PCA953X_IRQ=y 448CONFIG_GPIO_PCA953X_IRQ=y
449CONFIG_GPIO_ADP5585=y
446CONFIG_GPIO_BD9571MWV=m 450CONFIG_GPIO_BD9571MWV=m
447CONFIG_GPIO_MAX77620=y 451CONFIG_GPIO_MAX77620=y
448CONFIG_GPIO_SL28CPLD=m 452CONFIG_GPIO_SL28CPLD=m
@@ -481,6 +485,7 @@ CONFIG_IMX_SC_WDT=y
481CONFIG_IMX7ULP_WDT=y 485CONFIG_IMX7ULP_WDT=y
482CONFIG_ARM_SMC_WATCHDOG=y 486CONFIG_ARM_SMC_WATCHDOG=y
483CONFIG_XEN_WDT=y 487CONFIG_XEN_WDT=y
488CONFIG_MFD_ADP5585=y
484CONFIG_MFD_BD9571MWV=y 489CONFIG_MFD_BD9571MWV=y
485CONFIG_MFD_AXP20X_I2C=y 490CONFIG_MFD_AXP20X_I2C=y
486CONFIG_MFD_IMX_MIX=y 491CONFIG_MFD_IMX_MIX=y
@@ -544,13 +549,16 @@ CONFIG_VIDEO_MXC_CAPTURE=y
544CONFIG_VIDEO_MX8_CAPTURE=y 549CONFIG_VIDEO_MX8_CAPTURE=y
545CONFIG_VIDEO_MXC_CSI_CAMERA=y 550CONFIG_VIDEO_MXC_CSI_CAMERA=y
546CONFIG_MXC_MIPI_CSI=y 551CONFIG_MXC_MIPI_CSI=y
552CONFIG_DWC_MIPI_CSI2_HOST=y
547CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y 553CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y
548CONFIG_V4L_MEM2MEM_DRIVERS=y 554CONFIG_V4L_MEM2MEM_DRIVERS=y
549CONFIG_VIDEO_IMX8_JPEG=m 555CONFIG_VIDEO_IMX8_JPEG=m
556CONFIG_VIDEO_AMPHION_VPU=y
550CONFIG_SDR_PLATFORM_DRIVERS=y 557CONFIG_SDR_PLATFORM_DRIVERS=y
551CONFIG_VIDEO_IMX219=m 558CONFIG_VIDEO_IMX219=m
552CONFIG_VIDEO_OV5640=y 559CONFIG_VIDEO_OV5640=y
553CONFIG_VIDEO_OV5645=m 560CONFIG_VIDEO_OV5645=m
561CONFIG_VIDEO_AP1302=y
554CONFIG_IMX_DPU_CORE=y 562CONFIG_IMX_DPU_CORE=y
555CONFIG_IMX_LCDIF_CORE=y 563CONFIG_IMX_LCDIF_CORE=y
556CONFIG_IMX_LCDIFV3_CORE=y 564CONFIG_IMX_LCDIFV3_CORE=y
@@ -591,6 +599,7 @@ CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
591CONFIG_DRM_DW_HDMI_I2S_AUDIO=m 599CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
592CONFIG_DRM_DW_HDMI_GP_AUDIO=y 600CONFIG_DRM_DW_HDMI_GP_AUDIO=y
593CONFIG_DRM_DW_HDMI_CEC=m 601CONFIG_DRM_DW_HDMI_CEC=m
602CONFIG_DRM_DW_MIPI_DSI=y
594CONFIG_DRM_ITE_IT6263=y 603CONFIG_DRM_ITE_IT6263=y
595CONFIG_DRM_ITE_IT6161=y 604CONFIG_DRM_ITE_IT6161=y
596CONFIG_DRM_IMX=y 605CONFIG_DRM_IMX=y
@@ -601,6 +610,8 @@ CONFIG_DRM_IMX_LDB=y
601CONFIG_DRM_IMX8QM_LDB=y 610CONFIG_DRM_IMX8QM_LDB=y
602CONFIG_DRM_IMX8QXP_LDB=y 611CONFIG_DRM_IMX8QXP_LDB=y
603CONFIG_DRM_IMX8MP_LDB=y 612CONFIG_DRM_IMX8MP_LDB=y
613CONFIG_DRM_IMX93_LDB=y
614CONFIG_DRM_IMX_DW_MIPI_DSI=y
604CONFIG_DRM_IMX_HDMI=y 615CONFIG_DRM_IMX_HDMI=y
605CONFIG_DRM_IMX_SEC_DSIM=y 616CONFIG_DRM_IMX_SEC_DSIM=y
606CONFIG_DRM_IMX_DCNANO=y 617CONFIG_DRM_IMX_DCNANO=y
@@ -776,6 +787,7 @@ CONFIG_NEW_LEDS=y
776CONFIG_LEDS_CLASS=y 787CONFIG_LEDS_CLASS=y
777CONFIG_LEDS_LM3692X=m 788CONFIG_LEDS_LM3692X=m
778CONFIG_LEDS_PCA9532=m 789CONFIG_LEDS_PCA9532=m
790CONFIG_LEDS_PCA995X=m
779CONFIG_LEDS_GPIO=y 791CONFIG_LEDS_GPIO=y
780CONFIG_LEDS_PWM=y 792CONFIG_LEDS_PWM=y
781CONFIG_LEDS_SYSCON=y 793CONFIG_LEDS_SYSCON=y
@@ -807,6 +819,7 @@ CONFIG_RTC_DRV_CROS_EC=y
807CONFIG_RTC_DRV_FSL_FTM_ALARM=m 819CONFIG_RTC_DRV_FSL_FTM_ALARM=m
808CONFIG_RTC_DRV_PL031=y 820CONFIG_RTC_DRV_PL031=y
809CONFIG_RTC_DRV_SNVS=y 821CONFIG_RTC_DRV_SNVS=y
822CONFIG_RTC_DRV_BBNSM=y
810CONFIG_RTC_DRV_IMX_SC=y 823CONFIG_RTC_DRV_IMX_SC=y
811CONFIG_RTC_DRV_IMX_RPMSG=y 824CONFIG_RTC_DRV_IMX_RPMSG=y
812CONFIG_DMADEVICES=y 825CONFIG_DMADEVICES=y
@@ -869,6 +882,7 @@ CONFIG_CLK_IMX8MP=y
869CONFIG_CLK_IMX8MQ=y 882CONFIG_CLK_IMX8MQ=y
870CONFIG_CLK_IMX8QXP=y 883CONFIG_CLK_IMX8QXP=y
871CONFIG_CLK_IMX8ULP=y 884CONFIG_CLK_IMX8ULP=y
885CONFIG_CLK_IMX93=y
872CONFIG_HWSPINLOCK=y 886CONFIG_HWSPINLOCK=y
873CONFIG_ARM_MHU=y 887CONFIG_ARM_MHU=y
874CONFIG_IMX_MBOX=y 888CONFIG_IMX_MBOX=y
@@ -897,6 +911,7 @@ CONFIG_EXTCON_USBC_CROS_EC=y
897CONFIG_IIO=y 911CONFIG_IIO=y
898CONFIG_FXLS8962AF_I2C=m 912CONFIG_FXLS8962AF_I2C=m
899CONFIG_IMX8QXP_ADC=y 913CONFIG_IMX8QXP_ADC=y
914CONFIG_IMX93_ADC=y
900CONFIG_MAX9611=m 915CONFIG_MAX9611=m
901CONFIG_QCOM_SPMI_VADC=m 916CONFIG_QCOM_SPMI_VADC=m
902CONFIG_QCOM_SPMI_ADC5=m 917CONFIG_QCOM_SPMI_ADC5=m
@@ -913,6 +928,7 @@ CONFIG_IIO_ST_MAGN_3AXIS=m
913CONFIG_IIO_CROS_EC_BARO=m 928CONFIG_IIO_CROS_EC_BARO=m
914CONFIG_MPL3115=y 929CONFIG_MPL3115=y
915CONFIG_PWM=y 930CONFIG_PWM=y
931CONFIG_PWM_ADP5585=y
916CONFIG_PWM_CROS_EC=m 932CONFIG_PWM_CROS_EC=m
917CONFIG_PWM_FSL_FTM=m 933CONFIG_PWM_FSL_FTM=m
918CONFIG_PWM_IMX27=y 934CONFIG_PWM_IMX27=y
@@ -926,12 +942,14 @@ CONFIG_PHY_MIXEL_LVDS=y
926CONFIG_PHY_MIXEL_LVDS_COMBO=y 942CONFIG_PHY_MIXEL_LVDS_COMBO=y
927CONFIG_PHY_CADENCE_SALVO=y 943CONFIG_PHY_CADENCE_SALVO=y
928CONFIG_PHY_FSL_IMX8MP_LVDS=y 944CONFIG_PHY_FSL_IMX8MP_LVDS=y
945CONFIG_PHY_FSL_IMX93_MIPI_DPHY=y
929CONFIG_PHY_MIXEL_MIPI_DPHY=y 946CONFIG_PHY_MIXEL_MIPI_DPHY=y
930CONFIG_PHY_SAMSUNG_HDMI_PHY=y 947CONFIG_PHY_SAMSUNG_HDMI_PHY=y
931CONFIG_PHY_QCOM_USB_HS=y 948CONFIG_PHY_QCOM_USB_HS=y
932CONFIG_PHY_SAMSUNG_USB2=y 949CONFIG_PHY_SAMSUNG_USB2=y
933CONFIG_ARM_SMMU_V3_PMU=m 950CONFIG_ARM_SMMU_V3_PMU=m
934CONFIG_FSL_IMX8_DDR_PMU=y 951CONFIG_FSL_IMX8_DDR_PMU=y
952CONFIG_FSL_IMX9_DDR_PMU=y
935CONFIG_HISI_PMU=y 953CONFIG_HISI_PMU=y
936CONFIG_NVMEM_IMX_OCOTP=y 954CONFIG_NVMEM_IMX_OCOTP=y
937CONFIG_NVMEM_IMX_OCOTP_SCU=y 955CONFIG_NVMEM_IMX_OCOTP_SCU=y
@@ -1048,3 +1066,6 @@ CONFIG_TRUSTED_KEYS=m
1048CONFIG_TRUSTED_KEYS_TPM=n 1066CONFIG_TRUSTED_KEYS_TPM=n
1049CONFIG_TRUSTED_KEYS_TEE=n 1067CONFIG_TRUSTED_KEYS_TEE=n
1050CONFIG_TRUSTED_KEYS_CAAM=y 1068CONFIG_TRUSTED_KEYS_CAAM=y
1069
1070CONFIG_SOC_IMX9=y
1071CONFIG_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"
24# | arch/arm/configs/imx_v7_defconfig | linux-imx/imx-nxp-bsp/defconfig | 24# | arch/arm/configs/imx_v7_defconfig | linux-imx/imx-nxp-bsp/defconfig |
25# | arch/arm64/configs/imx_v8_defconfig | linux-imx/mx8-nxp-bsp/defconfig | 25# | arch/arm64/configs/imx_v8_defconfig | linux-imx/mx8-nxp-bsp/defconfig |
26SRCBRANCH = "lf-5.15.y" 26SRCBRANCH = "lf-5.15.y"
27LOCALVERSION = "-5.15.32-2.0.0" 27LOCALVERSION = "-5.15.52-2.1.0"
28SRCREV = "fa6c3168595c02bd9d5366fcc28c9e7304947a3d" 28SRCREV = "36363d8623ba60858e2632b7d2b70dae932c9a8b"
29 29
30# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition 30# PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
31# required by kernel-yocto.bbclass. 31# required by kernel-yocto.bbclass.
32# 32#
33# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and 33# LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
34# should be updated once patchlevel is merged. 34# should be updated once patchlevel is merged.
35LINUX_VERSION = "5.15.32" 35LINUX_VERSION = "5.15.52"
36 36
37DEFAULT_PREFERENCE = "1" 37DEFAULT_PREFERENCE = "1"
38 38