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

Commit 0dcd6278 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra:
  ARM: tegra: paz00: fix wrong UART port on mini-pcie plug
  ARM: tegra: paz00: fix wrong SD1 power gpio
  i2c: tegra: Add devexit_p() for remove
  ARM: tegra: dma: fix buildbreak for !CONFIG_TEGRA_SYSTEM_DMA
parents 72053353 0783a9bf

arch/arm/boot/dts/tegra-paz00.dts

+3 −3
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ 
	};



	serial@70006200 {

		status = "disable";

		clock-frequency = <216000000>;

	};



	serial@70006300 {

		clock-frequency = <216000000>;

		status = "disable";

	};



	serial@70006400 {
@@ -60,7 +60,7 @@ 
	sdhci@c8000000 {

		cd-gpios = <&gpio 173 0>; /* gpio PV5 */

		wp-gpios = <&gpio 57 0>;  /* gpio PH1 */

		power-gpios = <&gpio 155 0>; /* gpio PT3 */

		power-gpios = <&gpio 169 0>; /* gpio PV1 */

	};



	sdhci@c8000200 {

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

+4 −4
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ static struct plat_serial8250_port debug_uart_platform_data[] = { 
		.uartclk	= 216000000,

	}, {

		/* serial port on mini-pcie */

		.membase	= IO_ADDRESS(TEGRA_UARTD_BASE),

		.mapbase	= TEGRA_UARTD_BASE,

		.irq		= INT_UARTD,

		.membase	= IO_ADDRESS(TEGRA_UARTC_BASE),

		.mapbase	= TEGRA_UARTC_BASE,

		.irq		= INT_UARTC,

		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,

		.type		= PORT_TEGRA,

		.iotype		= UPIO_MEM,
@@ -174,7 +174,7 @@ static void __init tegra_paz00_fixup(struct tag *tags, char **cmdline, 
static __initdata struct tegra_clk_init_table paz00_clk_init_table[] = {

	/* name		parent		rate		enabled */

	{ "uarta",	"pll_p",	216000000,	true },

	{ "uartd",	"pll_p",	216000000,	true },

	{ "uartc",	"pll_p",	216000000,	true },



	{ "pll_p_out4",	"pll_p",	24000000,	true },

	{ "usbd",	"clk_m",	12000000,	false },

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
/* SDCARD */

#define TEGRA_GPIO_SD1_CD		TEGRA_GPIO_PV5

#define TEGRA_GPIO_SD1_WP		TEGRA_GPIO_PH1

#define TEGRA_GPIO_SD1_POWER		TEGRA_GPIO_PT3

#define TEGRA_GPIO_SD1_POWER		TEGRA_GPIO_PV1



/* ULPI */

#define TEGRA_ULPI_RST			TEGRA_GPIO_PV0

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

+5 −5
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 


#include <linux/list.h>



#if defined(CONFIG_TEGRA_SYSTEM_DMA)



struct tegra_dma_req;

struct tegra_dma_channel;



#define TEGRA_DMA_REQ_SEL_CNTR			0

#define TEGRA_DMA_REQ_SEL_I2S_2			1

#define TEGRA_DMA_REQ_SEL_I2S_1			2
@@ -56,6 +51,11 @@ struct tegra_dma_channel; 
#define TEGRA_DMA_REQ_SEL_OWR			25

#define TEGRA_DMA_REQ_SEL_INVALID		31



#if defined(CONFIG_TEGRA_SYSTEM_DMA)



struct tegra_dma_req;

struct tegra_dma_channel;



enum tegra_dma_mode {

	TEGRA_DMA_SHARED = 1,

	TEGRA_DMA_MODE_CONTINOUS = 2,

drivers/i2c/busses/i2c-tegra.c

+1 −1
Original line number Diff line number Diff line
@@ -755,7 +755,7 @@ MODULE_DEVICE_TABLE(of, tegra_i2c_of_match); 


static struct platform_driver tegra_i2c_driver = {

	.probe   = tegra_i2c_probe,

	.remove  = tegra_i2c_remove,

	.remove  = __devexit_p(tegra_i2c_remove),

#ifdef CONFIG_PM

	.suspend = tegra_i2c_suspend,

	.resume  = tegra_i2c_resume,