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

Commit 0792644d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra 

* 'for-linus' of git://android.git.kernel.org/kernel/tegra:
  ARM: Tegra: Harmony: Fix conflicting GPIO numbering
parents e6ece707 f2a4d8ae

arch/arm/mach-tegra/board-harmony-power.c

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


#include <mach/irqs.h>



#include "board-harmony.h"



#define PMC_CTRL		0x0

#define PMC_CTRL_INTR_LOW	(1 << 17)
@@ -98,7 +100,7 @@ static struct tps6586x_platform_data tps_platform = { 
	.irq_base	= TEGRA_NR_IRQS,

	.num_subdevs	= ARRAY_SIZE(tps_devs),

	.subdevs	= tps_devs,

	.gpio_base	= TEGRA_NR_GPIOS,

	.gpio_base	= HARMONY_GPIO_TPS6586X(0),

};



static struct i2c_board_info __initdata harmony_regulators[] = {

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

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
#ifndef _MACH_TEGRA_BOARD_HARMONY_H

#define _MACH_TEGRA_BOARD_HARMONY_H



#define HARMONY_GPIO_WM8903(_x_)	(TEGRA_NR_GPIOS + (_x_))

#define HARMONY_GPIO_TPS6586X(_x_)	(TEGRA_NR_GPIOS + (_x_))

#define HARMONY_GPIO_WM8903(_x_)	(HARMONY_GPIO_TPS6586X(4) + (_x_))



#define TEGRA_GPIO_SD2_CD		TEGRA_GPIO_PI5

#define TEGRA_GPIO_SD2_WP		TEGRA_GPIO_PH1