From: grant.likely@secretlab.ca (Grant Likely)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h>
Date: Thu, 22 Sep 2011 11:26:44 -0600 [thread overview]
Message-ID: <20110922172644.GL17168@ponder.secretlab.ca> (raw)
In-Reply-To: <1316633620-13184-2-git-send-email-swarren@nvidia.com>
On Wed, Sep 21, 2011 at 01:33:39PM -0600, Stephen Warren wrote:
> This will eventually allow <mach/gpio.h> to be deleted. This mirrors
> LinusW's recent equivalent work on various other ARM platforms.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> arch/arm/mach-tegra/board-harmony.h | 2 +
> arch/arm/mach-tegra/board-paz00.h | 2 +
> arch/arm/mach-tegra/board-seaboard.h | 2 +
> arch/arm/mach-tegra/board-trimslice.h | 2 +
> arch/arm/mach-tegra/include/mach/gpio-tegra.h | 39 +++++++++++++++++++++++++
> arch/arm/mach-tegra/include/mach/gpio.h | 39 -------------------------
> arch/arm/mach-tegra/usb_phy.c | 1 +
> drivers/gpio/gpio-tegra.c | 1 +
> drivers/mmc/host/sdhci-tegra.c | 2 +
> 9 files changed, 51 insertions(+), 39 deletions(-)
> create mode 100644 arch/arm/mach-tegra/include/mach/gpio-tegra.h
>
> diff --git a/arch/arm/mach-tegra/board-harmony.h b/arch/arm/mach-tegra/board-harmony.h
> index 280d203..139d96c 100644
> --- a/arch/arm/mach-tegra/board-harmony.h
> +++ b/arch/arm/mach-tegra/board-harmony.h
> @@ -17,6 +17,8 @@
> #ifndef _MACH_TEGRA_BOARD_HARMONY_H
> #define _MACH_TEGRA_BOARD_HARMONY_H
>
> +#include <mach/gpio-tegra.h>
> +
> #define HARMONY_GPIO_TPS6586X(_x_) (TEGRA_NR_GPIOS + (_x_))
> #define HARMONY_GPIO_WM8903(_x_) (HARMONY_GPIO_TPS6586X(4) + (_x_))
>
> diff --git a/arch/arm/mach-tegra/board-paz00.h b/arch/arm/mach-tegra/board-paz00.h
> index 86057c3..2dc1899 100644
> --- a/arch/arm/mach-tegra/board-paz00.h
> +++ b/arch/arm/mach-tegra/board-paz00.h
> @@ -17,6 +17,8 @@
> #ifndef _MACH_TEGRA_BOARD_PAZ00_H
> #define _MACH_TEGRA_BOARD_PAZ00_H
>
> +#include <mach/gpio-tegra.h>
> +
> /* SDCARD */
> #define TEGRA_GPIO_SD1_CD TEGRA_GPIO_PV5
> #define TEGRA_GPIO_SD1_WP TEGRA_GPIO_PH1
> diff --git a/arch/arm/mach-tegra/board-seaboard.h b/arch/arm/mach-tegra/board-seaboard.h
> index d06c334..4c45d4c 100644
> --- a/arch/arm/mach-tegra/board-seaboard.h
> +++ b/arch/arm/mach-tegra/board-seaboard.h
> @@ -17,6 +17,8 @@
> #ifndef _MACH_TEGRA_BOARD_SEABOARD_H
> #define _MACH_TEGRA_BOARD_SEABOARD_H
>
> +#include <mach/gpio-tegra.h>
> +
> #define SEABOARD_GPIO_TPS6586X(_x_) (TEGRA_NR_GPIOS + (_x_))
> #define SEABOARD_GPIO_WM8903(_x_) (SEABOARD_GPIO_TPS6586X(4) + (_x_))
>
> diff --git a/arch/arm/mach-tegra/board-trimslice.h b/arch/arm/mach-tegra/board-trimslice.h
> index 7a7dee8..50f128d 100644
> --- a/arch/arm/mach-tegra/board-trimslice.h
> +++ b/arch/arm/mach-tegra/board-trimslice.h
> @@ -17,6 +17,8 @@
> #ifndef _MACH_TEGRA_BOARD_TRIMSLICE_H
> #define _MACH_TEGRA_BOARD_TRIMSLICE_H
>
> +#include <mach/gpio-tegra.h>
> +
> #define TRIMSLICE_GPIO_SD4_CD TEGRA_GPIO_PP1 /* mmc4 cd */
> #define TRIMSLICE_GPIO_SD4_WP TEGRA_GPIO_PP2 /* mmc4 wp */
>
> diff --git a/arch/arm/mach-tegra/include/mach/gpio-tegra.h b/arch/arm/mach-tegra/include/mach/gpio-tegra.h
> new file mode 100644
> index 0000000..87d37fd
> --- /dev/null
> +++ b/arch/arm/mach-tegra/include/mach/gpio-tegra.h
> @@ -0,0 +1,39 @@
> +/*
> + * arch/arm/mach-tegra/include/mach/gpio.h
> + *
> + * Copyright (C) 2010 Google, Inc.
> + *
> + * Author:
> + * Erik Gilling <konkers@google.com>
> + *
> + * This software is licensed under the terms of the GNU General Public
> + * License version 2, as published by the Free Software Foundation, and
> + * may be copied, distributed, and modified under those terms.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#ifndef __MACH_TEGRA_GPIO_TEGRA_H
> +#define __MACH_TEGRA_GPIO_TEGRA_H
> +
> +#include <linux/types.h>
> +#include <mach/irqs.h>
> +
> +#define TEGRA_NR_GPIOS INT_GPIO_NR
> +
> +#define TEGRA_GPIO_TO_IRQ(gpio) (INT_GPIO_BASE + (gpio))
> +
> +struct tegra_gpio_table {
> + int gpio; /* GPIO number */
> + bool enable; /* Enable for GPIO at init? */
> +};
> +
> +void tegra_gpio_config(struct tegra_gpio_table *table, int num);
> +void tegra_gpio_enable(int gpio);
> +void tegra_gpio_disable(int gpio);
> +
> +#endif
> diff --git a/arch/arm/mach-tegra/include/mach/gpio.h b/arch/arm/mach-tegra/include/mach/gpio.h
> index 7910d26..e69de29 100644
> --- a/arch/arm/mach-tegra/include/mach/gpio.h
> +++ b/arch/arm/mach-tegra/include/mach/gpio.h
> @@ -1,39 +0,0 @@
> -/*
> - * arch/arm/mach-tegra/include/mach/gpio.h
> - *
> - * Copyright (C) 2010 Google, Inc.
> - *
> - * Author:
> - * Erik Gilling <konkers@google.com>
> - *
> - * This software is licensed under the terms of the GNU General Public
> - * License version 2, as published by the Free Software Foundation, and
> - * may be copied, distributed, and modified under those terms.
> - *
> - * This program is distributed in the hope that it will be useful,
> - * but WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - * GNU General Public License for more details.
> - *
> - */
> -
> -#ifndef __MACH_TEGRA_GPIO_H
> -#define __MACH_TEGRA_GPIO_H
> -
> -#include <linux/types.h>
> -#include <mach/irqs.h>
> -
> -#define TEGRA_NR_GPIOS INT_GPIO_NR
> -
> -#define TEGRA_GPIO_TO_IRQ(gpio) (INT_GPIO_BASE + (gpio))
> -
> -struct tegra_gpio_table {
> - int gpio; /* GPIO number */
> - bool enable; /* Enable for GPIO at init? */
> -};
> -
> -void tegra_gpio_config(struct tegra_gpio_table *table, int num);
> -void tegra_gpio_enable(int gpio);
> -void tegra_gpio_disable(int gpio);
> -
> -#endif
> diff --git a/arch/arm/mach-tegra/usb_phy.c b/arch/arm/mach-tegra/usb_phy.c
> index 88081bb..37576a7 100644
> --- a/arch/arm/mach-tegra/usb_phy.c
> +++ b/arch/arm/mach-tegra/usb_phy.c
> @@ -28,6 +28,7 @@
> #include <linux/usb/otg.h>
> #include <linux/usb/ulpi.h>
> #include <asm/mach-types.h>
> +#include <mach/gpio-tegra.h>
> #include <mach/usb_phy.h>
> #include <mach/iomap.h>
>
> diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
> index df64536..6b65207 100644
> --- a/drivers/gpio/gpio-tegra.c
> +++ b/drivers/gpio/gpio-tegra.c
> @@ -27,6 +27,7 @@
>
> #include <asm/mach/irq.h>
>
> +#include <mach/gpio-tegra.h>
> #include <mach/iomap.h>
> #include <mach/suspend.h>
>
> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
> index 67176af..067a4cd 100644
> --- a/drivers/mmc/host/sdhci-tegra.c
> +++ b/drivers/mmc/host/sdhci-tegra.c
> @@ -25,6 +25,8 @@
> #include <linux/module.h>
>
> #include <asm/gpio.h>
> +
> +#include <mach/gpio-tegra.h>
> #include <mach/sdhci.h>
>
> #include "sdhci-pltfm.h"
> --
> 1.7.0.4
>
next prev parent reply other threads:[~2011-09-22 17:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-21 19:33 [PATCH 1/3] arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h Stephen Warren
2011-09-21 19:33 ` [PATCH 2/3] arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h> Stephen Warren
2011-09-21 20:17 ` Olof Johansson
2011-09-22 17:26 ` Grant Likely [this message]
2011-09-21 19:33 ` [PATCH 3/3] arm/tegra: Move "gpio-names.h" into <mach/gpio-tegra.h> Stephen Warren
2011-09-21 20:14 ` Olof Johansson
2011-09-21 20:29 ` Stephen Warren
2011-09-21 20:16 ` [PATCH 1/3] arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h Olof Johansson
2011-09-22 8:11 ` Russell King - ARM Linux
2011-09-22 16:31 ` Stephen Warren
2011-09-22 16:32 ` Russell King - ARM Linux
2011-09-22 17:25 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110922172644.GL17168@ponder.secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).