Merge branch 'amba' into for-armsoc (dcf81c1a) · Commits · e / devices / android_kernel_teracube_2e

arch/arm/mach-bcmring/core.c

+2 −21

Original line number	Diff line number	Diff line
		@@ -52,27 +52,8 @@
		#include <mach/csp/chipcHw_inline.h>
		#include <mach/csp/tmrHw_reg.h>

		#define AMBA_DEVICE(name, initname, base, plat, size) \
		static struct amba_device name##_device = { \
		.dev = { \
		.coherent_dma_mask = ~0, \
		.init_name = initname, \
		.platform_data = plat \
		}, \
		.res = { \
		.start = MM_ADDR_IO_##base, \
		.end = MM_ADDR_IO_##base + (size) - 1, \
		.flags = IORESOURCE_MEM \
		}, \
		.dma_mask = ~0, \
		.irq = { \
		IRQ_##base \
		} \
		}


		AMBA_DEVICE(uartA, "uarta", UARTA, NULL, SZ_4K);
		AMBA_DEVICE(uartB, "uartb", UARTB, NULL, SZ_4K);
		static AMBA_APB_DEVICE(uartA, "uarta", MM_ADDR_IO_UARTA, { IRQ_UARTA }, NULL);
		static AMBA_APB_DEVICE(uartB, "uartb", MM_ADDR_IO_UARTB, { IRQ_UARTB }, NULL);

		static struct clk pll1_clk = {
		.name = "PLL1",

arch/arm/mach-ep93xx/core.c

+6 −40

Original line number	Diff line number	Diff line
		@@ -279,48 +279,14 @@ static struct amba_pl010_data ep93xx_uart_data = {
		.set_mctrl = ep93xx_uart_set_mctrl,
		};

		static struct amba_device uart1_device = {
		.dev = {
		.init_name = "apb:uart1",
		.platform_data = &ep93xx_uart_data,
		},
		.res = {
		.start = EP93XX_UART1_PHYS_BASE,
		.end = EP93XX_UART1_PHYS_BASE + 0x0fff,
		.flags = IORESOURCE_MEM,
		},
		.irq = { IRQ_EP93XX_UART1, NO_IRQ },
		.periphid = 0x00041010,
		};

		static struct amba_device uart2_device = {
		.dev = {
		.init_name = "apb:uart2",
		.platform_data = &ep93xx_uart_data,
		},
		.res = {
		.start = EP93XX_UART2_PHYS_BASE,
		.end = EP93XX_UART2_PHYS_BASE + 0x0fff,
		.flags = IORESOURCE_MEM,
		},
		.irq = { IRQ_EP93XX_UART2, NO_IRQ },
		.periphid = 0x00041010,
		};
		static AMBA_APB_DEVICE(uart1, "apb:uart1", 0x00041010, EP93XX_UART1_PHYS_BASE,
		{ IRQ_EP93XX_UART1 }, &ep93xx_uart_data);

		static struct amba_device uart3_device = {
		.dev = {
		.init_name = "apb:uart3",
		.platform_data = &ep93xx_uart_data,
		},
		.res = {
		.start = EP93XX_UART3_PHYS_BASE,
		.end = EP93XX_UART3_PHYS_BASE + 0x0fff,
		.flags = IORESOURCE_MEM,
		},
		.irq = { IRQ_EP93XX_UART3, NO_IRQ },
		.periphid = 0x00041010,
		};
		static AMBA_APB_DEVICE(uart2, "apb:uart2", 0x00041010, EP93XX_UART2_PHYS_BASE,
		{ IRQ_EP93XX_UART2 }, &ep93xx_uart_data);

		static AMBA_APB_DEVICE(uart3, "apb:uart3", 0x00041010, EP93XX_UART3_PHYS_BASE,
		{ IRQ_EP93XX_UART3 }, &ep93xx_uart_data);

		static struct resource ep93xx_rtc_resource[] = {
		{

arch/arm/mach-exynos/dma.c

+6 −32

Original line number	Diff line number	Diff line
		@@ -74,21 +74,8 @@ struct dma_pl330_platdata exynos4_pdma0_pdata = {
		.peri_id = pdma0_peri,
		};

		struct amba_device exynos4_device_pdma0 = {
		.dev = {
		.init_name = "dma-pl330.0",
		.dma_mask = &dma_dmamask,
		.coherent_dma_mask = DMA_BIT_MASK(32),
		.platform_data = &exynos4_pdma0_pdata,
		},
		.res = {
		.start = EXYNOS4_PA_PDMA0,
		.end = EXYNOS4_PA_PDMA0 + SZ_4K,
		.flags = IORESOURCE_MEM,
		},
		.irq = {IRQ_PDMA0, NO_IRQ},
		.periphid = 0x00041330,
		};
		AMBA_AHB_DEVICE(exynos4_pdma0, "dma-pl330.0", 0x00041330, EXYNOS4_PA_PDMA0,
		{IRQ_PDMA0}, &exynos4_pdma0_pdata);

		u8 pdma1_peri[] = {
		DMACH_PCM0_RX,
		@@ -123,21 +110,8 @@ struct dma_pl330_platdata exynos4_pdma1_pdata = {
		.peri_id = pdma1_peri,
		};

		struct amba_device exynos4_device_pdma1 = {
		.dev = {
		.init_name = "dma-pl330.1",
		.dma_mask = &dma_dmamask,
		.coherent_dma_mask = DMA_BIT_MASK(32),
		.platform_data = &exynos4_pdma1_pdata,
		},
		.res = {
		.start = EXYNOS4_PA_PDMA1,
		.end = EXYNOS4_PA_PDMA1 + SZ_4K,
		.flags = IORESOURCE_MEM,
		},
		.irq = {IRQ_PDMA1, NO_IRQ},
		.periphid = 0x00041330,
		};
		AMBA_AHB_DEVICE(exynos4_pdma1, "dma-pl330.1", 0x00041330, EXYNOS4_PA_PDMA1,
		{IRQ_PDMA1}, &exynos4_pdma1_pdata);

		static int __init exynos4_dma_init(void)
		{
		@@ -146,11 +120,11 @@ static int __init exynos4_dma_init(void)

		dma_cap_set(DMA_SLAVE, exynos4_pdma0_pdata.cap_mask);
		dma_cap_set(DMA_CYCLIC, exynos4_pdma0_pdata.cap_mask);
		amba_device_register(&exynos4_device_pdma0, &iomem_resource);
		amba_device_register(&exynos4_pdma0_device, &iomem_resource);

		dma_cap_set(DMA_SLAVE, exynos4_pdma1_pdata.cap_mask);
		dma_cap_set(DMA_CYCLIC, exynos4_pdma1_pdata.cap_mask);
		amba_device_register(&exynos4_device_pdma1, &iomem_resource);
		amba_device_register(&exynos4_pdma1_device, &iomem_resource);

		return 0;
		}

arch/arm/mach-integrator/core.c

+13 −57

Original line number	Diff line number	Diff line
		@@ -35,67 +35,23 @@

		static struct amba_pl010_data integrator_uart_data;

		static struct amba_device rtc_device = {
		.dev = {
		.init_name = "mb:15",
		},
		.res = {
		.start = INTEGRATOR_RTC_BASE,
		.end = INTEGRATOR_RTC_BASE + SZ_4K - 1,
		.flags = IORESOURCE_MEM,
		},
		.irq = { IRQ_RTCINT, NO_IRQ },
		};
		#define INTEGRATOR_RTC_IRQ { IRQ_RTCINT }
		#define INTEGRATOR_UART0_IRQ { IRQ_UARTINT0 }
		#define INTEGRATOR_UART1_IRQ { IRQ_UARTINT1 }
		#define KMI0_IRQ { IRQ_KMIINT0 }
		#define KMI1_IRQ { IRQ_KMIINT1 }

		static struct amba_device uart0_device = {
		.dev = {
		.init_name = "mb:16",
		.platform_data = &integrator_uart_data,
		},
		.res = {
		.start = INTEGRATOR_UART0_BASE,
		.end = INTEGRATOR_UART0_BASE + SZ_4K - 1,
		.flags = IORESOURCE_MEM,
		},
		.irq = { IRQ_UARTINT0, NO_IRQ },
		};
		static AMBA_APB_DEVICE(rtc, "mb:15", 0,
		INTEGRATOR_RTC_BASE, INTEGRATOR_RTC_IRQ, NULL);

		static struct amba_device uart1_device = {
		.dev = {
		.init_name = "mb:17",
		.platform_data = &integrator_uart_data,
		},
		.res = {
		.start = INTEGRATOR_UART1_BASE,
		.end = INTEGRATOR_UART1_BASE + SZ_4K - 1,
		.flags = IORESOURCE_MEM,
		},
		.irq = { IRQ_UARTINT1, NO_IRQ },
		};
		static AMBA_APB_DEVICE(uart0, "mb:16", 0,
		INTEGRATOR_UART0_BASE, INTEGRATOR_UART0_IRQ, &integrator_uart_data);

		static struct amba_device kmi0_device = {
		.dev = {
		.init_name = "mb:18",
		},
		.res = {
		.start = KMI0_BASE,
		.end = KMI0_BASE + SZ_4K - 1,
		.flags = IORESOURCE_MEM,
		},
		.irq = { IRQ_KMIINT0, NO_IRQ },
		};
		static AMBA_APB_DEVICE(uart1, "mb:17", 0,
		INTEGRATOR_UART1_BASE, INTEGRATOR_UART1_IRQ, &integrator_uart_data);

		static struct amba_device kmi1_device = {
		.dev = {
		.init_name = "mb:19",
		},
		.res = {
		.start = KMI1_BASE,
		.end = KMI1_BASE + SZ_4K - 1,
		.flags = IORESOURCE_MEM,
		},
		.irq = { IRQ_KMIINT1, NO_IRQ },
		};
		static AMBA_APB_DEVICE(kmi0, "mb:18", 0, KMI0_BASE, KMI0_IRQ, NULL);
		static AMBA_APB_DEVICE(kmi1, "mb:19", 0, KMI1_BASE, KMI1_IRQ, NULL);

		static struct amba_device *amba_devs[] __initdata = {
		&rtc_device,

arch/arm/mach-integrator/impd1.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -401,24 +401,21 @@ static int impd1_probe(struct lm_device *dev)

		pc_base = dev->resource.start + idev->offset;

		d = kzalloc(sizeof(struct amba_device), GFP_KERNEL);
		d = amba_device_alloc(NULL, pc_base, SZ_4K);
		if (!d)
		continue;

		dev_set_name(&d->dev, "lm%x:%5.5lx", dev->id, idev->offset >> 12);
		d->dev.parent = &dev->dev;
		d->res.start = dev->resource.start + idev->offset;
		d->res.end = d->res.start + SZ_4K - 1;
		d->res.flags = IORESOURCE_MEM;
		d->irq[0] = dev->irq;
		d->irq[1] = dev->irq;
		d->periphid = idev->id;
		d->dev.platform_data = idev->platform_data;

		ret = amba_device_register(d, &dev->resource);
		ret = amba_device_add(d, &dev->resource);
		if (ret) {
		dev_err(&d->dev, "unable to register device: %d\n", ret);
		kfree(d);
		amba_device_put(d);
		}
		}