From patchwork Tue Jan 21 15:26:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Jensen X-Patchwork-Id: 3518811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5451CC02DC for ; Tue, 21 Jan 2014 15:54:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 444A22013D for ; Tue, 21 Jan 2014 15:54:01 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 163EA20125 for ; Tue, 21 Jan 2014 15:54:00 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5deG-0000oU-Vj; Tue, 21 Jan 2014 15:53:57 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5dE9-0000rw-AK; Tue, 21 Jan 2014 15:26:57 +0000 Received: from mail-lb0-x229.google.com ([2a00:1450:4010:c04::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W5dE5-0000pB-0v for linux-arm-kernel@lists.infradead.org; Tue, 21 Jan 2014 15:26:53 +0000 Received: by mail-lb0-f169.google.com with SMTP id q8so6179613lbi.0 for ; Tue, 21 Jan 2014 07:26:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=3uwBc/IqClCMo9R8I6AUJlRDtkVvCqTEHgPj+TOSfpk=; b=ALAEkcfOQ7EG0XTlarwqh+sxZ+C+lDLUnKW0tbCsAWrvbHeroyIASmrluo5RC52m4m MldIoYZAahJUF9mvMsx0jx/wTjpaYadJn+rmAihs7SSfR3BZ8soTEOescN5lcE1NiQOZ AEG4Dc2nqTXS5u0XNUW/OLu4n0Kss7IRhjdl94gaNl3byXKCVd8HYFJB/zd8An1EsOUs bkvwy4ojkvPFgzzld4+CNCfnjiLR75ECCw6NIxEWhYa/NT4JPXku5a3daMoSgWWrp1SB wTA7CoyuBZAk+Ncg8gLvHgegU64NqlCR/GMsEUC3wJF4/nXK1PzMOxlKlqNAI1YoVXlR RNzg== X-Received: by 10.112.157.234 with SMTP id wp10mr1435467lbb.50.1390317990945; Tue, 21 Jan 2014 07:26:30 -0800 (PST) Received: from Ildjarn.ath.cx (static-213-115-41-10.sme.bredbandsbolaget.se. [213.115.41.10]) by mx.google.com with ESMTPSA id j1sm5884048laj.3.2014.01.21.07.26.29 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 21 Jan 2014 07:26:30 -0800 (PST) From: Jonas Jensen To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: moxart: DT fixups Date: Tue, 21 Jan 2014 16:26:13 +0100 Message-Id: <1390317973-24110-1-git-send-email-jonas.jensen@gmail.com> X-Mailer: git-send-email 1.8.2.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140121_102653_239007_C62DB8B1 X-CRM114-Status: GOOD ( 10.29 ) X-Spam-Score: -2.0 (--) Cc: devicetree@vger.kernel.org, arm@kernel.org, linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, Jonas Jensen X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change DT files to remain coherent with changes in accompanying drivers. 1. replace "sdhci" with "mmc" 2. add bus-width property to mmc node 3. drop device_type property 4. replace "mac@" with "ethernet@" 5. replace CONFIG_MMC_SDHCI_MOXART with CONFIG_MMC_MOXART Signed-off-by: Jonas Jensen --- Notes: Applies on top of: "[PATCH] ARM: moxart: move fixed rate clock child node to board level dts" http://lists.infradead.org/pipermail/linux-arm-kernel/2014-January/226141.html Applies to next-20140121 arch/arm/boot/dts/moxart-uc7112lx.dts | 5 ++--- arch/arm/boot/dts/moxart.dtsi | 8 ++++---- arch/arm/configs/moxart_defconfig | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/moxart-uc7112lx.dts b/arch/arm/boot/dts/moxart-uc7112lx.dts index 10d088d..ee6ef7c 100644 --- a/arch/arm/boot/dts/moxart-uc7112lx.dts +++ b/arch/arm/boot/dts/moxart-uc7112lx.dts @@ -80,15 +80,15 @@ clocks = <&ref12>; }; -&sdhci { +&mmc { status = "okay"; + bus-width = <4>; }; &mdio0 { status = "okay"; ethphy0: ethernet-phy@1 { - device_type = "ethernet-phy"; compatible = "moxa,moxart-rtl8201cp", "ethernet-phy-ieee802.3-c22"; reg = <1>; }; @@ -98,7 +98,6 @@ status = "okay"; ethphy1: ethernet-phy@1 { - device_type = "ethernet-phy"; compatible = "moxa,moxart-rtl8201cp", "ethernet-phy-ieee802.3-c22"; reg = <1>; }; diff --git a/arch/arm/boot/dts/moxart.dtsi b/arch/arm/boot/dts/moxart.dtsi index 1fd27ed..97c8084 100644 --- a/arch/arm/boot/dts/moxart.dtsi +++ b/arch/arm/boot/dts/moxart.dtsi @@ -90,8 +90,8 @@ clocks = <&clk_apb>; }; - sdhci: sdhci@98e00000 { - compatible = "moxa,moxart-sdhci"; + mmc: mmc@98e00000 { + compatible = "moxa,moxart-mmc"; reg = <0x98e00000 0x5C>; interrupts = <5 0>; clocks = <&clk_apb>; @@ -117,7 +117,7 @@ status = "disabled"; }; - mac0: mac@90900000 { + mac0: ethernet@90900000 { compatible = "moxa,moxart-mac"; reg = <0x90900000 0x90>; interrupts = <25 0>; @@ -126,7 +126,7 @@ status = "disabled"; }; - mac1: mac@92000000 { + mac1: ethernet@92000000 { compatible = "moxa,moxart-mac"; reg = <0x92000000 0x90>; interrupts = <27 0>; diff --git a/arch/arm/configs/moxart_defconfig b/arch/arm/configs/moxart_defconfig index a3cb76c..708c0cf 100644 --- a/arch/arm/configs/moxart_defconfig +++ b/arch/arm/configs/moxart_defconfig @@ -107,7 +107,7 @@ CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_MOXART_WDT=y # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y -CONFIG_MMC_SDHCI_MOXART=y +CONFIG_MMC_MOXART=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y