* [PATCH] ARM: tegra: Correct which USB controller has the UTMI pad registers
@ 2015-04-02 14:31 Tomeu Vizoso
2015-04-02 14:53 ` Mikko Perttunen
0 siblings, 1 reply; 8+ messages in thread
From: Tomeu Vizoso @ 2015-04-02 14:31 UTC (permalink / raw)
To: linux-tegra
Cc: Tomeu Vizoso, Mikko Perttunen, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Russell King,
Stephen Warren, Thierry Reding, Alexandre Courbot, devicetree,
linux-arm-kernel, linux-kernel
It should be the first controller, not the second.
This broke USB after 6261b06 ("regulator: Defer lookup of supply to
regulator_get"), because it changed the order in which the controllers
were probed.
The fix for this issue was suggested by Mikko Perttunen.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Mikko Perttunen <mikko.perttunen@kapsi.fi>
---
arch/arm/boot/dts/tegra124.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index cf01c81..cb786a9 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -838,6 +838,7 @@
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
+ nvidia,has-utmi-pad-registers;
status = "disabled";
};
@@ -874,7 +875,6 @@
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
- nvidia,has-utmi-pad-registers;
status = "disabled";
};
--
2.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH] ARM: tegra: Correct which USB controller has the UTMI pad registers
2015-04-02 14:31 [PATCH] ARM: tegra: Correct which USB controller has the UTMI pad registers Tomeu Vizoso
@ 2015-04-02 14:53 ` Mikko Perttunen
2015-04-02 15:00 ` [PATCH v2] " Tomeu Vizoso
0 siblings, 1 reply; 8+ messages in thread
From: Mikko Perttunen @ 2015-04-02 14:53 UTC (permalink / raw)
To: Tomeu Vizoso, linux-tegra
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Stephen Warren, Thierry Reding, Alexandre Courbot,
devicetree, linux-arm-kernel, linux-kernel
Have you checked that this patch applies correctly, considering that the
chunks are still ambiguous? :)
Mikko
On 04/02/2015 05:31 PM, Tomeu Vizoso wrote:
> It should be the first controller, not the second.
>
> This broke USB after 6261b06 ("regulator: Defer lookup of supply to
> regulator_get"), because it changed the order in which the controllers
> were probed.
>
> The fix for this issue was suggested by Mikko Perttunen.
>
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Cc: Mikko Perttunen <mikko.perttunen@kapsi.fi>
> ---
> arch/arm/boot/dts/tegra124.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
> index cf01c81..cb786a9 100644
> --- a/arch/arm/boot/dts/tegra124.dtsi
> +++ b/arch/arm/boot/dts/tegra124.dtsi
> @@ -838,6 +838,7 @@
> nvidia,hssquelch-level = <2>;
> nvidia,hsdiscon-level = <5>;
> nvidia,xcvr-hsslew = <12>;
> + nvidia,has-utmi-pad-registers;
> status = "disabled";
> };
>
> @@ -874,7 +875,6 @@
> nvidia,hssquelch-level = <2>;
> nvidia,hsdiscon-level = <5>;
> nvidia,xcvr-hsslew = <12>;
> - nvidia,has-utmi-pad-registers;
> status = "disabled";
> };
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2] ARM: tegra: Correct which USB controller has the UTMI pad registers
2015-04-02 14:53 ` Mikko Perttunen
@ 2015-04-02 15:00 ` Tomeu Vizoso
2015-04-02 15:20 ` Mikko Perttunen
0 siblings, 1 reply; 8+ messages in thread
From: Tomeu Vizoso @ 2015-04-02 15:00 UTC (permalink / raw)
To: linux-tegra
Cc: Tomeu Vizoso, Mikko Perttunen, Rob Herring, Pawel Moll,
Mark Rutland, Ian Campbell, Kumar Gala, Russell King,
Stephen Warren, Thierry Reding, Alexandre Courbot, devicetree,
linux-arm-kernel, linux-kernel
It should be the first controller, not the second.
This broke USB after 6261b06 ("regulator: Defer lookup of supply to
regulator_get"), because it changed the order in which the controllers
were probed.
The fix for this issue was suggested by Mikko Perttunen.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Mikko Perttunen <mikko.perttunen@kapsi.fi>
---
I think that the line numbers should be enough in this case, as I expect this to be merged soon, but just in case I'm sending the same patch with plenty of context.
Regards,
Tomeu
---
arch/arm/boot/dts/tegra124.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index cf01c81..cb786a9 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -821,77 +821,77 @@
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d000000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USBD>,
<&tegra_car TEGRA124_CLK_PLL_U>,
<&tegra_car TEGRA124_CLK_USBD>;
clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 59>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads";
nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>;
nvidia,term-range-adj = <6>;
nvidia,xcvr-setup = <9>;
nvidia,xcvr-lsfslew = <0>;
nvidia,xcvr-lsrslew = <3>;
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
+ nvidia,has-utmi-pad-registers;
status = "disabled";
};
usb@0,7d004000 {
compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x0 0x7d004000 0x0 0x4000>;
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB2>;
resets = <&tegra_car 58>;
reset-names = "usb";
nvidia,phy = <&phy2>;
status = "disabled";
};
phy2: usb-phy@0,7d004000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d004000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB2>,
<&tegra_car TEGRA124_CLK_PLL_U>,
<&tegra_car TEGRA124_CLK_USBD>;
clock-names = "reg", "pll_u", "utmi-pads";
resets = <&tegra_car 22>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads";
nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>;
nvidia,term-range-adj = <6>;
nvidia,xcvr-setup = <9>;
nvidia,xcvr-lsfslew = <0>;
nvidia,xcvr-lsrslew = <3>;
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
- nvidia,has-utmi-pad-registers;
status = "disabled";
};
usb@0,7d008000 {
compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x0 0x7d008000 0x0 0x4000>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB3>;
resets = <&tegra_car 59>;
reset-names = "usb";
nvidia,phy = <&phy3>;
status = "disabled";
};
phy3: usb-phy@0,7d008000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d008000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
phy_type = "utmi";
--
2.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2] ARM: tegra: Correct which USB controller has the UTMI pad registers
2015-04-02 15:00 ` [PATCH v2] " Tomeu Vizoso
@ 2015-04-02 15:20 ` Mikko Perttunen
2015-04-02 15:35 ` Mikko Perttunen
0 siblings, 1 reply; 8+ messages in thread
From: Mikko Perttunen @ 2015-04-02 15:20 UTC (permalink / raw)
To: Tomeu Vizoso, linux-tegra
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Stephen Warren, Thierry Reding, Alexandre Courbot,
devicetree, linux-arm-kernel, linux-kernel
Reviewed-by: Mikko Perttunen <mikko.perttunen@kapsi.fi>
On 04/02/2015 06:00 PM, Tomeu Vizoso wrote:
> It should be the first controller, not the second.
>
> This broke USB after 6261b06 ("regulator: Defer lookup of supply to
> regulator_get"), because it changed the order in which the controllers
> were probed.
>
> The fix for this issue was suggested by Mikko Perttunen.
>
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Cc: Mikko Perttunen <mikko.perttunen@kapsi.fi>
> ---
>
> I think that the line numbers should be enough in this case, as I expect this to be merged soon, but just in case I'm sending the same patch with plenty of context.
>
> Regards,
>
> Tomeu
>
> ---
> arch/arm/boot/dts/tegra124.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
> index cf01c81..cb786a9 100644
> --- a/arch/arm/boot/dts/tegra124.dtsi
> +++ b/arch/arm/boot/dts/tegra124.dtsi
> @@ -821,77 +821,77 @@
> compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
> reg = <0x0 0x7d000000 0x0 0x4000>,
> <0x0 0x7d000000 0x0 0x4000>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USBD>,
> <&tegra_car TEGRA124_CLK_PLL_U>,
> <&tegra_car TEGRA124_CLK_USBD>;
> clock-names = "reg", "pll_u", "utmi-pads";
> resets = <&tegra_car 59>, <&tegra_car 22>;
> reset-names = "usb", "utmi-pads";
> nvidia,hssync-start-delay = <0>;
> nvidia,idle-wait-delay = <17>;
> nvidia,elastic-limit = <16>;
> nvidia,term-range-adj = <6>;
> nvidia,xcvr-setup = <9>;
> nvidia,xcvr-lsfslew = <0>;
> nvidia,xcvr-lsrslew = <3>;
> nvidia,hssquelch-level = <2>;
> nvidia,hsdiscon-level = <5>;
> nvidia,xcvr-hsslew = <12>;
> + nvidia,has-utmi-pad-registers;
> status = "disabled";
> };
>
> usb@0,7d004000 {
> compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
> reg = <0x0 0x7d004000 0x0 0x4000>;
> interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USB2>;
> resets = <&tegra_car 58>;
> reset-names = "usb";
> nvidia,phy = <&phy2>;
> status = "disabled";
> };
>
> phy2: usb-phy@0,7d004000 {
> compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
> reg = <0x0 0x7d004000 0x0 0x4000>,
> <0x0 0x7d000000 0x0 0x4000>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USB2>,
> <&tegra_car TEGRA124_CLK_PLL_U>,
> <&tegra_car TEGRA124_CLK_USBD>;
> clock-names = "reg", "pll_u", "utmi-pads";
> resets = <&tegra_car 22>, <&tegra_car 22>;
> reset-names = "usb", "utmi-pads";
> nvidia,hssync-start-delay = <0>;
> nvidia,idle-wait-delay = <17>;
> nvidia,elastic-limit = <16>;
> nvidia,term-range-adj = <6>;
> nvidia,xcvr-setup = <9>;
> nvidia,xcvr-lsfslew = <0>;
> nvidia,xcvr-lsrslew = <3>;
> nvidia,hssquelch-level = <2>;
> nvidia,hsdiscon-level = <5>;
> nvidia,xcvr-hsslew = <12>;
> - nvidia,has-utmi-pad-registers;
> status = "disabled";
> };
>
> usb@0,7d008000 {
> compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
> reg = <0x0 0x7d008000 0x0 0x4000>;
> interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USB3>;
> resets = <&tegra_car 59>;
> reset-names = "usb";
> nvidia,phy = <&phy3>;
> status = "disabled";
> };
>
> phy3: usb-phy@0,7d008000 {
> compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
> reg = <0x0 0x7d008000 0x0 0x4000>,
> <0x0 0x7d000000 0x0 0x4000>;
> phy_type = "utmi";
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2] ARM: tegra: Correct which USB controller has the UTMI pad registers
2015-04-02 15:20 ` Mikko Perttunen
@ 2015-04-02 15:35 ` Mikko Perttunen
2015-04-03 7:21 ` [PATCH v3] " Tomeu Vizoso
0 siblings, 1 reply; 8+ messages in thread
From: Mikko Perttunen @ 2015-04-02 15:35 UTC (permalink / raw)
To: Tomeu Vizoso, linux-tegra
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
Russell King, Stephen Warren, Thierry Reding, Alexandre Courbot,
devicetree, linux-arm-kernel, linux-kernel
On 04/02/2015 06:20 PM, Mikko Perttunen wrote:
> Reviewed-by: Mikko Perttunen <mikko.perttunen@kapsi.fi>
Scratch that;
as Tuomas noted on IRC, the reset numbers here are still wrong.
phy1 should have 22 and phy2 58.
>
> On 04/02/2015 06:00 PM, Tomeu Vizoso wrote:
>> It should be the first controller, not the second.
>>
>> This broke USB after 6261b06 ("regulator: Defer lookup of supply to
>> regulator_get"), because it changed the order in which the controllers
>> were probed.
>>
>> The fix for this issue was suggested by Mikko Perttunen.
>>
>> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
>> Cc: Mikko Perttunen <mikko.perttunen@kapsi.fi>
>> ---
>>
>> I think that the line numbers should be enough in this case, as I
>> expect this to be merged soon, but just in case I'm sending the same
>> patch with plenty of context.
>>
>> Regards,
>>
>> Tomeu
>>
>> ---
>> arch/arm/boot/dts/tegra124.dtsi | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm/boot/dts/tegra124.dtsi
>> b/arch/arm/boot/dts/tegra124.dtsi
>> index cf01c81..cb786a9 100644
>> --- a/arch/arm/boot/dts/tegra124.dtsi
>> +++ b/arch/arm/boot/dts/tegra124.dtsi
>> @@ -821,77 +821,77 @@
>> compatible = "nvidia,tegra124-usb-phy",
>> "nvidia,tegra30-usb-phy";
>> reg = <0x0 0x7d000000 0x0 0x4000>,
>> <0x0 0x7d000000 0x0 0x4000>;
>> phy_type = "utmi";
>> clocks = <&tegra_car TEGRA124_CLK_USBD>,
>> <&tegra_car TEGRA124_CLK_PLL_U>,
>> <&tegra_car TEGRA124_CLK_USBD>;
>> clock-names = "reg", "pll_u", "utmi-pads";
>> resets = <&tegra_car 59>, <&tegra_car 22>;
>> reset-names = "usb", "utmi-pads";
>> nvidia,hssync-start-delay = <0>;
>> nvidia,idle-wait-delay = <17>;
>> nvidia,elastic-limit = <16>;
>> nvidia,term-range-adj = <6>;
>> nvidia,xcvr-setup = <9>;
>> nvidia,xcvr-lsfslew = <0>;
>> nvidia,xcvr-lsrslew = <3>;
>> nvidia,hssquelch-level = <2>;
>> nvidia,hsdiscon-level = <5>;
>> nvidia,xcvr-hsslew = <12>;
>> + nvidia,has-utmi-pad-registers;
>> status = "disabled";
>> };
>>
>> usb@0,7d004000 {
>> compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci",
>> "usb-ehci";
>> reg = <0x0 0x7d004000 0x0 0x4000>;
>> interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
>> phy_type = "utmi";
>> clocks = <&tegra_car TEGRA124_CLK_USB2>;
>> resets = <&tegra_car 58>;
>> reset-names = "usb";
>> nvidia,phy = <&phy2>;
>> status = "disabled";
>> };
>>
>> phy2: usb-phy@0,7d004000 {
>> compatible = "nvidia,tegra124-usb-phy",
>> "nvidia,tegra30-usb-phy";
>> reg = <0x0 0x7d004000 0x0 0x4000>,
>> <0x0 0x7d000000 0x0 0x4000>;
>> phy_type = "utmi";
>> clocks = <&tegra_car TEGRA124_CLK_USB2>,
>> <&tegra_car TEGRA124_CLK_PLL_U>,
>> <&tegra_car TEGRA124_CLK_USBD>;
>> clock-names = "reg", "pll_u", "utmi-pads";
>> resets = <&tegra_car 22>, <&tegra_car 22>;
>> reset-names = "usb", "utmi-pads";
>> nvidia,hssync-start-delay = <0>;
>> nvidia,idle-wait-delay = <17>;
>> nvidia,elastic-limit = <16>;
>> nvidia,term-range-adj = <6>;
>> nvidia,xcvr-setup = <9>;
>> nvidia,xcvr-lsfslew = <0>;
>> nvidia,xcvr-lsrslew = <3>;
>> nvidia,hssquelch-level = <2>;
>> nvidia,hsdiscon-level = <5>;
>> nvidia,xcvr-hsslew = <12>;
>> - nvidia,has-utmi-pad-registers;
>> status = "disabled";
>> };
>>
>> usb@0,7d008000 {
>> compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci",
>> "usb-ehci";
>> reg = <0x0 0x7d008000 0x0 0x4000>;
>> interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
>> phy_type = "utmi";
>> clocks = <&tegra_car TEGRA124_CLK_USB3>;
>> resets = <&tegra_car 59>;
>> reset-names = "usb";
>> nvidia,phy = <&phy3>;
>> status = "disabled";
>> };
>>
>> phy3: usb-phy@0,7d008000 {
>> compatible = "nvidia,tegra124-usb-phy",
>> "nvidia,tegra30-usb-phy";
>> reg = <0x0 0x7d008000 0x0 0x4000>,
>> <0x0 0x7d000000 0x0 0x4000>;
>> phy_type = "utmi";
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3] ARM: tegra: Correct which USB controller has the UTMI pad registers
2015-04-02 15:35 ` Mikko Perttunen
@ 2015-04-03 7:21 ` Tomeu Vizoso
2015-04-03 9:10 ` Mikko Perttunen
2015-04-28 9:11 ` Jon Hunter
0 siblings, 2 replies; 8+ messages in thread
From: Tomeu Vizoso @ 2015-04-03 7:21 UTC (permalink / raw)
To: linux-tegra
Cc: Tomeu Vizoso, Mikko Perttunen, Tuomas Tynkkynen, Rob Herring,
Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Russell King,
Stephen Warren, Thierry Reding, Alexandre Courbot, devicetree,
linux-arm-kernel, linux-kernel
It should be the first controller, not the second. The indexes of the
usb resets were also wrong and have been fixed.
The issue was caused by the changes in 308efde ("ARM: tegra: Add resets
& has-utmi-pad-registers flag to all USB PHYs") being misapplied by git
due to the patch context being insufficient.
This broke USB after 6261b06 ("regulator: Defer lookup of supply to
regulator_get"), because it changed the order in which the controllers
were probed.
The fix for this issue was suggested by Mikko Perttunen and Tuomas
Tynkkynen.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Cc: Mikko Perttunen <mikko.perttunen@kapsi.fi>
Cc: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
---
Hi,
hope I have gotten it right this time, but please do check :)
Thanks,
Tomeu
---
arch/arm/boot/dts/tegra124.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
index cf01c81..13cc7ca 100644
--- a/arch/arm/boot/dts/tegra124.dtsi
+++ b/arch/arm/boot/dts/tegra124.dtsi
@@ -809,114 +809,114 @@
compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x0 0x7d000000 0x0 0x4000>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USBD>;
resets = <&tegra_car 22>;
reset-names = "usb";
nvidia,phy = <&phy1>;
status = "disabled";
};
phy1: usb-phy@0,7d000000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d000000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USBD>,
<&tegra_car TEGRA124_CLK_PLL_U>,
<&tegra_car TEGRA124_CLK_USBD>;
clock-names = "reg", "pll_u", "utmi-pads";
- resets = <&tegra_car 59>, <&tegra_car 22>;
+ resets = <&tegra_car 22>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads";
nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>;
nvidia,term-range-adj = <6>;
nvidia,xcvr-setup = <9>;
nvidia,xcvr-lsfslew = <0>;
nvidia,xcvr-lsrslew = <3>;
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
+ nvidia,has-utmi-pad-registers;
status = "disabled";
};
usb@0,7d004000 {
compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x0 0x7d004000 0x0 0x4000>;
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB2>;
resets = <&tegra_car 58>;
reset-names = "usb";
nvidia,phy = <&phy2>;
status = "disabled";
};
phy2: usb-phy@0,7d004000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d004000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB2>,
<&tegra_car TEGRA124_CLK_PLL_U>,
<&tegra_car TEGRA124_CLK_USBD>;
clock-names = "reg", "pll_u", "utmi-pads";
- resets = <&tegra_car 22>, <&tegra_car 22>;
+ resets = <&tegra_car 58>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads";
nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>;
nvidia,term-range-adj = <6>;
nvidia,xcvr-setup = <9>;
nvidia,xcvr-lsfslew = <0>;
nvidia,xcvr-lsrslew = <3>;
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
- nvidia,has-utmi-pad-registers;
status = "disabled";
};
usb@0,7d008000 {
compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x0 0x7d008000 0x0 0x4000>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB3>;
resets = <&tegra_car 59>;
reset-names = "usb";
nvidia,phy = <&phy3>;
status = "disabled";
};
phy3: usb-phy@0,7d008000 {
compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x0 0x7d008000 0x0 0x4000>,
<0x0 0x7d000000 0x0 0x4000>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA124_CLK_USB3>,
<&tegra_car TEGRA124_CLK_PLL_U>,
<&tegra_car TEGRA124_CLK_USBD>;
clock-names = "reg", "pll_u", "utmi-pads";
- resets = <&tegra_car 58>, <&tegra_car 22>;
+ resets = <&tegra_car 59>, <&tegra_car 22>;
reset-names = "usb", "utmi-pads";
nvidia,hssync-start-delay = <0>;
nvidia,idle-wait-delay = <17>;
nvidia,elastic-limit = <16>;
nvidia,term-range-adj = <6>;
nvidia,xcvr-setup = <9>;
nvidia,xcvr-lsfslew = <0>;
nvidia,xcvr-lsrslew = <3>;
nvidia,hssquelch-level = <2>;
nvidia,hsdiscon-level = <5>;
nvidia,xcvr-hsslew = <12>;
status = "disabled";
};
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpu@0 {
device_type = "cpu";
--
2.3.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3] ARM: tegra: Correct which USB controller has the UTMI pad registers
2015-04-03 7:21 ` [PATCH v3] " Tomeu Vizoso
@ 2015-04-03 9:10 ` Mikko Perttunen
2015-04-28 9:11 ` Jon Hunter
1 sibling, 0 replies; 8+ messages in thread
From: Mikko Perttunen @ 2015-04-03 9:10 UTC (permalink / raw)
To: Tomeu Vizoso, linux-tegra
Cc: Tuomas Tynkkynen, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala, Russell King, Stephen Warren,
Thierry Reding, Alexandre Courbot, devicetree, linux-arm-kernel,
linux-kernel
On 04/03/2015 10:21 AM, Tomeu Vizoso wrote:
> It should be the first controller, not the second. The indexes of the
> usb resets were also wrong and have been fixed.
>
> The issue was caused by the changes in 308efde ("ARM: tegra: Add resets
> & has-utmi-pad-registers flag to all USB PHYs") being misapplied by git
> due to the patch context being insufficient.
>
> This broke USB after 6261b06 ("regulator: Defer lookup of supply to
> regulator_get"), because it changed the order in which the controllers
> were probed.
>
> The fix for this issue was suggested by Mikko Perttunen and Tuomas
> Tynkkynen.
>
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Cc: Mikko Perttunen <mikko.perttunen@kapsi.fi>
> Cc: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
> ---
> Hi,
>
> hope I have gotten it right this time, but please do check :)
Yeah, this seems correct to me :)
>
> Thanks,
>
> Tomeu
> ---
> arch/arm/boot/dts/tegra124.dtsi | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/tegra124.dtsi b/arch/arm/boot/dts/tegra124.dtsi
> index cf01c81..13cc7ca 100644
> --- a/arch/arm/boot/dts/tegra124.dtsi
> +++ b/arch/arm/boot/dts/tegra124.dtsi
> @@ -809,114 +809,114 @@
> compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
> reg = <0x0 0x7d000000 0x0 0x4000>;
> interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USBD>;
> resets = <&tegra_car 22>;
> reset-names = "usb";
> nvidia,phy = <&phy1>;
> status = "disabled";
> };
>
> phy1: usb-phy@0,7d000000 {
> compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
> reg = <0x0 0x7d000000 0x0 0x4000>,
> <0x0 0x7d000000 0x0 0x4000>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USBD>,
> <&tegra_car TEGRA124_CLK_PLL_U>,
> <&tegra_car TEGRA124_CLK_USBD>;
> clock-names = "reg", "pll_u", "utmi-pads";
> - resets = <&tegra_car 59>, <&tegra_car 22>;
> + resets = <&tegra_car 22>, <&tegra_car 22>;
> reset-names = "usb", "utmi-pads";
> nvidia,hssync-start-delay = <0>;
> nvidia,idle-wait-delay = <17>;
> nvidia,elastic-limit = <16>;
> nvidia,term-range-adj = <6>;
> nvidia,xcvr-setup = <9>;
> nvidia,xcvr-lsfslew = <0>;
> nvidia,xcvr-lsrslew = <3>;
> nvidia,hssquelch-level = <2>;
> nvidia,hsdiscon-level = <5>;
> nvidia,xcvr-hsslew = <12>;
> + nvidia,has-utmi-pad-registers;
> status = "disabled";
> };
>
> usb@0,7d004000 {
> compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
> reg = <0x0 0x7d004000 0x0 0x4000>;
> interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USB2>;
> resets = <&tegra_car 58>;
> reset-names = "usb";
> nvidia,phy = <&phy2>;
> status = "disabled";
> };
>
> phy2: usb-phy@0,7d004000 {
> compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
> reg = <0x0 0x7d004000 0x0 0x4000>,
> <0x0 0x7d000000 0x0 0x4000>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USB2>,
> <&tegra_car TEGRA124_CLK_PLL_U>,
> <&tegra_car TEGRA124_CLK_USBD>;
> clock-names = "reg", "pll_u", "utmi-pads";
> - resets = <&tegra_car 22>, <&tegra_car 22>;
> + resets = <&tegra_car 58>, <&tegra_car 22>;
> reset-names = "usb", "utmi-pads";
> nvidia,hssync-start-delay = <0>;
> nvidia,idle-wait-delay = <17>;
> nvidia,elastic-limit = <16>;
> nvidia,term-range-adj = <6>;
> nvidia,xcvr-setup = <9>;
> nvidia,xcvr-lsfslew = <0>;
> nvidia,xcvr-lsrslew = <3>;
> nvidia,hssquelch-level = <2>;
> nvidia,hsdiscon-level = <5>;
> nvidia,xcvr-hsslew = <12>;
> - nvidia,has-utmi-pad-registers;
> status = "disabled";
> };
>
> usb@0,7d008000 {
> compatible = "nvidia,tegra124-ehci", "nvidia,tegra30-ehci", "usb-ehci";
> reg = <0x0 0x7d008000 0x0 0x4000>;
> interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USB3>;
> resets = <&tegra_car 59>;
> reset-names = "usb";
> nvidia,phy = <&phy3>;
> status = "disabled";
> };
>
> phy3: usb-phy@0,7d008000 {
> compatible = "nvidia,tegra124-usb-phy", "nvidia,tegra30-usb-phy";
> reg = <0x0 0x7d008000 0x0 0x4000>,
> <0x0 0x7d000000 0x0 0x4000>;
> phy_type = "utmi";
> clocks = <&tegra_car TEGRA124_CLK_USB3>,
> <&tegra_car TEGRA124_CLK_PLL_U>,
> <&tegra_car TEGRA124_CLK_USBD>;
> clock-names = "reg", "pll_u", "utmi-pads";
> - resets = <&tegra_car 58>, <&tegra_car 22>;
> + resets = <&tegra_car 59>, <&tegra_car 22>;
> reset-names = "usb", "utmi-pads";
> nvidia,hssync-start-delay = <0>;
> nvidia,idle-wait-delay = <17>;
> nvidia,elastic-limit = <16>;
> nvidia,term-range-adj = <6>;
> nvidia,xcvr-setup = <9>;
> nvidia,xcvr-lsfslew = <0>;
> nvidia,xcvr-lsrslew = <3>;
> nvidia,hssquelch-level = <2>;
> nvidia,hsdiscon-level = <5>;
> nvidia,xcvr-hsslew = <12>;
> status = "disabled";
> };
>
> cpus {
> #address-cells = <1>;
> #size-cells = <0>;
>
> cpu@0 {
> device_type = "cpu";
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v3] ARM: tegra: Correct which USB controller has the UTMI pad registers
2015-04-03 7:21 ` [PATCH v3] " Tomeu Vizoso
2015-04-03 9:10 ` Mikko Perttunen
@ 2015-04-28 9:11 ` Jon Hunter
1 sibling, 0 replies; 8+ messages in thread
From: Jon Hunter @ 2015-04-28 9:11 UTC (permalink / raw)
To: Tomeu Vizoso, linux-tegra
Cc: Mark Rutland, Alexandre Courbot, Russell King, Pawel Moll,
Ian Campbell, Stephen Warren, linux-kernel, Mikko Perttunen,
devicetree, Rob Herring, Tuomas Tynkkynen, Kumar Gala,
Thierry Reding, linux-arm-kernel
On 04/03/2015 08:21 AM, Tomeu Vizoso wrote:
> It should be the first controller, not the second. The indexes of the
> usb resets were also wrong and have been fixed.
>
> The issue was caused by the changes in 308efde ("ARM: tegra: Add resets
> & has-utmi-pad-registers flag to all USB PHYs") being misapplied by git
> due to the patch context being insufficient.
>
> This broke USB after 6261b06 ("regulator: Defer lookup of supply to
> regulator_get"), because it changed the order in which the controllers
> were probed.
>
> The fix for this issue was suggested by Mikko Perttunen and Tuomas
> Tynkkynen.
>
> Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
> Cc: Mikko Perttunen <mikko.perttunen@kapsi.fi>
> Cc: Tuomas Tynkkynen <ttynkkynen@nvidia.com>
> ---
> Hi,
>
> hope I have gotten it right this time, but please do check :)
FWIW, this works for me.
Tested-by: Jon Hunter <jonathanh@nvidia.com>
Cheers
Jon
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-04-28 9:11 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-04-02 14:31 [PATCH] ARM: tegra: Correct which USB controller has the UTMI pad registers Tomeu Vizoso
2015-04-02 14:53 ` Mikko Perttunen
2015-04-02 15:00 ` [PATCH v2] " Tomeu Vizoso
2015-04-02 15:20 ` Mikko Perttunen
2015-04-02 15:35 ` Mikko Perttunen
2015-04-03 7:21 ` [PATCH v3] " Tomeu Vizoso
2015-04-03 9:10 ` Mikko Perttunen
2015-04-28 9:11 ` Jon Hunter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).