From patchwork Tue Oct 15 07:45:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3043821 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 97F229F2B6 for ; Tue, 15 Oct 2013 07:45:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 790CC20213 for ; Tue, 15 Oct 2013 07:45:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BB6620204 for ; Tue, 15 Oct 2013 07:45:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757553Ab3JOHp5 (ORCPT ); Tue, 15 Oct 2013 03:45:57 -0400 Received: from mail-pb0-f51.google.com ([209.85.160.51]:48748 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757189Ab3JOHp4 (ORCPT ); Tue, 15 Oct 2013 03:45:56 -0400 Received: by mail-pb0-f51.google.com with SMTP id jt11so8462594pbb.10 for ; Tue, 15 Oct 2013 00:45:56 -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=WwQUd/57HH15U5Bbh8un2JY1XcjzyTGg4NbUcmq1dIk=; b=EI9k/3CmQJdKcu7QGyXuw1CgTXyA8t9bUePGyYtswPjaKLaHLP5fGRlxYu0EintCc9 dT2824bPdE/6XZGEy+jAyLfAVoW2+xkDbiigYc3Gy+VIFb6EQdMINKB3gbhOG1gfRY2P JJndTvEpSyIreuO4gs+9YMfcg5mr9RLZT80xpCwA8QZIBpEMbx5SijI0nAsHhaJFtCFe q+WWRMFEoUgfN6OJ+L2xWBd4eB6cncLyGihAEJda7+TpbvHyS0A/faKCp88aA61oQthe fEv2w5T5PVrQiIO1I0WhxDYQV01dhU/jYgTld5LXWKcu9cbWNtj5Bxif+vcSJxKKipL+ FIhw== X-Received: by 10.66.188.203 with SMTP id gc11mr41025677pac.63.1381823156141; Tue, 15 Oct 2013 00:45:56 -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 fa4sm96866047pab.17.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Oct 2013 00:45:55 -0700 (PDT) Date: Tue, 15 Oct 2013 00:45:55 -0700 (PDT) Message-ID: <871u3ndljk.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 12/17] ARM: shmobile: r8a7778: fixup DT node naming for MMCIF 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 MMCIF DT node from "mmcif" to "mmc". Signed-off-by: Kuninori Morimoto --- arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +- arch/arm/boot/dts/r8a7778.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts index b317a1dc6..35a5f6a 100644 --- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts +++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts @@ -53,7 +53,7 @@ }; -&mmcif { +&mmc { pinctrl-0 = <&mmc_pins>; pinctrl-names = "default"; diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 322b703..c889901 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi @@ -157,7 +157,7 @@ status = "disabled"; }; - mmcif: mmcif@ffe4e000 { + mmc: mmc@ffe4e000 { compatible = "renesas,sh-mmcif"; reg = <0xffe4e000 0x100>; interrupt-parent = <&gic>;