From patchwork Tue Oct 15 07:44:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3043711 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3B39E9F2B6 for ; Tue, 15 Oct 2013 07:44:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A0DF20204 for ; Tue, 15 Oct 2013 07:44:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDAF620213 for ; Tue, 15 Oct 2013 07:44:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752707Ab3JOHoL (ORCPT ); Tue, 15 Oct 2013 03:44:11 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:38023 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751672Ab3JOHoK (ORCPT ); Tue, 15 Oct 2013 03:44:10 -0400 Received: by mail-pd0-f171.google.com with SMTP id z10so530296pdj.30 for ; Tue, 15 Oct 2013 00:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:in-reply-to:references:from:subject :mime-version:content-type; bh=IJx/JjgRMgIT6CnrGa7ymdA+KttBMSUMZ5aDlN6QsIU=; b=trlARldhWgV8fmiQBS44Ej9h2s1zOTmK2PgS1FWk5nZM4pAWOAxeOnf2pboG0b5KuB L4I9NRY0dXys82a5lcxcb8AZPh2UoiapgEvLHD/cepWS7EKnbkE0Y1H1XzhyKLkWCifS RkHRJCkqlO/awlCe1dEuHtKVF5Ua58ase0rDOszQrYj4gGzG68RnGMsmZxayOxKu4YEU Y6NgBBBb+Nlz6/YlBb+TCVwzUntqGz7G+7yEn8THwleHMqWgE99ScxsRv/nGJcRHyu5G RJsoCXh4O/RgHH62Y5lluanpM6NJam6an9u4fJAk6HtYHR/UIf2j+7HxkOYjsNqZQ1Aj mK8Q== X-Received: by 10.68.88.161 with SMTP id bh1mr40201345pbb.49.1381823050057; Tue, 15 Oct 2013 00:44:10 -0700 (PDT) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id f2sm82641480pbg.44.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:44:09 -0700 (PDT) Date: Tue, 15 Oct 2013 00:44:09 -0700 (PDT) Message-ID: <87hacjdlmi.wl%kuninori.morimoto.gx@renesas.com> To: Simon Cc: Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto In-Reply-To: <87iowzdlnh.wl%kuninori.morimoto.gx@renesas.com> References: <87iowzdlnh.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 01/17] ARM: shmobile: r8a73a4: fixup DT node naming for SDHI MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 According to ePAPR spec, this patch exchanges SDHI DT node from "sdhi" to "sd". Signed-off-by: Kuninori Morimoto --- arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 16 ++++++++-------- arch/arm/boot/dts/r8a73a4.dtsi | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts index 9443e93..27ce4ac 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts @@ -33,7 +33,7 @@ regulator-always-on; }; - vcc_sdhi0: regulator@1 { + vcc_sd0: regulator@1 { compatible = "regulator-fixed"; regulator-name = "SDHI0 Vcc"; @@ -98,12 +98,12 @@ renesas,function = "mmc0"; }; - sdhi0_pins: sdhi0 { + sd0_pins: sd0 { renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd"; renesas,function = "sdhi0"; }; - sdhi1_pins: sdhi1 { + sd1_pins: sd1 { renesas,groups = "sdhi1_data4", "sdhi1_ctrl"; renesas,function = "sdhi1"; }; @@ -118,21 +118,21 @@ status = "okay"; }; -&sdhi0 { - vmmc-supply = <&vcc_sdhi0>; +&sd0 { + vmmc-supply = <&vcc_sd0>; bus-width = <4>; toshiba,mmc-wrprotect-disable; pinctrl-names = "default"; - pinctrl-0 = <&sdhi0_pins>; + pinctrl-0 = <&sd0_pins>; status = "okay"; }; -&sdhi1 { +&sd1 { vmmc-supply = <&ape6evm_fixed_3v3>; bus-width = <4>; broken-cd; toshiba,mmc-wrprotect-disable; pinctrl-names = "default"; - pinctrl-0 = <&sdhi1_pins>; + pinctrl-0 = <&sd1_pins>; status = "okay"; }; diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi index 287e047..447c128 100644 --- a/arch/arm/boot/dts/r8a73a4.dtsi +++ b/arch/arm/boot/dts/r8a73a4.dtsi @@ -244,7 +244,7 @@ #gpio-cells = <2>; }; - sdhi0: sdhi@ee100000 { + sd0: sd@ee100000 { compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee100000 0 0x100>; interrupt-parent = <&gic>; @@ -253,7 +253,7 @@ status = "disabled"; }; - sdhi1: sdhi@ee120000 { + sd1: sd@ee120000 { compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee120000 0 0x100>; interrupt-parent = <&gic>; @@ -262,7 +262,7 @@ status = "disabled"; }; - sdhi2: sdhi@ee140000 { + sd2: sd@ee140000 { compatible = "renesas,sdhi-r8a73a4"; reg = <0 0xee140000 0 0x100>; interrupt-parent = <&gic>;