diff options
author | Rahul Sharma <rahul.sharma@samsung.com> | 2012-10-29 08:51:36 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-10-29 08:51:36 -0400 |
commit | 5af0d8a372811c353ab7de5d161463f58aa2173a (patch) | |
tree | a86464da1a245458c4dcffad5d50d35af54b62b9 | |
parent | 566cf8eef26d99415aa8a542bd6bba6a719d2031 (diff) |
ARM: dts: add device tree support for exynos5 mixer
This patch adds support for device tree based discovery for exynos5
mixer. Mixer node is also renamed with "exynos5-mixer".
Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | Documentation/devicetree/bindings/drm/exynos/mixer.txt | 15 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 2 |
3 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/drm/exynos/mixer.txt b/Documentation/devicetree/bindings/drm/exynos/mixer.txt new file mode 100644 index 000000000000..9b2ea0343566 --- /dev/null +++ b/Documentation/devicetree/bindings/drm/exynos/mixer.txt | |||
@@ -0,0 +1,15 @@ | |||
1 | Device-Tree bindings for mixer driver | ||
2 | |||
3 | Required properties: | ||
4 | - compatible: value should be "samsung,exynos5-mixer". | ||
5 | - reg: physical base address of the mixer and length of memory mapped | ||
6 | region. | ||
7 | - interrupts: interrupt number to the cpu. | ||
8 | |||
9 | Example: | ||
10 | |||
11 | mixer { | ||
12 | compatible = "samsung,exynos5-mixer"; | ||
13 | reg = <0x14450000 0x10000>; | ||
14 | interrupts = <0 94 0>; | ||
15 | }; | ||
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index b68be1cab2e0..2a203e62f745 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -526,4 +526,10 @@ | |||
526 | reg = <0x14530000 0x100000>; | 526 | reg = <0x14530000 0x100000>; |
527 | interrupts = <0 95 0>; | 527 | interrupts = <0 95 0>; |
528 | }; | 528 | }; |
529 | |||
530 | mixer { | ||
531 | compatible = "samsung,exynos5-mixer"; | ||
532 | reg = <0x14450000 0x10000>; | ||
533 | interrupts = <0 94 0>; | ||
534 | }; | ||
529 | }; | 535 | }; |
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 5e38208e0d13..4fc15daf7c17 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c | |||
@@ -74,6 +74,8 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { | |||
74 | "exynos-gsc.3", NULL), | 74 | "exynos-gsc.3", NULL), |
75 | OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000, | 75 | OF_DEV_AUXDATA("samsung,exynos5-hdmi", 0x14530000, |
76 | "exynos5-hdmi", NULL), | 76 | "exynos5-hdmi", NULL), |
77 | OF_DEV_AUXDATA("samsung,exynos5-mixer", 0x14450000, | ||
78 | "exynos5-mixer", NULL), | ||
77 | {}, | 79 | {}, |
78 | }; | 80 | }; |
79 | 81 | ||