ARM: tegra: first round of cleanup
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. This branch is based on v3.6-rc4. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABAgAGBQJQU321AAoJEMzrak5tbycxXDkP/jcUVzl07Wenyhqs2wekjSMp E0S0XJuSPMHiimmgAAX81xMtAd10TpOynqCbd3ajNJb9bLMenUysY676GbuSZgb6 KJQ3miGEokXyjLKdBR1GnlN9fJL0UsncO3fkeHPRw9JlVyn2AylLI9aYGhDOz6jz m4xCgiIiOyC5JSSFaz22664qdk9sqcs2hBLsHPkBwvMGxNJXR2Lw/hQ/Gq26oyP4 CQzsIxHyvUnYsN42zATQvn8mAISyjr4+ACSflbA+f+CzuJXLXssqGpv8FsZkjkuu v44a241COjzTjZkGIgqY3/QK2/lq3ZHoblPxOe8KzMSFfimrMqwOM0oltTsL8X4+ iONYEuwn5s6egezaIynzHOpyfup2XbUzFku1UyJ8ZAjMtvOKdFvHNU5mk0Z5TrrG F6WUi2BntX9wbfmcJzdquph9rXAjtAYZjOvno72wbRTS03FfqYenmL//udlrBLvg o/15Vw8gNNm4Wkk6lnt7E8FBWXok9bQ8zK22YUrz3yyplc7c7K7wuB+vAl8MEvCi xjrwt2JzHzZHuivQQ0+sKRBlkOcQX2DGmHTOBfB18B3F5Si8cLUHAJLjCBOBVOgN sZ6T1lhnZEPkmNcNECrQH9VESoyM2rqnUXy8V1QH50USZEti7zY0yEJWjALqMTL/ VVdyI7jE+kbGccJMaZjY =25au -----END PGP SIGNATURE----- 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
This commit is contained in:
Коммит
0968d01827
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
#include <asm/gpio.h>
|
||||
|
||||
#include <mach/gpio-tegra.h>
|
||||
#include <mach/sdhci.h>
|
||||
|
||||
#include "sdhci-pltfm.h"
|
||||
|
|
Загрузка…
Ссылка в новой задаче