Merge tag 'samsung-dt-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...

Samsung DeviceTree update for v4.11, second round:
1. Use bigger reserved memory region for Multi Format Codec on all Exynos
   chipsets so it could decode FullHD easily.

* tag 'samsung-dt-4.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Fix indentation of EHCI and OHCI ports
  ARM: dts: exynos: Increase MFC left reserved memory region size

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi b/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi
index f78c14c82e178857a33183a4a724d5015bc39eca..25186ac4188dfa235c5b6013c68ab6c7588ce691 100644 (file)
--- a/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi
+++ b/arch/arm/boot/dts/exynos-mfc-reserved-memory.dtsi
@@ -17,7 +17,7 @@
                mfc_left: region_mfc_left {
                        compatible = "shared-dma-pool";
                        no-map;
-                       size = <0x1000000>;
+                       size = <0x2400000>;
                        alignment = <0x100000>;
                };
 

diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 23d856010a5128f270b6dd6ae09e18c3df08e676..8fb0e00dd1bef1d551d5ad29ef0190da31bc72fe 100644 (file)
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -372,19 +372,19 @@
                #address-cells = <1>;
                #size-cells = <0>;
                port@0 {
-                   reg = <0>;
-                   phys = <&exynos_usbphy 1>;
-                   status = "disabled";
+                       reg = <0>;
+                       phys = <&exynos_usbphy 1>;
+                       status = "disabled";
                };
                port@1 {
-                   reg = <1>;
-                   phys = <&exynos_usbphy 2>;
-                   status = "disabled";
+                       reg = <1>;
+                       phys = <&exynos_usbphy 2>;
+                       status = "disabled";
                };
                port@2 {
-                   reg = <2>;
-                   phys = <&exynos_usbphy 3>;
-                   status = "disabled";
+                       reg = <2>;
+                       phys = <&exynos_usbphy 3>;
+                       status = "disabled";
                };
        };
 
@@ -398,9 +398,9 @@
                #address-cells = <1>;
                #size-cells = <0>;
                port@0 {
-                   reg = <0>;
-                   phys = <&exynos_usbphy 1>;
-                   status = "disabled";
+                       reg = <0>;
+                       phys = <&exynos_usbphy 1>;
+                       status = "disabled";
                };
        };