MIPS: TXx9: Add DMAC support (f48c8c95) · Commits · 戴 / test

arch/mips/include/asm/txx9/dmac.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -45,4 +45,7 @@ struct txx9dmac_slave {
		unsigned int reg_width;
		};

		void txx9_dmac_init(int id, unsigned long baseaddr, int irq,
		const struct txx9dmac_platform_data *pdata);

		#endif /* __ASM_TXX9_DMAC_H */

arch/mips/include/asm/txx9/tx4927.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@

		#define TX4927_SDRAMC_REG (TX4927_REG_BASE + 0x8000)
		#define TX4927_EBUSC_REG (TX4927_REG_BASE + 0x9000)
		#define TX4927_DMA_REG (TX4927_REG_BASE + 0xb000)
		#define TX4927_PCIC_REG (TX4927_REG_BASE + 0xd000)
		#define TX4927_CCFG_REG (TX4927_REG_BASE + 0xe000)
		#define TX4927_IRC_REG (TX4927_REG_BASE + 0xf600)
		@@ -265,5 +266,6 @@ int tx4927_pciclk66_setup(void);
		void tx4927_setup_pcierr_irq(void);
		void tx4927_irq_init(void);
		void tx4927_mtd_init(int ch);
		void tx4927_dmac_init(int memcpy_chan);

		#endif /* __ASM_TXX9_TX4927_H */

arch/mips/include/asm/txx9/tx4938.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -305,5 +305,6 @@ struct tx4938ide_platform_info {
		};

		void tx4938_ata_init(unsigned int irq, unsigned int shift, int tune);
		void tx4938_dmac_init(int memcpy_chan0, int memcpy_chan1);

		#endif

arch/mips/include/asm/txx9/tx4939.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -544,5 +544,6 @@ void tx4939_ata_init(void);
		void tx4939_rtc_init(void);
		void tx4939_ndfmc_init(unsigned int hold, unsigned int spw,
		unsigned char ch_mask, unsigned char wide_mask);
		void tx4939_dmac_init(int memcpy_chan0, int memcpy_chan1);

		#endif /* __ASM_TXX9_TX4939_H */

arch/mips/txx9/generic/setup.c

+55 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include <asm/txx9/pci.h>
		#include <asm/txx9tmr.h>
		#include <asm/txx9/ndfmc.h>
		#include <asm/txx9/dmac.h>
		#ifdef CONFIG_CPU_TX49XX
		#include <asm/txx9/tx4938.h>
		#endif
		@@ -821,3 +822,57 @@ void __init txx9_iocled_init(unsigned long baseaddr,
		{
		}
		#endif /* CONFIG_LEDS_GPIO */

		void __init txx9_dmac_init(int id, unsigned long baseaddr, int irq,
		const struct txx9dmac_platform_data *pdata)
		{
		#if defined(CONFIG_TXX9_DMAC) \|\| defined(CONFIG_TXX9_DMAC_MODULE)
		struct resource res[] = {
		{
		.start = baseaddr,
		.end = baseaddr + 0x800 - 1,
		.flags = IORESOURCE_MEM,
		#ifndef CONFIG_MACH_TX49XX
		}, {
		.start = irq,
		.flags = IORESOURCE_IRQ,
		#endif
		}
		};
		#ifdef CONFIG_MACH_TX49XX
		struct resource chan_res[] = {
		{
		.flags = IORESOURCE_IRQ,
		}
		};
		#endif
		struct platform_device *pdev = platform_device_alloc("txx9dmac", id);
		struct txx9dmac_chan_platform_data cpdata;
		int i;

		if (!pdev \|\|
		platform_device_add_resources(pdev, res, ARRAY_SIZE(res)) \|\|
		platform_device_add_data(pdev, pdata, sizeof(*pdata)) \|\|
		platform_device_add(pdev)) {
		platform_device_put(pdev);
		return;
		}
		memset(&cpdata, 0, sizeof(cpdata));
		cpdata.dmac_dev = pdev;
		for (i = 0; i < TXX9_DMA_MAX_NR_CHANNELS; i++) {
		#ifdef CONFIG_MACH_TX49XX
		chan_res[0].start = irq + i;
		#endif
		pdev = platform_device_alloc("txx9dmac-chan",
		id * TXX9_DMA_MAX_NR_CHANNELS + i);
		if (!pdev \|\|
		#ifdef CONFIG_MACH_TX49XX
		platform_device_add_resources(pdev, chan_res,
		ARRAY_SIZE(chan_res)) \|\|
		#endif
		platform_device_add_data(pdev, &cpdata, sizeof(cpdata)) \|\|
		platform_device_add(pdev))
		platform_device_put(pdev);
		}
		#endif
		}

Admin message