Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea5abbd2 authored by Stephen Warren's avatar Stephen Warren Committed by Russell King
Browse files

ARM: 7101/1: arm/tegra: Replace <mach/gpio.h> with <mach/gpio-tegra.h> 



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: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ab05be05

arch/arm/mach-tegra/board-harmony.h

+2 −0
Original line number Diff line number Diff line
@@ -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_))

arch/arm/mach-tegra/board-paz00.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef _MACH_TEGRA_BOARD_PAZ00_H

#define _MACH_TEGRA_BOARD_PAZ00_H



#include <mach/gpio-tegra.h>



#define TEGRA_GPIO_SD1_CD		TEGRA_GPIO_PV5

#define TEGRA_GPIO_SD1_WP		TEGRA_GPIO_PH1

#define TEGRA_GPIO_SD1_POWER		TEGRA_GPIO_PT3

arch/arm/mach-tegra/board-seaboard.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
#ifndef _MACH_TEGRA_BOARD_SEABOARD_H

#define _MACH_TEGRA_BOARD_SEABOARD_H



#include <mach/gpio-tegra.h>



#define TEGRA_GPIO_SD2_CD		TEGRA_GPIO_PI5

#define TEGRA_GPIO_SD2_WP		TEGRA_GPIO_PH1

#define TEGRA_GPIO_SD2_POWER		TEGRA_GPIO_PI6

arch/arm/mach-tegra/board-trimslice.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

arch/arm/mach-tegra/include/mach/gpio-tegra.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * 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