From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 513F1C04EB8 for ; Wed, 12 Dec 2018 04:16:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 19E8220811 for ; Wed, 12 Dec 2018 04:16:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="YcNFREBt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 19E8220811 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726402AbeLLEQw (ORCPT ); Tue, 11 Dec 2018 23:16:52 -0500 Received: from ozlabs.org ([203.11.71.1]:53363 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726218AbeLLEQv (ORCPT ); Tue, 11 Dec 2018 23:16:51 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43F3RN0DgYz9s3Z; Wed, 12 Dec 2018 15:16:47 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1544588208; bh=KY9hzNvl4TvkuM36pe62H/A+Ws6enQ1ilH4iYjg7TvA=; h=Date:From:To:Cc:Subject:From; b=YcNFREBtSG6RhsGeUFnSsQ8UP1WgGD0pJ6gjVZJ6F+jUYgo5jnR0Ig6XwAfFKDWlD weqDa6DStL6twT5WPsY0/2m0VDB8bUipq2nn3RLqjuErNFmd0CAzW2JOFlEF5nrBl4 htC4w/AlF2u6Obq08TSTvRg2Tdcgi9dA4FwpVnqHSM2qxEqJEOhcSx+A1LoYyuKIru 0cwXY8X+ZTQ5Kim1glqRsn/3/zak4PiSPY1l3SII2M9OBAa7hEppFhnh+r/zdvrDfk HkWKSvCO0q6ZK1S+THDWG9naKIvDl1lZXFEOJYyVJLuxIsrxdHZbliphBy0yvWxmG+ yCfCOdyO52ADg== Date: Wed, 12 Dec 2018 15:16:47 +1100 From: Stephen Rothwell To: Kishon Vijay Abraham I Cc: Linux Next Mailing List , Linux Kernel Mailing List , Douglas Anderson , Evan Green Subject: linux-next: manual merge of the phy-next tree with Linus' tree Message-ID: <20181212151647.71a5befe@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/PJBKlUCSWZt2TdamJ_Z6RR_"; protocol="application/pgp-signature" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/PJBKlUCSWZt2TdamJ_Z6RR_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the phy-next tree got a conflict in: Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt between commit: 7243ec72b902 ("dt-bindings: phy-qcom-qmp: Fix several mistakes from prior= commits") from Linus' tree and commit: 91fdc9b127c9 ("dt-bindings: phy-qcom-qmp: Fix register underspecification= ") from the phy-next tree. I fixed it up (I just used the latter veriosn of the conflicting line) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell diff --cc Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt index fbc198d5dd39,68c67eeef775..000000000000 --- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt +++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt @@@ -82,19 -66,23 +78,23 @@@ Required nodes - Each device node of QMP phy is required to have as many child nodes as the number of lanes the PHY has. =20 - 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 =20 + 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 =20 - 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 for pcie and usb qmp phys: + - 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. @@@ -103,12 -90,13 +102,15 @@@ - "pcie20_phy0_pipe_clk" Pipe Clock parent (or) "pcie20_phy1_pipe_clk" + - #clock-cells: must be 0 + - Phy pll outputs pipe clocks for pipe based PHYs. These clocks are t= hen + gate-controlled by the gcc. =20 +Required properties for child node of PHYs with lane reset, AKA: + "qcom,msm8996-qmp-pcie-phy" - resets: a list of phandles and reset controller specifier pairs, one for each entry in reset-names. - - reset-names: Must contain following for pcie qmp phys: + - reset-names: Must contain following: "lane" for reset specific to each lane. =20 Example: --Sig_/PJBKlUCSWZt2TdamJ_Z6RR_ Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAlwQi68ACgkQAVBC80lX 0Gzwngf/ZZPmjE7xRMcSDoQJjc/dWgYHHJkDdssYdbYAIt5kaFooFaw6h/cEWXk1 fTX1HrC/XcpN2FmOi1mn4p6sMnlETRDndz38mkKYAxZbR48dNLhIl7+A0pawYe8/ HaLdXsNfeRlKElA9CKA5iy0AxTr0LJ6VXO7uV/d6BCuPxe6ZBoto6HF3tIsaiV9l icYfdROii+W4mtasD9VscRIOHJLyVU55pqmHjXERiQV8dM9qyf4fLNRyhg7sSjL6 5s2DYzPlIL1uQpwQgvre7aHssxmZvFuFgyRgSyyY933pJkydoQQhAt6//o/4P/ol zU+kyhwA63a3xRhFNW0vo9Rp9Xsvmw== =wdjE -----END PGP SIGNATURE----- --Sig_/PJBKlUCSWZt2TdamJ_Z6RR_--