From patchwork Wed Jan 29 21:05:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joris Offouga X-Patchwork-Id: 240476 List-Id: U-Boot discussion From: offougajoris at gmail.com (Joris Offouga) Date: Wed, 29 Jan 2020 22:05:58 +0100 Subject: [PATCH V2 1/4] warp7: Fix the pmic_get() parameter in the DM case Message-ID: <20200129210602.14521-1-offougajoris@gmail.com> When pmic_get() is used with DM the first parameter must be the complete node name plus the unit address, so fix it accordingly Signed-off-by: Joris Offouga Reviewed-by: Fabio Estevam --- changes v1->v2: add commit log change commit message add reviewed board/warp7/warp7.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 9efc62f2fb..1ebec93916 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -67,7 +67,7 @@ int power_init_board(void) struct udevice *dev; int ret, dev_id, rev_id; - ret = pmic_get("pfuze3000", &dev); + ret = pmic_get("pfuze3000 at 8", &dev); if (ret == -ENODEV) return 0; if (ret != 0) From patchwork Wed Jan 29 21:05:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joris Offouga X-Patchwork-Id: 240477 List-Id: U-Boot discussion From: offougajoris at gmail.com (Joris Offouga) Date: Wed, 29 Jan 2020 22:05:59 +0100 Subject: [PATCH V2 2/4] warp7: remove unused usb configs In-Reply-To: <20200129210602.14521-1-offougajoris@gmail.com> References: <20200129210602.14521-1-offougajoris@gmail.com> Message-ID: <20200129210602.14521-2-offougajoris@gmail.com> With commit 6b503f9e6549("warp7: Switch to DM USB"). These configs are not necessary Signed-off-by: Joris Offouga Reviewed-by: Fabio Estevam --- changes v1->v2: add 12 digits for commit ID fix typo in commit log include/configs/warp7.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index da894ec0ca..39c00480bd 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -149,12 +149,8 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 0 -/* USB Configs */ -#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 OTG1 port enabled */ #define CONFIG_IMX_THERMAL From patchwork Wed Jan 29 21:06:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joris Offouga X-Patchwork-Id: 240478 List-Id: U-Boot discussion From: offougajoris at gmail.com (Joris Offouga) Date: Wed, 29 Jan 2020 22:06:00 +0100 Subject: [PATCH V2 3/4] arm: dts: imx7s-warp7: Move u-boot specific node in u-boot.dtsi In-Reply-To: <20200129210602.14521-1-offougajoris@gmail.com> References: <20200129210602.14521-1-offougajoris@gmail.com> Message-ID: <20200129210602.14521-3-offougajoris@gmail.com> These nodes are not in upstream kernel, so move these in u-boot.dtsi Signed-off-by: Joris Offouga Reviewed-by: Fabio Estevam --- changes v1->v2: fix stdoutpath in to stdout-path add commit log arch/arm/dts/imx7s-warp-u-boot.dtsi | 10 ++++++++++ arch/arm/dts/imx7s-warp.dts | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 arch/arm/dts/imx7s-warp-u-boot.dtsi diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi b/arch/arm/dts/imx7s-warp-u-boot.dtsi new file mode 100644 index 0000000000..6319840b1c --- /dev/null +++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi @@ -0,0 +1,10 @@ +/ { + aliases { + mmc0 = &usdhc3; + usb0 = &usbotg1; + }; + + chosen { + stdout-path = &uart1; + }; +}; diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index db5ef67eb1..f7ba2c0a24 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -17,15 +17,6 @@ reg = <0x80000000 0x20000000>; }; - aliases { - mmc0 = &usdhc3; - usb0 = &usbotg1; - }; - - chosen { - stdout-path = &uart1; - }; - gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pinctrl_gpio>; From patchwork Wed Jan 29 21:06:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joris Offouga X-Patchwork-Id: 240479 List-Id: U-Boot discussion From: offougajoris at gmail.com (Joris Offouga) Date: Wed, 29 Jan 2020 22:06:01 +0100 Subject: [PATCH V2 4/4] mx7dsabre: Fix usbtog probe when use dfu or ums In-Reply-To: <20200129210602.14521-1-offougajoris@gmail.com> References: <20200129210602.14521-1-offougajoris@gmail.com> Message-ID: <20200129210602.14521-4-offougajoris@gmail.com> Before: => ums 0 mmc 0 UMS: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x1dacc00 usb dr_mode not found CTRL+C - Operation aborted => dfu 0 mmc 0 usb dr_mode not found After : => ums 0 mmc 0 UMS: LUN 0, dev 0, hwpart 0, sector 0x0, count 0x1dacc00 => dfu 0 mmc 0 Signed-off-by: Joris Offouga Reviewed-by: Fabio Estevam --- changes v1->v2: none arch/arm/dts/imx7d-sdb-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/imx7d-sdb-u-boot.dtsi b/arch/arm/dts/imx7d-sdb-u-boot.dtsi index 05dd74eee1..b78358fa13 100644 --- a/arch/arm/dts/imx7d-sdb-u-boot.dtsi +++ b/arch/arm/dts/imx7d-sdb-u-boot.dtsi @@ -1,3 +1,7 @@ &fec2 { status = "disable"; }; + +&usbotg1 { + dr_mode = "peripheral"; +};