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

Commit ff945023 authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds
Browse files

[PATCH] ppc32: MPC834x BCSR_SIZE too small for use in a BAT. 



The call to io_block_mapping was creating an invalid BAT entry because the
value of BCSR_SIZE (32K) is too small to be used in a BAT (128K min).  This
change removes the io_block_mapping call since these registers can easily
be mapped using ioremap at the point of use.

Signed-off-by: default avatarRandy Vinson <rvinson@mvista.com>
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 92b4dc16

arch/ppc/platforms/83xx/mpc834x_sys.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -127,7 +127,6 @@ mpc834x_sys_map_io(void) 
{

{

	/* we steal the lowest ioremap addr for virt space */

	/* we steal the lowest ioremap addr for virt space */

	io_block_mapping(VIRT_IMMRBAR, immrbar, 1024*1024, _PAGE_IO);

	io_block_mapping(VIRT_IMMRBAR, immrbar, 1024*1024, _PAGE_IO);

	io_block_mapping(BCSR_VIRT_ADDR, BCSR_PHYS_ADDR, BCSR_SIZE, _PAGE_IO);

}

}





int

int

arch/ppc/platforms/83xx/mpc834x_sys.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 
#define VIRT_IMMRBAR		((uint)0xfe000000)

#define VIRT_IMMRBAR		((uint)0xfe000000)





#define BCSR_PHYS_ADDR		((uint)0xf8000000)

#define BCSR_PHYS_ADDR		((uint)0xf8000000)

#define BCSR_VIRT_ADDR		((uint)0xfe100000)

#define BCSR_SIZE		((uint)(32 * 1024))

#define BCSR_SIZE		((uint)(32 * 1024))





#ifdef CONFIG_PCI

#ifdef CONFIG_PCI