From patchwork Mon Aug 13 11:57:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 10701 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E24D723F34 for ; Mon, 13 Aug 2012 11:58:06 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id B2645A18016 for ; Mon, 13 Aug 2012 11:58:06 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so3077222yhp.11 for ; Mon, 13 Aug 2012 04:58:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=ZuH9ssvGQmVKm3mJ6mXHJVjIWWD2k+W/3tFgSCkBQyc=; b=QrCesbyXnUxYZ/JpYXoQuvrcsCVSrpUXzHZF61EWmLIses31brWR+4ePvFuqRt1ctO ZvoKy7aOjvoY0Sjclm+N/A0I1mzTDR4T2hDJtYZHa/GN75KpPLQEnamKkW9bsH6O3KKw U7RE9wX6Hyzkg/VzJibUzhCAfBSA+T5atoGuqONFsMUX2P8UH7XwdNikqqPOo1YGYo+s wDPuCtA91kiE42zsSTjgMiB+JD992F+jsUv+4M+tz0mrbWdV304HDJ4Mk8NXje1+0xbC jLOlD8AAcDQPK2x18vF+60D+Brg0NEWJitaQYmDJ1Z87+ha9NkLBE9iw/A5Mty0zp1a2 Ixew== Received: by 10.50.94.133 with SMTP id dc5mr5001781igb.16.1344859086174; Mon, 13 Aug 2012 04:58:06 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp173304igc; Mon, 13 Aug 2012 04:58:05 -0700 (PDT) Received: by 10.14.203.70 with SMTP id e46mr13870679eeo.2.1344859084835; Mon, 13 Aug 2012 04:58:04 -0700 (PDT) Received: from eu1sys200aog110.obsmtp.com (eu1sys200aog110.obsmtp.com. [207.126.144.129]) by mx.google.com with SMTP id z41si202463eep.103.2012.08.13.04.58.00 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Aug 2012 04:58:04 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.129 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.129; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.129 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob110.postini.com ([207.126.147.11]) with SMTP ID DSNKUCjryPJU+dgcU8dG2YyidqT7X3wEAFgg@postini.com; Mon, 13 Aug 2012 11:58:04 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 12B1BC9; Mon, 13 Aug 2012 11:49:41 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id BCC25B6C; Mon, 13 Aug 2012 11:57:56 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 0E3FFA8072; Mon, 13 Aug 2012 13:57:51 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Mon, 13 Aug 2012 13:57:55 +0200 From: Linus Walleij To: Cc: Linus Walleij Subject: [PATCH 3/7] pinctrl/coh901: move header to platform data dir Date: Mon, 13 Aug 2012 13:57:53 +0200 Message-ID: <1344859073-29370-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQmXuQFtWCg55w+A0Xaej5CExypSh4XUwFe47rEIBaogq132pFnYzeH7pXs2/+cho6FWYs3+ From: Linus Walleij Move the platform-specific COH901 pin control header out of the ARM tree and down into the proper platform data include directory. Signed-off-by: Linus Walleij --- arch/arm/mach-u300/core.c | 2 +- arch/arm/mach-u300/include/mach/gpio-u300.h | 26 -------------------------- drivers/pinctrl/pinctrl-coh901.c | 2 +- include/linux/platform_data/pinctrl-coh901.h | 26 ++++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 arch/arm/mach-u300/include/mach/gpio-u300.h create mode 100644 include/linux/platform_data/pinctrl-coh901.h diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c index 883d5c2..0158189 100644 --- a/arch/arm/mach-u300/core.c +++ b/arch/arm/mach-u300/core.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -43,7 +44,6 @@ #include #include #include -#include #include "spi.h" #include "i2c.h" diff --git a/arch/arm/mach-u300/include/mach/gpio-u300.h b/arch/arm/mach-u300/include/mach/gpio-u300.h deleted file mode 100644 index 30dea25..0000000 --- a/arch/arm/mach-u300/include/mach/gpio-u300.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2007-2012 ST-Ericsson AB - * License terms: GNU General Public License (GPL) version 2 - * GPIO block resgister definitions and inline macros for - * U300 GPIO COH 901 335 or COH 901 571/3 - * Author: Linus Walleij - */ - -#ifndef __MACH_U300_GPIO_U300_H -#define __MACH_U300_GPIO_U300_H - -/** - * struct u300_gpio_platform - U300 GPIO platform data - * @ports: number of GPIO block ports - * @gpio_base: first GPIO number for this block (use a free range) - * @gpio_irq_base: first GPIO IRQ number for this block (use a free range) - * @pinctrl_device: pin control device to spawn as child - */ -struct u300_gpio_platform { - u8 ports; - int gpio_base; - int gpio_irq_base; - struct platform_device *pinctrl_device; -}; - -#endif /* __MACH_U300_GPIO_U300_H */ diff --git a/drivers/pinctrl/pinctrl-coh901.c b/drivers/pinctrl/pinctrl-coh901.c index 91a5dc7..b446c96 100644 --- a/drivers/pinctrl/pinctrl-coh901.c +++ b/drivers/pinctrl/pinctrl-coh901.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "pinctrl-coh901.h" #define U300_GPIO_PORT_STRIDE (0x30) diff --git a/include/linux/platform_data/pinctrl-coh901.h b/include/linux/platform_data/pinctrl-coh901.h new file mode 100644 index 0000000..30dea25 --- /dev/null +++ b/include/linux/platform_data/pinctrl-coh901.h @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2007-2012 ST-Ericsson AB + * License terms: GNU General Public License (GPL) version 2 + * GPIO block resgister definitions and inline macros for + * U300 GPIO COH 901 335 or COH 901 571/3 + * Author: Linus Walleij + */ + +#ifndef __MACH_U300_GPIO_U300_H +#define __MACH_U300_GPIO_U300_H + +/** + * struct u300_gpio_platform - U300 GPIO platform data + * @ports: number of GPIO block ports + * @gpio_base: first GPIO number for this block (use a free range) + * @gpio_irq_base: first GPIO IRQ number for this block (use a free range) + * @pinctrl_device: pin control device to spawn as child + */ +struct u300_gpio_platform { + u8 ports; + int gpio_base; + int gpio_irq_base; + struct platform_device *pinctrl_device; +}; + +#endif /* __MACH_U300_GPIO_U300_H */