From patchwork Wed Oct 24 17:27:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 988723 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=devicetree-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="b+AgsmIK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42gHK73Bb9z9sN4 for ; Thu, 25 Oct 2018 04:28:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727219AbeJYB5D (ORCPT ); Wed, 24 Oct 2018 21:57:03 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:37589 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726829AbeJYB5D (ORCPT ); Wed, 24 Oct 2018 21:57:03 -0400 Received: by mail-pf1-f195.google.com with SMTP id j23-v6so2765735pfi.4 for ; Wed, 24 Oct 2018 10:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Zo6Yy0jjnp0S0dhiphPGuh6YMD8lt9ITlr4O1seM+Gc=; b=b+AgsmIKWD2XiodkoOykj5owJ/g0W/pd1Wk1882Q6WRv1h32pmo0Q/G1rgZOlV4YLg /8etHwDWNadLLzZRb4z/RMP1BvdQU7Qy+bvizl7nAqIDxhBTBxqFD17exyz8plUIn2/z SCs7ZmoQhMVq93aE8KxBETx/HDevUacFY6NSk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Zo6Yy0jjnp0S0dhiphPGuh6YMD8lt9ITlr4O1seM+Gc=; b=EQq07OqE0bnllpreYvkG1lFCdWijoTRZkSF5sRwUPmVbXyH9j2kMfXTZaZmOLMzE51 vcaog/LS7KHoCPKtZoUkoRg6cZ30LEa8RSgtSlEGQiaRHRhWkE/Hm5Vmb9Gw73zSHcro G23T4ykBU7QfkIXvshHl5jYcWlnq9WEDgJ+q3OyBIbJRxjK8YntXQ/wMNLTeUykG6DAB onV3+j/P6rAWO8+ETATcAh1tHLyItGZDr0tADrV8orZbSDgnl8nUn2Osb0jfRXfv7NoY CvNK5yBHXb8cGJCm/a6SuHCe0Q5x6inTw1NlFv5kAtmigb67lLavJn4jsQsXcxtgPJsq AgDQ== X-Gm-Message-State: AGRZ1gJTAp9r7fb/22CArGDzGEZT6485gXoh5QqtsmyAQGsDlfVBhWH7 b18azR0Je9OqXnTF8/2NQza7BA== X-Google-Smtp-Source: AJdET5c3LXhuLP77On6j9pIH+AjtCxsDfz02zYodcY8Pij9+8Fq85K56DZWJrtbk6GOR+kacucR4DQ== X-Received: by 2002:a62:569d:: with SMTP id h29-v6mr3632876pfj.42.1540402089025; Wed, 24 Oct 2018 10:28:09 -0700 (PDT) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:e418:c825:76cf:5f64]) by smtp.gmail.com with ESMTPSA id v185-v6sm5674265pfv.48.2018.10.24.10.28.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 24 Oct 2018 10:28:07 -0700 (PDT) From: Evan Green To: Rob Herring , Andy Gross , Kishon Vijay Abraham I Cc: Douglas Anderson , Stephen Boyd , Evan Green , devicetree@vger.kernel.org, Can Guo , linux-kernel@vger.kernel.org, Manu Gautam , Mark Rutland , Rob Herring Subject: [PATCH v4 1/5] dt-bindings: phy-qcom-qmp: Fix register underspecification Date: Wed, 24 Oct 2018 10:27:31 -0700 Message-Id: <20181024172735.154304-2-evgreen@chromium.org> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181024172735.154304-1-evgreen@chromium.org> References: <20181024172735.154304-1-evgreen@chromium.org> Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add register regions for the second lane of dual-lane nodes. This additional specification is needed so that the driver can stop reaching beyond the tx and rx register allocations to get at the second lane registers in a dual-lane PHY. While in there, document #clock-cells as optional for PHYs that don't provide a pipe clock. Also, document the pcs_misc register region, which was being quietly supplied and used. Signed-off-by: Evan Green Reviewed-by: Douglas Anderson Reviewed-by: Rob Herring --- Changes in v4: - Remove "status" from DT binding example (Rob) Changes in v3: None Changes in v2: - Added dt bindings change, corresponding driver fixup, and USB PHY fixup .../devicetree/bindings/phy/qcom-qmp-phy.txt | 70 +++++++++++++++++++--- 1 file changed, 62 insertions(+), 8 deletions(-) diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt index fbc198d5dd39..69f8eec1ef9d 100644 --- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt +++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt @@ -25,7 +25,7 @@ Required properties: - For all others: - The reg-names property shouldn't be defined. - - #clock-cells: must be 1 + - #clock-cells: must be 1 (PCIe and USB3 PHYs only) - Phy pll outputs a bunch of clocks for Tx, Rx and Pipe interface (for pipe based PHYs). These clock are then gate-controlled by gcc. @@ -82,23 +82,26 @@ Required nodes: - Each device node of QMP phy is required to have as many child nodes as the number of lanes the PHY has. -Required properties for child node: +Required properties for child nodes of PCIe PHYs (one child per lane): - reg: list of offset and length pairs of register sets for PHY blocks - - - index 0: tx - - index 1: rx - - index 2: pcs - - index 3: pcs_misc (optional) + tx, rx, pcs, and pcs_misc (optional). + - #phy-cells: must be 0 +Required properties for a single "lanes" child node of non-PCIe PHYs: + - reg: list of offset and length pairs of register sets for PHY blocks + For 1-lane devices: + tx, rx, pcs, and (optionally) pcs_misc + For 2-lane devices: + tx0, rx0, pcs, tx1, rx1, and (optionally) pcs_misc - #phy-cells: must be 0 -Required properties child node of pcie and usb3 qmp phys: +Required properties for child node of PCIe and USB3 qmp phys: - clocks: a list of phandles and clock-specifier pairs, one for each entry in clock-names. - clock-names: Must contain following: "pipe" for pipe clock specific to each lane. - clock-output-names: Name of the PHY clock that will be the parent for the above pipe clock. - For "qcom,ipq8074-qmp-pcie-phy": - "pcie20_phy0_pipe_clk" Pipe Clock parent (or) @@ -150,3 +153,54 @@ Example: ... ... }; + + phy@88eb000 { + compatible = "qcom,sdm845-qmp-usb3-uni-phy"; + reg = <0x88eb000 0x18c>; + #clock-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + clocks = <&gcc GCC_USB3_SEC_PHY_AUX_CLK>, + <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, + <&gcc GCC_USB3_SEC_CLKREF_CLK>, + <&gcc GCC_USB3_SEC_PHY_COM_AUX_CLK>; + clock-names = "aux", "cfg_ahb", "ref", "com_aux"; + + resets = <&gcc GCC_USB3PHY_PHY_SEC_BCR>, + <&gcc GCC_USB3_PHY_SEC_BCR>; + reset-names = "phy", "common"; + + lane@88eb200 { + reg = <0x88eb200 0x128>, + <0x88eb400 0x1fc>, + <0x88eb800 0x218>, + <0x88e9600 0x70>; + #phy-cells = <0>; + clocks = <&gcc GCC_USB3_SEC_PHY_PIPE_CLK>; + clock-names = "pipe0"; + clock-output-names = "usb3_uni_phy_pipe_clk_src"; + }; + }; + + phy@1d87000 { + compatible = "qcom,sdm845-qmp-ufs-phy"; + reg = <0x1d87000 0x18c>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + clock-names = "ref", + "ref_aux"; + clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>, + <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; + + lanes@1d87400 { + reg = <0x1d87400 0x108>, + <0x1d87600 0x1e0>, + <0x1d87c00 0x1dc>, + <0x1d87800 0x108>, + <0x1d87a00 0x1e0>; + #phy-cells = <0>; + }; + };