From patchwork Mon Mar 2 12:48:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 45282 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f199.google.com (mail-we0-f199.google.com [74.125.82.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C976C2149C for ; Mon, 2 Mar 2015 12:50:00 +0000 (UTC) Received: by wesk11 with SMTP id k11sf23482711wes.3 for ; Mon, 02 Mar 2015 04:50:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=xsVXUqyDYlnAzt8nT9yr2M7kB2TU3YBqe0/PHXH9EKU=; b=CC1qaPvfZyX9eRDKVTi6PGJqTAPkaCtAjLRRxdjQt6jPS91O1p8pv8h76KrYdWMAuR uaXVZX3qiec4ZacGwZb15lXQeH+5G9v1C/lVF+2SEo9wR6lyE+8uudEbvDvlZQitGGLe L3GQgRb9Tn6xrT2kqbfoJrYO9bdt7O5Zv/bjNtmOOWpZMqyWECsQrD/bQVfiLe0+/Gy1 9tTfVTuseN/5RAGnRDHsWwY5ct0Zz7AURiiwgRIoj49BRoM58+WWhg8Y6UCZucIWQr9T 4j6SKNuSOzJcEA/egCQP3w53SstYRSNPHNu1eKfXoSD0J34/ZfqHSWkl6hn1z2WX+z56 LH4Q== X-Gm-Message-State: ALoCoQldO+W5wCi1UMPcNk5uJBbLnHwHJ9jVeUDiBJM31w1i4ZIcf7rGBPjF/5XmCk8AHaVJIBqT X-Received: by 10.194.63.208 with SMTP id i16mr1152673wjs.2.1425300600119; Mon, 02 Mar 2015 04:50:00 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.203.171 with SMTP id kr11ls403153lac.36.gmail; Mon, 02 Mar 2015 04:49:59 -0800 (PST) X-Received: by 10.152.120.134 with SMTP id lc6mr4179984lab.72.1425300599961; Mon, 02 Mar 2015 04:49:59 -0800 (PST) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id mz5si4615803lbb.168.2015.03.02.04.49.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Mar 2015 04:49:59 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbjf15 with SMTP id f15so1797356lbj.2 for ; Mon, 02 Mar 2015 04:49:59 -0800 (PST) X-Received: by 10.112.130.39 with SMTP id ob7mr14636476lbb.32.1425300599869; Mon, 02 Mar 2015 04:49:59 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp5503570lbj; Mon, 2 Mar 2015 04:49:58 -0800 (PST) X-Received: by 10.68.202.98 with SMTP id kh2mr47106328pbc.6.1425300596447; Mon, 02 Mar 2015 04:49:56 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e7si5502959pdn.179.2015.03.02.04.49.55; Mon, 02 Mar 2015 04:49:56 -0800 (PST) Received-SPF: none (google.com: devicetree-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754200AbbCBMty (ORCPT + 5 others); Mon, 2 Mar 2015 07:49:54 -0500 Received: from mail-we0-f175.google.com ([74.125.82.175]:32855 "EHLO mail-we0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754071AbbCBMsr (ORCPT ); Mon, 2 Mar 2015 07:48:47 -0500 Received: by wevk48 with SMTP id k48so33087525wev.0 for ; Mon, 02 Mar 2015 04:48:45 -0800 (PST) X-Received: by 10.180.12.233 with SMTP id b9mr34710831wic.49.1425300525244; Mon, 02 Mar 2015 04:48:45 -0800 (PST) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id t9sm15910109wia.15.2015.03.02.04.48.43 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Mar 2015 04:48:44 -0800 (PST) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, maxime.coquelin@st.com, patrice.chotard@st.com, srinivas.kandagatla@gmail.com, tj@kernel.org Cc: peter.griffin@linaro.org, lee.jones@linaro.org, linux-ide@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 1/3] ahci: st: Update the ahci_st DT documentation Date: Mon, 2 Mar 2015 12:48:37 +0000 Message-Id: <1425300519-13747-2-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1425300519-13747-1-git-send-email-peter.griffin@linaro.org> References: <1425300519-13747-1-git-send-email-peter.griffin@linaro.org> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.griffin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , As part of testing ahci_st driver working on stih407 I noticed several things wrong in the DT documentation: - 1) Compatible string doesn't match the driver code 2) pwr-rst reset isn't documented (but exists in the driver) 3) some whitespace issues (spaces not tabs) Also add in a stih407 family example into the doc. Signed-off-by: Peter Griffin Acked-by: Lee Jones --- Documentation/devicetree/bindings/ata/ahci-st.txt | 45 ++++++++++++++++------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/ata/ahci-st.txt b/Documentation/devicetree/bindings/ata/ahci-st.txt index 1331202..e1d01df 100644 --- a/Documentation/devicetree/bindings/ata/ahci-st.txt +++ b/Documentation/devicetree/bindings/ata/ahci-st.txt @@ -3,29 +3,48 @@ STMicroelectronics STi SATA controller This binding describes a SATA device. Required properties: - - compatible : Must be "st,sti-ahci" + - compatible : Must be "st,ahci" - reg : Physical base addresses and length of register sets - interrupts : Interrupt associated with the SATA device - interrupt-names : Associated name must be; "hostc" - - resets : The power-down and soft-reset lines of SATA IP - - reset-names : Associated names must be; "pwr-dwn" and "sw-rst" - clocks : The phandle for the clock - clock-names : Associated name must be; "ahci_clk" - phys : The phandle for the PHY port - phy-names : Associated name must be; "ahci_phy" +Optional properties: + - resets : The power-down, soft-reset and power-reset lines of SATA IP + - reset-names : Associated names must be; "pwr-dwn", "sw-rst" and "pwr-rst" + Example: + /* Example for stih416 */ sata0: sata@fe380000 { - compatible = "st,sti-ahci"; - reg = <0xfe380000 0x1000>; - interrupts = ; - interrupt-names = "hostc"; - phys = <&phy_port0 PHY_TYPE_SATA>; - phy-names = "ahci_phy"; - resets = <&powerdown STIH416_SATA0_POWERDOWN>, + compatible = "st,ahci"; + reg = <0xfe380000 0x1000>; + interrupts = ; + interrupt-names = "hostc"; + phys = <&phy_port0 PHY_TYPE_SATA>; + phy-names = "ahci_phy"; + resets = <&powerdown STIH416_SATA0_POWERDOWN>, <&softreset STIH416_SATA0_SOFTRESET>; - reset-names = "pwr-dwn", "sw-rst"; - clocks = <&clk_s_a0_ls CLK_ICN_REG>; - clock-names = "ahci_clk"; + reset-names = "pwr-dwn", "sw-rst"; + clocks = <&clk_s_a0_ls CLK_ICN_REG>; + clock-names = "ahci_clk"; + }; + + /* Example for stih407 family silicon */ + sata0: sata@9b20000 { + compatible = "st,ahci"; + reg = <0x9b20000 0x1000>; + interrupts = ; + interrupt-names = "hostc"; + phys = <&phy_port0 PHY_TYPE_SATA>; + phy-names = "ahci_phy"; + resets = <&powerdown STIH407_SATA0_POWERDOWN>, + <&softreset STIH407_SATA0_SOFTRESET>, + <&softreset STIH407_SATA0_PWR_SOFTRESET>; + reset-names = "pwr-dwn", "sw-rst", "pwr-rst"; + clocks = <&clk_s_c0_flexgen CLK_ICN_REG>; + clock-names = "ahci_clk"; };