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

Commit 6d2e857d authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 4055/1: iop13xx: fix phys_io/io_pg_offst for iq81340mc/sc 



The phys_io/io_pg_offst machine record variables were being set
to bogus values, causing problems when enabling DEBUG_LL.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 99e4a6dd

arch/arm/mach-iop13xx/iq81340mc.c

+3 −3
Original line number Diff line number Diff line
@@ -88,11 +88,11 @@ static struct sys_timer iq81340mc_timer = { 


MACHINE_START(IQ81340MC, "Intel IQ81340MC")

	/* Maintainer: Dan Williams <dan.j.williams@intel.com> */

	.phys_io        = PHYS_IO,

	.io_pg_offst    = IO_PG_OFFSET,

	.phys_io        = IOP13XX_PMMR_PHYS_MEM_BASE,

	.io_pg_offst    = (IOP13XX_PMMR_VIRT_MEM_BASE >> 18) & 0xfffc,

	.boot_params    = 0x00000100,

	.map_io         = iop13xx_map_io,

	.init_irq       = iop13xx_init_irq,

	.timer          = &iq81340mc_timer,

	.boot_params    = BOOT_PARAM_OFFSET,

	.init_machine   = iq81340mc_init,

MACHINE_END

arch/arm/mach-iop13xx/iq81340sc.c

+3 −3
Original line number Diff line number Diff line
@@ -90,11 +90,11 @@ static struct sys_timer iq81340sc_timer = { 


MACHINE_START(IQ81340SC, "Intel IQ81340SC")

	/* Maintainer: Dan Williams <dan.j.williams@intel.com> */

	.phys_io        = PHYS_IO,

	.io_pg_offst    = IO_PG_OFFSET,

	.phys_io	= IOP13XX_PMMR_PHYS_MEM_BASE,

	.io_pg_offst	= (IOP13XX_PMMR_VIRT_MEM_BASE >> 18) & 0xfffc,

	.boot_params    = 0x00000100,

	.map_io         = iop13xx_map_io,

	.init_irq       = iop13xx_init_irq,

	.timer          = &iq81340sc_timer,

	.boot_params    = BOOT_PARAM_OFFSET,

	.init_machine   = iq81340sc_init,

MACHINE_END

include/asm-arm/arch-iop13xx/iq81340.h

+1 −4
Original line number Diff line number Diff line
@@ -24,8 +24,5 @@ 
#define PBI_CF_IDE_BASE     (IQ81340_CMP_FLSH)

#define PBI_CF_BAR_ADDR     (IOP13XX_PBI_BAR1)



/* These are the values used in the Machine description */

#define PHYS_IO         0xfeffff00

#define IO_PG_OFFSET    0xffffff00

#define BOOT_PARAM_OFFSET  0x00000100



#endif	/* _IQ81340_H_ */