Commit 0968d018 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.7-cleanup' of... 

Merge tag 'tegra-for-3.7-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup

From Stephen Warren:

This branch contains a few early cleanups; consistent use of IO_ADDRESS,
always selecting USE_OF since we're converting to device-tree-only this
merge window, and removing includes of some header files as part of
working towards single zImage.

* tag 'tegra-for-3.7-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  mmc: tegra: remove useless include of <mach/*.h>
  gpio: tegra: remove useless includes of <mach/*.h>
  ARM: tegra: remove duplicate select USE_OF
  ARM: tegra: use IO_ADDRESS for getting virtual address
parents c098c9f2 a5b64ce6

arch/arm/mach-tegra/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ config ARCH_TEGRA_3x_SOC 
	select USB_ARCH_HAS_EHCI if USB_SUPPORT

	select USB_ULPI if USB

	select USB_ULPI_VIEWPORT if USB_SUPPORT

	select USE_OF

	select ARM_ERRATA_743622

	select ARM_ERRATA_751472

	select ARM_ERRATA_754322

arch/arm/mach-tegra/apbio.c

+2 −2
Original line number Diff line number Diff line
@@ -293,12 +293,12 @@ static apbio_write_fptr apbio_write; 


static u32 tegra_apb_readl_direct(unsigned long offset)

{

	return readl(IO_TO_VIRT(offset));

	return readl(IO_ADDRESS(offset));

}



static void tegra_apb_writel_direct(u32 value, unsigned long offset)

{

	writel(value, IO_TO_VIRT(offset));

	writel(value, IO_ADDRESS(offset));

}



void tegra_apb_io_init(void)

arch/arm/mach-tegra/fuse.c

+2 −2
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ void tegra_init_fuse(void) 
{

	u32 id;



	u32 reg = readl(IO_TO_VIRT(TEGRA_CLK_RESET_BASE + 0x48));

	u32 reg = readl(IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x48));

	reg |= 1 << 28;

	writel(reg, IO_TO_VIRT(TEGRA_CLK_RESET_BASE + 0x48));

	writel(reg, IO_ADDRESS(TEGRA_CLK_RESET_BASE + 0x48));



	reg = tegra_fuse_readl(FUSE_SKU_INFO);

	tegra_sku_id = reg & 0xFF;

drivers/gpio/gpio-tegra.c

+0 −3
Original line number Diff line number Diff line
@@ -30,9 +30,6 @@ 


#include <asm/mach/irq.h>



#include <mach/iomap.h>

#include <mach/suspend.h>



#define GPIO_BANK(x)		((x) >> 5)

#define GPIO_PORT(x)		(((x) >> 3) & 0x3)

#define GPIO_BIT(x)		((x) & 0x7)

drivers/mmc/host/sdhci-tegra.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 


#include <asm/gpio.h>



#include <mach/gpio-tegra.h>

#include <mach/sdhci.h>



#include "sdhci-pltfm.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE