diff mbox series

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

Message ID 20190304104916.3937-1-narmstrong@baylibre.com (mailing list archive)
State Mainlined, archived
Commit a6256b3a92cbaf3f5ff034ce09d5665607e2d7a4
Headers show
Series dt-bindings: reset: meson-g12a: Add missing USB2 PHY resets | expand

Commit Message

Neil Armstrong March 4, 2019, 10:49 a.m. UTC
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")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Martin Blumenstingl March 5, 2019, 10:02 p.m. UTC | #1
On Mon, Mar 4, 2019 at 11:49 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>
> 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")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

> ---
>  include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
> index 8063e8314eef..6d487c5eba2c 100644
> --- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
> +++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
> @@ -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
Neil Armstrong March 7, 2019, 12:23 p.m. UTC | #2
On 05/03/2019 23:02, Martin Blumenstingl wrote:
> On Mon, Mar 4, 2019 at 11:49 AM Neil Armstrong <narmstrong@baylibre.com> wrote:
>>
>> 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")
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> 
>> ---
>>  include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
>> index 8063e8314eef..6d487c5eba2c 100644
>> --- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
>> +++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
>> @@ -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

Exactly, thanks for pointing this !

Neil

> 
> 
> Regards
> Martin
>
Philipp Zabel March 20, 2019, 10:35 a.m. UTC | #3
On Mon, 2019-03-04 at 11:49 +0100, Neil Armstrong wrote:
> 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")
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
> index 8063e8314eef..6d487c5eba2c 100644
> --- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
> +++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
> @@ -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					*/

Thank you, applied to reset/fixes with Martin's review tag.
Kevin Hilman March 22, 2019, 10:53 p.m. UTC | #4
Hi Philip,

Philipp Zabel <p.zabel@pengutronix.de> writes:

> On Mon, 2019-03-04 at 11:49 +0100, Neil Armstrong wrote:
>> 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")
>> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
>> ---
>>  include/dt-bindings/reset/amlogic,meson-g12a-reset.h | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>> 
>> diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
>> index 8063e8314eef..6d487c5eba2c 100644
>> --- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
>> +++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
>> @@ -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					*/
>
> 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
Philipp Zabel March 26, 2019, 11:33 a.m. UTC | #5
Hi Kevin,

On Fri, 2019-03-22 at 15:53 -0700, Kevin Hilman wrote:
[...]
> 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
diff mbox series

Patch

diff --git a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
index 8063e8314eef..6d487c5eba2c 100644
--- a/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
+++ b/include/dt-bindings/reset/amlogic,meson-g12a-reset.h
@@ -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					*/