[U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM

[U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM

[Joris Offouga]

This series convert Pico i.MX7 and variant board to DM.
The following options have been enabled:
-CONFIG_DM_GPIO
-CONFIG_DM_EMMC

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
---

Change in v2: 
- add missing dtb in Makefile 

Joris Offouga (5):
  Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM
  pico-imx7d: defconfig: Add DT file hooks
  pico-imx7d: defconfig Enable DM gpio pinctrl and pinctrl_imx7
  pico-imx7d: Convert DM MMC
  pico-imx7d: Increase u-boot size for dfu request

 arch/arm/dts/Makefile                    |   5 +-
 arch/arm/dts/imx7d-pico-hobbit.dts       | 105 ++++++
 arch/arm/dts/imx7d-pico-pi.dts           |  93 +++++
 arch/arm/dts/imx7d-pico.dtsi             | 590 +++++++++++++++++++++++++++++++
 board/technexion/pico-imx7d/pico-imx7d.c |  42 +--
 board/technexion/pico-imx7d/spl.c        |  38 ++
 configs/pico-hobbit-imx7d_defconfig      |   7 +-
 configs/pico-imx7d_defconfig             |   7 +-
 configs/pico-pi-imx7d_defconfig          |   7 +-
 include/configs/pico-imx7d.h             |   2 +-
 10 files changed, 852 insertions(+), 44 deletions(-)
 create mode 100644 arch/arm/dts/imx7d-pico-hobbit.dts
 create mode 100644 arch/arm/dts/imx7d-pico-pi.dts
 create mode 100644 arch/arm/dts/imx7d-pico.dtsi

-- 
2.7.4

[U-Boot] [PATCH V2 1/5] Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM

[Joris Offouga]

This patch imports the Linux kernel base board imx7d-pico.dtsi,
pi board imx7d-pico-pi.dts and hobbit board imx7d-pico-hobbit.dts
from Linux v5.1-rc1.

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
---
 arch/arm/dts/Makefile              |   5 +-
 arch/arm/dts/imx7d-pico-hobbit.dts | 105 +++++++
 arch/arm/dts/imx7d-pico-pi.dts     |  93 ++++++
 arch/arm/dts/imx7d-pico.dtsi       | 586 +++++++++++++++++++++++++++++++++++++
 4 files changed, 788 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/imx7d-pico-hobbit.dts
 create mode 100644 arch/arm/dts/imx7d-pico-pi.dts
 create mode 100644 arch/arm/dts/imx7d-pico.dtsi

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 0e2ffdb..e30c57b 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -544,7 +544,10 @@ dtb-$(CONFIG_MX7) += imx7d-sdb.dtb \
 	imx7d-sdb-qspi.dtb \
 	imx7-colibri-emmc.dtb \
 	imx7-colibri-rawnand.dtb \
-	imx7s-warp.dtb
+	imx7s-warp.dtb \
+	imx7d-pico-pi.dtb \
+	imx7d-pico-hobbit.dtb
+
 
 dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb
 
diff --git a/arch/arm/dts/imx7d-pico-hobbit.dts b/arch/arm/dts/imx7d-pico-hobbit.dts
new file mode 100644
index 0000000..98604f0
--- /dev/null
+++ b/arch/arm/dts/imx7d-pico-hobbit.dts
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+//
+// Copyright 2017 NXP
+
+#include "imx7d-pico.dtsi"
+
+/ {
+	model = "TechNexion PICO-IMX7D Board using Hobbit baseboard";
+	compatible = "technexion,imx7d-pico-hobbit", "fsl,imx7d";
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_leds>;
+
+		led {
+			label = "gpio-led";
+			gpios = <&gpio2 13 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "imx7-sgtl5000";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,bitclock-master = <&dailink_master>;
+		simple-audio-card,frame-master = <&dailink_master>;
+		simple-audio-card,cpu {
+			sound-dai = <&sai1>;
+		};
+
+		dailink_master: simple-audio-card,codec {
+			sound-dai = <&sgtl5000>;
+			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+		};
+	};
+};
+
+&i2c1 {
+	sgtl5000: codec at a {
+		#sound-dai-cells = <0>;
+		reg = <0x0a>;
+		compatible = "fsl,sgtl5000";
+		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+		VDDA-supply = <&reg_2p5v>;
+		VDDIO-supply = <&reg_vref_1v8>;
+	};
+};
+
+&i2c4 {
+	status = "okay";
+
+	adc081c: adc at 50 {
+		compatible = "ti,adc081c";
+		reg = <0x50>;
+		vref-supply = <&reg_3p3v>;
+	};
+};
+
+&ecspi3 {
+	ads7846 at 0 {
+		reg = <0>;
+		compatible = "ti,ads7846";
+		interrupt-parent = <&gpio2>;
+		interrupts = <7 0>;
+		spi-max-frequency = <1000000>;
+		pendown-gpio = <&gpio2 7 0>;
+		vcc-supply = <&reg_3p3v>;
+		ti,x-min = /bits/ 16 <0>;
+		ti,x-max = /bits/ 16 <4095>;
+		ti,y-min = /bits/ 16 <0>;
+		ti,y-max = /bits/ 16 <4095>;
+		ti,pressure-max = /bits/ 16 <1024>;
+		ti,x-plate-ohms = /bits/ 16 <90>;
+		ti,y-plate-ohms = /bits/ 16 <90>;
+		ti,debounce-max = /bits/ 16 <70>;
+		ti,debounce-tol = /bits/ 16 <3>;
+		ti,debounce-rep = /bits/ 16 <2>;
+		ti,settle-delay-usec = /bits/ 16 <150>;
+		wakeup-source;
+	};
+};
+
+&iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	pinctrl_hog: hoggrp {
+		fsl,pins = <
+			MX7D_PAD_EPDC_DATA00__GPIO2_IO0		0x14
+			MX7D_PAD_EPDC_DATA01__GPIO2_IO1		0x14
+			MX7D_PAD_EPDC_DATA02__GPIO2_IO2		0x14
+			MX7D_PAD_EPDC_DATA03__GPIO2_IO3		0x14
+			MX7D_PAD_EPDC_DATA05__GPIO2_IO5		0x14
+			MX7D_PAD_EPDC_DATA12__GPIO2_IO12	0x14
+			MX7D_PAD_EPDC_DATA07__GPIO2_IO7		0x14
+		>;
+	};
+
+	pinctrl_gpio_leds: gpioledsgrp {
+		fsl,pins = <
+			MX7D_PAD_EPDC_DATA13__GPIO2_IO13	0x14
+		>;
+	};
+};
\ No newline at end of file
diff --git a/arch/arm/dts/imx7d-pico-pi.dts b/arch/arm/dts/imx7d-pico-pi.dts
new file mode 100644
index 0000000..66ca590
--- /dev/null
+++ b/arch/arm/dts/imx7d-pico-pi.dts
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+//
+// Copyright 2017 NXP
+
+#include "imx7d-pico.dtsi"
+
+/ {
+	model = "TechNexion PICO-IMX7D Board and PI baseboard";
+	compatible = "technexion,imx7d-pico-pi", "fsl,imx7d";
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_leds>;
+
+		led {
+			label = "gpio-led";
+			gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "imx7-sgtl5000";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,bitclock-master = <&dailink_master>;
+		simple-audio-card,frame-master = <&dailink_master>;
+		simple-audio-card,cpu {
+			sound-dai = <&sai1>;
+		};
+
+		dailink_master: simple-audio-card,codec {
+			sound-dai = <&sgtl5000>;
+			clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+		};
+	};
+};
+
+&i2c1 {
+	sgtl5000: codec at a {
+		#sound-dai-cells = <0>;
+		reg = <0x0a>;
+		compatible = "fsl,sgtl5000";
+		clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+		VDDA-supply = <&reg_2p5v>;
+		VDDIO-supply = <&reg_vref_1v8>;
+	};
+};
+
+&i2c4 {
+	polytouch: touchscreen at 38 {
+		compatible = "edt,edt-ft5x06";
+		reg = <0x38>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_touchscreen>;
+		interrupt-parent = <&gpio2>;
+		interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
+		reset-gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
+		touchscreen-size-x = <800>;
+		touchscreen-size-y = <480>;
+	};
+};
+
+&iomuxc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	pinctrl_hog: hoggrp {
+		fsl,pins = <
+			MX7D_PAD_EPDC_DATA00__GPIO2_IO0		0x14
+			MX7D_PAD_EPDC_DATA01__GPIO2_IO1		0x14
+			MX7D_PAD_EPDC_DATA02__GPIO2_IO2		0x14
+			MX7D_PAD_EPDC_DATA03__GPIO2_IO3		0x14
+			MX7D_PAD_EPDC_DATA05__GPIO2_IO5		0x14
+			MX7D_PAD_EPDC_DATA12__GPIO2_IO12	0x14
+			MX7D_PAD_EPDC_DATA07__GPIO2_IO7		0x14
+		>;
+	};
+
+	pinctrl_gpio_leds: gpioledsgrp {
+		fsl,pins = <
+			MX7D_PAD_EPDC_DATA06__GPIO2_IO6		0x14
+		>;
+	};
+
+	pinctrl_touchscreen: touchscreengrp {
+		fsl,pins = <
+			MX7D_PAD_EPDC_DATA04__GPIO2_IO4		0x14
+			MX7D_PAD_EPDC_DATA13__GPIO2_IO13	0x14
+		>;
+	};
+
+};
\ No newline at end of file
diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi
new file mode 100644
index 0000000..d1a4079
--- /dev/null
+++ b/arch/arm/dts/imx7d-pico.dtsi
@@ -0,0 +1,586 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+//
+// Copyright 2017 NXP
+
+/dts-v1/;
+
+#include "imx7d.dtsi"
+
+
+/ {
+	/* Will be filled by the bootloader */
+	memory at 80000000 {
+		device_type = "memory";
+		reg = <0x80000000 0>;
+	};
+
+	reg_wlreg_on: regulator-wlreg_on {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_reg_wlreg_on>;
+		regulator-name = "wlreg_on";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&gpio4 16 GPIO_ACTIVE_HIGH>;
+		enable-active-high;
+	};
+
+	reg_2p5v: regulator-2p5v {
+		compatible = "regulator-fixed";
+		regulator-name = "2P5V";
+		regulator-min-microvolt = <2500000>;
+		regulator-max-microvolt = <2500000>;
+		regulator-always-on;
+	};
+
+	reg_3p3v: regulator-3p3v {
+		compatible = "regulator-fixed";
+		regulator-name = "3P3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+	};
+
+	reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_usbotg1_pwr>;
+		compatible = "regulator-fixed";
+		regulator-name = "usb_otg1_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		gpio = <&gpio4 5 GPIO_ACTIVE_LOW>;
+	};
+
+	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
+		compatible = "regulator-fixed";
+		regulator-name = "usb_otg2_vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+	};
+
+	reg_vref_1v8: regulator-vref-1v8 {
+		compatible = "regulator-fixed";
+		regulator-name = "vref-1v8";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+	};
+
+	usdhc2_pwrseq: usdhc2_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;
+		clock-names = "ext_clock";
+	};
+};
+
+&clks {
+	assigned-clocks = <&clks IMX7D_CLKO2_ROOT_SRC>,
+			  <&clks IMX7D_CLKO2_ROOT_DIV>;
+	assigned-clock-parents = <&clks IMX7D_CKIL>;
+	assigned-clock-rates = <0>, <32768>;
+};
+
+&ecspi3 {
+	cs-gpios = <&gpio4 11 GPIO_ACTIVE_LOW>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_ecspi3>;
+	status = "okay";
+};
+
+&fec1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_enet1>;
+	assigned-clocks = <&clks IMX7D_ENET1_TIME_ROOT_SRC>,
+			  <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
+	assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
+	assigned-clock-rates = <0>, <100000000>;
+	phy-mode = "rgmii";
+	phy-handle = <&ethphy0>;
+	fsl,magic-packet;
+	phy-reset-gpios = <&gpio6 11 GPIO_ACTIVE_LOW>;
+	status = "okay";
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		ethphy0: ethernet-phy at 1 {
+			compatible = "ethernet-phy-ieee802.3-c22";
+			reg = <1>;
+			status = "okay";
+		};
+	};
+};
+
+&flexcan1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_can1>;
+	status = "okay";
+};
+
+&flexcan2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_can2>;
+	status = "okay";
+};
+
+&i2c1 {
+	clock-frequency = <100000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c1>;
+	status = "okay";
+};
+
+&i2c2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c2>;
+	status = "okay";
+};
+
+&i2c4 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_i2c4>;
+	status = "okay";
+
+	pmic: pfuze3000 at 8 {
+		compatible = "fsl,pfuze3000";
+		reg = <0x08>;
+
+		regulators {
+			sw1a_reg: sw1a {
+				regulator-min-microvolt = <700000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-ramp-delay = <6250>;
+			};
+			/* use sw1c_reg to align with pfuze100/pfuze200 */
+			sw1c_reg: sw1b {
+				regulator-min-microvolt = <700000>;
+				regulator-max-microvolt = <1475000>;
+				regulator-boot-on;
+				regulator-always-on;
+				regulator-ramp-delay = <6250>;
+			};
+
+			sw2_reg: sw2 {
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <1850000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			sw3a_reg: sw3 {
+				regulator-min-microvolt = <900000>;
+				regulator-max-microvolt = <1650000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			swbst_reg: swbst {
+				regulator-min-microvolt = <5000000>;
+				regulator-max-microvolt = <5150000>;
+			};
+
+			snvs_reg: vsnvs {
+				regulator-min-microvolt = <1000000>;
+				regulator-max-microvolt = <3000000>;
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			vref_reg: vrefddr {
+				regulator-boot-on;
+				regulator-always-on;
+			};
+
+			vgen1_reg: vldo1 {
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-always-on;
+			};
+
+			vgen2_reg: vldo2 {
+				regulator-min-microvolt = <800000>;
+				regulator-max-microvolt = <1550000>;
+			};
+
+			vgen3_reg: vccsd {
+				regulator-min-microvolt = <2850000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-always-on;
+			};
+
+			vgen4_reg: v33 {
+				regulator-min-microvolt = <2850000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-always-on;
+			};
+
+			vgen5_reg: vldo3 {
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-always-on;
+			};
+
+			vgen6_reg: vldo4 {
+				regulator-min-microvolt = <1800000>;
+				regulator-max-microvolt = <3300000>;
+				regulator-always-on;
+			};
+		};
+	};
+};
+
+&sai1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sai1>;
+	assigned-clocks = <&clks IMX7D_SAI1_ROOT_SRC>,
+			  <&clks IMX7D_SAI1_ROOT_CLK>;
+	assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>;
+	assigned-clock-rates = <0>, <24576000>;
+	status = "okay";
+};
+
+
+&pwm1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pwm1>;
+	status = "okay";
+};
+
+&pwm2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pwm2>;
+	status = "okay";
+};
+
+&pwm3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_pwm3>;
+	status = "okay";
+};
+
+&pwm4 { /* Backlight */
+	status = "okay";
+};
+
+&uart5 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart5>;
+	assigned-clocks = <&clks IMX7D_UART5_ROOT_SRC>;
+	assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>;
+	status = "okay";
+};
+
+&uart6 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart6>;
+	assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>;
+	assigned-clock-parents = <&clks IMX7D_OSC_24M_CLK>;
+	uart-has-rtscts;
+	status = "okay";
+};
+
+&uart7 { /* Bluetooth */
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart7>;
+	assigned-clocks = <&clks IMX7D_UART7_ROOT_SRC>;
+	assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>;
+	uart-has-rtscts;
+	status = "okay";
+};
+
+&usbotg1 {
+	vbus-supply = <&reg_usb_otg1_vbus>;
+	status = "okay";
+};
+
+&usbotg2 {
+	vbus-supply = <&reg_usb_otg2_vbus>;
+	dr_mode = "host";
+	status = "okay";
+};
+
+&usdhc1 {
+	pinctrl-names = "default", "state_100mhz", "state_200mhz";
+	pinctrl-0 = <&pinctrl_usdhc1>;
+	pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
+	pinctrl-2 = <&pinctrl_usdhc1_200mhz>;
+	cd-gpios = <&gpio5 0 GPIO_ACTIVE_LOW>;
+	bus-width = <4>;
+	tuning-step = <2>;
+	vmmc-supply = <&reg_3p3v>;
+	wakeup-source;
+	no-1-8-v;
+	keep-power-in-suspend;
+	status = "okay";
+};
+
+&usdhc2 { /* Wifi SDIO */
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_wifi_clk>;
+	no-1-8-v;
+	non-removable;
+	keep-power-in-suspend;
+	wakeup-source;
+	vmmc-supply = <&reg_wlreg_on>;
+	mmc-pwrseq = <&usdhc2_pwrseq>;
+	status = "okay";
+};
+
+&usdhc3 {
+	pinctrl-names = "default", "state_100mhz", "state_200mhz";
+	pinctrl-0 = <&pinctrl_usdhc3>;
+	pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
+	pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+	assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>;
+	assigned-clock-rates = <400000000>;
+	bus-width = <8>;
+	no-1-8-v;
+	fsl,tuning-step = <2>;
+	non-removable;
+	status = "okay";
+};
+
+&wdog1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_wdog>;
+	fsl,ext-reset-output;
+	status = "okay";
+};
+
+&iomuxc {
+	pinctrl_ecspi3: ecspi3grp {
+		fsl,pins = <
+			MX7D_PAD_I2C1_SCL__ECSPI3_MISO		0x2
+			MX7D_PAD_I2C1_SDA__ECSPI3_MOSI		0x2
+			MX7D_PAD_I2C2_SCL__ECSPI3_SCLK		0x2
+			MX7D_PAD_I2C2_SDA__GPIO4_IO11		0x14
+		>;
+	};
+
+	pinctrl_i2c1: i2c1grp {
+		fsl,pins = <
+			MX7D_PAD_UART1_TX_DATA__I2C1_SDA	0x4000007f
+			MX7D_PAD_UART1_RX_DATA__I2C1_SCL	0x4000007f
+		>;
+	};
+
+	pinctrl_i2c2: i2c2grp {
+		fsl,pins = <
+			MX7D_PAD_UART2_TX_DATA__I2C2_SDA	0x4000007f
+			MX7D_PAD_UART2_RX_DATA__I2C2_SCL	0x4000007f
+		>;
+	};
+
+	pinctrl_enet1: enet1grp {
+		fsl,pins = <
+			MX7D_PAD_SD2_CD_B__ENET1_MDIO			0x3
+			MX7D_PAD_SD2_WP__ENET1_MDC			0x3
+			MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC	0x1
+			MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0	0x1
+			MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1	0x1
+			MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2	0x1
+			MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3	0x1
+			MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL	0x1
+			MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC	0x1
+			MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0	0x1
+			MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1	0x1
+			MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2	0x1
+			MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3	0x1
+			MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL	0x1
+			MX7D_PAD_SD3_RESET_B__GPIO6_IO11                0x1  /* Ethernet reset */
+		>;
+	};
+
+	pinctrl_can1: can1frp {
+		fsl,pins = <
+			MX7D_PAD_SAI1_RX_DATA__FLEXCAN1_RX	0x59
+			MX7D_PAD_SAI1_TX_BCLK__FLEXCAN1_TX	0x59
+		>;
+	};
+
+	pinctrl_can2: can2frp {
+		fsl,pins = <
+			MX7D_PAD_SAI1_TX_SYNC__FLEXCAN2_RX	0x59
+			MX7D_PAD_SAI1_TX_DATA__FLEXCAN2_TX	0x59
+		>;
+	};
+
+	pinctrl_i2c4: i2c4grp {
+		fsl,pins = <
+			MX7D_PAD_SAI1_RX_BCLK__I2C4_SDA		0x4000007f
+			MX7D_PAD_SAI1_RX_SYNC__I2C4_SCL		0x4000007f
+		>;
+	};
+
+	pinctrl_pwm1: pwm1 {
+		fsl,pins = <
+			MX7D_PAD_GPIO1_IO08__PWM1_OUT   0x7f
+		>;
+	};
+
+	pinctrl_pwm2: pwm2 {
+		fsl,pins = <
+			MX7D_PAD_GPIO1_IO09__PWM2_OUT   0x7f
+		>;
+	};
+
+	pinctrl_pwm3: pwm3 {
+		fsl,pins = <
+			MX7D_PAD_GPIO1_IO10__PWM3_OUT   0x7f
+		>;
+	};
+
+	pinctrl_reg_wlreg_on: regregongrp {
+		fsl,pins = <
+			MX7D_PAD_ECSPI1_SCLK__GPIO4_IO16	0x59
+		>;
+	};
+
+	pinctrl_sai1: sai1grp {
+		fsl,pins = <
+			MX7D_PAD_ENET1_RX_CLK__SAI1_TX_BCLK	0x1f
+			MX7D_PAD_ENET1_CRS__SAI1_TX_SYNC	0x1f
+			MX7D_PAD_ENET1_COL__SAI1_TX_DATA0	0x30
+			MX7D_PAD_ENET1_TX_CLK__SAI1_RX_DATA0	0x1f
+		>;
+	};
+
+	pinctrl_uart5: uart5grp {
+		fsl,pins = <
+			MX7D_PAD_I2C4_SDA__UART5_DCE_TX		0x79
+			MX7D_PAD_I2C4_SCL__UART5_DCE_RX		0x79
+		>;
+	};
+
+	pinctrl_uart6: uart6grp {
+		fsl,pins = <
+			MX7D_PAD_EPDC_DATA08__UART6_DCE_RX	0x79
+			MX7D_PAD_EPDC_DATA09__UART6_DCE_TX	0x79
+			MX7D_PAD_EPDC_DATA10__UART6_DCE_RTS	0x79
+			MX7D_PAD_EPDC_DATA11__UART6_DCE_CTS	0x79
+		>;
+	};
+
+	pinctrl_uart7: uart7grp {
+		fsl,pins = <
+			MX7D_PAD_ECSPI2_MOSI__UART7_DCE_TX	0x79
+			MX7D_PAD_ECSPI2_SCLK__UART7_DCE_RX	0x79
+			MX7D_PAD_ECSPI2_SS0__UART7_DCE_CTS	0x79
+			MX7D_PAD_ECSPI2_MISO__UART7_DCE_RTS	0x79
+		>;
+	};
+
+	pinctrl_usbotg1_pwr: usbotg_pwr {
+		fsl,pins = <
+			MX7D_PAD_UART3_TX_DATA__GPIO4_IO5	0x14
+		>;
+	};
+
+	pinctrl_usdhc1: usdhc1grp {
+		fsl,pins = <
+			MX7D_PAD_SD1_CMD__SD1_CMD		0x59
+			MX7D_PAD_SD1_CLK__SD1_CLK		0x19
+			MX7D_PAD_SD1_DATA0__SD1_DATA0		0x59
+			MX7D_PAD_SD1_DATA1__SD1_DATA1		0x59
+			MX7D_PAD_SD1_DATA2__SD1_DATA2		0x59
+			MX7D_PAD_SD1_DATA3__SD1_DATA3		0x59
+			MX7D_PAD_SD1_CD_B__GPIO5_IO0		0x15
+		>;
+	};
+
+	pinctrl_usdhc1_100mhz: usdhc1grp_100mhz {
+		fsl,pins = <
+			MX7D_PAD_SD1_CMD__SD1_CMD		0x5a
+			MX7D_PAD_SD1_CLK__SD1_CLK		0x1a
+			MX7D_PAD_SD1_DATA0__SD1_DATA0		0x5a
+			MX7D_PAD_SD1_DATA1__SD1_DATA1		0x5a
+			MX7D_PAD_SD1_DATA2__SD1_DATA2		0x5a
+			MX7D_PAD_SD1_DATA3__SD1_DATA3		0x5a
+			MX7D_PAD_SD1_CD_B__GPIO5_IO0		0x15
+		>;
+	};
+
+	pinctrl_usdhc1_200mhz: usdhc1grp_200mhz {
+		fsl,pins = <
+			MX7D_PAD_SD1_CMD__SD1_CMD		0x5b
+			MX7D_PAD_SD1_CLK__SD1_CLK		0x1b
+			MX7D_PAD_SD1_DATA0__SD1_DATA0		0x5b
+			MX7D_PAD_SD1_DATA1__SD1_DATA1		0x5b
+			MX7D_PAD_SD1_DATA2__SD1_DATA2		0x5b
+			MX7D_PAD_SD1_DATA3__SD1_DATA3		0x5b
+			MX7D_PAD_SD1_CD_B__GPIO5_IO0		0x15
+		>;
+	};
+
+	pinctrl_usdhc2: usdhc2grp {
+		fsl,pins = <
+			MX7D_PAD_SD2_CMD__SD2_CMD		0x59
+			MX7D_PAD_SD2_CLK__SD2_CLK		0x19
+			MX7D_PAD_SD2_DATA0__SD2_DATA0		0x59
+			MX7D_PAD_SD2_DATA1__SD2_DATA1		0x59
+			MX7D_PAD_SD2_DATA2__SD2_DATA2		0x59
+			MX7D_PAD_SD2_DATA3__SD2_DATA3		0x59
+		>;
+	};
+
+	pinctrl_usdhc3: usdhc3grp {
+		fsl,pins = <
+			MX7D_PAD_SD3_CMD__SD3_CMD		0x59
+			MX7D_PAD_SD3_CLK__SD3_CLK		0x19
+			MX7D_PAD_SD3_DATA0__SD3_DATA0		0x59
+			MX7D_PAD_SD3_DATA1__SD3_DATA1		0x59
+			MX7D_PAD_SD3_DATA2__SD3_DATA2		0x59
+			MX7D_PAD_SD3_DATA3__SD3_DATA3		0x59
+			MX7D_PAD_SD3_DATA4__SD3_DATA4		0x59
+			MX7D_PAD_SD3_DATA5__SD3_DATA5		0x59
+			MX7D_PAD_SD3_DATA6__SD3_DATA6		0x59
+			MX7D_PAD_SD3_DATA7__SD3_DATA7		0x59
+		>;
+	};
+
+	pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
+		fsl,pins = <
+			MX7D_PAD_SD3_CMD__SD3_CMD		0x5a
+			MX7D_PAD_SD3_CLK__SD3_CLK		0x1a
+			MX7D_PAD_SD3_DATA0__SD3_DATA0		0x5a
+			MX7D_PAD_SD3_DATA1__SD3_DATA1		0x5a
+			MX7D_PAD_SD3_DATA2__SD3_DATA2		0x5a
+			MX7D_PAD_SD3_DATA3__SD3_DATA3		0x5a
+			MX7D_PAD_SD3_DATA4__SD3_DATA4		0x5a
+			MX7D_PAD_SD3_DATA5__SD3_DATA5		0x5a
+			MX7D_PAD_SD3_DATA6__SD3_DATA6		0x5a
+			MX7D_PAD_SD3_DATA7__SD3_DATA7		0x5a
+		>;
+	};
+
+	pinctrl_usdhc3_200mhz: usdhc3grp_200mhz {
+		fsl,pins = <
+			MX7D_PAD_SD3_CMD__SD3_CMD		0x5b
+			MX7D_PAD_SD3_CLK__SD3_CLK		0x1b
+			MX7D_PAD_SD3_DATA0__SD3_DATA0		0x5b
+			MX7D_PAD_SD3_DATA1__SD3_DATA1		0x5b
+			MX7D_PAD_SD3_DATA2__SD3_DATA2		0x5b
+			MX7D_PAD_SD3_DATA3__SD3_DATA3		0x5b
+			MX7D_PAD_SD3_DATA4__SD3_DATA4		0x5b
+			MX7D_PAD_SD3_DATA5__SD3_DATA5		0x5b
+			MX7D_PAD_SD3_DATA6__SD3_DATA6		0x5b
+			MX7D_PAD_SD3_DATA7__SD3_DATA7		0x5b
+		>;
+	};
+};
+
+&iomuxc_lpsr {
+	pinctrl_wifi_clk: wificlkgrp {
+		fsl,pins = <
+			MX7D_PAD_LPSR_GPIO1_IO03__CCM_CLKO2	0x7d
+		>;
+	};
+
+	pinctrl_wdog: wdoggrp {
+		fsl,pins = <
+			MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B	0x74
+		>;
+	};
+};
\ No newline at end of file
-- 
2.7.4

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Joris Offouga]

This patch adds DT file hooks for Pico i.MX7D SOM and variant boards

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
---
 configs/pico-hobbit-imx7d_defconfig | 3 ++-
 configs/pico-imx7d_defconfig        | 3 ++-
 configs/pico-pi-imx7d_defconfig     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
index f58d517..75eab28 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
@@ -58,4 +60,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index 7e13923..beee839 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="ask"
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
@@ -58,4 +60,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
-CONFIG_OF_LIBFDT=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index c8ac2ff..05d5fe5 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_DEFAULT_FDT_FILE="imx7d-pico-pi.dtb"
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi"
 CONFIG_BOUNCE_BUFFER=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_USB_HOST_SUPPORT=y
@@ -58,4 +60,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525
 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
 CONFIG_CI_UDC=y
 CONFIG_VIDEO=y
-CONFIG_OF_LIBFDT=y
-- 
2.7.4

[U-Boot] [PATCH V2 3/5] pico-imx7d: defconfig Enable DM gpio pinctrl and pinctrl_imx7

[Joris Offouga]

This patch is necessary for convert this board to dm driver model

DM GPIO requires gpio_request() to be called explicitly before
doing any gpio operation

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
---
 board/technexion/pico-imx7d/pico-imx7d.c | 4 +++-
 configs/pico-hobbit-imx7d_defconfig      | 3 +++
 configs/pico-imx7d_defconfig             | 3 +++
 configs/pico-pi-imx7d_defconfig          | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 767d13d..3b9be45 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -165,7 +165,7 @@ static iomux_v3_cfg_t const fec1_pads[] = {
 static void setup_iomux_fec(void)
 {
 	imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));
-
+	gpio_request(FEC1_RST_GPIO, "phy_rst");
 	gpio_direction_output(FEC1_RST_GPIO, 0);
 	udelay(500);
 	gpio_set_value(FEC1_RST_GPIO, 1);
@@ -291,6 +291,8 @@ static iomux_v3_cfg_t const lcd_pads[] = {
 void setup_lcd(void)
 {
 	imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads));
+	gpio_request(IMX_GPIO_NR(1, 11), "lcd_brightness");
+	gpio_request(IMX_GPIO_NR(1, 6), "lcd_enable");
 	/* Set Brightness to high */
 	gpio_direction_output(IMX_GPIO_NR(1, 11) , 1);
 	/* Set LCD enable to high */
diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
index 75eab28..a830aa8 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -27,6 +27,9 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX7=y
+CONFIG_DM_GPIO=y
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_DFU=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index beee839..ec7faf9 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -27,6 +27,9 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX7=y
+CONFIG_DM_GPIO=y
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_DFU=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index 05d5fe5..662492a 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -27,6 +27,9 @@ CONFIG_SPL_USB_SDP_SUPPORT=y
 CONFIG_CMD_BOOTMENU=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_XIMG is not set
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX7=y
+CONFIG_DM_GPIO=y
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_DFU=y
-- 
2.7.4

[U-Boot] [PATCH V2 4/5] pico-imx7d: Convert DM MMC

[Joris Offouga]

This patch enable convert DM MMC for imx7d-pico board and variant.

Before the DM conversion only usdhc3 was enabled and therefore it appeared
as MMC 0 to u-boot. After enabling MMC DM though usdhc3 defaults to MMC 2,
which left unattended would drive changes to existing pico-pi bootscripts and
environment variables that rely on mmc 0.

Setup the alias of mmc0 and usdhc3 so that existing pico-imx7d boot code will
work unmodified.

When converting to DM_MMC it is necessary that SPL initializes eMMC
by itself, so move the original eMMC initialization from U-Boot
proper to SPL.

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 arch/arm/dts/imx7d-pico.dtsi             |  4 ++++
 board/technexion/pico-imx7d/pico-imx7d.c | 38 --------------------------------
 board/technexion/pico-imx7d/spl.c        | 38 ++++++++++++++++++++++++++++++++
 configs/pico-hobbit-imx7d_defconfig      |  1 +
 configs/pico-imx7d_defconfig             |  1 +
 configs/pico-pi-imx7d_defconfig          |  1 +
 6 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/arch/arm/dts/imx7d-pico.dtsi b/arch/arm/dts/imx7d-pico.dtsi
index d1a4079..9f1fe68 100644
--- a/arch/arm/dts/imx7d-pico.dtsi
+++ b/arch/arm/dts/imx7d-pico.dtsi
@@ -8,6 +8,10 @@
 
 
 / {
+	aliases {
+		mmc0 = &usdhc3;
+	};
+
 	/* Will be filled by the bootloader */
 	memory at 80000000 {
 		device_type = "memory";
diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 3b9be45..e63b19d 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -13,10 +13,8 @@
 #include <asm/mach-imx/mxc_i2c.h>
 #include <asm/io.h>
 #include <common.h>
-#include <fsl_esdhc.h>
 #include <i2c.h>
 #include <miiphy.h>
-#include <mmc.h>
 #include <netdev.h>
 #include <usb.h>
 #include <power/pmic.h>
@@ -28,9 +26,6 @@ DECLARE_GLOBAL_DATA_PTR;
 #define UART_PAD_CTRL  (PAD_CTL_DSE_3P3V_49OHM | \
 	PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS)
 
-#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
-	PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM)
-
 #define ENET_PAD_CTRL  (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM)
 #define ENET_PAD_CTRL_MII  (PAD_CTL_DSE_3P3V_32OHM)
 
@@ -126,20 +121,6 @@ static iomux_v3_cfg_t const uart5_pads[] = {
 	MX7D_PAD_I2C4_SDA__UART5_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
 };
 
-static iomux_v3_cfg_t const usdhc3_emmc_pads[] = {
-	MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_SD3_DATA7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-	MX7D_PAD_GPIO1_IO14__GPIO1_IO14 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
-};
-
 #ifdef CONFIG_FEC_MXC
 static iomux_v3_cfg_t const fec1_pads[] = {
 	MX7D_PAD_SD2_CD_B__ENET1_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL_MII),
@@ -224,25 +205,6 @@ static void setup_iomux_uart(void)
 	imx_iomux_v3_setup_multiple_pads(uart5_pads, ARRAY_SIZE(uart5_pads));
 }
 
-static struct fsl_esdhc_cfg usdhc_cfg[1] = {
-	{USDHC3_BASE_ADDR},
-};
-
-int board_mmc_getcd(struct mmc *mmc)
-{
-	/* Assume uSDHC3 emmc is always present */
-	return 1;
-}
-
-int board_mmc_init(bd_t *bis)
-{
-	imx_iomux_v3_setup_multiple_pads(
-			usdhc3_emmc_pads, ARRAY_SIZE(usdhc3_emmc_pads));
-	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
-
-	return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
-}
-
 int board_early_init_f(void)
 {
 	setup_iomux_uart();
diff --git a/board/technexion/pico-imx7d/spl.c b/board/technexion/pico-imx7d/spl.c
index 8c34438..92a4646 100644
--- a/board/technexion/pico-imx7d/spl.c
+++ b/board/technexion/pico-imx7d/spl.c
@@ -5,11 +5,15 @@
  * Author: Richard Hu <richard.hu@technexion.com>
  */
 
+#include <asm/arch/clock.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/crm_regs.h>
+#include <asm/arch/mx7-pins.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/arch-mx7/mx7-ddr.h>
+#include <asm/mach-imx/iomux-v3.h>
 #include <asm/gpio.h>
+#include <fsl_esdhc.h>
 #include <spl.h>
 
 #if defined(CONFIG_SPL_BUILD)
@@ -119,4 +123,38 @@ void board_init_f(ulong dummy)
 void reset_cpu(ulong addr)
 {
 }
+
+#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
+	PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM)
+
+static iomux_v3_cfg_t const usdhc3_pads[] = {
+	MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_SD3_DATA0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_SD3_DATA1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_SD3_DATA2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_SD3_DATA3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_SD3_DATA4__SD3_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_SD3_DATA5__SD3_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_SD3_DATA6__SD3_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_SD3_DATA7__SD3_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+	MX7D_PAD_GPIO1_IO14__GPIO1_IO14 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+};
+
+static struct fsl_esdhc_cfg usdhc_cfg[1] = {
+	{USDHC3_BASE_ADDR},
+};
+
+int board_mmc_getcd(struct mmc *mmc)
+{
+	/* Assume uSDHC3 emmc is always present */
+	return 1;
+}
+
+int board_mmc_init(bd_t *bis)
+{
+	imx_iomux_v3_setup_multiple_pads(usdhc3_pads, ARRAY_SIZE(usdhc3_pads));
+	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
+	return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
+}
 #endif
diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
index a830aa8..918e4b9 100644
--- a/configs/pico-hobbit-imx7d_defconfig
+++ b/configs/pico-hobbit-imx7d_defconfig
@@ -34,6 +34,7 @@ CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
+CONFIG_DM_MMC=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
diff --git a/configs/pico-imx7d_defconfig b/configs/pico-imx7d_defconfig
index ec7faf9..04d7804 100644
--- a/configs/pico-imx7d_defconfig
+++ b/configs/pico-imx7d_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_BOOTMENU=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_IMX7=y
 CONFIG_DM_GPIO=y
+CONFIG_DM_MMC=y
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_DFU=y
diff --git a/configs/pico-pi-imx7d_defconfig b/configs/pico-pi-imx7d_defconfig
index 662492a..926e70e 100644
--- a/configs/pico-pi-imx7d_defconfig
+++ b/configs/pico-pi-imx7d_defconfig
@@ -34,6 +34,7 @@ CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_WRITE_SIZE=0x20000
 CONFIG_CMD_DFU=y
 CONFIG_CMD_GPIO=y
+CONFIG_DM_MMC=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
-- 
2.7.4

[U-Boot] [PATCH V2 5/5] pico-imx7d: Increase u-boot size for dfu request

[Joris Offouga]

After DM conversion, the size of U-Boot binary to increase.
Previous size is 480K after DM Conversion the new size is 557K
So it's necessary to increase the dfu request for store u-boot-dtb.img in eMMC.

Signed-off-by: Joris Offouga <offougajoris@gmail.com>
---
 include/configs/pico-imx7d.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 0f6d6b7..04d316f 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -46,7 +46,7 @@
 #define CONFIG_DFU_ENV_SETTINGS \
 	"dfu_alt_info=" \
 		"spl raw 0x2 0x400;" \
-		"u-boot raw 0x8a 0x400;" \
+		"u-boot raw 0x8a 0x1000;" \
 		"/boot/zImage ext4 0 1;" \
 		"/boot/imx7d-pico-hobbit.dtb ext4 0 1;" \
 		"/boot/imx7d-pico-pi.dtb ext4 0 1;" \
-- 
2.7.4

[U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM

[Fabio Estevam]

Hi Joris,

On Thu, Apr 4, 2019 at 9:01 AM Joris Offouga <offougajoris@gmail.com> wrote:
>
> This series convert Pico i.MX7 and variant board to DM.
> The following options have been enabled:
> -CONFIG_DM_GPIO
> -CONFIG_DM_EMMC
>
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> ---
>
> Change in v2:
> - add missing dtb in Makefile

Thanks for working on this series.

My previous Tested-by tag still applies here as well :-)

For the entire series:

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

[U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM

[Joris OFFOUGA]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="windows-1254", Size: 693 bytes --]

Le ven. 5 avr. 2019 à 15:07, Fabio Estevam <festevam@gmail.com> a écrit :

> Hi Joris,
>
Hi Fabio,

> On Thu, Apr 4, 2019 at 9:01 AM Joris Offouga <offougajoris@gmail.com>
> wrote:
> >
> > This series convert Pico i.MX7 and variant board to DM.
> > The following options have been enabled:
> > -CONFIG_DM_GPIO
> > -CONFIG_DM_EMMC
> >
> > Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> > ---
> >
> > Change in v2:
> > - add missing dtb in Makefile
>
> Thanks for working on this series.
>
It was a pleasure I learned a lot 😁

>
> My previous Tested-by tag still applies here as well :-)
>
> For the entire series:
>
> Tested-by: Fabio Estevam <festevam@gmail.com>
>
Thanks Fabio,

[U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM

[jorisoffouga]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="windows-1254", Size: 1049 bytes --]

Hi Stefano

I think this series should be applied for 2019.04 ?

BR

Joris

Le 05/04/2019 à 15:28, Joris OFFOUGA a écrit :
>
>
> Le ven. 5 avr. 2019 à 15:07, Fabio Estevam <festevam@gmail.com 
> <mailto:festevam@gmail.com>> a écrit :
>
>     Hi Joris,
>
> Hi Fabio,
>
>     On Thu, Apr 4, 2019 at 9:01 AM Joris Offouga
>     <offougajoris at gmail.com <mailto:offougajoris@gmail.com>> wrote:
>     >
>     > This series convert Pico i.MX7 and variant board to DM.
>     > The following options have been enabled:
>     > -CONFIG_DM_GPIO
>     > -CONFIG_DM_EMMC
>     >
>     > Signed-off-by: Joris Offouga <offougajoris@gmail.com
>     <mailto:offougajoris@gmail.com>>
>     > ---
>     >
>     > Change in v2:
>     > - add missing dtb in Makefile
>
>     Thanks for working on this series.
>
> It was a pleasure I learned a lot 😁
>
>
>     My previous Tested-by tag still applies here as well :-)
>
>     For the entire series:
>
>     Tested-by: Fabio Estevam <festevam@gmail.com
>     <mailto:festevam@gmail.com>>
>
> Thanks Fabio,
>
>

[U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM

[Stefano Babic]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="windows-1254", Size: 1556 bytes --]

On 15/04/19 10:02, jorisoffouga wrote:
> Hi Stefano
> 
> I think this series should be applied for 2019.04 ?


2019.04 is out, this goes to 2019.07

Stefano

> 
> BR
> 
> Joris
> 
> Le 05/04/2019 à 15:28, Joris OFFOUGA a écrit :
>>
>>
>> Le ven. 5 avr. 2019 à 15:07, Fabio Estevam <festevam@gmail.com
>> <mailto:festevam@gmail.com>> a écrit :
>>
>>     Hi Joris,
>>
>> Hi Fabio, 
>>
>>     On Thu, Apr 4, 2019 at 9:01 AM Joris Offouga
>>     <offougajoris at gmail.com <mailto:offougajoris@gmail.com>> wrote:
>>     >
>>     > This series convert Pico i.MX7 and variant board to DM.
>>     > The following options have been enabled:
>>     > -CONFIG_DM_GPIO
>>     > -CONFIG_DM_EMMC
>>     >
>>     > Signed-off-by: Joris Offouga <offougajoris@gmail.com
>>     <mailto:offougajoris@gmail.com>>
>>     > ---
>>     >
>>     > Change in v2:
>>     > - add missing dtb in Makefile
>>
>>     Thanks for working on this series.
>>
>> It was a pleasure I learned a lot 😁
>>
>>
>>     My previous Tested-by tag still applies here as well :-)
>>
>>     For the entire series:
>>
>>     Tested-by: Fabio Estevam <festevam@gmail.com
>>     <mailto:festevam@gmail.com>>
>>
>> Thanks Fabio, 
>>
>>


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

[U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM

[Fabio Estevam]

Hi Stefano,

On Mon, Apr 15, 2019 at 5:16 AM Stefano Babic <sbabic@denx.de> wrote:

> On 15/04/19 10:02, jorisoffouga wrote:
> > Hi Stefano
> >
> > I think this series should be applied for 2019.04 ?
>
>
> 2019.04 is out, this goes to 2019.07


It seems this series was missed in your first pull request to Tom?

We would like to continue the DM conversion work, so please consider
including this series in your next pull request.

Thanks

[U-Boot] [PATCH V2 0/5] Convert Pico i.MX7 to DM

[Stefano Babic]

On 24/04/19 12:18, Fabio Estevam wrote:
> Hi Stefano,
> 
> On Mon, Apr 15, 2019 at 5:16 AM Stefano Babic <sbabic@denx.de
> <mailto:sbabic@denx.de>> wrote:
> 
>     On 15/04/19 10:02, jorisoffouga wrote:
>     > Hi Stefano
>     >
>     > I think this series should be applied for 2019.04 ?
> 
> 
>     2019.04 is out, this goes to 2019.07
> 
> 
> It seems this series was missed in your first pull request to Tom?
> 


It was, there is an older series about pico-imx7d that I have to take a
look before applying this.


> We would like to continue the DM conversion work, so please consider
> including this series in your next pull request.

Sure.

Regards,
Stefano

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

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Stefano Babic]

On 04/04/19 14:00, Joris Offouga wrote:
> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
> 
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> ---
>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>  configs/pico-imx7d_defconfig        | 3 ++-
>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>  3 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
> index f58d517..75eab28 100644
> --- a/configs/pico-hobbit-imx7d_defconfig
> +++ b/configs/pico-hobbit-imx7d_defconfig
> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
> +CONFIG_OF_CONTROL=y
> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
                                          ^---  two much "o"

I fix this myself by merging.


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

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Joris OFFOUGA]

Le jeu. 25 avr. 2019 à 11:00, Stefano Babic <sbabic@denx.de> a écrit :

> On 04/04/19 14:00, Joris Offouga wrote:
> > This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
> >
> > Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> > ---
> >  configs/pico-hobbit-imx7d_defconfig | 3 ++-
> >  configs/pico-imx7d_defconfig        | 3 ++-
> >  configs/pico-pi-imx7d_defconfig     | 3 ++-
> >  3 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/configs/pico-hobbit-imx7d_defconfig
> b/configs/pico-hobbit-imx7d_defconfig
> > index f58d517..75eab28 100644
> > --- a/configs/pico-hobbit-imx7d_defconfig
> > +++ b/configs/pico-hobbit-imx7d_defconfig
> > @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
> >  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> >  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
> >  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
> > +CONFIG_OF_CONTROL=y
> > +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>                                           ^---  two much "o"
>
> I fix this myself by merging.
>
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
> =====================================================================
>

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Stefano Babic]

On 25/04/19 11:00, Stefano Babic wrote:
> On 04/04/19 14:00, Joris Offouga wrote:
>> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
>>
>> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
>> ---
>>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>>  configs/pico-imx7d_defconfig        | 3 ++-
>>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>>  3 files changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/configs/pico-hobbit-imx7d_defconfig b/configs/pico-hobbit-imx7d_defconfig
>> index f58d517..75eab28 100644
>> --- a/configs/pico-hobbit-imx7d_defconfig
>> +++ b/configs/pico-hobbit-imx7d_defconfig
>> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
>>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>> +CONFIG_OF_CONTROL=y
>> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>                                           ^---  two much "o"
> 
> I fix this myself by merging.
> 
> 

However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there
is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
missing something ?

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

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Joris OFFOUGA]

Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de> a écrit :

> On 25/04/19 11:00, Stefano Babic wrote:
> > On 04/04/19 14:00, Joris Offouga wrote:
> >> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
> >>
> >> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> >> ---
> >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
> >>  configs/pico-imx7d_defconfig        | 3 ++-
> >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
> >>  3 files changed, 6 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/configs/pico-hobbit-imx7d_defconfig
> b/configs/pico-hobbit-imx7d_defconfig
> >> index f58d517..75eab28 100644
> >> --- a/configs/pico-hobbit-imx7d_defconfig
> >> +++ b/configs/pico-hobbit-imx7d_defconfig
> >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
> >>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
> >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
> >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
> >> +CONFIG_OF_CONTROL=y
> >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
> >                                           ^---  two much "o"
> >
> > I fix this myself by merging.
> >
> >
>
> However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there
> is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
> missing something ?
>
No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
Best regards,
Joris Offouga

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

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Stefano Babic]

On 25/04/19 11:18, Joris OFFOUGA wrote:
> 
> 
> Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de
> <mailto:sbabic@denx.de>> a écrit :
> 
>     On 25/04/19 11:00, Stefano Babic wrote:
>     > On 04/04/19 14:00, Joris Offouga wrote:
>     >> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
>     >>
>     >> Signed-off-by: Joris Offouga <offougajoris@gmail.com
>     <mailto:offougajoris@gmail.com>>
>     >> ---
>     >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>     >>  configs/pico-imx7d_defconfig        | 3 ++-
>     >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>     >>  3 files changed, 6 insertions(+), 3 deletions(-)
>     >>
>     >> diff --git a/configs/pico-hobbit-imx7d_defconfig
>     b/configs/pico-hobbit-imx7d_defconfig
>     >> index f58d517..75eab28 100644
>     >> --- a/configs/pico-hobbit-imx7d_defconfig
>     >> +++ b/configs/pico-hobbit-imx7d_defconfig
>     >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>     >>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>     >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
>     >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>     >> +CONFIG_OF_CONTROL=y
>     >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>     >                                           ^---  two much "o"
>     >
>     > I fix this myself by merging.
>     >
>     >
> 
>     However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there
>     is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
>     missing something ?
> 
> No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
> Best regards,

I suppose this, but then something in the build is broken, If I run
buildman, a pico-imx7d board is searched. In fact, there is a
configs/pico-imx7d_defconfig. If this is just SOM, this file has no
reason to exist.

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

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Joris Offouga]

Le 25/04/2019 à 11:26, Stefano Babic a écrit :
> On 25/04/19 11:18, Joris OFFOUGA wrote:
>>
>> Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de
>> <mailto:sbabic@denx.de>> a écrit :
>>
>>      On 25/04/19 11:00, Stefano Babic wrote:
>>      > On 04/04/19 14:00, Joris Offouga wrote:
>>      >> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
>>      >>
>>      >> Signed-off-by: Joris Offouga <offougajoris@gmail.com
>>      <mailto:offougajoris@gmail.com>>
>>      >> ---
>>      >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>>      >>  configs/pico-imx7d_defconfig        | 3 ++-
>>      >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>>      >>  3 files changed, 6 insertions(+), 3 deletions(-)
>>      >>
>>      >> diff --git a/configs/pico-hobbit-imx7d_defconfig
>>      b/configs/pico-hobbit-imx7d_defconfig
>>      >> index f58d517..75eab28 100644
>>      >> --- a/configs/pico-hobbit-imx7d_defconfig
>>      >> +++ b/configs/pico-hobbit-imx7d_defconfig
>>      >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>>      >>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>>      >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
>>      >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>>      >> +CONFIG_OF_CONTROL=y
>>      >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>>      >                                           ^---  two much "o"
>>      >
>>      > I fix this myself by merging.
>>      >
>>      >
>>
>>      However, this fix pico-hobbit-imx7d, but not pico-imx7d. In fact, there
>>      is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
>>      missing something ?
>>
>> No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
>> Best regards,
> I suppose this, but then something in the build is broken, If I run
> buildman, a pico-imx7d board is searched. In fact, there is a
> configs/pico-imx7d_defconfig. If this is just SOM, this file has no
> reason to exist.

For pico_imx7d_defconfig, i set 
CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi.dtb"

You have to ask Fabio and Otavio I did not grow on it when I did the dm 
conversion, they asked me to convert everything even som

Best Regards,

Joris Offouga

> Best regards,
> Stefano Babic
>
>

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Stefano Babic]

On 25/04/19 11:57, Joris Offouga wrote:
> 
> Le 25/04/2019 à 11:26, Stefano Babic a écrit :
>> On 25/04/19 11:18, Joris OFFOUGA wrote:
>>>
>>> Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de
>>> <mailto:sbabic@denx.de>> a écrit :
>>>
>>>      On 25/04/19 11:00, Stefano Babic wrote:
>>>      > On 04/04/19 14:00, Joris Offouga wrote:
>>>      >> This patch adds DT file hooks for Pico i.MX7D SOM and variant
>>> boards
>>>      >>
>>>      >> Signed-off-by: Joris Offouga <offougajoris@gmail.com
>>>      <mailto:offougajoris@gmail.com>>
>>>      >> ---
>>>      >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>>>      >>  configs/pico-imx7d_defconfig        | 3 ++-
>>>      >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>>>      >>  3 files changed, 6 insertions(+), 3 deletions(-)
>>>      >>
>>>      >> diff --git a/configs/pico-hobbit-imx7d_defconfig
>>>      b/configs/pico-hobbit-imx7d_defconfig
>>>      >> index f58d517..75eab28 100644
>>>      >> --- a/configs/pico-hobbit-imx7d_defconfig
>>>      >> +++ b/configs/pico-hobbit-imx7d_defconfig
>>>      >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>>>      >> 
>>> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>>>      >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run
>>> distro_bootcmd"
>>>      >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>>>      >> +CONFIG_OF_CONTROL=y
>>>      >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>>>      >                                           ^---  two much "o"
>>>      >
>>>      > I fix this myself by merging.
>>>      >
>>>      >
>>>
>>>      However, this fix pico-hobbit-imx7d, but not pico-imx7d. In
>>> fact, there
>>>      is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
>>>      missing something ?
>>>
>>> No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
>>> Best regards,
>> I suppose this, but then something in the build is broken, If I run
>> buildman, a pico-imx7d board is searched. In fact, there is a
>> configs/pico-imx7d_defconfig. If this is just SOM, this file has no
>> reason to exist.
> 
> For pico_imx7d_defconfig, i set
> CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi.dtb"
> 

This is not what I see in your patch
http://patchwork.ozlabs.org/patch/1077223/:

+CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico"

I fix myself in the defconfig.

> You have to ask Fabio and Otavio I did not grow on it when I did the dm
> conversion, they asked me to convert everything even som

Just SOM it is quite weird if there is not an evaluation board to
support it. Anyway, I fix the name, 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
=====================================================================

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Joris Offouga]

Le 25/04/2019 à 12:28, Stefano Babic a écrit :
> On 25/04/19 11:57, Joris Offouga wrote:
>> Le 25/04/2019 à 11:26, Stefano Babic a écrit :
>>> On 25/04/19 11:18, Joris OFFOUGA wrote:
>>>> Le jeu. 25 avr. 2019 à 11:12, Stefano Babic <sbabic@denx.de
>>>> <mailto:sbabic@denx.de>> a écrit :
>>>>
>>>>       On 25/04/19 11:00, Stefano Babic wrote:
>>>>       > On 04/04/19 14:00, Joris Offouga wrote:
>>>>       >> This patch adds DT file hooks for Pico i.MX7D SOM and variant
>>>> boards
>>>>       >>
>>>>       >> Signed-off-by: Joris Offouga <offougajoris@gmail.com
>>>>       <mailto:offougajoris@gmail.com>>
>>>>       >> ---
>>>>       >>  configs/pico-hobbit-imx7d_defconfig | 3 ++-
>>>>       >>  configs/pico-imx7d_defconfig        | 3 ++-
>>>>       >>  configs/pico-pi-imx7d_defconfig     | 3 ++-
>>>>       >>  3 files changed, 6 insertions(+), 3 deletions(-)
>>>>       >>
>>>>       >> diff --git a/configs/pico-hobbit-imx7d_defconfig
>>>>       b/configs/pico-hobbit-imx7d_defconfig
>>>>       >> index f58d517..75eab28 100644
>>>>       >> --- a/configs/pico-hobbit-imx7d_defconfig
>>>>       >> +++ b/configs/pico-hobbit-imx7d_defconfig
>>>>       >> @@ -16,6 +16,8 @@ CONFIG_NR_DRAM_BANKS=1
>>>>       >>
>>>> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>>>>       >>  CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run
>>>> distro_bootcmd"
>>>>       >>  CONFIG_DEFAULT_FDT_FILE="imx7d-pico-hobbit.dtb"
>>>>       >> +CONFIG_OF_CONTROL=y
>>>>       >> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-hoobit"
>>>>       >                                           ^---  two much "o"
>>>>       >
>>>>       > I fix this myself by merging.
>>>>       >
>>>>       >
>>>>
>>>>       However, this fix pico-hobbit-imx7d, but not pico-imx7d. In
>>>> fact, there
>>>>       is no pico-imx7d.dts, but CONFIG_DEFAULT_DEVICE_TREE is set. Am I
>>>>       missing something ?
>>>>
>>>> No it's just som he does not need to CONFIG_DEFAULT_DEVICE_TREE
>>>> Best regards,
>>> I suppose this, but then something in the build is broken, If I run
>>> buildman, a pico-imx7d board is searched. In fact, there is a
>>> configs/pico-imx7d_defconfig. If this is just SOM, this file has no
>>> reason to exist.
>> For pico_imx7d_defconfig, i set
>> CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico-pi.dtb"
>>
> This is not what I see in your patch
> http://patchwork.ozlabs.org/patch/1077223/:
>
> +CONFIG_DEFAULT_DEVICE_TREE="imx7d-pico"
>
> I fix myself in the defconfig.
Sorry for the mistake and thanks.
>> You have to ask Fabio and Otavio I did not grow on it when I did the dm
>> conversion, they asked me to convert everything even som
> Just SOM it is quite weird if there is not an evaluation board to
> support it. Anyway, I fix the name, thanks.
Thanks Stefano
>
> Best regards,
> Stefano Babic

Best regards,

Joris Offouga

>

[U-Boot] [PATCH V2 2/5] pico-imx7d: defconfig: Add DT file hooks

[Fabio Estevam]

Hi Stefano,

On Thu, Apr 25, 2019 at 7:28 AM Stefano Babic <sbabic@denx.de> wrote:

> Just SOM it is quite weird if there is not an evaluation board to
> support it. Anyway, I fix the name, thanks.

Yes, for U-Boot purpose we can either use:
imx7d-pico-pi or imx7d-pico-hobbit for the CONFIG_DEFAULT_DEVICE_TREE option.

Both will work fine.

Thanks for fixing it.

[U-Boot] [U-Boot, V2, 1/5] Arm: imx7d-pico: Import all Linux device tree for Pico i.MX7D SOM

[sbabic at denx.de]

> This patch imports the Linux kernel base board imx7d-pico.dtsi,
> pi board imx7d-pico-pi.dts and hobbit board imx7d-pico-hobbit.dts
> from Linux v5.1-rc1.
> Signed-off-by: Joris Offouga <offougajoris@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
=====================================================================

[U-Boot] [U-Boot, V2, 5/5] pico-imx7d: Increase u-boot size for dfu request

[sbabic at denx.de]

> After DM conversion, the size of U-Boot binary to increase.
> Previous size is 480K after DM Conversion the new size is 557K
> So it's necessary to increase the dfu request for store u-boot-dtb.img in eMMC.
> Signed-off-by: Joris Offouga <offougajoris@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
=====================================================================

[U-Boot] [U-Boot, V2, 3/5] pico-imx7d: defconfig Enable DM gpio pinctrl and pinctrl_imx7

[sbabic at denx.de]

> This patch is necessary for convert this board to dm driver model
> DM GPIO requires gpio_request() to be called explicitly before
> doing any gpio operation
> Signed-off-by: Joris Offouga <offougajoris@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
=====================================================================

[U-Boot] [U-Boot,V2,2/5] pico-imx7d: defconfig: Add DT file hooks

[sbabic at denx.de]

> This patch adds DT file hooks for Pico i.MX7D SOM and variant boards
> Signed-off-by: Joris Offouga <offougajoris@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
=====================================================================

[U-Boot] [U-Boot,V2,4/5] pico-imx7d: Convert DM MMC

[sbabic at denx.de]

> This patch enable convert DM MMC for imx7d-pico board and variant.
> Before the DM conversion only usdhc3 was enabled and therefore it appeared
> as MMC 0 to u-boot. After enabling MMC DM though usdhc3 defaults to MMC 2,
> which left unattended would drive changes to existing pico-pi bootscripts and
> environment variables that rely on mmc 0.
> Setup the alias of mmc0 and usdhc3 so that existing pico-imx7d boot code will
> work unmodified.
> When converting to DM_MMC it is necessary that SPL initializes eMMC
> by itself, so move the original eMMC initialization from U-Boot
> proper to SPL.
> Signed-off-by: Joris Offouga <offougajoris@gmail.com>
> Signed-off-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
=====================================================================