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

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

MIPS, IDE: Alchem, au1xxx-ide: Remove pb1200/db1200 header dep 



au1xxx-ide uses defines from the pb1200/db1200 headers:
get DBDMA ID through platform resource information,
hardcode register spacing.  The only 2 users of this driver (and
the only boards it can really work on realiably) use the same
register layout.

Signed-off-by: default avatarManuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-ide@vger.kernel.org
To: Linux-MIPS <linux-mips@linux-mips.org>
Cc: linux-ide@vger.kernel.org
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Patchwork: https://patchwork.linux-mips.org/patch/2716/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 7517de34

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

+6 −1
Original line number Diff line number Diff line
@@ -213,7 +213,12 @@ static struct resource db1200_ide_res[] = { 
		.start	= DB1200_IDE_INT,

		.end	= DB1200_IDE_INT,

		.flags	= IORESOURCE_IRQ,

	}

	},

	[2] = {

		.start	= DSCR_CMD0_DMA_REQ1,

		.end	= DSCR_CMD0_DMA_REQ1,

		.flags	= IORESOURCE_DMA,

	},

};



static u64 ide_dmamask = DMA_BIT_MASK(32);

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

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


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

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

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

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



#include "../platform.h"
@@ -115,7 +116,12 @@ static struct resource ide_resources[] = { 
		.start	= IDE_INT,

		.end	= IDE_INT,

		.flags	= IORESOURCE_IRQ

	}

	},

	[2] = {

		.start	= DSCR_CMD0_DMA_REQ1,

		.end	= DSCR_CMD0_DMA_REQ1,

		.flags	= IORESOURCE_DMA,

	},

};



static u64 ide_dmamask = DMA_BIT_MASK(32);

arch/mips/include/asm/mach-au1x00/au1xxx_ide.h

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ typedef struct { 
#endif

	int			irq;

	u32			regbase;

	int			ddma_id;

} _auide_hwif;



/******************************************************************************/

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

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 


#define IDE_PHYS_ADDR		0x18800000

#define IDE_REG_SHIFT		5

#define IDE_DDMA_REQ		DSCR_CMD0_DMA_REQ1

#define IDE_RQSIZE		128



#define DB1200_IDE_PHYS_ADDR	IDE_PHYS_ADDR

#define DB1200_IDE_PHYS_LEN	(16 << IDE_REG_SHIFT)

arch/mips/include/asm/mach-pb1x00/pb1200.h

+0 −2
Original line number Diff line number Diff line
@@ -76,8 +76,6 @@ 
#define IDE_REG_SHIFT		5

#define IDE_PHYS_LEN		(16 << IDE_REG_SHIFT)

#define IDE_INT 		PB1200_IDE_INT

#define IDE_DDMA_REQ		DSCR_CMD0_DMA_REQ1

#define IDE_RQSIZE		128



#define NAND_PHYS_ADDR 	0x1C000000