LinuxLists.cc - [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6

2014-06-09 20:22:56

Subject: [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6

This patch fixes two problems: -

1) The device tree isn't currently providing sti-ethclk which is
required by the dwmac glue code to correctly configure the ethernet
PHY clock speed.

This means depending on what the bootloader/jtag has
configured this clock to, and what switch/hub the board is plugged
into you most likely will NOT successfully negotiate a ethernet link.

2) The stmmaceth clock was associated with the wrong clock. It was
referencing the PHY clock rather than the interconnect clock which
clocks the IP.

This patch also brings us closer to not having to boot the upstream
kernel with the clk_ignore_unused parameter.

Signed-off-by: Peter Griffin <[email protected]>
---
arch/arm/boot/dts/stih415.dtsi | 8 ++++----
arch/arm/boot/dts/stih416.dtsi | 8 ++++----
include/dt-bindings/clock/stih415-clks.h | 1 +
include/dt-bindings/clock/stih416-clks.h | 1 +
4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
index c81dce4..768bf27 100644
--- a/arch/arm/boot/dts/stih415.dtsi
+++ b/arch/arm/boot/dts/stih415.dtsi
@@ -169,8 +169,8 @@

pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mii0>;
- clock-names = "stmmaceth";
- clocks = <&clk_s_a1_ls CLK_GMAC0_PHY>;
+ clock-names = "stmmaceth", "sti-ethclk";
+ clocks = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
};

ethernet1: dwmac@fef08000 {
@@ -189,11 +189,11 @@
st,syscon = <&syscfg_sbc>;

resets = <&softreset STIH415_ETH1_SOFTRESET>;
- reset-names = "stmmaceth";
+ reset-names = "stmmaceth", "sti-ethclk";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mii1>;
clock-names = "stmmaceth";
- clocks = <&clk_s_a0_ls CLK_ETH1_PHY>;
+ clocks = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
};

rc: rc@fe518000 {
diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index 6473287..98c43cc 100644
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -175,8 +175,8 @@
reset-names = "stmmaceth";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mii0>;
- clock-names = "stmmaceth";
- clocks = <&clk_s_a1_ls CLK_GMAC0_PHY>;
+ clock-names = "stmmaceth", "sti-ethclk";
+ clocks = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
};

ethernet1: dwmac@fef08000 {
@@ -197,8 +197,8 @@
reset-names = "stmmaceth";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mii1>;
- clock-names = "stmmaceth";
- clocks = <&clk_s_a0_ls CLK_ETH1_PHY>;
+ clock-names = "stmmaceth", "sti-ethclk";
+ clocks = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
};

rc: rc@fe518000 {
diff --git a/include/dt-bindings/clock/stih415-clks.h b/include/dt-bindings/clock/stih415-clks.h
index 0d2c739..d80caa6 100644
--- a/include/dt-bindings/clock/stih415-clks.h
+++ b/include/dt-bindings/clock/stih415-clks.h
@@ -10,6 +10,7 @@
#define CLK_ETH1_PHY 4

/* CLOCKGEN A1 */
+#define CLK_ICN_IF_2 0
#define CLK_GMAC0_PHY 3

#endif
diff --git a/include/dt-bindings/clock/stih416-clks.h b/include/dt-bindings/clock/stih416-clks.h
index 552c779..f9bdbd1 100644
--- a/include/dt-bindings/clock/stih416-clks.h
+++ b/include/dt-bindings/clock/stih416-clks.h
@@ -10,6 +10,7 @@
#define CLK_ETH1_PHY 4

/* CLOCKGEN A1 */
+#define CLK_ICN_IF_2 0
#define CLK_GMAC0_PHY 3

#endif
--
1.9.1

2014-06-09 20:30:45

by Srinivas Kandagatla

[permalink] [raw]

Subject: Re: [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6

Thanks Pete for the patch.
Patch looks good for me.

Acked-by: Srinivas Kandagatla <[email protected]>

On 09/06/14 21:22, Peter Griffin wrote:
> This patch fixes two problems: -
>
> 1) The device tree isn't currently providing sti-ethclk which is
> required by the dwmac glue code to correctly configure the ethernet
> PHY clock speed.
>
> This means depending on what the bootloader/jtag has
> configured this clock to, and what switch/hub the board is plugged
> into you most likely will NOT successfully negotiate a ethernet link.
>
> 2) The stmmaceth clock was associated with the wrong clock. It was
> referencing the PHY clock rather than the interconnect clock which
> clocks the IP.
>
> This patch also brings us closer to not having to boot the upstream
> kernel with the clk_ignore_unused parameter.
>
> Signed-off-by: Peter Griffin <[email protected]>
> ---
> arch/arm/boot/dts/stih415.dtsi | 8 ++++----
> arch/arm/boot/dts/stih416.dtsi | 8 ++++----
> include/dt-bindings/clock/stih415-clks.h | 1 +
> include/dt-bindings/clock/stih416-clks.h | 1 +
> 4 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
> index c81dce4..768bf27 100644
> --- a/arch/arm/boot/dts/stih415.dtsi
> +++ b/arch/arm/boot/dts/stih415.dtsi
> @@ -169,8 +169,8 @@
>
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_mii0>;
> - clock-names = "stmmaceth";
> - clocks = <&clk_s_a1_ls CLK_GMAC0_PHY>;
> + clock-names = "stmmaceth", "sti-ethclk";
> + clocks = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
> };
>
> ethernet1: dwmac@fef08000 {
> @@ -189,11 +189,11 @@
> st,syscon = <&syscfg_sbc>;
>
> resets = <&softreset STIH415_ETH1_SOFTRESET>;
> - reset-names = "stmmaceth";
> + reset-names = "stmmaceth", "sti-ethclk";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_mii1>;
> clock-names = "stmmaceth";
> - clocks = <&clk_s_a0_ls CLK_ETH1_PHY>;
> + clocks = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
> };
>
> rc: rc@fe518000 {
> diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
> index 6473287..98c43cc 100644
> --- a/arch/arm/boot/dts/stih416.dtsi
> +++ b/arch/arm/boot/dts/stih416.dtsi
> @@ -175,8 +175,8 @@
> reset-names = "stmmaceth";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_mii0>;
> - clock-names = "stmmaceth";
> - clocks = <&clk_s_a1_ls CLK_GMAC0_PHY>;
> + clock-names = "stmmaceth", "sti-ethclk";
> + clocks = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
> };
>
> ethernet1: dwmac@fef08000 {
> @@ -197,8 +197,8 @@
> reset-names = "stmmaceth";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_mii1>;
> - clock-names = "stmmaceth";
> - clocks = <&clk_s_a0_ls CLK_ETH1_PHY>;
> + clock-names = "stmmaceth", "sti-ethclk";
> + clocks = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
> };
>
> rc: rc@fe518000 {
> diff --git a/include/dt-bindings/clock/stih415-clks.h b/include/dt-bindings/clock/stih415-clks.h
> index 0d2c739..d80caa6 100644
> --- a/include/dt-bindings/clock/stih415-clks.h
> +++ b/include/dt-bindings/clock/stih415-clks.h
> @@ -10,6 +10,7 @@
> #define CLK_ETH1_PHY 4
>
> /* CLOCKGEN A1 */
> +#define CLK_ICN_IF_2 0
> #define CLK_GMAC0_PHY 3
>
> #endif
> diff --git a/include/dt-bindings/clock/stih416-clks.h b/include/dt-bindings/clock/stih416-clks.h
> index 552c779..f9bdbd1 100644
> --- a/include/dt-bindings/clock/stih416-clks.h
> +++ b/include/dt-bindings/clock/stih416-clks.h
> @@ -10,6 +10,7 @@
> #define CLK_ETH1_PHY 4
>
> /* CLOCKGEN A1 */
> +#define CLK_ICN_IF_2 0
> #define CLK_GMAC0_PHY 3
>
> #endif
>

2014-06-16 09:01:54

by Lee Jones

[permalink] [raw]

Subject: Re: [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6

2014-06-16 09:19:49

by Peter Griffin

[permalink] [raw]

Subject: Re: [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6

Hi Lee,

> > ethernet1: dwmac@fef08000 {
> > @@ -189,11 +189,11 @@
> > st,syscon = <&syscfg_sbc>;
> >
> > resets = <&softreset STIH415_ETH1_SOFTRESET>;
> > - reset-names = "stmmaceth";
> > + reset-names = "stmmaceth", "sti-ethclk";
> > pinctrl-names = "default";
> > pinctrl-0 = <&pinctrl_mii1>;
> > clock-names = "stmmaceth";
> > - clocks = <&clk_s_a0_ls CLK_ETH1_PHY>;
> > + clocks = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
>
> This looks wrong to me. You appear to have changed the reset-names
> instead of the clock-names here.

Whoops, your right, I'll send a V2 shortly.

Pete.

2014-06-16 09:23:46

by Peter Griffin

[permalink] [raw]

Subject: [PATCH V2] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6

This patch fixes two problems: -

1) The device tree isn't currently providing sti-ethclk which is
required by the dwmac glue code to correctly configure the ethernet
PHY clock speed.

This means depending on what the bootloader/jtag has
configured this clock to, and what switch/hub the board is plugged
into you most likely will NOT successfully negotiate a ethernet link.

2) The stmmaceth clock was associated with the wrong clock. It was
referencing the PHY clock rather than the interconnect clock which
clocks the IP.

This patch also brings us closer to not having to boot the upstream
kernel with the clk_ignore_unused parameter.

Signed-off-by: Peter Griffin <[email protected]>
---
arch/arm/boot/dts/stih415.dtsi | 8 ++++----
arch/arm/boot/dts/stih416.dtsi | 8 ++++----
include/dt-bindings/clock/stih415-clks.h | 1 +
include/dt-bindings/clock/stih416-clks.h | 1 +
4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
index d6f254f..a0f6f75 100644
--- a/arch/arm/boot/dts/stih415.dtsi
+++ b/arch/arm/boot/dts/stih415.dtsi
@@ -169,8 +169,8 @@

pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mii0>;
- clock-names = "stmmaceth";
- clocks = <&clk_s_a1_ls CLK_GMAC0_PHY>;
+ clock-names = "stmmaceth", "sti-ethclk";
+ clocks = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
};

ethernet1: dwmac@fef08000 {
@@ -192,8 +192,8 @@
reset-names = "stmmaceth";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mii1>;
- clock-names = "stmmaceth";
- clocks = <&clk_s_a0_ls CLK_ETH1_PHY>;
+ clock-names = "stmmaceth", "sti-ethclk";
+ clocks = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
};

rc: rc@fe518000 {
diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index 06473c5..84758d7 100644
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -175,8 +175,8 @@
reset-names = "stmmaceth";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mii0>;
- clock-names = "stmmaceth";
- clocks = <&clk_s_a1_ls CLK_GMAC0_PHY>;
+ clock-names = "stmmaceth", "sti-ethclk";
+ clocks = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
};

ethernet1: dwmac@fef08000 {
@@ -197,8 +197,8 @@
reset-names = "stmmaceth";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mii1>;
- clock-names = "stmmaceth";
- clocks = <&clk_s_a0_ls CLK_ETH1_PHY>;
+ clock-names = "stmmaceth", "sti-ethclk";
+ clocks = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
};

rc: rc@fe518000 {
diff --git a/include/dt-bindings/clock/stih415-clks.h b/include/dt-bindings/clock/stih415-clks.h
index 0d2c739..d80caa6 100644
--- a/include/dt-bindings/clock/stih415-clks.h
+++ b/include/dt-bindings/clock/stih415-clks.h
@@ -10,6 +10,7 @@
#define CLK_ETH1_PHY 4

/* CLOCKGEN A1 */
+#define CLK_ICN_IF_2 0
#define CLK_GMAC0_PHY 3

#endif
diff --git a/include/dt-bindings/clock/stih416-clks.h b/include/dt-bindings/clock/stih416-clks.h
index 552c779..f9bdbd1 100644
--- a/include/dt-bindings/clock/stih416-clks.h
+++ b/include/dt-bindings/clock/stih416-clks.h
@@ -10,6 +10,7 @@
#define CLK_ETH1_PHY 4

/* CLOCKGEN A1 */
+#define CLK_ICN_IF_2 0
#define CLK_GMAC0_PHY 3

#endif
--
1.9.1

2014-06-16 09:29:47

by Lee Jones

[permalink] [raw]

Subject: Re: [PATCH V2] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6

> This patch fixes two problems: -
>
> 1) The device tree isn't currently providing sti-ethclk which is
> required by the dwmac glue code to correctly configure the ethernet
> PHY clock speed.
>
> This means depending on what the bootloader/jtag has
> configured this clock to, and what switch/hub the board is plugged
> into you most likely will NOT successfully negotiate a ethernet link.
>
> 2) The stmmaceth clock was associated with the wrong clock. It was
> referencing the PHY clock rather than the interconnect clock which
> clocks the IP.
>
> This patch also brings us closer to not having to boot the upstream
> kernel with the clk_ignore_unused parameter.
>
> Signed-off-by: Peter Griffin <[email protected]>
> ---
> arch/arm/boot/dts/stih415.dtsi | 8 ++++----
> arch/arm/boot/dts/stih416.dtsi | 8 ++++----
> include/dt-bindings/clock/stih415-clks.h | 1 +
> include/dt-bindings/clock/stih416-clks.h | 1 +
> 4 files changed, 10 insertions(+), 8 deletions(-)

Patch looks good to me now:

Acked-by: Lee Jones <[email protected]>

> diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
> index d6f254f..a0f6f75 100644
> --- a/arch/arm/boot/dts/stih415.dtsi
> +++ b/arch/arm/boot/dts/stih415.dtsi
> @@ -169,8 +169,8 @@
>
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_mii0>;
> - clock-names = "stmmaceth";
> - clocks = <&clk_s_a1_ls CLK_GMAC0_PHY>;
> + clock-names = "stmmaceth", "sti-ethclk";
> + clocks = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
> };
>
> ethernet1: dwmac@fef08000 {
> @@ -192,8 +192,8 @@
> reset-names = "stmmaceth";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_mii1>;
> - clock-names = "stmmaceth";
> - clocks = <&clk_s_a0_ls CLK_ETH1_PHY>;
> + clock-names = "stmmaceth", "sti-ethclk";
> + clocks = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
> };
>
> rc: rc@fe518000 {
> diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
> index 06473c5..84758d7 100644
> --- a/arch/arm/boot/dts/stih416.dtsi
> +++ b/arch/arm/boot/dts/stih416.dtsi
> @@ -175,8 +175,8 @@
> reset-names = "stmmaceth";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_mii0>;
> - clock-names = "stmmaceth";
> - clocks = <&clk_s_a1_ls CLK_GMAC0_PHY>;
> + clock-names = "stmmaceth", "sti-ethclk";
> + clocks = <&clk_s_a1_ls CLK_ICN_IF_2>, <&clk_s_a1_ls CLK_GMAC0_PHY>;
> };
>
> ethernet1: dwmac@fef08000 {
> @@ -197,8 +197,8 @@
> reset-names = "stmmaceth";
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_mii1>;
> - clock-names = "stmmaceth";
> - clocks = <&clk_s_a0_ls CLK_ETH1_PHY>;
> + clock-names = "stmmaceth", "sti-ethclk";
> + clocks = <&clk_s_a0_ls CLK_ICN_REG>, <&clk_s_a0_ls CLK_ETH1_PHY>;
> };
>
> rc: rc@fe518000 {
> diff --git a/include/dt-bindings/clock/stih415-clks.h b/include/dt-bindings/clock/stih415-clks.h
> index 0d2c739..d80caa6 100644
> --- a/include/dt-bindings/clock/stih415-clks.h
> +++ b/include/dt-bindings/clock/stih415-clks.h
> @@ -10,6 +10,7 @@
> #define CLK_ETH1_PHY 4
>
> /* CLOCKGEN A1 */
> +#define CLK_ICN_IF_2 0
> #define CLK_GMAC0_PHY 3
>
> #endif
> diff --git a/include/dt-bindings/clock/stih416-clks.h b/include/dt-bindings/clock/stih416-clks.h
> index 552c779..f9bdbd1 100644
> --- a/include/dt-bindings/clock/stih416-clks.h
> +++ b/include/dt-bindings/clock/stih416-clks.h
> @@ -10,6 +10,7 @@
> #define CLK_ETH1_PHY 4
>
> /* CLOCKGEN A1 */
> +#define CLK_ICN_IF_2 0
> #define CLK_GMAC0_PHY 3
>
> #endif

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

2014-06-16 11:28:47

by Maxime Coquelin

[permalink] [raw]

Subject: Re: [PATCH V2] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6

Hi Peter,

On 06/16/2014 11:23 AM, Peter Griffin wrote:
> This patch fixes two problems: -
>
> 1) The device tree isn't currently providing sti-ethclk which is
> required by the dwmac glue code to correctly configure the ethernet
> PHY clock speed.
>
> This means depending on what the bootloader/jtag has
> configured this clock to, and what switch/hub the board is plugged
> into you most likely will NOT successfully negotiate a ethernet link.
>
> 2) The stmmaceth clock was associated with the wrong clock. It was
> referencing the PHY clock rather than the interconnect clock which
> clocks the IP.
>
> This patch also brings us closer to not having to boot the upstream
> kernel with the clk_ignore_unused parameter.
>
> Signed-off-by: Peter Griffin <[email protected]>
> ---
> arch/arm/boot/dts/stih415.dtsi | 8 ++++----
> arch/arm/boot/dts/stih416.dtsi | 8 ++++----
> include/dt-bindings/clock/stih415-clks.h | 1 +
> include/dt-bindings/clock/stih416-clks.h | 1 +
> 4 files changed, 10 insertions(+), 8 deletions(-)
>

...

Acked-by: Maxime Coquelin <[email protected]>

Thanks for the fix!

Maxime

2014-06-17 07:10:45

by Lee Jones

[permalink] [raw]

Subject: Re: [PATCH V2] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6

> On 06/16/2014 11:23 AM, Peter Griffin wrote:
> >This patch fixes two problems: -
> >
> >1) The device tree isn't currently providing sti-ethclk which is
> >required by the dwmac glue code to correctly configure the ethernet
> >PHY clock speed.
> >
> >This means depending on what the bootloader/jtag has
> >configured this clock to, and what switch/hub the board is plugged
> >into you most likely will NOT successfully negotiate a ethernet link.
> >
> >2) The stmmaceth clock was associated with the wrong clock. It was
> >referencing the PHY clock rather than the interconnect clock which
> >clocks the IP.
> >
> >This patch also brings us closer to not having to boot the upstream
> >kernel with the clk_ignore_unused parameter.
> >
> >Signed-off-by: Peter Griffin <[email protected]>
> >---
> > arch/arm/boot/dts/stih415.dtsi | 8 ++++----
> > arch/arm/boot/dts/stih416.dtsi | 8 ++++----
> > include/dt-bindings/clock/stih415-clks.h | 1 +
> > include/dt-bindings/clock/stih416-clks.h | 1 +
> > 4 files changed, 10 insertions(+), 8 deletions(-)
>
> Acked-by: Maxime Coquelin <[email protected]>
>
> Thanks for the fix!

Can you apply Maxime and my Acks and send to ARM-SoC (CC'ed), due for
their -fixes branch please?

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog