Skip to contentSkip to conversation

dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets

PATCH Applied Neil Armstrong 4 participants 6 messages Mar 4, 2019 – Mar 26, 2019

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

PATCH 1/1 dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets

The G12A Documentation lacked these 2 reset lines, but they are present and used for each USB 2 PHYs.

Add them to the dt-bindings for the upcoming USB support.

Fixes dbfc54534dfc ("dt-bindings: reset: meson: add g12a bindings")
---
 include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/dt-bindings/reset/amlogic,meson-g12a-reset.h +4 -1
index 8063e8314eef..6d487c5eba2c 100644
@@ -51,7 +51,10 @@
 #define RESET_SD_EMMC_A			44
 #define RESET_SD_EMMC_B			45
 #define RESET_SD_EMMC_C			46
-/*					47-60 */
+/*					47	*/
+#define RESET_USB_PHY20			48
+#define RESET_USB_PHY21			49
+/*					50-60	*/
 #define RESET_AUDIO_CODEC		61
 /*					62-63	*/
 /*	RESET2					*/
Signature · 1 line
2.20.1
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Neil Armstrong

The G12A Documentation lacked these 2 reset lines, but they are present and used for each USB 2 PHYs.

Add them to the dt-bindings for the upcoming USB support.

Fixes dbfc54534dfc ("dt-bindings: reset: meson: add g12a bindings")
Quoted 9 lines
---
 include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/dt-bindings/reset/amlogic,meson-g12a-reset.h +0 -0
index 8063e8314eef..6d487c5eba2c 100644

include/dt-bindings/reset/amlogic,meson-g12a-reset.h line 56

Quoted 7 lines
include/dt-bindings/reset/amlogic,meson-g12a-reset.h +3 -1
@@ -51,7 +51,10 @@
 #define RESET_SD_EMMC_A                        44
 #define RESET_SD_EMMC_B                        45
 #define RESET_SD_EMMC_C                        46
-/*                                     47-60 */
+/*                                     47      */
+#define RESET_USB_PHY20                        48
+#define RESET_USB_PHY21                        49

because it's always hard to look up, here's the reference to that information Amlogic's buildroot kernel (buildroot_openlinux_kernel_4.9_fbdev_20180706):
kernel/aml-4.9/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c uses:
writel((val | (0x3 << 16)), (void __iomem *) ((unsigned long)phy->reset_regs + (0x21 * 4 - 0x8)));

this translates to:
- (0x21 * 4 - 0x8) = RESET1 register / reset line ID 32 and above (reset line 0 is at "0x20 * 4 - 0x08")
- bits 16 and 17 = add 32 to that gives us reset IDs 48 and 49

Regards
Martin

#2 lore raw
Quoted 34 lines · Martin Blumenstingl
Quoted 8 lines · Neil Armstrong

The G12A Documentation lacked these 2 reset lines, but they are present and used for each USB 2 PHYs.

Add them to the dt-bindings for the upcoming USB support.

Fixes dbfc54534dfc ("dt-bindings: reset: meson: add g12a bindings")
Quoted 9 lines
---
 include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/dt-bindings/reset/amlogic,meson-g12a-reset.h +0 -0
index 8063e8314eef..6d487c5eba2c 100644

include/dt-bindings/reset/amlogic,meson-g12a-reset.h line 56

Quoted 7 lines
include/dt-bindings/reset/amlogic,meson-g12a-reset.h +3 -1
@@ -51,7 +51,10 @@
 #define RESET_SD_EMMC_A                        44
 #define RESET_SD_EMMC_B                        45
 #define RESET_SD_EMMC_C                        46
-/*                                     47-60 */
+/*                                     47      */
+#define RESET_USB_PHY20                        48
+#define RESET_USB_PHY21                        49

because it's always hard to look up, here's the reference to that information Amlogic's buildroot kernel (buildroot_openlinux_kernel_4.9_fbdev_20180706):
kernel/aml-4.9/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c uses:
writel((val | (0x3 << 16)), (void __iomem *) ((unsigned long)phy->reset_regs + (0x21 * 4 - 0x8)));

Quoted 4 lines

this translates to:
- (0x21 * 4 - 0x8) = RESET1 register / reset line ID 32 and above (reset line 0 is at "0x20 * 4 - 0x08")
- bits 16 and 17 = add 32 to that gives us reset IDs 48 and 49

Exactly, thanks for pointing this !

Neil

Quoted 5 lines

Regards
Martin

maintainer Applied
#3 lore raw
In reply to Neil Armstrong
Quoted 17 lines · Neil Armstrong

The G12A Documentation lacked these 2 reset lines, but they are present and used for each USB 2 PHYs.

Add them to the dt-bindings for the upcoming USB support.

Fixes dbfc54534dfc ("dt-bindings: reset: meson: add g12a bindings")
---
 include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/dt-bindings/reset/amlogic,meson-g12a-reset.h +0 -0
index 8063e8314eef..6d487c5eba2c 100644
@@ -51,7 +51,10 @@
 #define RESET_SD_EMMC_A			44

include/dt-bindings/reset/amlogic,meson-g12a-reset.h line 60

Quoted 10 lines
include/dt-bindings/reset/amlogic,meson-g12a-reset.h +4 -1
 #define RESET_SD_EMMC_B			45
 #define RESET_SD_EMMC_C			46
-/*					47-60 */
+/*					47	*/
+#define RESET_USB_PHY20			48
+#define RESET_USB_PHY21			49
+/*					50-60	*/
 #define RESET_AUDIO_CODEC		61
 /*					62-63	*/
 /*	RESET2					*/

Thank you, applied to reset/fixes with Martin's review tag.

maintainer
#4 lore raw

Hi Philip,

Quoted 22 lines · Philipp Zabel
Quoted 21 lines · Neil Armstrong

The G12A Documentation lacked these 2 reset lines, but they are present and used for each USB 2 PHYs.

Add them to the dt-bindings for the upcoming USB support.

Fixes dbfc54534dfc ("dt-bindings: reset: meson: add g12a bindings")
---
 include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
include/dt-bindings/reset/amlogic,meson-g12a-reset.h +1 -1
index 8063e8314eef..6d487c5eba2c 100644
@@ -51,7 +51,10 @@
 #define RESET_SD_EMMC_A			44
 #define RESET_SD_EMMC_B			45
 #define RESET_SD_EMMC_C			46
-/*					47-60 */
+/*					47	*/
Quoted 8 lines

include/dt-bindings/reset/amlogic,meson-g12a-reset.h line 60

Quoted 6 lines
include/dt-bindings/reset/amlogic,meson-g12a-reset.h +3 -0
+#define RESET_USB_PHY20			48
+#define RESET_USB_PHY21			49
+/*					50-60	*/
 #define RESET_AUDIO_CODEC		61
 /*					62-63	*/
 /*	RESET2					*/

Thank you, applied to reset/fixes with Martin's review tag.

Could ou make a immtable tag for this in your tree? This is needed for some upcoming DT users we'd like to queue for the next cycle.

Thanks,

Kevin

maintainer
#5 lore raw

Hi Kevin,

On Fri, 2019-03-22 at 15:53 -0700, Kevin Hilman wrote:
[...]

Quoted 2 lines

Could ou make a immtable tag for this in your tree? This is needed for some upcoming DT users we'd like to queue for the next cycle.

I have just sent a reset/fixes pull request including this patch. Once that gets merged, you can either wait for the next -rc that includes it or pull in
git://git.pengutronix.de/pza/linux reset/meson-g12a
which is just the first patch of the two.

regards
Philipp