Commit fcbd3b4b authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Ralf Baechle
Browse files

[MIPS] Pb1200/DBAu1200: move platform code to its proper place 



Since both the IDE interface and SMC 91C111 Ethernet chip are on-board
devices, not SOC devices, move the platform device registration form the
common to the board specific code.

While at it, remove semicolon (which didn't break compilation only by
chance) from the AU1XXX_ATA_DDMA_REQ macro and do some renaming:

- change 'au1200_ide0_' variable name prefix to the mere 'ide_';

- change 'smc91x_' variable name prefix to 'smc91c111_' since that's the
  name of the chip used on the boards;

- drop 'AU1XXX_' prefix from the names of macros describing IDE and Ethernet
  on-board devices;

- change 'SMC91111_' to 'SMC91C111_', change 'IRQ' to 'INT' in the names of
  the macros describing the Ethernet chip for consistency with the IDE
  macros;

- change 'ATA_' to 'IDE_' and 'OFFSET' to 'SHIFT' (since this value is
  indeed a shift count) in the names of the macros describing the IDE
  interface.

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent df270051

arch/mips/au1000/common/platform.c

+0 −54
Original line number Diff line number Diff line
@@ -233,19 +233,6 @@ static struct resource au1200_lcd_resources[] = { 
	}

};



static struct resource au1200_ide0_resources[] = {

	[0] = {

		.start		= AU1XXX_ATA_PHYS_ADDR,

		.end 		= AU1XXX_ATA_PHYS_ADDR + AU1XXX_ATA_PHYS_LEN - 1,

		.flags		= IORESOURCE_MEM,

	},

	[1] = {

		.start		= AU1XXX_ATA_INT,

		.end		= AU1XXX_ATA_INT,

		.flags		= IORESOURCE_IRQ,

	}

};



static u64 au1200_lcd_dmamask = ~(u32)0;



static struct platform_device au1200_lcd_device = {
@@ -259,20 +246,6 @@ static struct platform_device au1200_lcd_device = { 
	.resource       = au1200_lcd_resources,

};





static u64 ide0_dmamask = ~(u32)0;



static struct platform_device au1200_ide0_device = {

	.name		= "au1200-ide",

	.id		= 0,

	.dev = {

		.dma_mask 		= &ide0_dmamask,

		.coherent_dma_mask	= 0xffffffff,

	},

	.num_resources = ARRAY_SIZE(au1200_ide0_resources),

	.resource	= au1200_ide0_resources,

};



static u64 au1xxx_mmc_dmamask =  ~(u32)0;



static struct platform_device au1xxx_mmc_device = {
@@ -292,29 +265,6 @@ static struct platform_device au1x00_pcmcia_device = { 
	.id 		= 0,

};



#if defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200)

static struct resource smc91x_resources[] = {

	[0] = {

		.name	= "smc91x-regs",

		.start	= AU1XXX_SMC91111_PHYS_ADDR,

		.end	= AU1XXX_SMC91111_PHYS_ADDR + 0xf,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= AU1XXX_SMC91111_IRQ,

		.end	= AU1XXX_SMC91111_IRQ,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device smc91x_device = {

	.name		= "smc91x",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(smc91x_resources),

	.resource	= smc91x_resources,

};

#endif /* defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200) */



/* All Alchemy demoboards with I2C have this #define in their headers */

#ifdef SMBUS_PSC_BASE

static struct resource pbdb_smbus_resources[] = {
@@ -345,12 +295,8 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = { 
	&au1xxx_usb_gdt_device,

	&au1xxx_usb_otg_device,

	&au1200_lcd_device,

	&au1200_ide0_device,

	&au1xxx_mmc_device,

#endif

#if defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200)

	&smc91x_device,

#endif

#ifdef SMBUS_PSC_BASE

	&pbdb_smbus_device,

#endif

arch/mips/au1000/pb1200/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,5 +3,6 @@ 
#



lib-y := init.o board_setup.o irqmap.o

obj-y += platform.o



EXTRA_CFLAGS += -Werror

arch/mips/au1000/pb1200/platform.c

0 → 100644
+84 −0
Original line number Diff line number Diff line 
/*

 * Pb1200/DBAu1200 board platform device registration

 *

 * Copyright (C) 2008 MontaVista Software Inc. <source@mvista.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#include <linux/init.h>

#include <linux/platform_device.h>



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



static struct resource ide_resources[] = {

	[0] = {

		.start	= IDE_PHYS_ADDR,

		.end 	= IDE_PHYS_ADDR + IDE_PHYS_LEN - 1,

		.flags	= IORESOURCE_MEM

	},

	[1] = {

		.start	= IDE_INT,

		.end	= IDE_INT,

		.flags	= IORESOURCE_IRQ

	}

};



static u64 ide_dmamask = ~(u32)0;



static struct platform_device ide_device = {

	.name		= "au1200-ide",

	.id		= 0,

	.dev = {

		.dma_mask 		= &ide_dmamask,

		.coherent_dma_mask	= 0xffffffff,

	},

	.num_resources	= ARRAY_SIZE(ide_resources),

	.resource	= ide_resources

};



static struct resource smc91c111_resources[] = {

	[0] = {

		.name	= "smc91x-regs",

		.start	= SMC91C111_PHYS_ADDR,

		.end	= SMC91C111_PHYS_ADDR + 0xf,

		.flags	= IORESOURCE_MEM

	},

	[1] = {

		.start	= SMC91C111_INT,

		.end	= SMC91C111_INT,

		.flags	= IORESOURCE_IRQ

	},

};



static struct platform_device smc91c111_device = {

	.name		= "smc91x",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(smc91c111_resources),

	.resource	= smc91c111_resources

};



static struct platform_device *board_platform_devices[] __initdata = {

	&ide_device,

	&smc91c111_device

};



static int __init board_register_devices(void)

{

	return platform_add_devices(board_platform_devices,

				    ARRAY_SIZE(board_platform_devices));

}



arch_initcall(board_register_devices);

drivers/ide/mips/au1xxx-ide.c

+4 −4
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ static void auide_ddma_rx_callback(int irq, void *param) 
static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 devwidth, u32 flags)

{

	dev->dev_id          = dev_id;

	dev->dev_physaddr    = (u32)AU1XXX_ATA_PHYS_ADDR;

	dev->dev_physaddr    = (u32)IDE_PHYS_ADDR;

	dev->dev_intlevel    = 0;

	dev->dev_intpolarity = 0;

	dev->dev_tsize       = tsize;
@@ -397,7 +397,7 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d) 
	dbdev_tab_t source_dev_tab, target_dev_tab;

	u32 dev_id, tsize, devwidth, flags;



	dev_id   = AU1XXX_ATA_DDMA_REQ;

	dev_id	 = IDE_DDMA_REQ;



	tsize    =  8; /*  1 */

	devwidth = 32; /* 16 */
@@ -506,10 +506,10 @@ static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif) 


	/* FIXME? */

	for (i = 0; i < 8; i++)

		*ata_regs++ = ahwif->regbase + (i << AU1XXX_ATA_REG_OFFSET);

		*ata_regs++ = ahwif->regbase + (i << IDE_REG_SHIFT);



	/* set the Alternative Status register */

	*ata_regs = ahwif->regbase + (14 << AU1XXX_ATA_REG_OFFSET);

	*ata_regs = ahwif->regbase + (14 << IDE_REG_SHIFT);

}



static const struct ide_port_ops au1xxx_port_ops = {

include/asm-mips/mach-db1x00/db1200.h

+9 −9
Original line number Diff line number Diff line
@@ -169,15 +169,15 @@ static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR; 
#define BCSR_INT_SD0INSERT	0x1000

#define BCSR_INT_SD0EJECT	0x2000



#define AU1XXX_SMC91111_PHYS_ADDR	(0x19000300)

#define AU1XXX_SMC91111_IRQ			DB1200_ETH_INT



#define AU1XXX_ATA_PHYS_ADDR		(0x18800000)

#define AU1XXX_ATA_REG_OFFSET		(5)

#define AU1XXX_ATA_PHYS_LEN		(16 << AU1XXX_ATA_REG_OFFSET)

#define AU1XXX_ATA_INT			DB1200_IDE_INT

#define AU1XXX_ATA_DDMA_REQ		DSCR_CMD0_DMA_REQ1;

#define AU1XXX_ATA_RQSIZE		128

#define SMC91C111_PHYS_ADDR	0x19000300

#define SMC91C111_INT		DB1200_ETH_INT



#define IDE_PHYS_ADDR		0x18800000

#define IDE_REG_SHIFT		5

#define IDE_PHYS_LEN		(16 << IDE_REG_SHIFT)

#define IDE_INT 		DB1200_IDE_INT

#define IDE_DDMA_REQ		DSCR_CMD0_DMA_REQ1

#define IDE_RQSIZE		128



#define NAND_PHYS_ADDR   0x20000000

CRA Git | Maintained and supported by SUSTech CRA and CCSE