diff options
author | Olof Johansson <olof@lixom.net> | 2012-03-13 19:22:20 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-03-13 19:22:20 -0400 |
commit | 6307e418251240c2d18b3d69b96e50176c51a113 (patch) | |
tree | 425dd6e83c560d05afdbd5578da5003a117a20dc /arch/arm/plat-samsung | |
parent | f3d88244dbaf0ba5e4c719f6d5c1a263e85e6bd6 (diff) | |
parent | efd9960b0e1bdfe48490504a8166ffdbcc466dba (diff) |
Merge branch 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers
* 'next/devel-samsung-dma' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
ARM: EXYNOS: Enable MDMA driver
(includes dependent base of samsung/cleanup-exynos-clock)
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/devs.c | 13 | ||||
-rw-r--r-- | arch/arm/plat-samsung/dma-ops.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/dma-pl330.h | 16 |
3 files changed, 18 insertions, 13 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index f10768e988d..98b864777a3 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c | |||
@@ -744,17 +744,6 @@ struct platform_device s3c_device_iis = { | |||
744 | }; | 744 | }; |
745 | #endif /* CONFIG_PLAT_S3C24XX */ | 745 | #endif /* CONFIG_PLAT_S3C24XX */ |
746 | 746 | ||
747 | #ifdef CONFIG_CPU_S3C2440 | ||
748 | struct platform_device s3c2412_device_iis = { | ||
749 | .name = "s3c2412-iis", | ||
750 | .id = -1, | ||
751 | .dev = { | ||
752 | .dma_mask = &samsung_device_dma_mask, | ||
753 | .coherent_dma_mask = DMA_BIT_MASK(32), | ||
754 | } | ||
755 | }; | ||
756 | #endif /* CONFIG_CPU_S3C2440 */ | ||
757 | |||
758 | /* IDE CFCON */ | 747 | /* IDE CFCON */ |
759 | 748 | ||
760 | #ifdef CONFIG_SAMSUNG_DEV_IDE | 749 | #ifdef CONFIG_SAMSUNG_DEV_IDE |
@@ -1078,7 +1067,7 @@ static struct resource s5p_pmu_resource[] = { | |||
1078 | DEFINE_RES_IRQ(IRQ_PMU) | 1067 | DEFINE_RES_IRQ(IRQ_PMU) |
1079 | }; | 1068 | }; |
1080 | 1069 | ||
1081 | struct platform_device s5p_device_pmu = { | 1070 | static struct platform_device s5p_device_pmu = { |
1082 | .name = "arm-pmu", | 1071 | .name = "arm-pmu", |
1083 | .id = ARM_PMU_DEVICE_CPU, | 1072 | .id = ARM_PMU_DEVICE_CPU, |
1084 | .num_resources = ARRAY_SIZE(s5p_pmu_resource), | 1073 | .num_resources = ARRAY_SIZE(s5p_pmu_resource), |
diff --git a/arch/arm/plat-samsung/dma-ops.c b/arch/arm/plat-samsung/dma-ops.c index 0747c77a2fd..301d9c319d0 100644 --- a/arch/arm/plat-samsung/dma-ops.c +++ b/arch/arm/plat-samsung/dma-ops.c | |||
@@ -116,7 +116,7 @@ static inline int samsung_dmadev_flush(unsigned ch) | |||
116 | return dmaengine_terminate_all((struct dma_chan *)ch); | 116 | return dmaengine_terminate_all((struct dma_chan *)ch); |
117 | } | 117 | } |
118 | 118 | ||
119 | struct samsung_dma_ops dmadev_ops = { | 119 | static struct samsung_dma_ops dmadev_ops = { |
120 | .request = samsung_dmadev_request, | 120 | .request = samsung_dmadev_request, |
121 | .release = samsung_dmadev_release, | 121 | .release = samsung_dmadev_release, |
122 | .prepare = samsung_dmadev_prepare, | 122 | .prepare = samsung_dmadev_prepare, |
diff --git a/arch/arm/plat-samsung/include/plat/dma-pl330.h b/arch/arm/plat-samsung/include/plat/dma-pl330.h index c5eaad529de..0670f37aaae 100644 --- a/arch/arm/plat-samsung/include/plat/dma-pl330.h +++ b/arch/arm/plat-samsung/include/plat/dma-pl330.h | |||
@@ -82,6 +82,22 @@ enum dma_ch { | |||
82 | DMACH_SLIMBUS4_TX, | 82 | DMACH_SLIMBUS4_TX, |
83 | DMACH_SLIMBUS5_RX, | 83 | DMACH_SLIMBUS5_RX, |
84 | DMACH_SLIMBUS5_TX, | 84 | DMACH_SLIMBUS5_TX, |
85 | DMACH_MIPI_HSI0, | ||
86 | DMACH_MIPI_HSI1, | ||
87 | DMACH_MIPI_HSI2, | ||
88 | DMACH_MIPI_HSI3, | ||
89 | DMACH_MIPI_HSI4, | ||
90 | DMACH_MIPI_HSI5, | ||
91 | DMACH_MIPI_HSI6, | ||
92 | DMACH_MIPI_HSI7, | ||
93 | DMACH_MTOM_0, | ||
94 | DMACH_MTOM_1, | ||
95 | DMACH_MTOM_2, | ||
96 | DMACH_MTOM_3, | ||
97 | DMACH_MTOM_4, | ||
98 | DMACH_MTOM_5, | ||
99 | DMACH_MTOM_6, | ||
100 | DMACH_MTOM_7, | ||
85 | /* END Marker, also used to denote a reserved channel */ | 101 | /* END Marker, also used to denote a reserved channel */ |
86 | DMACH_MAX, | 102 | DMACH_MAX, |
87 | }; | 103 | }; |