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

Commit fab4db0d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt 

Samsung DeviceTree updates and improvements for v4.6:
1. Add SROM controller device nodes.
2. Add Ethernet chip as child of SROM controller on SMDK5410.
3. Allow simultaneous usage exynos-rng and s5p-sss drivers on Exynos5.
4. Cleanup CPU configuration on Exynos542x/5800.
5. Add necessary nodes for cpufreq-dt driver on Exynos542x/5800 (OPPs,
   regulator supplies) which allows frequency and voltage scalling
   of this SoC.
6. Minor cleanups.

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

:
  ARM: dts: Replace legacy *,wakeup property with wakeup-source for exynos boards
  ARM: dts: Add GSCL block parent clock management to pm domain on exynos542x
  ARM: dts: Extend existing CPU OPP for exynos5800
  ARM: dts: Add CPU OPP properties for exynos542x/5800
  ARM: dts: Add cluster regulator supply properties for exynos542x/5800
  ARM: dts: Make CPU configuration more readable on exynos542x/5800
  ARM: dts: Replace legacy *,wakeup property with wakeup-source on s5pv210
  ARM: dts: Allow simultaneous usage exynos-rng and s5p-sss drivers on exynos5
  ARM: dts: Add Ethernet chip to exynos5410-smdk5410
  ARM: dts: Add SROM to exynos5410
  ARM: dts: Add SROM device node for exynos5
  ARM: dts: Add SROM device node for exynos4
  ARM: dts: Add pinctrl support to exynos5410

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fc2834a4 36a0282a

arch/arm/boot/dts/exynos3250-monk.dts

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
			linux,code = <KEY_POWER>;

			label = "power key";

			debounce-interval = <10>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};
@@ -67,7 +67,7 @@ 
			interrupt-parent = <&gpx1>;

			interrupts = <5 0>;

			reg = <0x25>;

			wakeup;

			wakeup-source;



			muic: max77836-muic {

				compatible = "maxim,max77836-muic";
@@ -185,7 +185,7 @@ 
		interrupt-parent = <&gpx0>;

		interrupts = <7 0>;

		reg = <0x66>;

		wakeup;

		wakeup-source;



		s2mps14_osc: clocks {

			compatible = "samsung,s2mps14-clk";

arch/arm/boot/dts/exynos3250-rinato.dts

+3 −3
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
			linux,code = <KEY_POWER>;

			label = "power key";

			debounce-interval = <10>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};
@@ -58,7 +58,7 @@ 
			interrupt-parent = <&gpx1>;

			interrupts = <5 0>;

			reg = <0x25>;

			wakeup;

			wakeup-source;



			muic: max77836-muic {

				compatible = "maxim,max77836-muic";
@@ -246,7 +246,7 @@ 
		interrupt-parent = <&gpx0>;

		interrupts = <7 0>;

		reg = <0x66>;

		wakeup;

		wakeup-source;



		s2mps14_osc: clocks {

			compatible = "samsung,s2mps14-clk";

arch/arm/boot/dts/exynos4.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -76,6 +76,11 @@ 
		reg = <0x10000000 0x100>;

	};



	sromc@12570000 {

		compatible = "samsung,exynos-srom";

		reg = <0x12570000 0x14>;

	};



	mipi_phy: video-phy@10020710 {

		compatible = "samsung,s5pv210-mipi-video-phy";

		#phy-cells = <1>;

arch/arm/boot/dts/exynos4210-origen.dts

+5 −5
Original line number Diff line number Diff line
@@ -60,35 +60,35 @@ 
			label = "Up";

			gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_UP>;

			gpio-key,wakeup;

			wakeup-source;

		};



		down {

			label = "Down";

			gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_DOWN>;

			gpio-key,wakeup;

			wakeup-source;

		};



		back {

			label = "Back";

			gpios = <&gpx1 7 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_BACK>;

			gpio-key,wakeup;

			wakeup-source;

		};



		home {

			label = "Home";

			gpios = <&gpx1 6 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_HOME>;

			gpio-key,wakeup;

			wakeup-source;

		};



		menu {

			label = "Menu";

			gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_MENU>;

			gpio-key,wakeup;

			wakeup-source;

		};

	};

arch/arm/boot/dts/exynos4210-smdkv310.dts

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
	samsung,keypad-num-rows = <2>;

	samsung,keypad-num-columns = <8>;

	linux,keypad-no-autorepeat;

	linux,keypad-wakeup;

	wakeup-source;

	pinctrl-names = "default";

	pinctrl-0 = <&keypad_rows &keypad_cols>;

	status = "okay";