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

Commit 21c8715f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: integrator: use __iomem pointers for MMIO, part 2 



Due to some interesting merges in the integrator code, not
all users of mmio pointers were converted before, this
fixes all warnings that got introduced as a consequence.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
parent c6e9fbbf

arch/arm/mach-integrator/include/mach/cm.h

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

 */

void cm_control(u32, u32);

void cm_control(u32, u32);





#define CM_CTRL	IO_ADDRESS(INTEGRATOR_HDR_CTRL)

#define CM_CTRL	__io_address(INTEGRATOR_HDR_CTRL)





#define CM_CTRL_LED			(1 << 0)

#define CM_CTRL_LED			(1 << 0)

#define CM_CTRL_nMBDET			(1 << 1)

#define CM_CTRL_nMBDET			(1 << 1)

arch/arm/mach-integrator/include/mach/platform.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -324,9 +324,9 @@ 
 */

 */

#define PHYS_PCI_V3_BASE                0x62000000

#define PHYS_PCI_V3_BASE                0x62000000





#define PCI_MEMORY_VADDR		0xe8000000

#define PCI_MEMORY_VADDR		IOMEM(0xe8000000)

#define PCI_CONFIG_VADDR		0xec000000

#define PCI_CONFIG_VADDR		IOMEM(0xec000000)

#define PCI_V3_VADDR			0xed000000

#define PCI_V3_VADDR			IOMEM(0xed000000)





/* ------------------------------------------------------------------------

/* ------------------------------------------------------------------------

 *  Integrator Interrupt Controllers

 *  Integrator Interrupt Controllers

arch/arm/mach-integrator/integrator_ap.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -157,7 +157,7 @@ static struct map_desc ap_io_desc[] __initdata = { 
static void __init ap_map_io(void)

static void __init ap_map_io(void)

{

{

	iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));

	iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));

	vga_base = PCI_MEMORY_VADDR;

	vga_base = (unsigned long)PCI_MEMORY_VADDR;

	pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));

	pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));

}

}

arch/arm/mach-integrator/integrator_cp.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -261,6 +261,8 @@ static void __init intcp_init_early(void) 
#endif

#endif

}

}





#ifdef CONFIG_OF



static void __init intcp_timer_init_of(void)

static void __init intcp_timer_init_of(void)

{

{

	struct device_node *node;

	struct device_node *node;
@@ -297,8 +299,6 @@ static struct sys_timer cp_of_timer = { 
	.init		= intcp_timer_init_of,

	.init		= intcp_timer_init_of,

};

};





#ifdef CONFIG_OF



static const struct of_device_id fpga_irq_of_match[] __initconst = {

static const struct of_device_id fpga_irq_of_match[] __initconst = {

	{ .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },

	{ .compatible = "arm,versatile-fpga-irq", .data = fpga_irq_of_init, },

	{ /* Sentinel */ }

	{ /* Sentinel */ }