diff options
author | Shaik Ameer Basha <shaik.ameer@samsung.com> | 2012-09-07 01:13:08 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-09-07 01:13:08 -0400 |
commit | 1128658a0841dbfdc95dc2e3e8d573e4eb1f6a40 (patch) | |
tree | 3874dac8a0af783d71008ad0837b2cefc54d65d2 /arch/arm/mach-exynos | |
parent | 2822d3187b22abda46e90d3dcd4dddc6b86427fd (diff) |
ARM: EXYNOS: Adds G-Scaler device from Device Tree
This patch adds,
- 4 G-Scaler devices to the DT device list
- G-Scaler specific entries to the machine file
- binding documentation for G-Scaler entries
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r-- | arch/arm/mach-exynos/include/mach/map.h | 5 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index c72b675b3e4b..0300d7adc151 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h | |||
@@ -121,6 +121,11 @@ | |||
121 | #define EXYNOS4_PA_SYSMMU_MFC_L 0x13620000 | 121 | #define EXYNOS4_PA_SYSMMU_MFC_L 0x13620000 |
122 | #define EXYNOS4_PA_SYSMMU_MFC_R 0x13630000 | 122 | #define EXYNOS4_PA_SYSMMU_MFC_R 0x13630000 |
123 | 123 | ||
124 | #define EXYNOS5_PA_GSC0 0x13E00000 | ||
125 | #define EXYNOS5_PA_GSC1 0x13E10000 | ||
126 | #define EXYNOS5_PA_GSC2 0x13E20000 | ||
127 | #define EXYNOS5_PA_GSC3 0x13E30000 | ||
128 | |||
124 | #define EXYNOS5_PA_SYSMMU_MDMA1 0x10A40000 | 129 | #define EXYNOS5_PA_SYSMMU_MDMA1 0x10A40000 |
125 | #define EXYNOS5_PA_SYSMMU_SSS 0x10A50000 | 130 | #define EXYNOS5_PA_SYSMMU_SSS 0x10A50000 |
126 | #define EXYNOS5_PA_SYSMMU_2D 0x10A60000 | 131 | #define EXYNOS5_PA_SYSMMU_2D 0x10A60000 |
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index ef770bc2318f..e707eb1b1eab 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c | |||
@@ -56,6 +56,14 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { | |||
56 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL), | 56 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL), |
57 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL), | 57 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL), |
58 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL), | 58 | OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL), |
59 | OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC0, | ||
60 | "exynos-gsc.0", NULL), | ||
61 | OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC1, | ||
62 | "exynos-gsc.1", NULL), | ||
63 | OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC2, | ||
64 | "exynos-gsc.2", NULL), | ||
65 | OF_DEV_AUXDATA("samsung,exynos5-gsc", EXYNOS5_PA_GSC3, | ||
66 | "exynos-gsc.3", NULL), | ||
59 | {}, | 67 | {}, |
60 | }; | 68 | }; |
61 | 69 | ||