diff options
| author | Olof Johansson <olof@lixom.net> | 2016-07-06 08:46:39 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-07-06 08:46:39 +0300 |
| commit | 8fe9c8b750ca294882b163100817f97866990481 (patch) | |
| tree | 7435b319f3f8b4c112143621d34a3c6640297d62 /arch/arm/boot/dts/exynos5800-peach-pi.dts | |
| parent | 355e5ce71f8e72741ea3ef1c00d77e96b518aaa2 (diff) | |
| parent | 9f7d27fa1b0b3685471a1a34223a3475943f53e4 (diff) | |
| download | linux-8fe9c8b750ca294882b163100817f97866990481.tar.xz | |
Merge tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt
Topic branch for Exynos MFC changes for v4.8, part 2:
Replace hardcoded reserved memory ranges with auto-allocated ones
and enable MFC for all boards.
* tag 'samsung-drivers-exynos-mfc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: dts: exynos: enable MFC device for all boards
ARM: dts: exynos: move MFC reserved memory regions from boards to .dtsi
ARM: dts: exynos: replace hardcoded reserved memory ranges with auto-allocated ones
ARM: dts: exynos: Enable MFC device on Exynos4412 Odroid boards
ARM: dts: exynos: Convert MFC device to generic reserved memory bindings
ARM: EXYNOS: Remove code for MFC custom reserved memory handling
media: s5p-mfc: add iommu support
media: s5p-mfc: replace custom reserved memory handling code with generic one
media: s5p-mfc: use generic reserved memory bindings
of: reserved_mem: add support for using more than one region for given device
media: set proper max seg size for devices on Exynos SoCs
media: vb2-dma-contig: add helper for setting dma max seg size
s5p-mfc: Fix race between s5p_mfc_probe() and s5p_mfc_open()
s5p-mfc: Add release callback for memory region devs
s5p-mfc: Set device name for reserved memory region devs
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/exynos5800-peach-pi.dts')
| -rw-r--r-- | arch/arm/boot/dts/exynos5800-peach-pi.dts | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/exynos5800-peach-pi.dts b/arch/arm/boot/dts/exynos5800-peach-pi.dts index 203c8da4d58e..5ec71e2400fd 100644 --- a/arch/arm/boot/dts/exynos5800-peach-pi.dts +++ b/arch/arm/boot/dts/exynos5800-peach-pi.dts @@ -16,6 +16,7 @@ #include <dt-bindings/regulator/maxim,max77802.h> #include "exynos5800.dtsi" #include "exynos5420-cpus.dtsi" +#include "exynos-mfc-reserved-memory.dtsi" / { model = "Google Peach Pi Rev 10+"; @@ -663,11 +664,6 @@ status = "okay"; }; -&mfc { - samsung,mfc-r = <0x43000000 0x800000>; - samsung,mfc-l = <0x51000000 0x800000>; -}; - &mmc_0 { status = "okay"; num-slots = <1>; |