[PATCH 1/5] ARM: board: warp: Import dts files

[PATCH 1/5] ARM: board: warp: Import dts files

[Peter Robinson]

Import the i.MX6 based Warp dts files from Linux 5.12-rc1.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 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

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 116f75192f..1481a6ec46 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -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
 
diff --git a/arch/arm/dts/imx6sl-warp.dts b/arch/arm/dts/imx6sl-warp.dts
new file mode 100644
index 0000000000..9d7c888489
--- /dev/null
+++ b/arch/arm/dts/imx6sl-warp.dts
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2014, 2015 O.S. Systems Software LTDA.
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ *  a) This file is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of
+ *     the License, or (at your option) any later version.
+ *
+ *     This file is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this file; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ *  b) Permission is hereby granted, free of charge, to any person
+ *     obtaining a copy of this software and associated documentation
+ *     files (the "Software"), to deal in the Software without
+ *     restriction, including without limitation the rights to use,
+ *     copy, modify, merge, publish, distribute, sublicense, and/or
+ *     sell copies of the Software, and to permit persons to whom the
+ *     Software is furnished to do so, subject to the following
+ *     conditions:
+ *
+ *     The above copyright notice and this permission notice shall be
+ *     included in all copies or substantial portions of the Software.
+ *
+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ *     OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include "imx6sl.dtsi"
+
+/ {
+	model = "Revotics WaRP Board";
+	compatible = "revotics,imx6sl-warp", "fsl,imx6sl";
+
+	memory at 80000000 {
+		device_type = "memory";
+		reg = <0x80000000 0x20000000>;
+	};
+
+	usdhc3_pwrseq: usdhc3_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		reset-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>, 	/* WL_REG_ON */
+			      <&gpio4 7 GPIO_ACTIVE_LOW>, 	/* WL_HOSTWAKE */
+			      <&gpio3 25 GPIO_ACTIVE_LOW>, 	/* BT_REG_ON */
+			      <&gpio3 27 GPIO_ACTIVE_LOW>,	/* BT_HOSTWAKE */
+			      <&gpio4 4 GPIO_ACTIVE_LOW>, 	/* BT_WAKE */
+			      <&gpio4 6 GPIO_ACTIVE_LOW>; 	/* BT_RST_N */
+	};
+};
+
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart1>;
+	status = "okay";
+};
+
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart3>;
+	status = "okay";
+};
+
+&uart5 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart5>;
+	uart-has-rtscts;
+	status = "okay";
+};
+
+&usbotg1 {
+	dr_mode = "peripheral";
+	disable-over-current;
+	status = "okay";
+};
+
+&usbotg2 {
+	dr_mode = "host";
+	disable-over-current;
+	status = "okay";
+};
+
+&usdhc2 {
+	pinctrl-names = "default", "state_100mhz", "state_200mhz";
+	pinctrl-0 = <&pinctrl_usdhc2>;
+	pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
+	pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
+	bus-width = <8>;
+	non-removable;
+	status = "okay";
+};
+
+&usdhc3 {
+	pinctrl-names = "default", "state_100mhz", "state_200mhz";
+	pinctrl-0 = <&pinctrl_usdhc3>;
+	pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
+	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+	bus-width = <4>;
+	non-removable;
+	keep-power-in-suspend;
+	wakeup-source;
+	mmc-pwrseq = <&usdhc3_pwrseq>;
+	status = "okay";
+};
+
+&iomuxc {
+	imx6sl-warp {
+		pinctrl_uart1: uart1grp {
+			fsl,pins = <
+				MX6SL_PAD_UART1_RXD__UART1_RX_DATA	0x41b0b1
+				MX6SL_PAD_UART1_TXD__UART1_TX_DATA	0x41b0b1
+			>;
+		};
+
+
+		pinctrl_uart3: uart3grp {
+			fsl,pins = <
+				MX6SL_PAD_AUD_RXC__UART3_RX_DATA	0x41b0b1
+				MX6SL_PAD_AUD_RXC__UART3_TX_DATA	0x41b0b1
+			>;
+		};
+
+		pinctrl_uart5: uart5grp {
+			fsl,pins = <
+				MX6SL_PAD_ECSPI1_SCLK__UART5_RX_DATA	0x41b0b1
+				MX6SL_PAD_ECSPI1_MOSI__UART5_TX_DATA	0x41b0b1
+				MX6SL_PAD_ECSPI1_MISO__UART5_RTS_B	0x4130b1
+				MX6SL_PAD_ECSPI1_SS0__UART5_CTS_B	0x4130b1
+			>;
+		};
+
+		pinctrl_usdhc2: usdhc2grp {
+			fsl,pins = <
+				MX6SL_PAD_SD2_CMD__SD2_CMD		0x417059
+				MX6SL_PAD_SD2_CLK__SD2_CLK		0x410059
+				MX6SL_PAD_SD2_DAT0__SD2_DATA0		0x417059
+				MX6SL_PAD_SD2_DAT1__SD2_DATA1		0x417059
+				MX6SL_PAD_SD2_DAT2__SD2_DATA2		0x417059
+				MX6SL_PAD_SD2_DAT3__SD2_DATA3		0x417059
+				MX6SL_PAD_SD2_DAT4__SD2_DATA4		0x417059
+				MX6SL_PAD_SD2_DAT5__SD2_DATA5		0x417059
+				MX6SL_PAD_SD2_DAT6__SD2_DATA6		0x417059
+				MX6SL_PAD_SD2_DAT7__SD2_DATA7		0x417059
+				MX6SL_PAD_SD2_RST__SD2_RESET		0x417059
+			>;
+		};
+
+		pinctrl_usdhc2_100mhz: usdhc2grp100mhz {
+			fsl,pins = <
+				MX6SL_PAD_SD2_CMD__SD2_CMD		0x4170b9
+				MX6SL_PAD_SD2_CLK__SD2_CLK		0x4100b9
+				MX6SL_PAD_SD2_DAT0__SD2_DATA0		0x4170b9
+				MX6SL_PAD_SD2_DAT1__SD2_DATA1		0x4170b9
+				MX6SL_PAD_SD2_DAT2__SD2_DATA2		0x4170b9
+				MX6SL_PAD_SD2_DAT3__SD2_DATA3		0x4170b9
+				MX6SL_PAD_SD2_DAT4__SD2_DATA4		0x4170b9
+				MX6SL_PAD_SD2_DAT5__SD2_DATA5		0x4170b9
+				MX6SL_PAD_SD2_DAT6__SD2_DATA6		0x4170b9
+				MX6SL_PAD_SD2_DAT7__SD2_DATA7		0x4170b9
+				MX6SL_PAD_SD2_RST__SD2_RESET		0x4170b9
+			>;
+		};
+
+		pinctrl_usdhc2_200mhz: usdhc2grp200mhz {
+			fsl,pins = <
+				MX6SL_PAD_SD2_CMD__SD2_CMD		0x4170f9
+				MX6SL_PAD_SD2_CLK__SD2_CLK		0x4100f9
+				MX6SL_PAD_SD2_DAT0__SD2_DATA0		0x4170f9
+				MX6SL_PAD_SD2_DAT1__SD2_DATA1		0x4170f9
+				MX6SL_PAD_SD2_DAT2__SD2_DATA2		0x4170f9
+				MX6SL_PAD_SD2_DAT3__SD2_DATA3		0x4170f9
+				MX6SL_PAD_SD2_DAT4__SD2_DATA4		0x4170f9
+				MX6SL_PAD_SD2_DAT5__SD2_DATA5		0x4170f9
+				MX6SL_PAD_SD2_DAT6__SD2_DATA6		0x4170f9
+				MX6SL_PAD_SD2_DAT7__SD2_DATA7		0x4170f9
+				MX6SL_PAD_SD2_RST__SD2_RESET		0x4170f9
+			>;
+		};
+
+		pinctrl_usdhc3: usdhc3grp {
+			fsl,pins = <
+				MX6SL_PAD_SD3_CMD__SD3_CMD		0x417059
+				MX6SL_PAD_SD3_CLK__SD3_CLK		0x410059
+				MX6SL_PAD_SD3_DAT0__SD3_DATA0		0x417059
+				MX6SL_PAD_SD3_DAT1__SD3_DATA1		0x417059
+				MX6SL_PAD_SD3_DAT2__SD3_DATA2		0x417059
+				MX6SL_PAD_SD3_DAT3__SD3_DATA3		0x417059
+			>;
+		};
+
+		pinctrl_usdhc3_100mhz: usdhc3grp100mhz {
+			fsl,pins = <
+				MX6SL_PAD_SD3_CMD__SD3_CMD		0x4170b9
+				MX6SL_PAD_SD3_CLK__SD3_CLK		0x4100b9
+				MX6SL_PAD_SD3_DAT0__SD3_DATA0		0x4170b9
+				MX6SL_PAD_SD3_DAT1__SD3_DATA1		0x4170b9
+				MX6SL_PAD_SD3_DAT2__SD3_DATA2		0x4170b9
+				MX6SL_PAD_SD3_DAT3__SD3_DATA3		0x4170b9
+			>;
+		};
+
+		pinctrl_usdhc3_200mhz: usdhc3grp200mhz {
+			fsl,pins = <
+				MX6SL_PAD_SD3_CMD__SD3_CMD		0x4170f9
+				MX6SL_PAD_SD3_CLK__SD3_CLK		0x4100f9
+				MX6SL_PAD_SD3_DAT0__SD3_DATA0		0x4170f9
+				MX6SL_PAD_SD3_DAT1__SD3_DATA1		0x4170f9
+				MX6SL_PAD_SD3_DAT2__SD3_DATA2		0x4170f9
+				MX6SL_PAD_SD3_DAT3__SD3_DATA3		0x4170f9
+			>;
+		};
+	};
+};
-- 
2.31.1

[PATCH 2/5] ARM: board: warp: Enable OF_CONTROL and DM gpio/pin control

[Peter Robinson]

Enable OF_CONTROL and DM for gpio and pin control support
on the i.MX6SL based Warp.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 configs/warp_defconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index 34acc9e6c8..68ad71c27c 100644
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -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
-- 
2.31.1

[PATCH 3/5] ARM: board: warp: convert to DM_MMC

[Peter Robinson]

Convert Warp to use DM MMC.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 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

diff --git a/arch/arm/dts/imx6sl-warp-u-boot.dtsi b/arch/arm/dts/imx6sl-warp-u-boot.dtsi
new file mode 100644
index 0000000000..daf2489cfd
--- /dev/null
+++ b/arch/arm/dts/imx6sl-warp-u-boot.dtsi
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
+
+/ {
+	aliases {
+		mmc0 = &usdhc2;
+	};
+};
diff --git a/board/warp/warp.c b/board/warp/warp.c
index 0f1d038fab..417f0e7507 100644
--- a/board/warp/warp.c
+++ b/board/warp/warp.c
@@ -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;
diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index 68ad71c27c..6efe400dd1 100644
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -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
-- 
2.31.1

[PATCH 4/5] ARM: board: warp: convert to DM_USB

[Peter Robinson]

Convert Warp to use DM USB.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 configs/warp_defconfig | 1 +
 include/configs/warp.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/warp_defconfig b/configs/warp_defconfig
index 6efe400dd1..223436c86e 100644
--- a/configs/warp_defconfig
+++ b/configs/warp_defconfig
@@ -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"
diff --git a/include/configs/warp.h b/include/configs/warp.h
index f17eea117f..8cde52f634 100644
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -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
-- 
2.31.1

[PATCH 5/5] ARM: board: warp7: Minor cleanups and DM_ETH

[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_ETH for the USB,
and the device doesn't have MTD storage so drop that.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Stefano Babic <sbabic@denx.de>
---
 configs/warp7_bl33_defconfig | 3 +--
 configs/warp7_defconfig      | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig
index 4b45fcd50a..98d370754a 100644
--- a/configs/warp7_bl33_defconfig
+++ b/configs/warp7_bl33_defconfig
@@ -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
diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index 3d11196080..8fa1981207 100644
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -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
-- 
2.31.1

[PATCH 1/5] ARM: board: warp: Import dts files

[Fabio Estevam]

On Fri, Apr 2, 2021 at 3:06 PM Peter Robinson <pbrobinson@gmail.com> wrote:
>
> Import the i.MX6 based Warp dts files from Linux 5.12-rc1.
>
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>

For the series:

Reviewed-by: Fabio Estevam <festevam@gmail.com>

[PATCH 3/5] ARM: board: warp: convert to DM_MMC

[Jaehoon Chung]

On 4/3/21 3:05 AM, Peter Robinson wrote:
> Convert Warp to use DM MMC.
> 
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>

Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

Best Regards,
Jaehoon Chung

> ---
>  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
> 
> diff --git a/arch/arm/dts/imx6sl-warp-u-boot.dtsi b/arch/arm/dts/imx6sl-warp-u-boot.dtsi
> new file mode 100644
> index 0000000000..daf2489cfd
> --- /dev/null
> +++ b/arch/arm/dts/imx6sl-warp-u-boot.dtsi
> @@ -0,0 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +
> +/ {
> +	aliases {
> +		mmc0 = &usdhc2;
> +	};
> +};
> diff --git a/board/warp/warp.c b/board/warp/warp.c
> index 0f1d038fab..417f0e7507 100644
> --- a/board/warp/warp.c
> +++ b/board/warp/warp.c
> @@ -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;
> diff --git a/configs/warp_defconfig b/configs/warp_defconfig
> index 68ad71c27c..6efe400dd1 100644
> --- a/configs/warp_defconfig
> +++ b/configs/warp_defconfig
> @@ -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 4/5] ARM: board: warp: convert to DM_USB

[Stefano Babic]

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

On 02.04.21 20:05, Peter Robinson wrote:
> Convert Warp to use DM USB.
> 
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>   configs/warp_defconfig | 1 +
>   include/configs/warp.h | 1 -
>   2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configs/warp_defconfig b/configs/warp_defconfig
> index 6efe400dd1..223436c86e 100644
> --- a/configs/warp_defconfig
> +++ b/configs/warp_defconfig
> @@ -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"
> diff --git a/include/configs/warp.h b/include/configs/warp.h
> index f17eea117f..8cde52f634 100644
> --- a/include/configs/warp.h
> +++ b/include/configs/warp.h
> @@ -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
> 


-- 
=====================================================================
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

[sbabic at denx.de]

> Convert Warp to use DM USB.
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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

[sbabic at denx.de]

> Convert Warp to use DM MMC.
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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 2/5] ARM: board: warp: Enable OF_CONTROL and DM gpio/pin control

[sbabic at denx.de]

> Enable OF_CONTROL and DM for gpio and pin control support
> on the i.MX6SL based Warp.
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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 1/5] ARM: board: warp: Import dts files

[sbabic at denx.de]

> Import the i.MX6 based Warp dts files from Linux 5.12-rc1.
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Reviewed-by: Fabio Estevam <festevam@gmail.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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

[sbabic at denx.de]

> 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_ETH for the USB,
> and the device doesn't have MTD storage so drop that.
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
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

[Stefano Babic]

Hi 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

On 02.04.21 20:05, Peter Robinson wrote:
> 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_ETH for the USB,
> and the device doesn't have MTD storage so drop that.
> 
> Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
>   configs/warp7_bl33_defconfig | 3 +--
>   configs/warp7_defconfig      | 3 +--
>   2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig
> index 4b45fcd50a..98d370754a 100644
> --- a/configs/warp7_bl33_defconfig
> +++ b/configs/warp7_bl33_defconfig
> @@ -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
> diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
> index 3d11196080..8fa1981207 100644
> --- a/configs/warp7_defconfig
> +++ b/configs/warp7_defconfig
> @@ -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
> 


-- 
=====================================================================
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@denx.de
=====================================================================