From patchwork Tue Oct 15 10:20:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 3044261 Return-Path: X-Original-To: patchwork-linux-sh@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 33B9BBF924 for ; Tue, 15 Oct 2013 10:20:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94687202B8 for ; Tue, 15 Oct 2013 10:20:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E99820295 for ; Tue, 15 Oct 2013 10:20:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754076Ab3JOKUR (ORCPT ); Tue, 15 Oct 2013 06:20:17 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:60014 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758494Ab3JOKUO (ORCPT ); Tue, 15 Oct 2013 06:20:14 -0400 Received: by mail-la0-f41.google.com with SMTP id ec20so6821224lab.0 for ; Tue, 15 Oct 2013 03:20:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e7gUnQNxkOVSefAaAsenmkKfrOx+bebaYyuZBQQFQhs=; b=M6af/JiZ4XTCekvBnH4xme0+ShrYHclnI6zRlaZ4a6mdhJthBk0zsfLZ6h0iLGKccx hplpemJK8Qgwa+CwPxjQuZRWy4T5ottGpipTlOU9kFkB3X7PYsGeDulQfj8WqOKPW07v tixk/+aI5wqC65q6lbiMPBnS+Rz5z1AsD2f8nju/Ckqo9prqDtzrkyuGrcTpN3CJM3FG 7PLg2gJNxZFX6hz7FHU+d8LIvKkgkVZGO3UUjH5OJZPQzXAuvTcA4OO3VjbUmwxfpe6O 5O/wXNd6YwmpK465FuieDZjEDCxkXitw8gk3g/8ocfwy0srIg5dvT5e3LXlHOE3mdryy iVgQ== X-Gm-Message-State: ALoCoQkqRfdRrnA3AIpELg4isYYbJ5bgzHE9I4Cv8rJGkDlZx4BNxHjm0Pdy4cIB3yC3SRaANBct X-Received: by 10.112.159.166 with SMTP id xd6mr34758564lbb.22.1381832411585; Tue, 15 Oct 2013 03:20:11 -0700 (PDT) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPSA id b6sm63943503lae.0.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 15 Oct 2013 03:20:10 -0700 (PDT) From: Valentine Barshak To: linux-sh@vger.kernel.org, linux-ide@vger.kernel.org, devicetree@vger.kernel.org Cc: Simon Horman , Magnus Damm , Vladimir Barinov , Sergei Shtylyov , Kuninori Morimoto , Laurent Pinchart , Guennadi Liakhovetski , Tejun Heo , Mark Rutland Subject: [PATCH 1/2] sata_rcar: Adjust and document device tree bindings Date: Tue, 15 Oct 2013 14:20:06 +0400 Message-Id: <1381832407-22541-2-git-send-email-valentine.barshak@cogentembedded.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1381832407-22541-1-git-send-email-valentine.barshak@cogentembedded.com> References: <1381832407-22541-1-git-send-email-valentine.barshak@cogentembedded.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 This deprecates the "rcar-sata" compatibility string and adds the "sata-r8a7779" which complies to the preferred - format for SH-Mobile devices. The DT bindings are documented. Signed-off-by: Valentine Barshak --- Documentation/devicetree/bindings/ata/sata_rcar.txt | 15 +++++++++++++++ arch/arm/boot/dts/r8a7779.dtsi | 2 +- drivers/ata/sata_rcar.c | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/ata/sata_rcar.txt diff --git a/Documentation/devicetree/bindings/ata/sata_rcar.txt b/Documentation/devicetree/bindings/ata/sata_rcar.txt new file mode 100644 index 0000000..0719115 --- /dev/null +++ b/Documentation/devicetree/bindings/ata/sata_rcar.txt @@ -0,0 +1,15 @@ +* Renesas R-Car SATA + +Required properties: +- compatible : should contain "renesas,sata-r8a7779"; +- reg : offset and length of the SATA registers; +- interrupts : must consist of one interrupt specifier. + +Example: + +sata: sata@fc600000 { + compatible = "renesas,sata-r8a7779"; + reg = <0xfc600000 0x2000>; + interrupt-parent = <&gic>; + interrupts = <0 100 0x4>; +}; diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi index da61d27..b1747f5 100644 --- a/arch/arm/boot/dts/r8a7779.dtsi +++ b/arch/arm/boot/dts/r8a7779.dtsi @@ -201,7 +201,7 @@ }; sata: sata@fc600000 { - compatible = "renesas,rcar-sata"; + compatible = "renesas,sata-r8a7779"; reg = <0xfc600000 0x2000>; interrupt-parent = <&gic>; interrupts = <0 100 0x4>; diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c index c2d95e9..a625cc5 100644 --- a/drivers/ata/sata_rcar.c +++ b/drivers/ata/sata_rcar.c @@ -893,7 +893,8 @@ static const struct dev_pm_ops sata_rcar_pm_ops = { #endif static struct of_device_id sata_rcar_match[] = { - { .compatible = "renesas,rcar-sata", }, + { .compatible = "renesas,rcar-sata", }, /* Deprecated */ + { .compatible = "renesas,sata-r8a7779", }, {}, }; MODULE_DEVICE_TABLE(of, sata_rcar_match);