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

Commit 206aa6cd authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: physmap-flash for all devboards 



Replace the devboard NOR MTD mapping driver with physmap-flash support.
Also honor the "swapboot" switch settings wrt. to the layout of the
NOR partitions.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@gmail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Acked-By: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 8facefd0

arch/mips/alchemy/devboards/db1x00/platform.c

+20 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/platform_device.h>



#include <asm/mach-au1x00/au1xxx.h>

#include <asm/mach-db1x00/bcsr.h>

#include "../platform.h"



/* DB1xxx PCMCIA interrupt sources:
@@ -32,6 +33,7 @@ 
 */



#define DB1XXX_HAS_PCMCIA

#define F_SWAPPED (bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT)



#if defined(CONFIG_MIPS_DB1000)

#define DB1XXX_PCMCIA_CD0	AU1000_GPIO0_INT
@@ -40,6 +42,8 @@ 
#define DB1XXX_PCMCIA_CD1	AU1000_GPIO3_INT

#define DB1XXX_PCMCIA_STSCHG1	AU1000_GPIO4_INT

#define DB1XXX_PCMCIA_CARD1	AU1000_GPIO5_INT

#define BOARD_FLASH_SIZE	0x02000000 /* 32MB */

#define BOARD_FLASH_WIDTH	4 /* 32-bits */

#elif defined(CONFIG_MIPS_DB1100)

#define DB1XXX_PCMCIA_CD0	AU1100_GPIO0_INT

#define DB1XXX_PCMCIA_STSCHG0	AU1100_GPIO1_INT
@@ -47,6 +51,8 @@ 
#define DB1XXX_PCMCIA_CD1	AU1100_GPIO3_INT

#define DB1XXX_PCMCIA_STSCHG1	AU1100_GPIO4_INT

#define DB1XXX_PCMCIA_CARD1	AU1100_GPIO5_INT

#define BOARD_FLASH_SIZE	0x02000000 /* 32MB */

#define BOARD_FLASH_WIDTH	4 /* 32-bits */

#elif defined(CONFIG_MIPS_DB1500)

#define DB1XXX_PCMCIA_CD0	AU1500_GPIO0_INT

#define DB1XXX_PCMCIA_STSCHG0	AU1500_GPIO1_INT
@@ -54,6 +60,8 @@ 
#define DB1XXX_PCMCIA_CD1	AU1500_GPIO3_INT

#define DB1XXX_PCMCIA_STSCHG1	AU1500_GPIO4_INT

#define DB1XXX_PCMCIA_CARD1	AU1500_GPIO5_INT

#define BOARD_FLASH_SIZE	0x02000000 /* 32MB */

#define BOARD_FLASH_WIDTH	4 /* 32-bits */

#elif defined(CONFIG_MIPS_DB1550)

#define DB1XXX_PCMCIA_CD0	AU1550_GPIO0_INT

#define DB1XXX_PCMCIA_STSCHG0	AU1550_GPIO21_INT
@@ -61,9 +69,20 @@ 
#define DB1XXX_PCMCIA_CD1	AU1550_GPIO1_INT

#define DB1XXX_PCMCIA_STSCHG1	AU1550_GPIO22_INT

#define DB1XXX_PCMCIA_CARD1	AU1550_GPIO5_INT

#define BOARD_FLASH_SIZE	0x08000000 /* 128MB */

#define BOARD_FLASH_WIDTH	4 /* 32-bits */

#else

/* other board: no PCMCIA */

#undef DB1XXX_HAS_PCMCIA

#undef F_SWAPPED

#define F_SWAPPED 0

#if defined(CONFIG_MIPS_BOSPORUS)

#define BOARD_FLASH_SIZE	0x01000000 /* 16MB */

#define BOARD_FLASH_WIDTH	2 /* 16-bits */

#elif defined(CONFIG_MIPS_MIRAGE)

#define BOARD_FLASH_SIZE	0x04000000 /* 64MB */

#define BOARD_FLASH_WIDTH	4 /* 32-bits */

#endif

#endif



static int __init db1xxx_dev_init(void)
@@ -93,6 +112,7 @@ static int __init db1xxx_dev_init(void) 
				    0,

				    1);

#endif

	db1x_register_norflash(BOARD_FLASH_SIZE, BOARD_FLASH_WIDTH, F_SWAPPED);

	return 0;

}

device_initcall(db1xxx_dev_init);

arch/mips/alchemy/devboards/pb1000/board_setup.c

+7 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <asm/mach-pb1x00/pb1000.h>

#include <prom.h>



#include "../platform.h"



const char *get_system_type(void)

{
@@ -194,3 +195,9 @@ static int __init pb1000_init_irq(void) 
	return 0;

}

arch_initcall(pb1000_init_irq);



static int __init pb1000_device_init(void)

{

	return db1x_register_norflash(8 * 1024 * 1024, 4, 0);

}

device_initcall(pb1000_device_init);

arch/mips/alchemy/devboards/pb1100/platform.c

+7 −0
Original line number Diff line number Diff line
@@ -21,11 +21,14 @@ 
#include <linux/init.h>



#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-db1x00/bcsr.h>



#include "../platform.h"



static int __init pb1100_dev_init(void)

{

	int swapped;



	/* PCMCIA. single socket, identical to Pb1500 */

	db1x_register_pcmcia_socket(PCMCIA_ATTR_PSEUDO_PHYS,

				    PCMCIA_ATTR_PSEUDO_PHYS + 0x00040000 - 1,
@@ -38,6 +41,10 @@ static int __init pb1100_dev_init(void) 
				    /*AU1100_GPIO10_INT*/0, /* stschg */

				    0,			 /* eject */

				    0);			 /* id */



	swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1000_SWAPBOOT;

	db1x_register_norflash(64 * 1024 * 1024, 4, swapped);



	return 0;

}

device_initcall(pb1100_dev_init);

arch/mips/alchemy/devboards/pb1200/platform.c

+9 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ static struct platform_device *board_platform_devices[] __initdata = { 


static int __init board_register_devices(void)

{

	int swapped;



#ifdef CONFIG_MIPS_PB1200

	db1x_register_pcmcia_socket(PCMCIA_ATTR_PSEUDO_PHYS,

				    PCMCIA_ATTR_PSEUDO_PHYS + 0x00040000 - 1,
@@ -222,6 +224,13 @@ static int __init board_register_devices(void) 
				    1);

#endif



	swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1200_SWAPBOOT;

#ifdef CONFIG_MIPS_PB1200

	db1x_register_norflash(128 * 1024 * 1024, 2, swapped);

#else

	db1x_register_norflash(64 * 1024 * 1024, 2, swapped);

#endif



	return platform_add_devices(board_platform_devices,

				    ARRAY_SIZE(board_platform_devices));

}

arch/mips/alchemy/devboards/pb1500/platform.c

+7 −0
Original line number Diff line number Diff line
@@ -20,11 +20,14 @@ 


#include <linux/init.h>

#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-db1x00/bcsr.h>



#include "../platform.h"



static int __init pb1500_dev_init(void)

{

	int swapped;



	/* PCMCIA. single socket, identical to Pb1500 */

	db1x_register_pcmcia_socket(PCMCIA_ATTR_PSEUDO_PHYS,

				    PCMCIA_ATTR_PSEUDO_PHYS + 0x00040000 - 1,
@@ -37,6 +40,10 @@ static int __init pb1500_dev_init(void) 
				    /*AU1500_GPIO10_INT*/0, /* stschg */

				    0,			 /* eject */

				    0);			 /* id */



	swapped = bcsr_read(BCSR_STATUS) &  BCSR_STATUS_DB1000_SWAPBOOT;

	db1x_register_norflash(64 * 1024 * 1024, 4, swapped);



	return 0;

}

device_initcall(pb1500_dev_init);