* [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6
@ 2014-06-09 20:22 Peter Griffin
2014-06-09 20:30 ` Srinivas Kandagatla
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Peter Griffin @ 2014-06-09 20:22 UTC (permalink / raw)
To: linux-arm-kernel
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 <peter.griffin@linaro.org>
---
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 at 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 at 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 at 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 at 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
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6
2014-06-09 20:22 [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6 Peter Griffin
@ 2014-06-09 20:30 ` Srinivas Kandagatla
2014-06-16 9:01 ` Lee Jones
2014-06-16 9:23 ` [PATCH V2] " Peter Griffin
2 siblings, 0 replies; 8+ messages in thread
From: Srinivas Kandagatla @ 2014-06-09 20:30 UTC (permalink / raw)
To: linux-arm-kernel
Thanks Pete for the patch.
Patch looks good for me.
Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
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 <peter.griffin@linaro.org>
> ---
> 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 at 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 at 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 at 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 at 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
>
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6
2014-06-09 20:22 [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6 Peter Griffin
2014-06-09 20:30 ` Srinivas Kandagatla
@ 2014-06-16 9:01 ` Lee Jones
2014-06-16 9:19 ` Peter Griffin
2014-06-16 9:23 ` [PATCH V2] " Peter Griffin
2 siblings, 1 reply; 8+ messages in thread
From: Lee Jones @ 2014-06-16 9:01 UTC (permalink / raw)
To: linux-arm-kernel
> 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 <peter.griffin@linaro.org>
> ---
> 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
[...]
> ethernet1: dwmac at 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.
[...]
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6
2014-06-16 9:01 ` Lee Jones
@ 2014-06-16 9:19 ` Peter Griffin
0 siblings, 0 replies; 8+ messages in thread
From: Peter Griffin @ 2014-06-16 9:19 UTC (permalink / raw)
To: linux-arm-kernel
Hi Lee,
> > ethernet1: dwmac at 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.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH V2] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6
2014-06-09 20:22 [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6 Peter Griffin
2014-06-09 20:30 ` Srinivas Kandagatla
2014-06-16 9:01 ` Lee Jones
@ 2014-06-16 9:23 ` Peter Griffin
2014-06-16 9:29 ` Lee Jones
2014-06-16 11:28 ` Maxime Coquelin
2 siblings, 2 replies; 8+ messages in thread
From: Peter Griffin @ 2014-06-16 9:23 UTC (permalink / raw)
To: linux-arm-kernel
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 <peter.griffin@linaro.org>
---
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 at 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 at 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 at 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 at 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
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH V2] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6
2014-06-16 9:23 ` [PATCH V2] " Peter Griffin
@ 2014-06-16 9:29 ` Lee Jones
2014-06-16 11:28 ` Maxime Coquelin
1 sibling, 0 replies; 8+ messages in thread
From: Lee Jones @ 2014-06-16 9:29 UTC (permalink / raw)
To: linux-arm-kernel
> 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 <peter.griffin@linaro.org>
> ---
> 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 <lee.jones@linaro.org>
> 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 at 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 at 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 at 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 at 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
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH V2] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6
2014-06-16 9:23 ` [PATCH V2] " Peter Griffin
2014-06-16 9:29 ` Lee Jones
@ 2014-06-16 11:28 ` Maxime Coquelin
2014-06-17 7:10 ` Lee Jones
1 sibling, 1 reply; 8+ messages in thread
From: Maxime Coquelin @ 2014-06-16 11:28 UTC (permalink / raw)
To: linux-arm-kernel
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 <peter.griffin@linaro.org>
> ---
> 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 <maxime.coquelin@st.com>
Thanks for the fix!
Maxime
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH V2] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6
2014-06-16 11:28 ` Maxime Coquelin
@ 2014-06-17 7:10 ` Lee Jones
0 siblings, 0 replies; 8+ messages in thread
From: Lee Jones @ 2014-06-17 7:10 UTC (permalink / raw)
To: linux-arm-kernel
> 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 <peter.griffin@linaro.org>
> >---
> > 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 <maxime.coquelin@st.com>
>
> 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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2014-06-17 7:10 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-09 20:22 [PATCH] ARM: STi: DT: Properly define sti-ethclk & stmmaceth for stih415/6 Peter Griffin
2014-06-09 20:30 ` Srinivas Kandagatla
2014-06-16 9:01 ` Lee Jones
2014-06-16 9:19 ` Peter Griffin
2014-06-16 9:23 ` [PATCH V2] " Peter Griffin
2014-06-16 9:29 ` Lee Jones
2014-06-16 11:28 ` Maxime Coquelin
2014-06-17 7:10 ` Lee Jones
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).