summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-08-22 08:25:10 -0700
committerKevin Hilman <khilman@linaro.org>2013-08-22 08:25:36 -0700
commit5f5cc5cd7ce253e1d24be21dc07a430cb33a1529 (patch)
tree9c291e7e37b1bd4b1d6491f1904c1d875cf799f5 /Documentation
parent656d79cafc88137c87c0f6ac85080ce5dae2234b (diff)
parent6f9d02a056fff8e965da0f940a09d4c39a4fe80a (diff)
downloadlinux-stable-5f5cc5cd7ce253e1d24be21dc07a430cb33a1529.tar.gz
linux-stable-5f5cc5cd7ce253e1d24be21dc07a430cb33a1529.tar.bz2
linux-stable-5f5cc5cd7ce253e1d24be21dc07a430cb33a1529.zip
Merge tag 'samsung-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
From Kukjin Kim: Samsung Exynos DT updates for v3.12 - update codec, pmic, usb hub for Arndale - add exynos4412-trats 2 board dt - update camera, spi, sensor for Trats2 - update fimc, sensor for Trats - add support tmu for exynos5440 - add support g2d for exynos5250 - correct camera pinctrl for exynos4x12 - add support camera subsystem for exynos4 - add support basic pm domain, fimd, dp for exynos5420 - add support secure-firmware for OrigenQuad - update mfc and add support mfc for exynos5420 - add usb host node for exynos4 * tag 'samsung-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (38 commits) ARM: dts: Add USB host node for Exynos4 ARM: dts: add audio clock controller for exynos5420 ARM: dts: Correct the /include entry on exynos5420 dtsi file ARM: dts: Add MFC node for exynos 5420 ARM: dts: Update 5250 MFC node ARM: dts: Remove unsused MFC clock from exynos4 ARM: dts: Update clocks entry in MFC binding documentation ARM: dts: Hook up internal PHY on Arndale ARM: dts: Enable USB hub on Arndale ARM: dts: Add secure-firmware boot support for OrigenQaud board ARM: dts: Add pin state information for DP HPD support to Exynos5420 ARM: dts: Add DP controller DT node to exynos5420 SoC ARM: dts: Update DP controller DT Node for Exynos5 based SoCs ARM: dts: Add FIMD DT node to exynos5420 DTS files ARM: dts: Add basic PM domains for EXYNOS5420 ARM: dts: Update FIMD DT node for Exynos5 SoCs ARM: dts: Move display-timing information inside FIMD DT node for exynos5250 ARM: dts: Add S5K5BA sensor regulator definitions for Trats board ARM: dts: Add Exynos4210 SoC camera port pinctrl nodes ARM: dts: Add FIMC nodes for Exynos4210 Trats board ... Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/media/s5p-mfc.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index df37b0230c75..d75c3e589d43 100644
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -15,9 +15,9 @@ Required properties:
mapped region.
- interrupts : MFC interrupt number to the CPU.
- - clocks : from common clock binding: handle to mfc clocks.
- - clock-names : from common clock binding: must contain "sclk_mfc" and "mfc",
- corresponding to entries in the clocks property.
+ - clocks : from common clock binding: handle to mfc clock.
+ - clock-names : from common clock binding: must contain "mfc",
+ corresponding to entry in the clocks property.
- samsung,mfc-r : Base address of the first memory bank used by MFC
for DMA contiguous memory allocation and its size.
@@ -37,8 +37,8 @@ mfc: codec@13400000 {
reg = <0x13400000 0x10000>;
interrupts = <0 94 0>;
samsung,power-domain = <&pd_mfc>;
- clocks = <&clock 170>, <&clock 273>;
- clock-names = "sclk_mfc", "mfc";
+ clocks = <&clock 273>;
+ clock-names = "mfc";
};
Board specific DT entry: