Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932677AbaJ2Sja (ORCPT ); Wed, 29 Oct 2014 14:39:30 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:39056 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756677AbaJ2Sj1 (ORCPT ); Wed, 29 Oct 2014 14:39:27 -0400 Message-ID: <5451345B.5000703@gmail.com> Date: Wed, 29 Oct 2014 19:39:23 +0100 From: Sebastian Hesselbarth User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 CC: Chris Ball , Ulf Hansson , =?UTF-8?B?QW50b2luZSBUw6luYXJ0?= , linux-mmc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH RESEND 10/12] ARM: dts: berlin: Add SDHCI controller nodes to BG2/BG2CD References: <1413883364-681-1-git-send-email-sebastian.hesselbarth@gmail.com> <1413883364-681-11-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1413883364-681-11-git-send-email-sebastian.hesselbarth@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 21.10.2014 11:22, Sebastian Hesselbarth wrote: > Marvell Berlin BG2 has three, BG2CD just one pxav3 compatible > sdhci controllers, add them to the corresponding DT SoC > includes. > > Signed-off-by: Sebastian Hesselbarth Applied the three DT patches to berlin/dt. Sebastian > --- > Cc: Chris Ball > Cc: Ulf Hansson > Cc: "Antoine Ténart" > Cc: linux-mmc@vger.kernel.org > Cc: devicetree@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > --- > arch/arm/boot/dts/berlin2.dtsi | 34 ++++++++++++++++++++++++++++++++++ > arch/arm/boot/dts/berlin2cd.dtsi | 9 +++++++++ > 2 files changed, 43 insertions(+) > > diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi > index 9d7c810ebd0b..504f1add1938 100644 > --- a/arch/arm/boot/dts/berlin2.dtsi > +++ b/arch/arm/boot/dts/berlin2.dtsi > @@ -53,6 +53,35 @@ > > ranges = <0 0xf7000000 0x1000000>; > > + sdhci0: sdhci@ab0000 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0000 0x200>; > + clocks = <&chip CLKID_SDIO0XIN>, <&chip CLKID_SDIO0>; > + clock-names = "io", "core"; > + interrupts = ; > + status = "disabled"; > + }; > + > + sdhci1: sdhci@ab0800 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0800 0x200>; > + clocks = <&chip CLKID_SDIO1XIN>, <&chip CLKID_SDIO1>; > + clock-names = "io", "core"; > + interrupts = ; > + status = "disabled"; > + }; > + > + sdhci2: sdhci@ab1000 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab1000 0x200>; > + interrupts = ; > + clocks = <&chip CLKID_NFC_ECC>, <&chip CLKID_NFC>; > + clock-names = "io", "core"; > + pinctrl-0 = <&emmc_pmux>; > + pinctrl-names = "default"; > + status = "disabled"; > + }; > + > l2: l2-cache-controller@ac0000 { > compatible = "marvell,tauros3-cache", "arm,pl310-cache"; > reg = <0xac0000 0x1000>; > @@ -252,6 +281,11 @@ > reg = <0xea0000 0x400>; > clocks = <&refclk>; > clock-names = "refclk"; > + > + emmc_pmux: emmc-pmux { > + groups = "G26"; > + function = "emmc"; > + }; > }; > > apb@fc0000 { > diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi > index cc1df65da504..5a19017b5d71 100644 > --- a/arch/arm/boot/dts/berlin2cd.dtsi > +++ b/arch/arm/boot/dts/berlin2cd.dtsi > @@ -45,6 +45,15 @@ > > ranges = <0 0xf7000000 0x1000000>; > > + sdhci0: sdhci@ab0000 { > + compatible = "mrvl,pxav3-mmc"; > + reg = <0xab0000 0x200>; > + clocks = <&chip CLKID_SDIO0XIN>, <&chip CLKID_SDIO0>; > + clock-names = "io", "core"; > + interrupts = ; > + status = "disabled"; > + }; > + > l2: l2-cache-controller@ac0000 { > compatible = "arm,pl310-cache"; > reg = <0xac0000 0x1000>; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/