Commit 3904a393 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

arm: mach-orion5x: use IOMEM() for base address definitions 



We now define all virtual base address constants using IOMEM() so that
those are naturally typed as void __iomem pointers, and we do the
necessary adjustements in the mach-orion5x code.

Note that we introduce a few temporary additional "unsigned long"
casts when calling into plat-orion functions. Those are removed by
followup patches converting plat-orion functions to void __iomem
pointers as well.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 383b9961

arch/arm/mach-orion5x/addr-map.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int __init cpu_win_can_remap(const struct orion_addr_map_cfg *cfg, 
static struct orion_addr_map_cfg addr_map_cfg __initdata = {

	.num_wins = 8,

	.cpu_win_can_remap = cpu_win_can_remap,

	.bridge_virt_base = ORION5X_BRIDGE_VIRT_BASE,

	.bridge_virt_base = (unsigned long) ORION5X_BRIDGE_VIRT_BASE,

};



static const struct __initdata orion_addr_map_info addr_map_info[] = {

arch/arm/mach-orion5x/common.c

+11 −8
Original line number Diff line number Diff line
@@ -42,22 +42,22 @@ 
 ****************************************************************************/

static struct map_desc orion5x_io_desc[] __initdata = {

	{

		.virtual	= ORION5X_REGS_VIRT_BASE,

		.virtual	= (unsigned long) ORION5X_REGS_VIRT_BASE,

		.pfn		= __phys_to_pfn(ORION5X_REGS_PHYS_BASE),

		.length		= ORION5X_REGS_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= ORION5X_PCIE_IO_VIRT_BASE,

		.virtual	= (unsigned long) ORION5X_PCIE_IO_VIRT_BASE,

		.pfn		= __phys_to_pfn(ORION5X_PCIE_IO_PHYS_BASE),

		.length		= ORION5X_PCIE_IO_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= ORION5X_PCI_IO_VIRT_BASE,

		.virtual	= (unsigned long) ORION5X_PCI_IO_VIRT_BASE,

		.pfn		= __phys_to_pfn(ORION5X_PCI_IO_PHYS_BASE),

		.length		= ORION5X_PCI_IO_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= ORION5X_PCIE_WA_VIRT_BASE,

		.virtual	= (unsigned long) ORION5X_PCIE_WA_VIRT_BASE,

		.pfn		= __phys_to_pfn(ORION5X_PCIE_WA_PHYS_BASE),

		.length		= ORION5X_PCIE_WA_SIZE,

		.type		= MT_DEVICE,
@@ -156,7 +156,8 @@ void __init orion5x_spi_init() 
 ****************************************************************************/

void __init orion5x_uart0_init(void)

{

	orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,

	orion_uart0_init((unsigned long) UART0_VIRT_BASE,

			 UART0_PHYS_BASE,

			 IRQ_ORION5X_UART0, tclk);

}
@@ -165,7 +166,8 @@ void __init orion5x_uart0_init(void) 
 ****************************************************************************/

void __init orion5x_uart1_init(void)

{

	orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,

	orion_uart1_init((unsigned long) UART1_VIRT_BASE,

			 UART1_PHYS_BASE,

			 IRQ_ORION5X_UART1, tclk);

}
@@ -203,7 +205,7 @@ void __init orion5x_wdt_init(void) 
 ****************************************************************************/

void __init orion5x_init_early(void)

{

	orion_time_set_base(TIMER_VIRT_BASE);

	orion_time_set_base((unsigned long) TIMER_VIRT_BASE);

}



int orion5x_tclk;
@@ -224,7 +226,8 @@ static void __init orion5x_timer_init(void) 
{

	orion5x_tclk = orion5x_find_tclk();



	orion_time_init(ORION5X_BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,

	orion_time_init((unsigned long) ORION5X_BRIDGE_VIRT_BASE,

			BRIDGE_INT_TIMER1_CLR,

			IRQ_ORION5X_BRIDGE, orion5x_tclk);

}

arch/arm/mach-orion5x/dns323-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ static void __init dns323_init(void) 
		 * Note: AFAIK, rev B1 needs the same treatement but I'll let

		 * somebody else test it.

		 */

		writel(0x5, ORION5X_SATA_VIRT_BASE | 0x2c);

		writel(0x5, ORION5X_SATA_VIRT_BASE + 0x2c);

		break;

	}

}

arch/arm/mach-orion5x/include/mach/orion5x.h

+4 −4
Original line number Diff line number Diff line
@@ -37,16 +37,16 @@ 
 * fe000000	f0000000	16M	PCIe WA space (Orion-1/Orion-NAS only)

 ****************************************************************************/

#define ORION5X_REGS_PHYS_BASE		0xf1000000

#define ORION5X_REGS_VIRT_BASE		0xfdd00000

#define ORION5X_REGS_VIRT_BASE		IOMEM(0xfdd00000)

#define ORION5X_REGS_SIZE		SZ_1M



#define ORION5X_PCIE_IO_PHYS_BASE	0xf2000000

#define ORION5X_PCIE_IO_VIRT_BASE	0xfde00000

#define ORION5X_PCIE_IO_VIRT_BASE	IOMEM(0xfde00000)

#define ORION5X_PCIE_IO_BUS_BASE	0x00000000

#define ORION5X_PCIE_IO_SIZE		SZ_1M



#define ORION5X_PCI_IO_PHYS_BASE	0xf2100000

#define ORION5X_PCI_IO_VIRT_BASE	0xfdf00000

#define ORION5X_PCI_IO_VIRT_BASE	IOMEM(0xfdf00000)

#define ORION5X_PCI_IO_BUS_BASE		0x00100000

#define ORION5X_PCI_IO_SIZE		SZ_1M
@@ -55,7 +55,7 @@ 


/* Relevant only for Orion-1/Orion-NAS */

#define ORION5X_PCIE_WA_PHYS_BASE	0xf0000000

#define ORION5X_PCIE_WA_VIRT_BASE	0xfe000000

#define ORION5X_PCIE_WA_VIRT_BASE	IOMEM(0xfe000000)

#define ORION5X_PCIE_WA_SIZE		SZ_16M



#define ORION5X_PCIE_MEM_PHYS_BASE	0xe0000000

arch/arm/mach-orion5x/irq.c

+3 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/gpio.h>

#include <linux/kernel.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <mach/bridge-regs.h>

#include <plat/irq.h>
@@ -24,11 +25,11 @@ static int __initdata gpio0_irqs[4] = { 


void __init orion5x_init_irq(void)

{

	orion_irq_init(0, (void __iomem *)MAIN_IRQ_MASK);

	orion_irq_init(0, MAIN_IRQ_MASK);



	/*

	 * Initialize gpiolib for GPIOs 0-31.

	 */

	orion_gpio_init(NULL, 0, 32, (void __iomem *)GPIO_VIRT_BASE, 0,

	orion_gpio_init(NULL, 0, 32, GPIO_VIRT_BASE, 0,

			IRQ_ORION5X_GPIO_START, gpio0_irqs);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE