Commit 060f3d19 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

arm: mach-kirkwood: 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-kirkwood 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 c3c5a281

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
static struct __initdata orion_addr_map_cfg addr_map_cfg = {

	.num_wins = 8,

	.remappable_wins = 4,

	.bridge_virt_base = BRIDGE_VIRT_BASE,

	.bridge_virt_base = (unsigned long) BRIDGE_VIRT_BASE,

};



static const struct __initdata orion_addr_map_info addr_map_info[] = {

arch/arm/mach-kirkwood/common.c

+12 −11
Original line number Diff line number Diff line
@@ -42,17 +42,17 @@ 
 ****************************************************************************/

static struct map_desc kirkwood_io_desc[] __initdata = {

	{

		.virtual	= KIRKWOOD_PCIE_IO_VIRT_BASE,

		.virtual	= (unsigned long) KIRKWOOD_PCIE_IO_VIRT_BASE,

		.pfn		= __phys_to_pfn(KIRKWOOD_PCIE_IO_PHYS_BASE),

		.length		= KIRKWOOD_PCIE_IO_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= KIRKWOOD_PCIE1_IO_VIRT_BASE,

		.virtual	= (unsigned long) KIRKWOOD_PCIE1_IO_VIRT_BASE,

		.pfn		= __phys_to_pfn(KIRKWOOD_PCIE1_IO_PHYS_BASE),

		.length		= KIRKWOOD_PCIE1_IO_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= KIRKWOOD_REGS_VIRT_BASE,

		.virtual	= (unsigned long) KIRKWOOD_REGS_VIRT_BASE,

		.pfn		= __phys_to_pfn(KIRKWOOD_REGS_PHYS_BASE),

		.length		= KIRKWOOD_REGS_SIZE,

		.type		= MT_DEVICE,
@@ -215,8 +215,7 @@ static struct clk *tclk; 


static struct clk __init *kirkwood_register_gate(const char *name, u8 bit_idx)

{

	return clk_register_gate(NULL, name, "tclk", 0,

				 (void __iomem *)CLOCK_GATING_CTRL,

	return clk_register_gate(NULL, name, "tclk", 0, CLOCK_GATING_CTRL,

				 bit_idx, 0, &gating_lock);

}
@@ -225,8 +224,7 @@ static struct clk __init *kirkwood_register_gate_fn(const char *name, 
						    void (*fn_en)(void),

						    void (*fn_dis)(void))

{

	return clk_register_gate_fn(NULL, name, "tclk", 0,

				    (void __iomem *)CLOCK_GATING_CTRL,

	return clk_register_gate_fn(NULL, name, "tclk", 0, CLOCK_GATING_CTRL,

				    bit_idx, 0, &gating_lock, fn_en, fn_dis);

}
@@ -458,7 +456,8 @@ void __init kirkwood_i2c_init(void) 


void __init kirkwood_uart0_init(void)

{

	orion_uart0_init(UART0_VIRT_BASE, UART0_PHYS_BASE,

	orion_uart0_init((unsigned long) UART0_VIRT_BASE,

			 UART0_PHYS_BASE,

			 IRQ_KIRKWOOD_UART_0, tclk);

}
@@ -468,7 +467,8 @@ void __init kirkwood_uart0_init(void) 
 ****************************************************************************/

void __init kirkwood_uart1_init(void)

{

	orion_uart1_init(UART1_VIRT_BASE, UART1_PHYS_BASE,

	orion_uart1_init((unsigned long) UART1_VIRT_BASE,

			 UART1_PHYS_BASE,

			 IRQ_KIRKWOOD_UART_1, tclk);

}
@@ -516,7 +516,7 @@ void __init kirkwood_wdt_init(void) 
 ****************************************************************************/

void __init kirkwood_init_early(void)

{

	orion_time_set_base(TIMER_VIRT_BASE);

	orion_time_set_base((unsigned long) TIMER_VIRT_BASE);



	/*

	 * Some Kirkwood devices allocate their coherent buffers from atomic
@@ -545,7 +545,8 @@ static void __init kirkwood_timer_init(void) 
{

	kirkwood_tclk = kirkwood_find_tclk();



	orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,

	orion_time_init((unsigned long) BRIDGE_VIRT_BASE,

			BRIDGE_INT_TIMER1_CLR,

			IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);

}

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

+3 −3
Original line number Diff line number Diff line
@@ -37,17 +37,17 @@ 
#define KIRKWOOD_NAND_MEM_SIZE		SZ_1K



#define KIRKWOOD_PCIE1_IO_PHYS_BASE	0xf3000000

#define KIRKWOOD_PCIE1_IO_VIRT_BASE	0xfef00000

#define KIRKWOOD_PCIE1_IO_VIRT_BASE	IOMEM(0xfef00000)

#define KIRKWOOD_PCIE1_IO_BUS_BASE	0x00100000

#define KIRKWOOD_PCIE1_IO_SIZE		SZ_1M



#define KIRKWOOD_PCIE_IO_PHYS_BASE	0xf2000000

#define KIRKWOOD_PCIE_IO_VIRT_BASE	0xfee00000

#define KIRKWOOD_PCIE_IO_VIRT_BASE	IOMEM(0xfee00000)

#define KIRKWOOD_PCIE_IO_BUS_BASE	0x00000000

#define KIRKWOOD_PCIE_IO_SIZE		SZ_1M



#define KIRKWOOD_REGS_PHYS_BASE		0xf1000000

#define KIRKWOOD_REGS_VIRT_BASE		0xfed00000

#define KIRKWOOD_REGS_VIRT_BASE		IOMEM(0xfed00000)

#define KIRKWOOD_REGS_SIZE		SZ_1M



#define KIRKWOOD_PCIE_MEM_PHYS_BASE	0xe0000000

arch/arm/mach-kirkwood/irq.c

+5 −4
Original line number Diff line number Diff line
@@ -10,6 +10,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>
@@ -29,14 +30,14 @@ static int __initdata gpio1_irqs[4] = { 


void __init kirkwood_init_irq(void)

{

	orion_irq_init(0, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF));

	orion_irq_init(32, (void __iomem *)(IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF));

	orion_irq_init(0, IRQ_VIRT_BASE + IRQ_MASK_LOW_OFF);

	orion_irq_init(32, IRQ_VIRT_BASE + IRQ_MASK_HIGH_OFF);



	/*

	 * Initialize gpiolib for GPIOs 0-49.

	 */

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

	orion_gpio_init(NULL, 0, 32, GPIO_LOW_VIRT_BASE, 0,

			IRQ_KIRKWOOD_GPIO_START, gpio0_irqs);

	orion_gpio_init(NULL, 32, 18, (void __iomem *)GPIO_HIGH_VIRT_BASE, 0,

	orion_gpio_init(NULL, 32, 18, GPIO_HIGH_VIRT_BASE, 0,

			IRQ_KIRKWOOD_GPIO_START + 32, gpio1_irqs);

}

arch/arm/mach-kirkwood/mpp.c

+2 −1
Original line number Diff line number Diff line
@@ -38,5 +38,6 @@ static unsigned int __init kirkwood_variant(void) 
void __init kirkwood_mpp_conf(unsigned int *mpp_list)

{

	orion_mpp_conf(mpp_list, kirkwood_variant(),

		       MPP_MAX, DEV_BUS_VIRT_BASE);

		       MPP_MAX,

		       (unsigned long) DEV_BUS_VIRT_BASE);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE