From patchwork Fri Oct 25 14:25:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars Poeschel X-Patchwork-Id: 1184214 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=none (p=none dis=none) header.from=lemonage.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4705y85H64z9sR4 for ; Sat, 26 Oct 2019 01:26:08 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395210AbfJYOZt (ORCPT ); Fri, 25 Oct 2019 10:25:49 -0400 Received: from smtp3-1.goneo.de ([85.220.129.38]:54079 "EHLO smtp3-1.goneo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725825AbfJYOZs (ORCPT ); Fri, 25 Oct 2019 10:25:48 -0400 Received: from localhost (localhost [127.0.0.1]) by smtp3.goneo.de (Postfix) with ESMTP id 88006240028; Fri, 25 Oct 2019 16:25:45 +0200 (CEST) X-Virus-Scanned: by goneo X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-Spam-Status: No, score=-3.01 tagged_above=-999 tests=[ALL_TRUSTED=-1, AWL=-0.110, BAYES_00=-1.9] autolearn=ham Received: from smtp3.goneo.de ([127.0.0.1]) by localhost (smtp3.goneo.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4Ze3M7UwdCJi; Fri, 25 Oct 2019 16:25:44 +0200 (CEST) Received: from lem-wkst-02.lemonage.de. (hq.lemonage.de [87.138.178.34]) by smtp3.goneo.de (Postfix) with ESMTPA id 99DED23EFDE; Fri, 25 Oct 2019 16:25:43 +0200 (CEST) From: Lars Poeschel To: "David S. Miller" , Rob Herring , Mark Rutland , Lars Poeschel , netdev@vger.kernel.org (open list:NFC SUBSYSTEM), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Cc: Johan Hovold , Simon Horman , Rob Herring Subject: [PATCH v10 2/7] nfc: pn532: Add uart phy docs and rename it Date: Fri, 25 Oct 2019 16:25:16 +0200 Message-Id: <20191025142521.22695-3-poeschel@lemonage.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191025142521.22695-1-poeschel@lemonage.de> References: <20191025142521.22695-1-poeschel@lemonage.de> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This adds documentation about the uart phy to the pn532 binding doc. As the filename "pn533-i2c.txt" is not appropriate any more, rename it to the more general "pn532.txt". This also documents the deprecation of the compatible strings ending with "...-i2c". Cc: Johan Hovold Cc: Simon Horman Reviewed-by: Rob Herring Signed-off-by: Lars Poeschel --- Changes in v10: - Rebased the patch series on net-next 'Commit 503a64635d5e ("Merge branch 'DPAA-Ethernet-changes'")' Changes in v9: - Rebased the patch series on v5.4-rc2 - Produce patch with -M4 to git format-patch to detect the rename - Change DT node name from pn532@24 to nfc@24 in example Changes in v8: - Update existing binding doc instead of adding a new one: - Add uart phy example - Add general "pn532" compatible string - Deprecate "...-i2c" compatible strings - Rename file to a more general filename - Intentionally drop Rob's Reviewed-By as I guess this rather big change requires a new review Changes in v7: - Accidentally lost Rob's Reviewed-By Changes in v6: - Rebased the patch series on v5.3-rc5 - Picked up Rob's Reviewed-By Changes in v4: - Add documentation about reg property in case of i2c Changes in v3: - seperate binding doc instead of entry in trivial-devices.txt .../net/nfc/{pn533-i2c.txt => pn532.txt} | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) rename Documentation/devicetree/bindings/net/nfc/{pn533-i2c.txt => pn532.txt} (42%) diff --git a/Documentation/devicetree/bindings/net/nfc/pn533-i2c.txt b/Documentation/devicetree/bindings/net/nfc/pn532.txt similarity index 42% rename from Documentation/devicetree/bindings/net/nfc/pn533-i2c.txt rename to Documentation/devicetree/bindings/net/nfc/pn532.txt index 2efe3886b95b..a5507dc499bc 100644 --- a/Documentation/devicetree/bindings/net/nfc/pn533-i2c.txt +++ b/Documentation/devicetree/bindings/net/nfc/pn532.txt @@ -1,9 +1,16 @@ * NXP Semiconductors PN532 NFC Controller Required properties: -- compatible: Should be "nxp,pn532-i2c" or "nxp,pn533-i2c". +- compatible: Should be + - "nxp,pn532" Place a node with this inside the devicetree node of the bus + where the NFC chip is connected to. + Currently the kernel has phy bindings for uart and i2c. + - "nxp,pn532-i2c" (DEPRECATED) only works for the i2c binding. + - "nxp,pn533-i2c" (DEPRECATED) only works for the i2c binding. + +Required properties if connected on i2c: - clock-frequency: I²C work frequency. -- reg: address on the bus +- reg: for the I²C bus address. This is fixed at 0x24 for the PN532. - interrupts: GPIO interrupt to which the chip is connected Optional SoC Specific Properties: @@ -15,9 +22,9 @@ Example (for ARM-based BeagleBone with PN532 on I2C2): &i2c2 { - pn532: pn532@24 { + pn532: nfc@24 { - compatible = "nxp,pn532-i2c"; + compatible = "nxp,pn532"; reg = <0x24>; clock-frequency = <400000>; @@ -27,3 +34,13 @@ Example (for ARM-based BeagleBone with PN532 on I2C2): }; }; + +Example (for PN532 connected via uart): + +uart4: serial@49042000 { + compatible = "ti,omap3-uart"; + + pn532: nfc { + compatible = "nxp,pn532"; + }; +};