* [PATCH v1 0/7] ARM: prepare and add colibri imx6ull 1gb (emmc) support @ 2021-08-19 14:03 Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 1/7] ARM: imx_v6_v7_defconfig: enable mtd physmap Marcel Ziswiler ` (6 more replies) 0 siblings, 7 replies; 12+ messages in thread From: Marcel Ziswiler @ 2021-08-19 14:03 UTC (permalink / raw) To: linux-arm-kernel Cc: Marcel Ziswiler, Alexei Starovoitov, Andreas Kemnade, Andrii Nakryiko, Anson Huang, Arnd Bergmann, Daniel Borkmann, Fabio Estevam, Frank Rowand, John Fastabend, KP Singh, Marek Vasut, Martin KaFai Lau, NXP Linux Team, Olof Johansson, Otavio Salvador, Pascal Zimmermann, Pengutronix Kernel Team, Rob Herring, Russell King, Sascha Hauer, Shawn Guo, Song Liu, Yonghong Song, bpf, devicetree, linux-kernel, netdev, soc From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Clean-up imx_v6_v7_defconfig and then add support for the new Colibri iMX6ULL 1GB (eMMC) which builds on the success of the existing Colibri iMX6ULL SKUs using raw NAND but replaces this by more RAM (1 GB) and an eMMC (4 GB). Marcel Ziswiler (6): ARM: imx_v6_v7_defconfig: enable mtd physmap ARM: imx_v6_v7_defconfig: enable fb ARM: imx_v6_v7_defconfig: change snd soc tlv320aic3x to i2c variant ARM: imx_v6_v7_defconfig: rebuild default configuration ARM: imx_v6_v7_defconfig: build imx sdma driver as module ARM: imx_v6_v7_defconfig: enable bpf syscall and cgroup bpf Max Krummenacher (1): ARM: dts: colibri-imx6ull-emmc: add device trees arch/arm/boot/dts/Makefile | 1 + .../boot/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 ++ .../dts/imx6ull-colibri-emmc-nonwifi.dtsi | 185 ++++++++++++++++++ arch/arm/boot/dts/imx6ull-colibri.dtsi | 30 ++- arch/arm/configs/imx_v6_v7_defconfig | 46 ++--- 5 files changed, 249 insertions(+), 30 deletions(-) create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v1 1/7] ARM: imx_v6_v7_defconfig: enable mtd physmap 2021-08-19 14:03 [PATCH v1 0/7] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler @ 2021-08-19 14:03 ` Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 2/7] ARM: imx_v6_v7_defconfig: enable fb Marcel Ziswiler ` (5 subsequent siblings) 6 siblings, 0 replies; 12+ messages in thread From: Marcel Ziswiler @ 2021-08-19 14:03 UTC (permalink / raw) To: linux-arm-kernel Cc: Marcel Ziswiler, Andreas Kemnade, Anson Huang, Fabio Estevam, Marek Vasut, NXP Linux Team, Otavio Salvador, Pascal Zimmermann, Pengutronix Kernel Team, Russell King, Sascha Hauer, Shawn Guo, linux-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Enable CONFIG_MTD_PHYSMAP which is nowadays required for CONFIG_MTD_PHYSMAP_OF. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- arch/arm/configs/imx_v6_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index ccee86d0045dd..70b3c377c4302 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -97,6 +97,7 @@ CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_DATAFLASH=y CONFIG_MTD_M25P80=y -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v1 2/7] ARM: imx_v6_v7_defconfig: enable fb 2021-08-19 14:03 [PATCH v1 0/7] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 1/7] ARM: imx_v6_v7_defconfig: enable mtd physmap Marcel Ziswiler @ 2021-08-19 14:03 ` Marcel Ziswiler 2021-08-26 19:03 ` Fabio Estevam 2021-08-19 14:03 ` [PATCH v1 3/7] ARM: imx_v6_v7_defconfig: change snd soc tlv320aic3x to i2c variant Marcel Ziswiler ` (4 subsequent siblings) 6 siblings, 1 reply; 12+ messages in thread From: Marcel Ziswiler @ 2021-08-19 14:03 UTC (permalink / raw) To: linux-arm-kernel Cc: Marcel Ziswiler, Andreas Kemnade, Anson Huang, Fabio Estevam, Marek Vasut, NXP Linux Team, Pascal Zimmermann, Pengutronix Kernel Team, Russell King, Sascha Hauer, Shawn Guo, linux-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Enable CONFIG_FB which is nowadays required for CONFIG_DRM_PANEL_LVDS, CONFIG_DRM_PANEL_SIMPLE, CONFIG_DRM_PANEL_SEIKO_43WVF1G, CONFIG_FB_MODE_HELPERS, CONFIG_BACKLIGHT_PWM, CONFIG_BACKLIGHT_GPIO, CONFIG_FRAMEBUFFER_CONSOLE, CONFIG_LOGO, CONFIG_FONTS, CONFIG_FONT_8x8 and CONFIG_FONT_8x16. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- arch/arm/configs/imx_v6_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 70b3c377c4302..6618a009a105e 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -293,6 +293,7 @@ CONFIG_DRM_IMX_LDB=y CONFIG_DRM_IMX_HDMI=y CONFIG_DRM_ETNAVIV=y CONFIG_DRM_MXSFB=y +CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_L4F00242T03=y -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v1 2/7] ARM: imx_v6_v7_defconfig: enable fb 2021-08-19 14:03 ` [PATCH v1 2/7] ARM: imx_v6_v7_defconfig: enable fb Marcel Ziswiler @ 2021-08-26 19:03 ` Fabio Estevam 2021-08-27 15:33 ` Stefan Wahren 0 siblings, 1 reply; 12+ messages in thread From: Fabio Estevam @ 2021-08-26 19:03 UTC (permalink / raw) To: Marcel Ziswiler Cc: moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, Marcel Ziswiler, Andreas Kemnade, Anson Huang, Marek Vasut, NXP Linux Team, Pascal Zimmermann, Pengutronix Kernel Team, Russell King, Sascha Hauer, Shawn Guo, linux-kernel Hi Marcel, On Thu, Aug 19, 2021 at 11:04 AM Marcel Ziswiler <marcel@ziswiler.com> wrote: > > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > Enable CONFIG_FB which is nowadays required for CONFIG_DRM_PANEL_LVDS, > CONFIG_DRM_PANEL_SIMPLE, CONFIG_DRM_PANEL_SEIKO_43WVF1G, > CONFIG_FB_MODE_HELPERS, CONFIG_BACKLIGHT_PWM, CONFIG_BACKLIGHT_GPIO, > CONFIG_FRAMEBUFFER_CONSOLE, CONFIG_LOGO, CONFIG_FONTS, CONFIG_FONT_8x8 > and CONFIG_FONT_8x16. > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Yes, I noticed that I had no LCD output on an imx6ull-evk board and after selecting CONFIG_FB it works again. For the entire series: Reviewed-by: Fabio Estevam <festevam@gmail.com> _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 2/7] ARM: imx_v6_v7_defconfig: enable fb 2021-08-26 19:03 ` Fabio Estevam @ 2021-08-27 15:33 ` Stefan Wahren 2021-09-13 21:57 ` Fabio Estevam 0 siblings, 1 reply; 12+ messages in thread From: Stefan Wahren @ 2021-08-27 15:33 UTC (permalink / raw) To: Fabio Estevam, Marcel Ziswiler Cc: moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, Marcel Ziswiler, Andreas Kemnade, Anson Huang, Marek Vasut, NXP Linux Team, Pascal Zimmermann, Pengutronix Kernel Team, Russell King, Sascha Hauer, Shawn Guo, linux-kernel Hi, Am 26.08.21 um 21:03 schrieb Fabio Estevam: > Hi Marcel, > > On Thu, Aug 19, 2021 at 11:04 AM Marcel Ziswiler <marcel@ziswiler.com> wrote: >> From: Marcel Ziswiler <marcel.ziswiler@toradex.com> >> >> Enable CONFIG_FB which is nowadays required for CONFIG_DRM_PANEL_LVDS, >> CONFIG_DRM_PANEL_SIMPLE, CONFIG_DRM_PANEL_SEIKO_43WVF1G, >> CONFIG_FB_MODE_HELPERS, CONFIG_BACKLIGHT_PWM, CONFIG_BACKLIGHT_GPIO, >> CONFIG_FRAMEBUFFER_CONSOLE, CONFIG_LOGO, CONFIG_FONTS, CONFIG_FONT_8x8 >> and CONFIG_FONT_8x16. >> >> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > Yes, I noticed that I had no LCD output on an imx6ull-evk board and > after selecting CONFIG_FB it works again. this was caused by: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") Best regards > > For the entire series: > > Reviewed-by: Fabio Estevam <festevam@gmail.com> > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v1 2/7] ARM: imx_v6_v7_defconfig: enable fb 2021-08-27 15:33 ` Stefan Wahren @ 2021-09-13 21:57 ` Fabio Estevam 0 siblings, 0 replies; 12+ messages in thread From: Fabio Estevam @ 2021-09-13 21:57 UTC (permalink / raw) To: Stefan Wahren Cc: Marcel Ziswiler, moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE, Marcel Ziswiler, Andreas Kemnade, Anson Huang, Marek Vasut, NXP Linux Team, Pascal Zimmermann, Pengutronix Kernel Team, Russell King, Sascha Hauer, Shawn Guo, linux-kernel On Fri, Aug 27, 2021 at 12:33 PM Stefan Wahren <stefan.wahren@i2se.com> wrote: > > Hi, > > Am 26.08.21 um 21:03 schrieb Fabio Estevam: > > Hi Marcel, > > > > On Thu, Aug 19, 2021 at 11:04 AM Marcel Ziswiler <marcel@ziswiler.com> wrote: > >> From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > >> > >> Enable CONFIG_FB which is nowadays required for CONFIG_DRM_PANEL_LVDS, > >> CONFIG_DRM_PANEL_SIMPLE, CONFIG_DRM_PANEL_SEIKO_43WVF1G, > >> CONFIG_FB_MODE_HELPERS, CONFIG_BACKLIGHT_PWM, CONFIG_BACKLIGHT_GPIO, > >> CONFIG_FRAMEBUFFER_CONSOLE, CONFIG_LOGO, CONFIG_FONTS, CONFIG_FONT_8x8 > >> and CONFIG_FONT_8x16. > >> > >> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > Yes, I noticed that I had no LCD output on an imx6ull-evk board and > > after selecting CONFIG_FB it works again. > > this was caused by: > > f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") Thanks, Stefan. Marcel, I think you could resend this one with the Fixes tag and hopefully it could be applied as a fix for 5.14-rc. We can consider it as a regression fix, because it restores display support on many i.MX boards on 5.14-rc. Thanks _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v1 3/7] ARM: imx_v6_v7_defconfig: change snd soc tlv320aic3x to i2c variant 2021-08-19 14:03 [PATCH v1 0/7] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 1/7] ARM: imx_v6_v7_defconfig: enable mtd physmap Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 2/7] ARM: imx_v6_v7_defconfig: enable fb Marcel Ziswiler @ 2021-08-19 14:03 ` Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 4/7] ARM: imx_v6_v7_defconfig: rebuild default configuration Marcel Ziswiler ` (3 subsequent siblings) 6 siblings, 0 replies; 12+ messages in thread From: Marcel Ziswiler @ 2021-08-19 14:03 UTC (permalink / raw) To: linux-arm-kernel Cc: Marcel Ziswiler, Andreas Kemnade, Anson Huang, Fabio Estevam, Marek Vasut, NXP Linux Team, Pascal Zimmermann, Pengutronix Kernel Team, Russell King, Sascha Hauer, Shawn Guo, linux-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Change CONFIG_SND_SOC_TLV320AIC3X to CONFIG_SND_SOC_TLV320AIC3X_I2C. I did double check all current mainline device trees and they are all using the I2C rather than the SPI variant. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- arch/arm/configs/imx_v6_v7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 6618a009a105e..90d6a5cf254e0 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -317,7 +317,7 @@ CONFIG_SND_SOC_IMX_MC13783=y CONFIG_SND_SOC_FSL_ASOC_CARD=y CONFIG_SND_SOC_AC97_CODEC=y CONFIG_SND_SOC_CS42XX8_I2C=y -CONFIG_SND_SOC_TLV320AIC3X=y +CONFIG_SND_SOC_TLV320AIC3X_I2C=y CONFIG_SND_SOC_WM8960=y CONFIG_SND_SOC_WM8962=y CONFIG_SND_SIMPLE_CARD=y -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v1 4/7] ARM: imx_v6_v7_defconfig: rebuild default configuration 2021-08-19 14:03 [PATCH v1 0/7] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler ` (2 preceding siblings ...) 2021-08-19 14:03 ` [PATCH v1 3/7] ARM: imx_v6_v7_defconfig: change snd soc tlv320aic3x to i2c variant Marcel Ziswiler @ 2021-08-19 14:03 ` Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 5/7] ARM: imx_v6_v7_defconfig: build imx sdma driver as module Marcel Ziswiler ` (2 subsequent siblings) 6 siblings, 0 replies; 12+ messages in thread From: Marcel Ziswiler @ 2021-08-19 14:03 UTC (permalink / raw) To: linux-arm-kernel Cc: Marcel Ziswiler, Andreas Kemnade, Anson Huang, Fabio Estevam, Marek Vasut, NXP Linux Team, Pascal Zimmermann, Pengutronix Kernel Team, Russell King, Sascha Hauer, Shawn Guo, linux-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Run "make imx_v6_v7_defconfig; make savedefconfig" to rebuild imx_v6_v7_defconfig. This dropped the following nowadays obsolete configuration options: CONFIG_MTD_M25P80=y (got integrated into MTD_SPI_NOR) CONFIG_CS89x0=y (selected by CS89x0_PLATFORM) CONFIG_SMSC_PHY=y (selected by USB_NET_SMSC95XX) CONFIG_GPIO_MC9S08DZ60=y (depends on MACH_MX35_3DS) CONFIG_REGULATOR=y (selected by various stuff) CONFIG_MEDIA_CAMERA_SUPPORT=y (defaults to on if MEDIA_CAMERA) CONFIG_MEDIA_CONTROLLER=y (selected by various stuff) CONFIG_VIDEO_V4L2_SUBDEV_API=y (selected by various stuff) CONFIG_SND_SOC_PHYCORE_AC97=y CONFIG_SND_SOC_IMX_MC13783=y CONFIG_USB_EHCI_MXC=y CONFIG_USB_FSL_USB2=y Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- arch/arm/configs/imx_v6_v7_defconfig | 38 ++++++++-------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 90d6a5cf254e0..21803cd2d1ba7 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -28,9 +28,6 @@ CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX7D=y CONFIG_SOC_IMX7ULP=y CONFIG_SOC_VF610=y -CONFIG_PCI=y -CONFIG_PCI_MSI=y -CONFIG_PCI_IMX6=y CONFIG_SMP=y CONFIG_ARM_PSCI=y CONFIG_HIGHMEM=y @@ -58,7 +55,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y -# CONFIG_BLK_DEV_BSG is not set CONFIG_BINFMT_MISC=m CONFIG_NET=y CONFIG_PACKET=y @@ -66,9 +62,6 @@ CONFIG_UNIX=y CONFIG_INET=y CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set CONFIG_NETFILTER=y CONFIG_CAN=y CONFIG_CAN_FLEXCAN=y @@ -81,12 +74,14 @@ CONFIG_CFG80211_WEXT=y CONFIG_MAC80211=y CONFIG_RFKILL=y CONFIG_RFKILL_INPUT=y +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_IMX6=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set CONFIG_FW_LOADER_USER_HELPER=y CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y -CONFIG_CMA_SIZE_MBYTES=64 CONFIG_IMX_WEIM=y CONFIG_CONNECTOR=y CONFIG_MTD=y @@ -100,14 +95,12 @@ CONFIG_MTD_CFI_STAA=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_M25P80=y CONFIG_MTD_SST25L=y CONFIG_MTD_RAW_NAND=y CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_MTD_NAND_VF610_NFC=y CONFIG_MTD_NAND_MXC=y CONFIG_MTD_SPI_NOR=y -CONFIG_SPI_FSL_QUADSPI=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_MTD_UBI_BLOCK=y @@ -118,6 +111,7 @@ CONFIG_EEPROM_AT24=y CONFIG_EEPROM_AT25=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y +# CONFIG_BLK_DEV_BSG is not set CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_LOGGING=y CONFIG_SCSI_SCAN_ASYNC=y @@ -127,7 +121,6 @@ CONFIG_AHCI_IMX=y CONFIG_PATA_IMX=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_BROADCOM is not set -CONFIG_CS89x0=y CONFIG_CS89x0_PLATFORM=y # CONFIG_NET_VENDOR_FARADAY is not set # CONFIG_NET_VENDOR_INTEL is not set @@ -140,9 +133,8 @@ CONFIG_SMC91X=y CONFIG_SMC911X=y CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set -CONFIG_AT803X_PHY=y CONFIG_MICREL_PHY=y -CONFIG_SMSC_PHY=y +CONFIG_AT803X_PHY=y CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=y @@ -205,6 +197,7 @@ CONFIG_I2C_ALGOPCA=m CONFIG_I2C_GPIO=y CONFIG_I2C_IMX=y CONFIG_SPI=y +CONFIG_SPI_FSL_QUADSPI=y CONFIG_SPI_GPIO=y CONFIG_SPI_IMX=y CONFIG_SPI_FSL_DSPI=y @@ -213,14 +206,13 @@ CONFIG_PINCTRL_IMX8MN=y CONFIG_PINCTRL_IMX8MP=y CONFIG_PINCTRL_IMX8MQ=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MXC=y CONFIG_GPIO_SIOX=m CONFIG_GPIO_MAX732X=y -CONFIG_GPIO_MC9S08DZ60=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCF857X=y CONFIG_GPIO_STMPE=y CONFIG_GPIO_74X164=y -CONFIG_GPIO_MXC=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_SYSCON=y CONFIG_POWER_RESET_SYSCON_POWEROFF=y @@ -234,8 +226,8 @@ CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y CONFIG_WATCHDOG=y -CONFIG_DA9062_WATCHDOG=y CONFIG_DA9063_WATCHDOG=m +CONFIG_DA9062_WATCHDOG=y CONFIG_RN5T618_WATCHDOG=y CONFIG_IMX2_WDT=y CONFIG_IMX7ULP_WDT=y @@ -246,7 +238,6 @@ CONFIG_MFD_MC13XXX_SPI=y CONFIG_MFD_MC13XXX_I2C=y CONFIG_MFD_RN5T618=y CONFIG_MFD_STMPE=y -CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_ANATOP=y CONFIG_REGULATOR_DA9052=y @@ -262,9 +253,6 @@ CONFIG_RC_CORE=y CONFIG_RC_DEVICES=y CONFIG_IR_GPIO_CIR=y CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y @@ -272,7 +260,6 @@ CONFIG_VIDEO_MUX=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_CODA=m CONFIG_VIDEO_IMX_PXP=y -# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set CONFIG_VIDEO_ADV7180=m CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV5640=m @@ -308,12 +295,10 @@ CONFIG_SND_USB_AUDIO=m CONFIG_SND_SOC=y CONFIG_SND_SOC_FSL_ASRC=y CONFIG_SND_IMX_SOC=y -CONFIG_SND_SOC_PHYCORE_AC97=y CONFIG_SND_SOC_EUKREA_TLV320=y CONFIG_SND_SOC_IMX_ES8328=y CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_SPDIF=y -CONFIG_SND_SOC_IMX_MC13783=y CONFIG_SND_SOC_FSL_ASOC_CARD=y CONFIG_SND_SOC_AC97_CODEC=y CONFIG_SND_SOC_CS42XX8_I2C=y @@ -325,7 +310,6 @@ CONFIG_HID_MULTITOUCH=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MXC=y CONFIG_USB_ACM=m CONFIG_USB_STORAGE=y CONFIG_USB_CHIPIDEA=y @@ -340,7 +324,6 @@ CONFIG_USB_EHSET_TEST_FIXTURE=m CONFIG_NOP_USB_XCEIV=y CONFIG_USB_MXS_PHY=y CONFIG_USB_GADGET=y -CONFIG_USB_FSL_USB2=y CONFIG_USB_CONFIGFS=y CONFIG_USB_CONFIGFS_SERIAL=y CONFIG_USB_CONFIGFS_ACM=y @@ -389,11 +372,11 @@ CONFIG_RTC_DRV_ISL1208=y CONFIG_RTC_DRV_PCF8523=y CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_M41T80=y +CONFIG_RTC_DRV_RC5T619=y CONFIG_RTC_DRV_DA9063=y CONFIG_RTC_DRV_MC13XXX=y CONFIG_RTC_DRV_MXC=y CONFIG_RTC_DRV_MXC_V2=y -CONFIG_RTC_DRV_RC5T619=y CONFIG_RTC_DRV_SNVS=y CONFIG_DMADEVICES=y CONFIG_FSL_EDMA=y @@ -470,13 +453,14 @@ CONFIG_CRC_CCITT=m CONFIG_CRC_T10DIF=y CONFIG_CRC7=m CONFIG_LIBCRC32C=m +CONFIG_CMA_SIZE_MBYTES=64 CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_PRINTK_TIME=y +# CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_FS=y # CONFIG_SCHED_DEBUG is not set CONFIG_PROVE_LOCKING=y -# CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_FTRACE is not set -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v1 5/7] ARM: imx_v6_v7_defconfig: build imx sdma driver as module 2021-08-19 14:03 [PATCH v1 0/7] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler ` (3 preceding siblings ...) 2021-08-19 14:03 ` [PATCH v1 4/7] ARM: imx_v6_v7_defconfig: rebuild default configuration Marcel Ziswiler @ 2021-08-19 14:03 ` Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 6/7] ARM: imx_v6_v7_defconfig: enable bpf syscall and cgroup bpf Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 7/7] ARM: dts: colibri-imx6ull-emmc: add device trees Marcel Ziswiler 6 siblings, 0 replies; 12+ messages in thread From: Marcel Ziswiler @ 2021-08-19 14:03 UTC (permalink / raw) To: linux-arm-kernel Cc: Marcel Ziswiler, Andreas Kemnade, Anson Huang, Fabio Estevam, Marek Vasut, NXP Linux Team, Otavio Salvador, Pascal Zimmermann, Pengutronix Kernel Team, Russell King, Sascha Hauer, Shawn Guo, linux-kernel From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Build CONFIG_IMX_SDMA as module to avoid the following boot issue: [ 5.214751] imx-sdma 20ec000.sdma: Direct firmware load for imx/sdma/sdma-imx6q.bin failed with error -2 [ 5.215762] imx-sdma 20ec000.sdma: Falling back to sysfs fallback for: imx/sdma/sdma-imx6q.bin Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- arch/arm/configs/imx_v6_v7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 21803cd2d1ba7..c0008b7faf2ce 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -380,7 +380,7 @@ CONFIG_RTC_DRV_MXC_V2=y CONFIG_RTC_DRV_SNVS=y CONFIG_DMADEVICES=y CONFIG_FSL_EDMA=y -CONFIG_IMX_SDMA=y +CONFIG_IMX_SDMA=m CONFIG_MXS_DMA=y CONFIG_DMATEST=m CONFIG_STAGING=y -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v1 6/7] ARM: imx_v6_v7_defconfig: enable bpf syscall and cgroup bpf 2021-08-19 14:03 [PATCH v1 0/7] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler ` (4 preceding siblings ...) 2021-08-19 14:03 ` [PATCH v1 5/7] ARM: imx_v6_v7_defconfig: build imx sdma driver as module Marcel Ziswiler @ 2021-08-19 14:03 ` Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 7/7] ARM: dts: colibri-imx6ull-emmc: add device trees Marcel Ziswiler 6 siblings, 0 replies; 12+ messages in thread From: Marcel Ziswiler @ 2021-08-19 14:03 UTC (permalink / raw) To: linux-arm-kernel Cc: Marcel Ziswiler, Alexei Starovoitov, Andreas Kemnade, Andrii Nakryiko, Anson Huang, Daniel Borkmann, Fabio Estevam, John Fastabend, KP Singh, Marek Vasut, Martin KaFai Lau, NXP Linux Team, Pascal Zimmermann, Pengutronix Kernel Team, Russell King, Sascha Hauer, Shawn Guo, Song Liu, Yonghong Song, bpf, linux-kernel, netdev From: Marcel Ziswiler <marcel.ziswiler@toradex.com> Enable CONFIG_BPF_SYSCALL and CONFIG_CGROUP_BPF to allow for systemd interoperability. This avoids the following failure on boot: [ 10.615914] systemd[1]: system-getty.slice: unit configures an IP firewall, but the local system does not support BPF/cgroup firewalling. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- arch/arm/configs/imx_v6_v7_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index c0008b7faf2ce..3e58c76763563 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -2,11 +2,13 @@ CONFIG_KERNEL_LZO=y CONFIG_SYSVIPC=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_BUF_SHIFT=18 CONFIG_CGROUPS=y +CONFIG_CGROUP_BPF=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y CONFIG_EXPERT=y -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v1 7/7] ARM: dts: colibri-imx6ull-emmc: add device trees 2021-08-19 14:03 [PATCH v1 0/7] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler ` (5 preceding siblings ...) 2021-08-19 14:03 ` [PATCH v1 6/7] ARM: imx_v6_v7_defconfig: enable bpf syscall and cgroup bpf Marcel Ziswiler @ 2021-08-19 14:03 ` Marcel Ziswiler 2021-08-19 16:24 ` Marcel Ziswiler 6 siblings, 1 reply; 12+ messages in thread From: Marcel Ziswiler @ 2021-08-19 14:03 UTC (permalink / raw) To: linux-arm-kernel Cc: Max Krummenacher, Marcel Ziswiler, Arnd Bergmann, Fabio Estevam, Frank Rowand, NXP Linux Team, Olof Johansson, Pengutronix Kernel Team, Rob Herring, Russell King, Sascha Hauer, Shawn Guo, devicetree, linux-kernel, soc From: Max Krummenacher <max.krummenacher@toradex.com> Add devices trees for a Colibri iMX6ULL 1GB which has a eMMC instead of the raw NAND used on other SKUs. Related-to: ELB-4056, ELB-4058 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- arch/arm/boot/dts/Makefile | 1 + .../boot/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 ++ .../dts/imx6ull-colibri-emmc-nonwifi.dtsi | 185 ++++++++++++++++++ arch/arm/boot/dts/imx6ull-colibri.dtsi | 30 ++- 4 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 7e0934180724d..f88ddcc40b6ac 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -671,6 +671,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-tx6ul-0011.dtb \ imx6ul-tx6ul-mainboard.dtb \ imx6ull-14x14-evk.dtb \ + imx6ull-colibri-emmc-eval-v3.dtb \ imx6ull-colibri-eval-v3.dtb \ imx6ull-colibri-wifi-eval-v3.dtb \ imx6ull-myir-mys-6ulx-eval.dtb \ diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts b/arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts new file mode 100644 index 0000000000000..70104a6c5bac9 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Copyright 2021 Toradex AG + */ + +/dts-v1/; + +#include "imx6ull-colibri-emmc-nonwifi.dtsi" +#include "imx6ull-colibri-eval-v3.dtsi" + +/ { + model = "Toradex Colibri iMX6ULL 1GB (eMMC) on Colibri Evaluation Board V3"; + compatible = "toradex,colibri-imx6ull-emmc-eval", + "toradex,colibri-imx6ull-emmc", + "toradex,colibri-imx6ull", + "fsl,imx6ull"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi new file mode 100644 index 0000000000000..df055617e51f7 --- /dev/null +++ b/arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi @@ -0,0 +1,185 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Copyright 2021 Toradex AG + */ + +#include "imx6ull-colibri.dtsi" + +/ { + aliases { + mmc0 = &usdhc2; /* eMMC */ + mmc1 = &usdhc1; /* MMC 4bit slot */ + }; + + memory@80000000 { + device_type = "memory"; + reg = <0x80000000 0x10000000>; + }; +}; + +&gpio1 { + gpio-line-names = "SODIMM_8", + "SODIMM_6", + "SODIMM_129", + "SODIMM_89", + "SODIMM_19", + "SODIMM_21", + "UNUSABLE_SODIMM_180", + "UNUSABLE_SODIMM_184", + "SODIMM_4", + "SODIMM_2", + "SODIMM_106", + "SODIMM_71", + "SODIMM_23", + "SODIMM_31", + "SODIMM_99", + "SODIMM_102", + "SODIMM_33", + "SODIMM_35", + "SODIMM_25", + "SODIMM_27", + "SODIMM_36", + "SODIMM_38", + "SODIMM_32", + "SODIMM_34", + "SODIMM_135", + "SODIMM_77", + "SODIMM_100", + "SODIMM_186", + "SODIMM_196", + "SODIMM_194"; +}; + +&gpio2 { + gpio-line-names = "SODIMM_55", + "SODIMM_63", + "SODIMM_178", + "SODIMM_188", + "SODIMM_73", + "SODIMM_30", + "SODIMM_67", + "SODIMM_104", + "", + "", + "", + "", + "", + "", + "", + "", + "SODIMM_190", + "SODIMM_47", + "SODIMM_192", + "SODIMM_49", + "SODIMM_51", + "SODIMM_53"; +}; + +&gpio3 { + gpio-line-names = "SODIMM_56", + "SODIMM_44", + "SODIMM_68", + "SODIMM_82", + "", + "SODIMM_76", + "SODIMM_70", + "SODIMM_60", + "SODIMM_58", + "SODIMM_78", + "SODIMM_72", + "SODIMM_80", + "SODIMM_46", + "SODIMM_62", + "SODIMM_48", + "SODIMM_74", + "SODIMM_50", + "SODIMM_52", + "SODIMM_54", + "SODIMM_66", + "SODIMM_64", + "SODIMM_57", + "SODIMM_61", + "SODIMM_29", + "SODIMM_37", + "SODIMM_88", + "SODIMM_86", + "SODIMM_92", + "SODIMM_90"; +}; + +&gpio4 { + gpio-line-names = "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "SODIMM_140", + "SODIMM_59", + "SODIMM_142", + "SODIMM_144", + "SODIMM_133", + "SODIMM_146", + "SODIMM_28", + "SODIMM_75", + "SODIMM_96", + "SODIMM_81", + "SODIMM_94", + "SODIMM_101", + "SODIMM_103", + "SODIMM_79", + "SODIMM_97", + "SODIMM_69", + "SODIMM_98", + "SODIMM_85", + "SODIMM_65"; +}; + +&gpio5 { + gpio-line-names = "SODIMM_43", + "SODIMM_45", + "SODIMM_137", + "SODIMM_95", + "SODIMM_107", + "SODIMM_131", + "SODIMM_93", + "", + "SODIMM_138", + "", + "SODIMM_105", + "SODIMM_127"; +}; + +&gpmi { + status = "disabled"; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 + &pinctrl_gpio4 &pinctrl_gpio6 &pinctrl_gpio7 + &pinctrl_gpmi_gpio>; +}; + +&iomuxc_snvs { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_snvs_gpio1 &pinctrl_snvs_gpio3>; +}; + +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2emmc>; + assigned-clocks = <&clks IMX6UL_CLK_USDHC2_SEL>, <&clks IMX6UL_CLK_USDHC2>; + assigned-clock-parents = <&clks IMX6UL_CLK_PLL2_PFD2>; + assigned-clock-rates = <0>, <198000000>; + bus-width = <8>; + keep-power-in-suspend; + no-1-8-v; + non-removable; + vmmc-supply = <®_module_3v3>; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi index 0cdbf7b6e7285..f432fc0a6a530 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0 OR MIT) /* - * Copyright 2018 Toradex AG + * Copyright 2018-2021 Toradex AG */ #include "imx6ull.dtsi" @@ -345,6 +345,19 @@ MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0xb0b0 /* SODIMM 63 */ >; }; + /* + * With an eMMC instead of a raw NAND device the following pins + * are available at SODIMM pins + */ + pinctrl_gpmi_gpio: gpmi-gpio-grp { + fsl,pins = < + MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x10b0 /* SODIMM 140 */ + MX6UL_PAD_NAND_CE0_B__GPIO4_IO13 0x10b0 /* SODIMM 144 */ + MX6UL_PAD_NAND_CLE__GPIO4_IO15 0x10b0 /* SODIMM 146 */ + MX6UL_PAD_NAND_READY_B__GPIO4_IO12 0x10b0 /* SODIMM 142 */ + >; + }; + pinctrl_gpmi_nand: gpmi-nand-grp { fsl,pins = < MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9 @@ -533,6 +546,21 @@ MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x10 >; }; + pinctrl_usdhc2emmc: usdhc2emmcgrp { + fsl,pins = < + MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x17059 + MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 + MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 + MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 + MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 + MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 + MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 + MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 + MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 + >; + }; + pinctrl_wdog: wdog-grp { fsl,pins = < MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0 -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v1 7/7] ARM: dts: colibri-imx6ull-emmc: add device trees 2021-08-19 14:03 ` [PATCH v1 7/7] ARM: dts: colibri-imx6ull-emmc: add device trees Marcel Ziswiler @ 2021-08-19 16:24 ` Marcel Ziswiler 0 siblings, 0 replies; 12+ messages in thread From: Marcel Ziswiler @ 2021-08-19 16:24 UTC (permalink / raw) To: linux-arm-kernel Cc: soc, Max Krummenacher, kernel, linux-imx, festevam, linux, devicetree, frowand.list, olof, arnd, s.hauer, linux-kernel, robh+dt, shawnguo On Thu, 2021-08-19 at 16:03 +0200, Marcel Ziswiler wrote: > From: Max Krummenacher <max.krummenacher@toradex.com> > > Add devices trees for a Colibri iMX6ULL 1GB which has a eMMC instead of > the raw NAND used on other SKUs. > > Related-to: ELB-4056, ELB-4058 > Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > --- > > arch/arm/boot/dts/Makefile | 1 + > .../boot/dts/imx6ull-colibri-emmc-eval-v3.dts | 17 ++ > .../dts/imx6ull-colibri-emmc-nonwifi.dtsi | 185 ++++++++++++++++++ > arch/arm/boot/dts/imx6ull-colibri.dtsi | 30 ++- > 4 files changed, 232 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-eval-v3.dts > create mode 100644 arch/arm/boot/dts/imx6ull-colibri-emmc-nonwifi.dtsi > > ... > > diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi > index 0cdbf7b6e7285..f432fc0a6a530 100644 > --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi > +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: (GPL-2.0 OR MIT) > /* > - * Copyright 2018 Toradex AG > + * Copyright 2018-2021 Toradex AG > */ > > #include "imx6ull.dtsi" > @@ -345,6 +345,19 @@ MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01 0xb0b0 /* SODIMM 63 */ > >; > }; > > + /* > + * With an eMMC instead of a raw NAND device the following pins > + * are available at SODIMM pins > + */ > + pinctrl_gpmi_gpio: gpmi-gpio-grp { > + fsl,pins = < > + MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x10b0 /* SODIMM 140 */ > + MX6UL_PAD_NAND_CE0_B__GPIO4_IO13 0x10b0 /* SODIMM 144 */ > + MX6UL_PAD_NAND_CLE__GPIO4_IO15 0x10b0 /* SODIMM 146 */ > + MX6UL_PAD_NAND_READY_B__GPIO4_IO12 0x10b0 /* SODIMM 142 */ > + >; > + }; > + Just noticed that I somehow messed up the indentation above with one spurious tab too much. Will correct that in a v2. Sorry about that. > pinctrl_gpmi_nand: gpmi-nand-grp { > fsl,pins = < > MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00 0x100a9 > @@ -533,6 +546,21 @@ MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x10 > >; > }; > > + pinctrl_usdhc2emmc: usdhc2emmcgrp { > + fsl,pins = < > + MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x17059 > + MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x17059 > + MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17059 > + MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17059 > + MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17059 > + MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17059 > + MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17059 > + MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17059 > + MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17059 > + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17059 > + >; > + }; > + Ditto above. > pinctrl_wdog: wdog-grp { > fsl,pins = < > MX6UL_PAD_LCD_RESET__WDOG1_WDOG_ANY 0x30b0 Cheers Marcel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-09-13 21:59 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-08-19 14:03 [PATCH v1 0/7] ARM: prepare and add colibri imx6ull 1gb (emmc) support Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 1/7] ARM: imx_v6_v7_defconfig: enable mtd physmap Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 2/7] ARM: imx_v6_v7_defconfig: enable fb Marcel Ziswiler 2021-08-26 19:03 ` Fabio Estevam 2021-08-27 15:33 ` Stefan Wahren 2021-09-13 21:57 ` Fabio Estevam 2021-08-19 14:03 ` [PATCH v1 3/7] ARM: imx_v6_v7_defconfig: change snd soc tlv320aic3x to i2c variant Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 4/7] ARM: imx_v6_v7_defconfig: rebuild default configuration Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 5/7] ARM: imx_v6_v7_defconfig: build imx sdma driver as module Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 6/7] ARM: imx_v6_v7_defconfig: enable bpf syscall and cgroup bpf Marcel Ziswiler 2021-08-19 14:03 ` [PATCH v1 7/7] ARM: dts: colibri-imx6ull-emmc: add device trees Marcel Ziswiler 2021-08-19 16:24 ` Marcel Ziswiler
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).