Commit 5a7df447 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt-5.5-2' of... 

Merge tag 'samsung-dt-5.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM changes for v5.5, part 2

1. Cleanup by adjusting DTS to bindings,
2. Add touch-sensitive buttons to Midas (Galaxy S III family phones),
3. Add GPU/Mali to Exynos542x and Odroid XU3/XU4 family.

* tag 'samsung-dt-5.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add Mali/GPU node on Exynos5420 and enable it on Odroid XU3/4
  ARM: dts: exynos: Add support for the touch-sensitive buttons on Midas family
  ARM: dts: exynos: Rename children of SysRAM node to "sram"

Link: https://lore.kernel.org/r/20191119142026.7190-1-krzk@kernel.org


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e42617b8 1a5a85c5

arch/arm/boot/dts/exynos3250.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -145,12 +145,12 @@ sram@2020000 { 
			#size-cells = <1>;

			ranges = <0 0x02020000 0x40000>;



			smp-sysram@0 {

			smp-sram@0 {

				compatible = "samsung,exynos4210-sysram";

				reg = <0x0 0x1000>;

			};



			smp-sysram@3f000 {

			smp-sram@3f000 {

				compatible = "samsung,exynos4210-sysram-ns";

				reg = <0x3f000 0x1000>;

			};

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

+3 −3
Original line number Diff line number Diff line
@@ -590,16 +590,16 @@ &serial_3 { 
};



&sysram {

	smp-sysram@0 {

	smp-sram@0 {

		status = "disabled";

	};



	smp-sysram@5000 {

	smp-sram@5000 {

		compatible = "samsung,exynos4210-sysram";

		reg = <0x5000 0x1000>;

	};



	smp-sysram@1f000 {

	smp-sram@1f000 {

		status = "disabled";

	};

};

arch/arm/boot/dts/exynos4210.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -79,12 +79,12 @@ sysram: sram@2020000 { 
			#size-cells = <1>;

			ranges = <0 0x02020000 0x20000>;



			smp-sysram@0 {

			smp-sram@0 {

				compatible = "samsung,exynos4210-sysram";

				reg = <0x0 0x1000>;

			};



			smp-sysram@1f000 {

			smp-sram@1f000 {

				compatible = "samsung,exynos4210-sysram-ns";

				reg = <0x1f000 0x1000>;

			};

arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -168,3 +168,8 @@ &s5c73m3 { 
	vdda-supply = <&ldo17_reg>;

	status = "okay";

};



&touchkey_reg {

	gpio = <&gpm0 0 GPIO_ACTIVE_HIGH>;

	status = "okay";

};

arch/arm/boot/dts/exynos4412-midas.dtsi

+29 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "exynos4412.dtsi"

#include "exynos4412-ppmu-common.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/clock/maxim,max77686.h>

#include <dt-bindings/pinctrl/samsung.h>
@@ -92,6 +93,15 @@ vcc18mhl: voltage-regulator-5 { 
		enable-active-high;

	};



	touchkey_reg: voltage-regulator-6 {

		compatible = "regulator-fixed";

		regulator-name = "LED_VDD_3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		enable-active-high;

		status = "disabled";

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";
@@ -197,6 +207,25 @@ max77693-fuel-gauge@36 { 
		};

	};



	i2c-gpio-4 {

		compatible = "i2c-gpio";

		sda-gpios = <&gpl0 2 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

		scl-gpios = <&gpl0 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

		i2c-gpio,delay-us = <2>;

		#address-cells = <1>;

		#size-cells = <0>;



		touchkey@20 {

			compatible = "cypress,midas-touchkey";

			reg = <0x20>;

			vdd-supply = <&touchkey_reg>;

			vcc-supply = <&ldo5_reg>;

			interrupt-parent = <&gpj0>;

			interrupts = <3 IRQ_TYPE_EDGE_FALLING>;

			linux,keycodes = <KEY_BACK KEY_MENU>;

		};

	};



	i2c-mhl {

		compatible = "i2c-gpio";

		gpios = <&gpf0 4 GPIO_ACTIVE_HIGH>, <&gpf0 6 GPIO_ACTIVE_HIGH>;