[PATCH 1/4] warp7: fix pmic probe
Signed-off-by: Joris Offouga offougajoris@gmail.com --- 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@8", &dev); if (ret == -ENODEV) return 0; if (ret != 0)
With commit 6b503f ("warp7: Switch to DM USB"). This configs are not necessary
Signed-off-by: Joris Offouga offougajoris@gmail.com --- include/configs/warp7.h | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/include/configs/warp7.h b/include/configs/warp7.h index da894ec0ca..49d2415445 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -150,11 +150,7 @@ #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
On Wed, Jan 29, 2020 at 5:16 PM Joris Offouga offougajoris@gmail.com wrote:
With commit 6b503f ("warp7: Switch to DM USB").
Please use 12 digits for the commit ID.
This configs are not necessary
"These configs". Also, you could make it in a single sentence.
Signed-off-by: Joris Offouga offougajoris@gmail.com
include/configs/warp7.h | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/include/configs/warp7.h b/include/configs/warp7.h index da894ec0ca..49d2415445 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -150,11 +150,7 @@ #define CONFIG_SYS_MMC_ENV_PART 0
/* USB Configs */
This comment could also be removed.
-#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 */
Thanks
Signed-off-by: Joris Offouga offougajoris@gmail.com --- 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..65da3a0d23 --- /dev/null +++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi @@ -0,0 +1,10 @@ +/ { + aliases { + mmc0 = &usdhc3; + usb0 = &usbotg1; + }; + + chosen { + stdoutpath = &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>;
Hi Joris,
On Wed, Jan 29, 2020 at 5:16 PM Joris Offouga offougajoris@gmail.com wrote:
Please always provide a commit log.
Signed-off-by: Joris Offouga offougajoris@gmail.com
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..65da3a0d23 --- /dev/null +++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi @@ -0,0 +1,10 @@ +/ {
- aliases {
mmc0 = &usdhc3;usb0 = &usbotg1;- };
- chosen {
stdoutpath = &uart1;
This should be stdout-path instead.
Actually I think it is better to have the Linux upstream dts to have the stdout-path entry.
Care to send a patch for that?
Thanks
Le 29/01/2020 à 21:22, Fabio Estevam a écrit :
Hi Joris,
On Wed, Jan 29, 2020 at 5:16 PM Joris Offouga offougajoris@gmail.com wrote: Please always provide a commit log.
Signed-off-by: Joris Offouga offougajoris@gmail.com
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..65da3a0d23 --- /dev/null +++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi @@ -0,0 +1,10 @@ +/ {
- aliases {
mmc0 = &usdhc3;usb0 = &usbotg1;- };
- chosen {
stdoutpath = &uart1;This should be stdout-path instead.
indeed, i send v2
Actually I think it is better to have the Linux upstream dts to have the stdout-path entry.
Care to send a patch for that?
of course i would
Best regards,
Joris
Thanks
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 offougajoris@gmail.com --- 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"; +};
On Wed, Jan 29, 2020 at 5:16 PM Joris Offouga offougajoris@gmail.com wrote:
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";
Why to include this in the U-Boot specific version?
I see dr_mode = "peripheral" in the main dts.
+};
2.20.1
Le 29/01/2020 à 21:25, Fabio Estevam a écrit :
On Wed, Jan 29, 2020 at 5:16 PM Joris Offouga offougajoris@gmail.com wrote:
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";Why to include this in the U-Boot specific version?
I see dr_mode = "peripheral" in the main dts.
This is not present in main dts : https://gitlab.denx.de/u-boot/u-boot/blob/master/arch/arm/dts/imx7d-sdb.dts#...
I include in u-boot.dtsi because is not present in mainline kernel : https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/a...
Best regards,
Joris
+};
2.20.1
Hi Joris,
On Wed, Jan 29, 2020 at 5:41 PM Joris Offouga offougajoris@gmail.com wrote:
This is not present in main dts : https://gitlab.denx.de/u-boot/u-boot/blob/master/arch/arm/dts/imx7d-sdb.dts#...
I include in u-boot.dtsi because is not present in mainline kernel : https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/a...
Sorry, I was looking at the warp7 dts.
Should we pass 'dr_mode = "peripheral" in the upstream kenel dts?
Thanks
On Wed, Jan 29, 2020 at 5:16 PM Joris Offouga offougajoris@gmail.com wrote:
Signed-off-by: Joris Offouga offougajoris@gmail.com
Please provide a commit log.
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@8", &dev);
Reviewed-by: Fabio Estevam festevam@gmail.com
participants (2)
-
Fabio Estevam -
Joris Offouga