From patchwork Sun Jan 25 22:33:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christophe Ricard X-Patchwork-Id: 432618 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 5DCD5140161 for ; Mon, 26 Jan 2015 09:33:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751425AbbAYWdp (ORCPT ); Sun, 25 Jan 2015 17:33:45 -0500 Received: from mail-wi0-f170.google.com ([209.85.212.170]:63951 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053AbbAYWdn (ORCPT ); Sun, 25 Jan 2015 17:33:43 -0500 Received: by mail-wi0-f170.google.com with SMTP id em10so2999249wid.1 for ; Sun, 25 Jan 2015 14:33:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=zvE8doT5Rl0zovQgiOKFBA1O3k5t3M6MRt9tBsz8PFk=; b=KzX1hrcRTzZCu+gTsIHF9yi+oHG6mKlRUibGkfqNc1U4OfBWyiTvZyeEU/TUpoXZcZ 0DWYMkilYyGSXt8uu3ZeCJJ13j23wA+p5/7jmbRsDnYUBreODSnQtD3E0kDmKjQ92xih iIbWfY61RIkeAu2glnt2uVYDQN/TArDUWLW6KKTzu5Nli/8vTvObqBMdlccjyV8Katf+ sRvfPXtzO48IwPTBvAXvvSRT2kXvSJcClptVYV0cmgY3Ivr6hdMvLAwXaapR6TBrRCKD hB06Gs8hRq3jBgn+efsAWDhNHe1z444AnV7tN4LUllEZfgub2aPLkJiN32zSce6VqJY5 hwLw== X-Received: by 10.194.7.103 with SMTP id i7mr37329030wja.53.1422225221919; Sun, 25 Jan 2015 14:33:41 -0800 (PST) Received: from localhost.localdomain (ax113-6-78-236-204-66.fbx.proxad.net. [78.236.204.66]) by mx.google.com with ESMTPSA id ku8sm11834404wjb.23.2015.01.25.14.33.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 25 Jan 2015 14:33:41 -0800 (PST) From: Christophe Ricard X-Google-Original-From: Christophe Ricard To: sameo@linux.intel.com Cc: linux-nfc@lists.01.org, christophe.ricard@gmail.com, christophe-h.ricard@st.com, devicetree@vger.kernel.org Subject: [PATCH 01/13] NFC: dts: st21nfca: Fix compatible string spelling to follow other drivers Date: Sun, 25 Jan 2015 23:33:19 +0100 Message-Id: <1422225211-27510-2-git-send-email-christophe-h.ricard@st.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1422225211-27510-1-git-send-email-christophe-h.ricard@st.com> References: <1422225211-27510-1-git-send-email-christophe-h.ricard@st.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Other drivers are following the following compatible string format for dts: s/_/-/ Because some devices may still use the previous string, the new corrected string is added to the of_device_id table. Signed-off-by: Christophe Ricard --- Documentation/devicetree/bindings/net/nfc/st21nfca.txt | 4 ++-- drivers/nfc/st21nfca/i2c.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/nfc/st21nfca.txt b/Documentation/devicetree/bindings/net/nfc/st21nfca.txt index e4faa2e..db677fe 100644 --- a/Documentation/devicetree/bindings/net/nfc/st21nfca.txt +++ b/Documentation/devicetree/bindings/net/nfc/st21nfca.txt @@ -1,7 +1,7 @@ * STMicroelectronics SAS. ST21NFCA NFC Controller Required properties: -- compatible: Should be "st,st21nfca_i2c". +- compatible: Should be "st,st21nfca-i2c". - clock-frequency: I²C work frequency. - reg: address on the bus - interrupt-parent: phandle for the interrupt gpio controller @@ -20,7 +20,7 @@ Example (for ARM-based BeagleBoard xM with ST21NFCA on I2C2): st21nfca: st21nfca@1 { - compatible = "st,st21nfca_i2c"; + compatible = "st,st21nfca-i2c"; reg = <0x01>; clock-frequency = <400000>; diff --git a/drivers/nfc/st21nfca/i2c.c b/drivers/nfc/st21nfca/i2c.c index 0572208..b2e0792 100644 --- a/drivers/nfc/st21nfca/i2c.c +++ b/drivers/nfc/st21nfca/i2c.c @@ -661,6 +661,7 @@ static int st21nfca_hci_i2c_remove(struct i2c_client *client) #ifdef CONFIG_OF static const struct of_device_id of_st21nfca_i2c_match[] = { + { .compatible = "st,st21nfca-i2c", }, { .compatible = "st,st21nfca_i2c", }, {} };