Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c441ab93 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-3' of... 

Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup3

Merge "Samsung 3rd DT updates for v3.15" from Kukjin Kim:

- Arndale Octa board updates:
  LDO3 and LDO23 enabled for soft-reset
  LDO9 enabled for USB operation
  MDMA1 disabled to avoid imprecise external abort

Note that this is based on previous tags/samsung-dt-2

* tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: dts: Keep some essential LDOs enabled for arndale-octa board
  ARM: dts: Disable MDMA1 node for arndale-octa board

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents efa25ffd 55ace6b2

arch/arm/boot/dts/exynos5420-arndale-octa.dts

+15 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
					regulator-name = "PVDD_APIO_MMCON_1V8";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				ldo4_reg: LDO4 {
@@ -150,6 +151,7 @@ 
					regulator-name = "PVDD_USB_3V3";

					regulator-min-microvolt = <3000000>;

					regulator-max-microvolt = <3000000>;

					regulator-always-on;

				};



				ldo10_reg: LDO10 {
@@ -218,6 +220,7 @@ 
					regulator-name = "PVDD_MIFS_1V1";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

				};



				ldo24_reg: LDO24 {
@@ -361,4 +364,16 @@ 
			gpio-key,wakeup;

		};

	};



	amba {

		mdma1: mdma@11C10000 {

			/*

			 * MDMA1 can support both secure and non-secure

			 * AXI transactions. When this is enabled in the kernel

			 * for boards that run in secure mode, we are getting

			 * imprecise external aborts causing the kernel to oops.

			 */

			status = "disabled";

		};

	};

};