From patchwork Sun Mar 8 08:51:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 447696 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3BF3B140218 for ; Sun, 8 Mar 2015 19:52:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751674AbbCHIwA (ORCPT ); Sun, 8 Mar 2015 04:52:00 -0400 Received: from guitar.tcltek.co.il ([192.115.133.116]:45838 "EHLO mx.tkos.co.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751619AbbCHIv5 (ORCPT ); Sun, 8 Mar 2015 04:51:57 -0400 Received: from sapphire.tkos.co.il (unknown [10.0.4.3]) by mx.tkos.co.il (Postfix) with ESMTPA id 19A2B440655; Sun, 8 Mar 2015 10:51:41 +0200 (IST) From: Baruch Siach To: Linus Walleij Cc: linux-gpio@vger.kernel.org, Baruch Siach , Stephen Warren Subject: [PATCH 2/2] pinctrl: remove doc mention of the enable/disable API Date: Sun, 8 Mar 2015 10:51:46 +0200 Message-Id: <46f7c40cdc176e60aa4735b9cd515942fec1f7f7.1425804706.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.1.4 In-Reply-To: <14c3c3a3ee485c9fdc868b9fab2322bf47963ec0.1425804706.git.baruch@tkos.co.il> References: <14c3c3a3ee485c9fdc868b9fab2322bf47963ec0.1425804706.git.baruch@tkos.co.il> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org This API has changed in commit 6e5e959dde0 (pinctrl: API changes to support multiple states per device). Fixes: 6e5e959dde0 ('pinctrl: API changes to support multiple states per device') Cc: Stephen Warren Signed-off-by: Baruch Siach --- Documentation/pinctrl.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/pinctrl.txt b/Documentation/pinctrl.txt index 91ea46b89d83..2db41b41225e 100644 --- a/Documentation/pinctrl.txt +++ b/Documentation/pinctrl.txt @@ -1265,7 +1265,7 @@ The semantics of the pinctrl APIs are: Usually the pin control core handled the get/put pair and call out to the device drivers bookkeeping operations, like checking available functions and -the associated pins, whereas the enable/disable pass on to the pin controller +the associated pins, whereas select_state pass on to the pin controller driver which takes care of activating and/or deactivating the mux setting by quickly poking some registers. @@ -1362,8 +1362,9 @@ function, but with different named in the mapping as described under "Advanced mapping" above. So that for an SPI device, we have two states named "pos-A" and "pos-B". -This snippet first muxes the function in the pins defined by group A, enables -it, disables and releases it, and muxes it in on the pins defined by group B: +This snippet first initializes a state object for both groups (in foo_probe()), +then muxes the function in the pins defined by group A, and finally muxes it in +on the pins defined by group B: #include