ARM: board: warp: Import dts files
Subsystems (2)
PATCH 1/5 ARM: board: warp: Import dts files
Import the i.MX6 based Warp dts files from Linux 5.12-rc1.
--- arch/arm/dts/Makefile | 4 +- arch/arm/dts/imx6sl-warp.dts | 234 +++++++++++++++++++++++++++++++++++ 2 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/imx6sl-warp.dts
arch/arm/dts/Makefile +3 -1
@@ -734,7 +734,9 @@ dtb-y += \ endif -dtb-$(CONFIG_MX6SL) += imx6sl-evk.dtb +dtb-$(CONFIG_MX6SL) += \ + imx6sl-evk.dtb \ + imx6sl-warp.dtb dtb-$(CONFIG_MX6SLL) += imx6sll-evk.dtb
arch/arm/dts/imx6sl-warp.dts new file +234 -0
234 lines not on this page · raw message
Signature · 1 line
2.31.1
PATCH 2/5 ARM: board: warp: Enable OF_CONTROL and DM gpio/pin control
Enable OF_CONTROL and DM for gpio and pin control support on the i.MX6SL based Warp.
--- configs/warp_defconfig | 7 +++++++ 1 file changed, 7 insertions(+)
configs/warp_defconfig +7 -0
@@ -2,10 +2,12 @@ CONFIG_ARM=y CONFIG_ARCH_MX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_DEVICE_TREE="imx6sl-warp" CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x60000 CONFIG_MX6SL=y CONFIG_TARGET_WARP=y +CONFIG_OF_CONTROL=y # CONFIG_CMD_BMODE is not set CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/warp/imximage.cfg"
@@ -18,6 +20,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_PART=y +# CONFIG_CMD_PINMUX is not set CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set
@@ -32,9 +35,13 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y # CONFIG_NET is not set CONFIG_BOUNCE_BUFFER=y +CONFIG_DM=y +CONFIG_DM_GPIO=y CONFIG_DFU_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_USB=y CONFIG_USB_STORAGE=y
Signature · 1 line
2.31.1
PATCH 2/5 ARM: board: warp: Enable OF_CONTROL and DM gpio/pin control
Quoted 6 lines
Enable
OF_CONTROLand DM for gpio and pin control support on the i.MX6SL based Warp.Signed-off-by Peter Robinson <[email protected]>Cc Otavio Salvador <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 3/5 ARM: board: warp: convert to DM_MMC
In reply to Peter RobinsonConvert Warp to use DM MMC.
--- arch/arm/dts/imx6sl-warp-u-boot.dtsi | 7 ++++++ board/warp/warp.c | 33 ---------------------------- configs/warp_defconfig | 1 + 3 files changed, 8 insertions(+), 33 deletions(-) create mode 100644 arch/arm/dts/imx6sl-warp-u-boot.dtsi
arch/arm/dts/imx6sl-warp-u-boot.dtsi new file +7 -0
@@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/ { + aliases { + mmc0 = &usdhc2; + }; +};
board/warp/warp.c +0 -33
@@ -21,9 +21,7 @@#include <linux/sizes.h> #include <common.h> #include <watchdog.h> -#include <fsl_esdhc_imx.h> #include <i2c.h> -#include <mmc.h> #include <usb.h> #include <power/pmic.h> #include <power/max77696_pmic.h>
@@ -62,37 +60,6 @@ static void setup_iomux_uart(void)imx_iomux_v3_setup_multiple_pads (uart1_pads,ARRAY_SIZE (uart1_pads)); } -static struct fsl_esdhc_cfg usdhc_cfg[1 ] = { - {USDHC2_BASE_ADDR ,0 ,0 ,0 ,1 }, -}; - -int board_mmc_getcd (struct mmc *mmc) -{ -return 1 ;/* Assume boot SD always present */ -} - -int board_mmc_init (struct bd_info *bis) -{ -static iomux_v3_cfg_t const usdhc2_pads[] = { -MX6_PAD_SD2_CLK__USDHC2_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_CMD__USDHC2_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_RST__USDHC2_RST |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT0__USDHC2_DAT0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT1__USDHC2_DAT1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT2__USDHC2_DAT2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT3__USDHC2_DAT3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT4__USDHC2_DAT4 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT5__USDHC2_DAT5 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT6__USDHC2_DAT6 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT7__USDHC2_DAT7 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), - }; - -imx_iomux_v3_setup_multiple_pads (usdhc2_pads,ARRAY_SIZE (usdhc2_pads)); - - usdhc_cfg[0 ].sdhc_clk =mxc_get_clock (MXC_ESDHC2_CLK ); -return fsl_esdhc_initialize (bis, &usdhc_cfg[0 ]); -} -int board_usb_phy_mode (int port) {return USB_INIT_DEVICE ;
configs/warp_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DFU_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_DM_MMC=y CONFIG_FSL_USDHC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y
Signature · 1 line
2.31.1
PATCH 3/5 ARM: board: warp: convert to DM_MMC
Quoted 6 lines · Peter Robinson
Convert Warp to use DM MMC.
Signed-off-by Peter Robinson <[email protected]>Cc Otavio Salvador <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>
Best Regards,
Jaehoon Chung
Quoted 85 lines
--- arch/arm/dts/imx6sl-warp-u-boot.dtsi | 7 ++++++ board/warp/warp.c | 33 ---------------------------- configs/warp_defconfig | 1 + 3 files changed, 8 insertions(+), 33 deletions(-) create mode 100644 arch/arm/dts/imx6sl-warp-u-boot.dtsiarch/arm/dts/imx6sl-warp-u-boot.dtsi new file +7
-0@@ -0,0 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/ { + aliases { + mmc0 = &usdhc2; + }; +};board/warp/warp.c +0
-33@@ -21,9 +21,7 @@#include <linux/sizes.h> #include <common.h> #include <watchdog.h> -#include <fsl_esdhc_imx.h> #include <i2c.h> -#include <mmc.h> #include <usb.h> #include <power/pmic.h> #include <power/max77696_pmic.h> @@ -62,37 +60,6 @@ static void setup_iomux_uart(void)imx_iomux_v3_setup_multiple_pads (uart1_pads,ARRAY_SIZE (uart1_pads)); } -static struct fsl_esdhc_cfg usdhc_cfg[1 ] = { - {USDHC2_BASE_ADDR ,0 ,0 ,0 ,1 }, -}; - -int board_mmc_getcd (struct mmc *mmc) -{ -return 1 ;/* Assume boot SD always present */ -} - -int board_mmc_init (struct bd_info *bis) -{ -static iomux_v3_cfg_t const usdhc2_pads[] = { -MX6_PAD_SD2_CLK__USDHC2_CLK |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_CMD__USDHC2_CMD |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_RST__USDHC2_RST |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT0__USDHC2_DAT0 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT1__USDHC2_DAT1 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT2__USDHC2_DAT2 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT3__USDHC2_DAT3 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT4__USDHC2_DAT4 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT5__USDHC2_DAT5 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT6__USDHC2_DAT6 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), -MX6_PAD_SD2_DAT7__USDHC2_DAT7 |MUX_PAD_CTRL (USDHC_PAD_CTRL ), - }; - -imx_iomux_v3_setup_multiple_pads (usdhc2_pads,ARRAY_SIZE (usdhc2_pads)); - - usdhc_cfg[0 ].sdhc_clk =mxc_get_clock (MXC_ESDHC2_CLK ); -return fsl_esdhc_initialize (bis, &usdhc_cfg[0 ]); -} -int board_usb_phy_mode (int port) {return USB_INIT_DEVICE ;configs/warp_defconfig +1
-0@@ -39,6 +39,7 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DFU_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y +CONFIG_DM_MMC=y CONFIG_FSL_USDHC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y
PATCH 3/5 ARM: board: warp: convert to DM_MMC
In reply to Peter RobinsonQuoted 6 lines
Convert Warp to use DM MMC.
Signed-off-by Peter Robinson <[email protected]>Cc Otavio Salvador <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>Reviewed-by Jaehoon Chung <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 4/5 ARM: board: warp: convert to DM_USB
In reply to Peter RobinsonConvert Warp to use DM USB.
--- configs/warp_defconfig | 1 + include/configs/warp.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)
configs/warp_defconfig +1 -0
@@ -45,6 +45,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL"
include/configs/warp.h +0 -1
@@ -45,7 +45,6 @@#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Only OTG2 port enabled */ #endif #define CONFIG_USBD_HS
Signature · 1 line
2.31.1
PATCH 4/5 ARM: board: warp: convert to DM_USB
Hi Peter,
I get warnings after applying this series:
arm: + warp7
+(warp7) board/warp7/warp7.c: In function 'board_eth_init':
+(warp7) board/warp7/warp7.c:94:8: error: implicit declaration of function 'usb_eth_initialize'; did you mean 'sh_eth_initialize'? [-Werror=implicit-function-declaration]
+(warp7) 94 | ret = usb_eth_initialize(bis); +(warp7) | ^~~~~~~~~~~~~~~~~~ +(warp7) | sh_eth_initialize
Same for warp7_bl33. Can you check, please ? Thanks !
Best regards,
Stefano
Quoted 36 lines · Peter Robinson
Convert Warp to use DM USB.
Signed-off-by Peter Robinson <[email protected]>Cc Otavio Salvador <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>--- configs/warp_defconfig | 1 + include/configs/warp.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-)configs/warp_defconfig +1
-0@@ -45,6 +45,7 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL"include/configs/warp.h +0
-1@@ -45,7 +45,6 @@#define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)#define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1/* Only OTG2 port enabled */ #endif #define CONFIG_USBD_HS
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 4/5 ARM: board: warp: convert to DM_USB
In reply to Peter RobinsonQuoted 5 lines
Convert Warp to use DM USB.
Signed-off-by Peter Robinson <[email protected]>Cc Otavio Salvador <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
PATCH 5/5 ARM: board: warp7: Minor cleanups and DM_ETH
In reply to Peter RobinsonWe don't need a random MAC as the only network that's supported is over USB and that has a hardcoded MAC, enable DM_ETH for the USB, and the device doesn't have MTD storage so drop that.
--- configs/warp7_bl33_defconfig | 3 +-- configs/warp7_defconfig | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
configs/warp7_bl33_defconfig +1 -2
@@ -32,14 +32,13 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_DFU_MMC=y +CONFIG_DM_ETH=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y -CONFIG_MTD=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=y
configs/warp7_defconfig +1 -2
@@ -38,14 +38,13 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_DFU_MMC=y +CONFIG_DM_ETH=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y -CONFIG_MTD=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=y
Signature · 1 line
2.31.1
PATCH 5/5 ARM: board: warp7: Minor cleanups and DM_ETH
Quoted 6 lines
We don't need a random MAC as the only network that's supported is over USB and that has a hardcoded MAC, enable
DM_ETHfor the USB, and the device doesn't have MTD storage so drop that.Signed-off-by Peter Robinson <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================
Re: [PATCH 5/5] ARM: board: warp7: Minor cleanups and DM_ETH
In reply to Peter RobinsonHi Peter,
series was lost, sorry.
I have picked them up and rebased on current master. Anyway, build fails (warning) due to
+board/warp7/warp7.c: In function 'board_eth_init':+board/warp7/warp7.c:94:15: error: implicit declaration of function 'usb_eth_initialize'; did you mean 'sh_eth_initialize'? [-Werror=implicit-function-declaration]
+ 94 | ret = usb_eth_initialize(bis);
+ | ^~~~~~~~~~~~~~~~~~
But as board already switched to CONFIG_DM_USB and CONFIG_DM_ETH, do we still need to call this function ?
Best regards,
Stefano
Quoted 53 lines · Peter Robinson
We don't need a random MAC as the only network that's supported is over USB and that has a hardcoded MAC, enable
DM_ETHfor the USB, and the device doesn't have MTD storage so drop that.Signed-off-by Peter Robinson <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>--- configs/warp7_bl33_defconfig | 3 +-- configs/warp7_defconfig | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)configs/warp7_bl33_defconfig +1
-2@@ -32,14 +32,13 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_DFU_MMC=y +CONFIG_DM_ETH=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y -CONFIG_MTD=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=yconfigs/warp7_defconfig +1
-2@@ -38,14 +38,13 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y -CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_DFU_MMC=y +CONFIG_DM_ETH=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_USDHC=y -CONFIG_MTD=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=y
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
Fabio Estevam
reviewerPATCH 1/5 ARM: board: warp: Import dts files
In reply to Peter RobinsonQuoted 6 lines · Peter Robinson
Import the i.MX6 based Warp dts files from Linux 5.12-rc1.
Signed-off-by Peter Robinson <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>
For the series:
PATCH 1/5 ARM: board: warp: Import dts files
In reply to Peter RobinsonQuoted 5 lines
Import the i.MX6 based Warp dts files from Linux 5.12-rc1.
Signed-off-by Peter Robinson <[email protected]>Cc Fabio Estevam <[email protected]>Cc Stefano Babic <[email protected]>Reviewed-by Fabio Estevam <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================