On 22/01/2016 at 14:20:25 +0100, Nicolas Ferre wrote :
> After 57a38effa598 (net: phy: micrel: disable broadcast for KSZ8081/KSZ8091)
> the macb0 interface has difficulties to come back from power saving mode if
> address not explicitly set up.
> As the micrel phy on the board is actually configured to show up at address 1
> we use this explicitly.
> Adding the phy node and its real address fixes the issue.
>
> The phy IRQ and associated pinmux node is also added.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@xxxxxxxxx>
> Cc: stable@xxxxxxxxxxxxxxx # 4.4+ // manual merge needed
Acked-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxxxxxxxxx>
> ---
> v2: - correct typos in commit message
> - add a sentence about the IRQ + pinmux as well
> - add stable tag
>
> arch/arm/boot/dts/at91-sama5d2_xplained.dts | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
> index 77ddff036409..e683856c507c 100644
> --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts
> +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts
> @@ -114,9 +114,15 @@
>
> macb0: ethernet@f8008000 {
> pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_macb0_default>;
> + pinctrl-0 = <&pinctrl_macb0_default &pinctrl_macb0_phy_irq>;
> phy-mode = "rmii";
> status = "okay";
> +
> + ethernet-phy@1 {
> + reg = <0x1>;
> + interrupt-parent = <&pioA>;
> + interrupts = <73 IRQ_TYPE_LEVEL_LOW>;
> + };
> };
>
> pdmic@f8018000 {
> @@ -300,6 +306,10 @@
> bias-disable;
> };
>
> + pinctrl_macb0_phy_irq: macb0_phy_irq {
> + pinmux = <PIN_PC9__GPIO>;
> + };
> +
> pinctrl_pdmic_default: pdmic_default {
> pinmux = <PIN_PB26__PDMIC_DAT>,
> <PIN_PB27__PDMIC_CLK>;
> --
> 2.1.3
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html