From patchwork Thu Dec 24 11:16:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Kaneko X-Patchwork-Id: 7916891 Return-Path: X-Original-To: patchwork-linux-spi@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 D70FF9F318 for ; Thu, 24 Dec 2015 11:19:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13B4A202FF for ; Thu, 24 Dec 2015 11:19:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26CD1203E1 for ; Thu, 24 Dec 2015 11:19:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751367AbbLXLTc (ORCPT ); Thu, 24 Dec 2015 06:19:32 -0500 Received: from mail-pf0-f174.google.com ([209.85.192.174]:36493 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750969AbbLXLTc (ORCPT ); Thu, 24 Dec 2015 06:19:32 -0500 Received: by mail-pf0-f174.google.com with SMTP id 65so22982469pff.3; Thu, 24 Dec 2015 03:19:31 -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:in-reply-to:references; bh=9w3X/7Rr+4DVyDD090W5L3l6XlfBlt6U0DwoAumbBFM=; b=RmYMURVaB5yd9aZLeWtNwJrVGofmDdLxCD9I+MF6uSG6I6rd4hH0P5gjGR+/TqdS7C nATH97jPbmyLbNFRlcVl6Sl50wtUPhKWd2mSXfALs6Jr/syK/V6zX/wSrua02hIDkXtz 3XK0eyRv//aV6IgZZCJ774M/z6eYVOAInQ9zjt7iP8k0PWPfzw0uiWP4L0FgtoUrA5/X LkKW3N63PkEFIZBOUQrwQnZMSyig8lDF/QgMuKE6UA8Auv39jTX+o0jmI6c8hmmLKrYd G1/YBGufJGtSUCzxRivJWE9v4b0qOevUIoweGFiA5ty95+fnUXJb3F4qjOtMJiYOeeZX Q07g== X-Received: by 10.98.74.220 with SMTP id c89mr51532804pfj.11.1450955971672; Thu, 24 Dec 2015 03:19:31 -0800 (PST) Received: from localhost.localdomain (p3469131-ipngn19901marunouchi.tokyo.ocn.ne.jp. [153.229.6.131]) by smtp.gmail.com with ESMTPSA id w65sm49700595pfa.18.2015.12.24.03.19.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Dec 2015 03:19:31 -0800 (PST) From: Yoshihiro Kaneko To: linux-spi@vger.kernel.org Cc: Geert Uytterhoeven , Mark Brown , Simon Horman , Magnus Damm , linux-sh@vger.kernel.org Subject: [PATCH 1/2] spi: sh-msiof: Add rcar fallback compatibility string Date: Thu, 24 Dec 2015 20:16:46 +0900 Message-Id: <1450955807-22869-2-git-send-email-ykaneko0929@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1450955807-22869-1-git-send-email-ykaneko0929@gmail.com> References: <1450955807-22869-1-git-send-email-ykaneko0929@gmail.com> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 Add fallback compatibility string for R-Car Gen2 and Gen3. This is in keeping with the fallback scheme being adopted wherever appropriate for drivers for Renesas SoCs. In Addition, this patch deletes the compat strings for old SoCs. Signed-off-by: Yoshihiro Kaneko --- Documentation/devicetree/bindings/spi/sh-msiof.txt | 11 ++++++++--- drivers/spi/spi-sh-msiof.c | 5 +++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt index aa005c1..d9d89ee 100644 --- a/Documentation/devicetree/bindings/spi/sh-msiof.txt +++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt @@ -2,8 +2,8 @@ Renesas MSIOF spi controller Required properties: - compatible : "renesas,msiof-" for SoCs, - "renesas,sh-msiof" for SuperH, or - "renesas,sh-mobile-msiof" for SH Mobile series. + "renesas,rcar-gen2-msiof" for R-Car Gen2 series, or + "renesas,rcar-gen3-msiof" for R-Car Gen3 series. Examples with soctypes are: "renesas,msiof-r8a7790" (R-Car H2) "renesas,msiof-r8a7791" (R-Car M2-W) @@ -11,6 +11,11 @@ Required properties: "renesas,msiof-r8a7793" (R-Car M2-N) "renesas,msiof-r8a7794" (R-Car E2) "renesas,msiof-sh73a0" (SH-Mobile AG5) + + When compatible with the generic version, nodes must + list the SoC-specific version corresponding to the + platform first followed by the generic version. + - reg : A list of offsets and lengths of the register sets for the device. If only one register set is present, it is to be used @@ -60,7 +65,7 @@ Documentation/devicetree/bindings/pinctrl/renesas,*. Example: msiof0: spi@e6e20000 { - compatible = "renesas,msiof-r8a7791"; + compatible = "renesas,msiof-r8a7791", "renesas,rcar-gen2-msiof"; reg = <0 0xe6e20000 0 0x0064>; interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>; diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index a7934ab..283fb31 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -1,6 +1,7 @@ /* * SuperH MSIOF SPI Master Interface * + * Copyright (C) 2014-2015 Renesas Electronics Corporation * Copyright (c) 2009 Magnus Damm * Copyright (C) 2014 Glider bvba * @@ -971,8 +972,8 @@ static const struct sh_msiof_chipdata r8a779x_data = { }; static const struct of_device_id sh_msiof_match[] = { - { .compatible = "renesas,sh-msiof", .data = &sh_data }, - { .compatible = "renesas,sh-mobile-msiof", .data = &sh_data }, + { .compatible = "renesas,rcar-gen2-msiof", .data = &r8a779x_data }, + { .compatible = "renesas,rcar-gen3-msiof", .data = &r8a779x_data }, { .compatible = "renesas,msiof-r8a7790", .data = &r8a779x_data }, { .compatible = "renesas,msiof-r8a7791", .data = &r8a779x_data }, { .compatible = "renesas,msiof-r8a7792", .data = &r8a779x_data },