From: florian@openwrt.org (Florian Fainelli)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] ARM: kirkwood: add device node entries for the gigabit interfaces
Date: Fri, 29 Mar 2013 19:51:53 +0100 [thread overview]
Message-ID: <5155E2C9.9050201@openwrt.org> (raw)
In-Reply-To: <20130329184852.GM13280@titan.lakedaemon.net>
Le 03/29/13 19:48, Jason Cooper a ?crit :
> On Fri, Mar 29, 2013 at 07:14:37PM +0100, Florian Fainelli wrote:
>> This patch modifies kirkwood.dtsi to specify the various gigabit
>> interfaces nodes available on kirkwood devices. They are disabled by
>> default and should be enabled on a per-board basis. egiga0 and egiga1
>> aliases are defined for convenience. The mdio node is also present and
>> should be enabled on a per-board basis as well.
>>
>> Signed-off-by: Florian Fainelli <florian@openwrt.org>
>> ---
>> arch/arm/boot/dts/kirkwood.dtsi | 46 +++++++++++++++++++++++++++++++++++++++
>> arch/arm/mach-kirkwood/common.c | 4 ++--
>> 2 files changed, 48 insertions(+), 2 deletions(-)
>>
> ...
>> diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
>> index 49792a0..a606f9f 100644
>> --- a/arch/arm/mach-kirkwood/common.c
>> +++ b/arch/arm/mach-kirkwood/common.c
>> @@ -251,8 +251,8 @@ void __init kirkwood_clk_init(void)
>> /* clkdev entries, mapping clks to devices */
>> orion_clkdev_add(NULL, "orion_spi.0", runit);
>> orion_clkdev_add(NULL, "orion_spi.1", runit);
>> - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0);
>> - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1);
>> + orion_clkdev_add("0", MV643XX_ETH_NAME ".0", ge0);
>> + orion_clkdev_add("1", MV643XX_ETH_NAME ".1", ge1);
>
> Your first patch is going to go through David's tree, and I'd like to
> prevent any hard dependency between his tree and arm-soc. Can this
> change be pulled out and applied separately? At first glance, it looks
> like a fix to match sata and pcie.
I just actually did the same thing as what SATA has (two clocks with
names), define a clock name "0" and "1" (is not that too generic BTW?)
for ge0 and ge1. But I don't think this change is required.
--
Florian
WARNING: multiple messages have this Message-ID (diff)
From: Florian Fainelli <florian@openwrt.org>
To: Jason Cooper <jason@lakedaemon.net>
Cc: davem@davemloft.net, netdev@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org,
thomas.petazzoni@free-electrons.com, jm@lentin.co.uk,
moinejf@free.fr, sebastian.hesselbarth@gmail.com,
buytenh@wantstofly.org, andrew@lunn.ch,
grant.likely@secretlab.ca, rob.herring@calxeda.com
Subject: Re: [PATCH 2/4] ARM: kirkwood: add device node entries for the gigabit interfaces
Date: Fri, 29 Mar 2013 19:51:53 +0100 [thread overview]
Message-ID: <5155E2C9.9050201@openwrt.org> (raw)
In-Reply-To: <20130329184852.GM13280@titan.lakedaemon.net>
Le 03/29/13 19:48, Jason Cooper a écrit :
> On Fri, Mar 29, 2013 at 07:14:37PM +0100, Florian Fainelli wrote:
>> This patch modifies kirkwood.dtsi to specify the various gigabit
>> interfaces nodes available on kirkwood devices. They are disabled by
>> default and should be enabled on a per-board basis. egiga0 and egiga1
>> aliases are defined for convenience. The mdio node is also present and
>> should be enabled on a per-board basis as well.
>>
>> Signed-off-by: Florian Fainelli <florian@openwrt.org>
>> ---
>> arch/arm/boot/dts/kirkwood.dtsi | 46 +++++++++++++++++++++++++++++++++++++++
>> arch/arm/mach-kirkwood/common.c | 4 ++--
>> 2 files changed, 48 insertions(+), 2 deletions(-)
>>
> ...
>> diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
>> index 49792a0..a606f9f 100644
>> --- a/arch/arm/mach-kirkwood/common.c
>> +++ b/arch/arm/mach-kirkwood/common.c
>> @@ -251,8 +251,8 @@ void __init kirkwood_clk_init(void)
>> /* clkdev entries, mapping clks to devices */
>> orion_clkdev_add(NULL, "orion_spi.0", runit);
>> orion_clkdev_add(NULL, "orion_spi.1", runit);
>> - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".0", ge0);
>> - orion_clkdev_add(NULL, MV643XX_ETH_NAME ".1", ge1);
>> + orion_clkdev_add("0", MV643XX_ETH_NAME ".0", ge0);
>> + orion_clkdev_add("1", MV643XX_ETH_NAME ".1", ge1);
>
> Your first patch is going to go through David's tree, and I'd like to
> prevent any hard dependency between his tree and arm-soc. Can this
> change be pulled out and applied separately? At first glance, it looks
> like a fix to match sata and pcie.
I just actually did the same thing as what SATA has (two clocks with
names), define a clock name "0" and "1" (is not that too generic BTW?)
for ge0 and ge1. But I don't think this change is required.
--
Florian
next prev parent reply other threads:[~2013-03-29 18:51 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-29 18:14 [PATCH 0/4] mv643xx_eth device tree bindings Florian Fainelli
2013-03-29 18:14 ` Florian Fainelli
2013-03-29 18:14 ` [PATCH 1/4] mv643xx_eth: add Device Tree bindings Florian Fainelli
2013-03-29 18:14 ` Florian Fainelli
2013-03-29 18:25 ` Florian Fainelli
2013-03-29 18:25 ` Florian Fainelli
2013-03-29 18:14 ` [PATCH 2/4] ARM: kirkwood: add device node entries for the gigabit interfaces Florian Fainelli
2013-03-29 18:14 ` Florian Fainelli
2013-03-29 18:48 ` Jason Cooper
2013-03-29 18:48 ` Jason Cooper
2013-03-29 18:51 ` Florian Fainelli [this message]
2013-03-29 18:51 ` Florian Fainelli
2013-04-03 9:27 ` Florian Fainelli
2013-04-03 9:27 ` Florian Fainelli
2013-03-29 18:14 ` [PATCH 3/4] ARM: orion5x: add gigabit ethernet device tree node Florian Fainelli
2013-03-29 18:14 ` Florian Fainelli
2013-03-29 18:14 ` [PATCH 4/4] ARM: dove: add gigabit device tree nodes to dove.dtsi Florian Fainelli
2013-03-29 18:14 ` Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5155E2C9.9050201@openwrt.org \
--to=florian@openwrt.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.