From patchwork Tue Dec 3 14:50:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21965 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 024C6202AE for ; Tue, 3 Dec 2013 14:50:55 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id j5sf14085296qaq.1 for ; Tue, 03 Dec 2013 06:50:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=z8VJ7jNvvLRB3mDCS859qjOQ3NAYg1XRnY7MEOg65O8=; b=BZsUo4fdKv0adHsXLDcxN+s6yGmhNtx0KNJYLai5BL34aYqmkB3SR7cP1UMUiPkcmU dTpoPcDTwIJeoDwuCyupUBITDjYQeW/y4Ek1tGmrWTkiMcK4/2Hx7auw7edgTasVxD/V hr0xm3Xf0CVsi2dTGki4RHpc/nYMe7ENA5oVyIOknDOjUqgl6yXqPk81Vk6yKJgL5mjZ uxKAcOEj0bvKI23YMA3Xv1vxK/25sv2G7UHN6QH7JUgtsU0bENyYJrMDWIdffUV9U3jE OpMDJnO4gvNM8NegYbWU1wp6QckOiGaFr2vmeLN2vRMGwY7yFP1EiFEAPw9jzwaI5rYW NZug== X-Gm-Message-State: ALoCoQnWZp06XwBHjg1yBrCRPrqykbUpqyWn0MoPHziMW+XxIk1gQElAem3bD4+4DiO5VvgGRfPL X-Received: by 10.58.136.6 with SMTP id pw6mr3137640veb.32.1386082255814; Tue, 03 Dec 2013 06:50:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.2.69 with SMTP id 5ls5456511qes.98.gmail; Tue, 03 Dec 2013 06:50:55 -0800 (PST) X-Received: by 10.52.121.104 with SMTP id lj8mr4174612vdb.33.1386082255696; Tue, 03 Dec 2013 06:50:55 -0800 (PST) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id a6si31372892vdp.39.2013.12.03.06.50.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Dec 2013 06:50:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id db12so10243685veb.36 for ; Tue, 03 Dec 2013 06:50:55 -0800 (PST) X-Received: by 10.58.44.72 with SMTP id c8mr1286675vem.37.1386082255511; Tue, 03 Dec 2013 06:50:55 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp214065vcz; Tue, 3 Dec 2013 06:50:55 -0800 (PST) X-Received: by 10.112.218.74 with SMTP id pe10mr935265lbc.19.1386082254645; Tue, 03 Dec 2013 06:50:54 -0800 (PST) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com [209.85.215.42]) by mx.google.com with ESMTPS id le8si20251299lab.123.2013.12.03.06.50.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Dec 2013 06:50:54 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.42 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.42; Received: by mail-la0-f42.google.com with SMTP id ec20so9163249lab.15 for ; Tue, 03 Dec 2013 06:50:54 -0800 (PST) X-Received: by 10.112.92.112 with SMTP id cl16mr957103lbb.15.1386082253905; Tue, 03 Dec 2013 06:50:53 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id c8sm33834671lag.3.2013.12.03.06.50.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Dec 2013 06:50:53 -0800 (PST) From: Linus Walleij To: Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org Cc: Linus Walleij Subject: [PATCH 3/3] mfd/pinctrl: delete platform data header Date: Tue, 3 Dec 2013 15:50:49 +0100 Message-Id: <1386082249-18958-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This deletes the special AB8500 GPIO platform data passing header and merges the few remaining contents down into the abx500 pinctrl driver which handles the abx500 GPIO device. Signed-off-by: Linus Walleij --- Lee, Sam: I'd like an ACK on this one too, for the same reason as the previous patch. --- drivers/pinctrl/pinctrl-abx500.c | 1 - drivers/pinctrl/pinctrl-abx500.h | 12 ++++++++++++ include/linux/mfd/abx500/ab8500-gpio.h | 23 ----------------------- 3 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 include/linux/mfd/abx500/ab8500-gpio.h diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/pinctrl-abx500.c index 66a06d5194cd..119928061f54 100644 --- a/drivers/pinctrl/pinctrl-abx500.c +++ b/drivers/pinctrl/pinctrl-abx500.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/pinctrl/pinctrl-abx500.h b/drivers/pinctrl/pinctrl-abx500.h index eeca8f973999..2fa003c5cf02 100644 --- a/drivers/pinctrl/pinctrl-abx500.h +++ b/drivers/pinctrl/pinctrl-abx500.h @@ -15,6 +15,18 @@ enum abx500_pin_func { ABX500_ALT_C, }; +enum abx500_gpio_pull_updown { + ABX500_GPIO_PULL_DOWN = 0x0, + ABX500_GPIO_PULL_NONE = 0x1, + ABX500_GPIO_PULL_UP = 0x3, +}; + +enum abx500_gpio_vinsel { + ABX500_GPIO_VINSEL_VBAT = 0x0, + ABX500_GPIO_VINSEL_VIN_1V8 = 0x1, + ABX500_GPIO_VINSEL_VDD_BIF = 0x2, +}; + /** * struct abx500_function - ABx500 pinctrl mux function * @name: The name of the function, exported to pinctrl core. diff --git a/include/linux/mfd/abx500/ab8500-gpio.h b/include/linux/mfd/abx500/ab8500-gpio.h deleted file mode 100644 index ebef068cbb6f..000000000000 --- a/include/linux/mfd/abx500/ab8500-gpio.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright ST-Ericsson 2010. - * - * Author: Bibek Basu - * Licensed under GPLv2. - */ - -#ifndef _AB8500_GPIO_H -#define _AB8500_GPIO_H - -enum abx500_gpio_pull_updown { - ABX500_GPIO_PULL_DOWN = 0x0, - ABX500_GPIO_PULL_NONE = 0x1, - ABX500_GPIO_PULL_UP = 0x3, -}; - -enum abx500_gpio_vinsel { - ABX500_GPIO_VINSEL_VBAT = 0x0, - ABX500_GPIO_VINSEL_VIN_1V8 = 0x1, - ABX500_GPIO_VINSEL_VDD_BIF = 0x2, -}; - -#endif /* _AB8500_GPIO_H */