Skip to contentSkip to conversation

warp7: fix pmic probe

PATCH New Joris Offouga 2 participants 11 messages Jan 29, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 warp7: fix pmic probe

---
 board/warp7/warp7.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/warp7/warp7.c +1 -1
index 9efc62f2fb..1ebec93916 100644
@@ -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)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/4 warp7: remove unused usb configs

With commit 6b503f ("warp7: Switch to DM USB").
This configs are not necessary

---
 include/configs/warp7.h | 4 ----
 1 file changed, 4 deletions(-)
include/configs/warp7.h +0 -4
index da894ec0ca..49d2415445 100644
@@ -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
 
Signature · 1 line
2.20.1
reviewer
#2 lore raw

PATCH 2/4 warp7: remove unused usb configs

Quoted 2 lines · Joris Offouga

With commit 6b503f ("warp7: Switch to DM USB").

Please use 12 digits for the commit ID.

Quoted 1 line

This configs are not necessary

"These configs". Also, you could make it in a single sentence.

include/configs/warp7.h line 152

Quoted 13 lines
---
 include/configs/warp7.h | 4 ----
 1 file changed, 4 deletions(-)
include/configs/warp7.h +0 -0
index da894ec0ca..49d2415445 100644
@@ -150,11 +150,7 @@
 #define CONFIG_SYS_MMC_ENV_PART                0
 
 /* USB Configs */

This comment could also be removed.

include/configs/warp7.h line 157

Quoted 5 lines
include/configs/warp7.h +0 -4
-#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

#3 lore raw

PATCH 3/4 arm: dts: imx7s-warp7: Move u-boot specific node in u-boot.dtsi

In reply to Joris Offouga
---
 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
arch/arm/dts/imx7s-warp-u-boot.dtsi new file +10 -0
new file mode 100644
index 0000000000..65da3a0d23
@@ -0,0 +1,10 @@
+/ {
+    aliases {
+        mmc0 = &usdhc3;
+        usb0 = &usbotg1;
+    };
+
+    chosen {
+        stdoutpath = &uart1;
+    };
+};
arch/arm/dts/imx7s-warp.dts +0 -9
index db5ef67eb1..f7ba2c0a24 100644
@@ -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>;
Signature · 1 line
2.20.1
reviewer
#4 lore raw

PATCH 3/4 arm: dts: imx7s-warp7: Move u-boot specific node in u-boot.dtsi

Hi Joris,

Quoted 1 line · Joris Offouga

Please always provide a commit log.

Quoted 13 lines
---
 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
arch/arm/dts/imx7s-warp-u-boot.dtsi new file +0 -0
new file mode 100644
index 0000000000..65da3a0d23

arch/arm/dts/imx7s-warp-u-boot.dtsi line 8

Quoted 8 lines
arch/arm/dts/imx7s-warp-u-boot.dtsi new file +8 -0
@@ -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

#5 lore raw

PATCH 3/4 arm: dts: imx7s-warp7: Move u-boot specific node in u-boot.dtsi

Le 29/01/2020 à 21:22, Fabio Estevam a écrit :

Quoted 12 lines

Hi Joris,

On Wed, Jan 29, 2020 at 5:16 PM Joris Offouga <[email protected]> wrote:
Please always provide a commit log.

Quoted 7 lines
---
  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

Quoted 15 lines
Quoted 6 lines
arch/arm/dts/imx7s-warp-u-boot.dtsi new file +0 -0
new file mode 100644
index 0000000000..65da3a0d23

arch/arm/dts/imx7s-warp-u-boot.dtsi line 8

Quoted 8 lines
arch/arm/dts/imx7s-warp-u-boot.dtsi new file +8 -0
@@ -0,0 +1,10 @@
+/ {
+    aliases {
+        mmc0 = &usdhc3;
+        usb0 = &usbotg1;
+    };
+
+    chosen {
+        stdoutpath = &uart1;

This should be stdout-path instead.

indeed, i send v2

Quoted 5 lines

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

Quoted 2 lines

Thanks

#6 lore raw

PATCH 4/4 mx7dsabre: Fix usbtog probe when use dfu or ums

In reply to Joris Offouga

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

---
 arch/arm/dts/imx7d-sdb-u-boot.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/dts/imx7d-sdb-u-boot.dtsi +4 -0
index 05dd74eee1..b78358fa13 100644
@@ -1,3 +1,7 @@
 &fec2 {
 	status = "disable";
 };
+
+&usbotg1 {
+	dr_mode = "peripheral";
+};
Signature · 1 line
2.20.1
reviewer
#7 lore raw

PATCH 4/4 mx7dsabre: Fix usbtog probe when use dfu or ums

arch/arm/dts/imx7d-sdb-u-boot.dtsi line 6

Quoted 12 lines · Joris Offouga
arch/arm/dts/imx7d-sdb-u-boot.dtsi +3 -0
index 05dd74eee1..b78358fa13 100644
@@ -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.

Quoted 4 lines
arch/arm/dts/imx7d-sdb-u-boot.dtsi +1 -1
+};
--

2.20.1

#8 lore raw

PATCH 4/4 mx7dsabre: Fix usbtog probe when use dfu or ums

Le 29/01/2020 à 21:25, Fabio Estevam a écrit :

Quoted 14 lines · Joris Offouga

arch/arm/dts/imx7d-sdb-u-boot.dtsi line 6

Quoted 11 lines
arch/arm/dts/imx7d-sdb-u-boot.dtsi +3 -0
index 05dd74eee1..b78358fa13 100644
@@ -1,3 +1,7 @@
  &fec2 {
         status = "disable";
  };
+
+&usbotg1 {
+       dr_mode = "peripheral";

Why to include this in the U-Boot specific version?

Quoted 1 line

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#L401

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/arm/boot/dts/imx7d-sdb.dts#n413

Best regards,

Joris

Quoted 5 lines
Quoted 5 lines
arch/arm/dts/imx7d-sdb-u-boot.dtsi +1 -1
+};
--

2.20.1

reviewer
#9 lore raw

PATCH 4/4 mx7dsabre: Fix usbtog probe when use dfu or ums

Hi Joris,

Quoted 5 lines · Joris Offouga

This is not present in main dts :
https://gitlab.denx.de/u-boot/u-boot/blob/master/arch/arm/dts/imx7d-sdb.dts#L401

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/arm/boot/dts/imx7d-sdb.dts#n413

Sorry, I was looking at the warp7 dts.

Should we pass 'dr_mode = "peripheral" in the upstream kenel dts?

Thanks

reviewer
#10 lore raw

PATCH 1/4 warp7: fix pmic probe

In reply to Joris Offouga
Quoted 2 lines · Joris Offouga

Please provide a commit log.

Quoted 9 lines
---
 board/warp7/warp7.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/warp7/warp7.c +0 -0
index 9efc62f2fb..1ebec93916 100644

board/warp7/warp7.c int power_init_board(void) · line 70

Quoted 5 lines
board/warp7/warp7.c +1 -1
@@ -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);