From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756173AbbCFQpZ (ORCPT ); Fri, 6 Mar 2015 11:45:25 -0500 Received: from eusmtp01.atmel.com ([212.144.249.243]:7544 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751773AbbCFQpU (ORCPT ); Fri, 6 Mar 2015 11:45:20 -0500 Message-ID: <54F9D99B.3090006@atmel.com> Date: Fri, 6 Mar 2015 17:45:15 +0100 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Boris Brezillon , "David S. Miller" , CC: Jean-Christophe Plagniol-Villard , "Alexandre Belloni" , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , "Kumar Gala" , , , Subject: Re: [PATCH v2 2/3] ARM: at91/dt: fix macb compatible strings References: <1425637442-8724-1-git-send-email-boris.brezillon@free-electrons.com> <1425637442-8724-3-git-send-email-boris.brezillon@free-electrons.com> In-Reply-To: <1425637442-8724-3-git-send-email-boris.brezillon@free-electrons.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le 06/03/2015 11:24, Boris Brezillon a écrit : > Some at91 SoCs embed a 10/100 Mbit Ethernet IP, that is based on the > at91sam9260 SoC. > Fix at91 DTs accordingly. > > Signed-off-by: Boris Brezillon > Reviewed-by: Alexandre Belloni Acked-by: Nicolas Ferre > --- > arch/arm/boot/dts/at91sam9260.dtsi | 2 +- > arch/arm/boot/dts/at91sam9263.dtsi | 2 +- > arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- > arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 2 +- > arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 2 +- > arch/arm/boot/dts/sama5d3_emac.dtsi | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi > index fff0ee6..9f7c737 100644 > --- a/arch/arm/boot/dts/at91sam9260.dtsi > +++ b/arch/arm/boot/dts/at91sam9260.dtsi > @@ -842,7 +842,7 @@ > }; > > macb0: ethernet@fffc4000 { > - compatible = "cdns,at32ap7000-macb", "cdns,macb"; > + compatible = "cdns,at91sam9260-macb", "cdns,macb"; > reg = <0xfffc4000 0x100>; > interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>; > pinctrl-names = "default"; > diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi > index 1f67bb4..340179e 100644 > --- a/arch/arm/boot/dts/at91sam9263.dtsi > +++ b/arch/arm/boot/dts/at91sam9263.dtsi > @@ -845,7 +845,7 @@ > }; > > macb0: ethernet@fffbc000 { > - compatible = "cdns,at32ap7000-macb", "cdns,macb"; > + compatible = "cdns,at91sam9260-macb", "cdns,macb"; > reg = <0xfffbc000 0x100>; > interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>; > pinctrl-names = "default"; > diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi > index ee80aa9..586eab7 100644 > --- a/arch/arm/boot/dts/at91sam9g45.dtsi > +++ b/arch/arm/boot/dts/at91sam9g45.dtsi > @@ -956,7 +956,7 @@ > }; > > macb0: ethernet@fffbc000 { > - compatible = "cdns,at32ap7000-macb", "cdns,macb"; > + compatible = "cdns,at91sam9260-macb", "cdns,macb"; > reg = <0xfffbc000 0x100>; > interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>; > pinctrl-names = "default"; > diff --git a/arch/arm/boot/dts/at91sam9x5_macb0.dtsi b/arch/arm/boot/dts/at91sam9x5_macb0.dtsi > index 57e89d1..73d7e30 100644 > --- a/arch/arm/boot/dts/at91sam9x5_macb0.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5_macb0.dtsi > @@ -53,7 +53,7 @@ > }; > > macb0: ethernet@f802c000 { > - compatible = "cdns,at32ap7000-macb", "cdns,macb"; > + compatible = "cdns,at91sam9260-macb", "cdns,macb"; > reg = <0xf802c000 0x100>; > interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; > pinctrl-names = "default"; > diff --git a/arch/arm/boot/dts/at91sam9x5_macb1.dtsi b/arch/arm/boot/dts/at91sam9x5_macb1.dtsi > index 663676c..d81980c 100644 > --- a/arch/arm/boot/dts/at91sam9x5_macb1.dtsi > +++ b/arch/arm/boot/dts/at91sam9x5_macb1.dtsi > @@ -41,7 +41,7 @@ > }; > > macb1: ethernet@f8030000 { > - compatible = "cdns,at32ap7000-macb", "cdns,macb"; > + compatible = "cdns,at91sam9260-macb", "cdns,macb"; > reg = <0xf8030000 0x100>; > interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; > pinctrl-names = "default"; > diff --git a/arch/arm/boot/dts/sama5d3_emac.dtsi b/arch/arm/boot/dts/sama5d3_emac.dtsi > index fe2af92..b4544cf 100644 > --- a/arch/arm/boot/dts/sama5d3_emac.dtsi > +++ b/arch/arm/boot/dts/sama5d3_emac.dtsi > @@ -41,7 +41,7 @@ > }; > > macb1: ethernet@f802c000 { > - compatible = "cdns,at32ap7000-macb", "cdns,macb"; > + compatible = "cdns,at91sam9260-macb", "cdns,macb"; > reg = <0xf802c000 0x100>; > interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>; > pinctrl-names = "default"; > -- Nicolas Ferre