From patchwork Fri May 29 00:54:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 6503521 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8EC109F38D for ; Fri, 29 May 2015 00:54:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2AF76205B8 for ; Fri, 29 May 2015 00:54:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 403BD205B1 for ; Fri, 29 May 2015 00:54:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755276AbbE2AyZ (ORCPT ); Thu, 28 May 2015 20:54:25 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:44822 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755179AbbE2AyZ (ORCPT ); Thu, 28 May 2015 20:54:25 -0400 Received: from ayumi.isobedori.kobe.vergenet.net (pa8a134.hyognt01.ap.so-net.ne.jp [182.168.161.52]) by kirsty.vergenet.net (Postfix) with ESMTP id 317F6266CF2; Fri, 29 May 2015 10:54:17 +1000 (EST) Received: by ayumi.isobedori.kobe.vergenet.net (Postfix, from userid 7100) id 86453EDEE28; Fri, 29 May 2015 09:54:19 +0900 (JST) From: Simon Horman To: linux-sh@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Magnus Damm , Geert Uytterhoeven , Simon Horman Subject: [PATCH 04/10] ARM: shmobile: henninger dts: Replace "nor-jedec" by "jedec, spi-nor" Date: Fri, 29 May 2015 09:54:12 +0900 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 From: Geert Uytterhoeven Cfr. commit 8947e396a8296c52 ('Documentation: dt: mtd: replace "nor-jedec" binding with "jedec, spi-nor"') Signed-off-by: Geert Uytterhoeven Acked-by: Brian Norris Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7791-henninger.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts index bb80122b4113..655d1804e5e9 100644 --- a/arch/arm/boot/dts/r8a7791-henninger.dts +++ b/arch/arm/boot/dts/r8a7791-henninger.dts @@ -226,7 +226,7 @@ flash@0 { #address-cells = <1>; #size-cells = <1>; - compatible = "spansion,s25fl512s", "nor-jedec"; + compatible = "spansion,s25fl512s", "jedec,spi-nor"; reg = <0>; spi-max-frequency = <30000000>; spi-tx-bus-width = <4>;