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

Commit 7c83955a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt' of... 

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

Merge "Samsung DT updates for v3.20" from Kukjin Kim:

- exynos3250
  : add exynos_usbphy node and hsotg nodes
- exynos3250-rinato
  : enable usb
  : cleanup and use macro for gpio-keys
  : add fimd and Panel devices support
- exynos3250-monk
  : enable usb
  : cleanup and use macro for gpio-keys
- exynos5250-snow
  : add power and lid gpio-keys pinctrl
- exynos5420-peach-pit and exynos5800-peach-pi
  : configure regulators for suspend
  : set always on for USB webCam regulators
  : add lid GPIO key device
- exynos5422
  : add support new board Odroid XU3
- dt-bindings
  : add exynos-chipid

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

:
  ARM: dts: Configure regulators for suspend on exynos Peach boards
  ARM: dts: Set Peach boards USB WebCam regulators to always on
  ARM: dts: Add lid GPIO key device node for Peach boards
  ARM: dts: Add power and lid GPIO keys pinctrl for exynos5250-snow
  Documentation: dt-bindings: add exynos-chipid binding information
  ARM: dts: add Panel device support for exynos3250-rinato
  ARM: dts: add fimd device support for exynos3250-rinato
  ARM: dts: use macro in gpio keys for exynos3250 boards
  ARM: dts: remove unnecessary gpio-key nodes for exynos3250 boards
  ARM: dts: Enable USB node for exynos3250-monk
  ARM: dts: Enable USB node for exynos3250-rinato
  ARM: dts: Add hsotg node for exynos3250
  ARM: dts: Add exynos_usbphy node for exynos3250
  ARM: dts: Add dts file for Odroid XU3 board

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 02453b9c 23c76dc6

Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
SAMSUNG Exynos SoCs Chipid driver.



Required properties:

- compatible : Should at least contain "samsung,exynos4210-chipid".



- reg: offset and length of the register set



Example:

	chipid@10000000 {

		compatible = "samsung,exynos4210-chipid";

		reg = <0x10000000 0x100>;

	};

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \ 
	exynos5420-arndale-octa.dtb \

	exynos5420-peach-pit.dtb \

	exynos5420-smdk5420.dtb \

	exynos5422-odroidxu3.dtb \

	exynos5440-sd5v1.dtb \

	exynos5440-ssdk5440.dtb \

	exynos5800-peach-pi.dtb

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

+12 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
/dts-v1/;

#include "exynos3250.dtsi"

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

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



/ {

	model = "Samsung Monk board";
@@ -37,9 +38,7 @@ 
		compatible = "gpio-keys";



		power_key {

			interrupt-parent = <&gpx2>;

			interrupts = <7 0>;

			gpios = <&gpx2 7 1>;

			gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "power key";

			debounce-interval = <10>;
@@ -134,6 +133,16 @@ 
	};

};



&exynos_usbphy {

	status = "okay";

};



&hsotg {

	vusb_d-supply = <&ldo15_reg>;

	vusb_a-supply = <&ldo12_reg>;

	status = "okay";

};



&i2c_0 {

	#address-cells = <1>;

	#size-cells = <0>;

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

+82 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
/dts-v1/;

#include "exynos3250.dtsi"

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

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



/ {

	model = "Samsung Rinato board";
@@ -37,9 +38,7 @@ 
		compatible = "gpio-keys";



		power_key {

			interrupt-parent = <&gpx2>;

			interrupts = <7 0>;

			gpios = <&gpx2 7 1>;

			gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "power key";

			debounce-interval = <10>;
@@ -125,6 +124,86 @@ 
	};

};



&exynos_usbphy {

	status = "okay";

};



&hsotg {

	vusb_d-supply = <&ldo15_reg>;

	vusb_a-supply = <&ldo12_reg>;

	status = "okay";

};



&dsi_0 {

	vddcore-supply = <&ldo6_reg>;

	vddio-supply = <&ldo6_reg>;

	samsung,pll-clock-frequency = <24000000>;

	status = "okay";



	ports {

		#address-cells = <1>;

		#size-cells = <0>;



		port@1 {

			reg = <1>;



			dsi_out: endpoint {

				remote-endpoint = <&dsi_in>;

				samsung,burst-clock-frequency = <250000000>;

				samsung,esc-clock-frequency = <20000000>;

			};

		};

	};



	panel@0 {

		compatible = "samsung,s6e63j0x03";

		reg = <0>;

		vdd3-supply = <&ldo16_reg>;

		vci-supply = <&ldo20_reg>;

		reset-gpios = <&gpe0 1 0>;

		te-gpios = <&gpx0 6 0>;

		power-on-delay= <30>;

		power-off-delay= <120>;

		reset-delay = <5>;

		init-delay = <100>;

		flip-horizontal;

		flip-vertical;

		panel-width-mm = <29>;

		panel-height-mm = <29>;



		display-timings {

			timing-0 {

				clock-frequency = <0>;

				hactive = <320>;

				vactive = <320>;

				hfront-porch = <1>;

				hback-porch = <1>;

				hsync-len = <1>;

				vfront-porch = <150>;

				vback-porch = <1>;

				vsync-len = <2>;

			};

		};



		port {

			dsi_in: endpoint {

				remote-endpoint = <&dsi_out>;

			};

		};

	};

};



&fimd {

	status = "okay";



	i80-if-timings {

		cs-setup = <0>;

		wr-setup = <0>;

		wr-act = <1>;

		wr-hold = <0>;

	};

};



&i2c_0 {

	#address-cells = <1>;

	#size-cells = <0>;

arch/arm/boot/dts/exynos3250.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -255,6 +255,17 @@ 
			status = "disabled";

		};



		hsotg: hsotg@12480000 {

			compatible = "snps,dwc2";

			reg = <0x12480000 0x20000>;

			interrupts = <0 141 0>;

			clocks = <&cmu CLK_USBOTG>;

			clock-names = "otg";

			phys = <&exynos_usbphy 0>;

			phy-names = "usb2-phy";

			status = "disabled";

		};



		mshc_0: mshc@12510000 {

			compatible = "samsung,exynos5250-dw-mshc";

			reg = <0x12510000 0x1000>;
@@ -279,6 +290,16 @@ 
			status = "disabled";

		};



		exynos_usbphy: exynos-usbphy@125B0000 {

			compatible = "samsung,exynos3250-usb2-phy";

			reg = <0x125B0000 0x100>;

			samsung,pmureg-phandle = <&pmu_system_controller>;

			clocks = <&cmu CLK_USBOTG>, <&cmu CLK_SCLK_UPLL>;

			clock-names = "phy", "ref";

			#phy-cells = <1>;

			status = "disabled";

		};



		amba {

			compatible = "arm,amba-bus";

			#address-cells = <1>;