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

Commit aaaa10b0 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.17" from Kukjin Kim:

exynos3250: add i2s dt for audio interface

exynos4
 - cleanup arm-pmu node because of 4 pmu on
   exynos4412 but 2 pmu on other exynos4 SoCs
 - add support sub-nodes to exynos usb host for exynos4

exynos4412-odroid-common
 - fix T-FLASH hotplug detection
 - disable 'always on' for BUCK8
 - add support for GPIO based buttons
 - add MAX98090 audio codec

exynos4412-odroidx2 and exynos4412-odroidu3
- refactor exynos4412-odroidx and exynos4412-odroid-common
  for odroid-x2 and u2/u3

exynos4412-odroidx
 - add support for USB phy, host and device
 - enable common hardware blocks, secure firmware calls,
   watchdog, g2d and fimc (mem2mem) multimedia accelerators
 - add support for USB phy, host and device
 - correct memory size

exynos5410
 - fill in CPU clock-frequency property to avoid warning

exynos5420
 - remove display pd because of instability

exynos5420-peach-pit and exynos5800-peach-pi
 - sort nodes each other to check its differences easily
 - enable audio support and add sound-card name property
 - add mask-tpm-reset node
 - add cros_ec including keyboard, i2c tunnel and tps65090
   and battery under the i2c tunnel

* tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Add I2S dt node for exynos3250
  ARM: dts: Add cros_ec to exynos5420-peach-pit and exynos5800-peach-pi
  ARM: dts: clean up arm-pmu node for exynos4
  ARM: dts: remove display power domain for exynos5420
  ARM: dts: Add sound nodes for Odroid-X2/U3 boards
  ARM: dts: fix T-FLASH hotplug detection for exynos4412-odroid-common
  ARM: dts: add support for GPIO buttons for exynos4412-odroid
  ARM: dts: disable 'always on' for BUCK8 regulator for exynos4412-odroid-common
  ARM: dts: refactor Odroid DTS file and add support for Odroid X2 and U2/U3
  ARM: dts: correct memory size for exynos4412-odroidx
  ARM: dts: add support for USB phy, host and device for exynos4412-odroidx
  ARM: dts: enable common hardware blocks for exynos4412-odroidx
  ARM: dts: add port sub-nodes to exynos usb host modules for exynos4
  ARM: dts: Add mask-tpm-reset node in exynos5800-peach-pi
  ARM: dts: Add mask-tpm-reset node in exynos5420-peach-pit
  ARM: dts: Add sound-card name for Snow/Peach-Pit/Peach-Pi
  ARM: dts: Fill in CPU clock-frequency for exynos5410
  ARM: dts: Sort nodes within Peach-pit/Peach-pi dts files
  ARM: dts: Enable audio support for exynos5800-peach-pi
parents 223f93ed ccaba452

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -66,7 +66,9 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ 
	exynos4210-smdkv310.dtb \

	exynos4210-trats.dtb \

	exynos4210-universal_c210.dtb \

	exynos4412-odroidu3.dtb \

	exynos4412-odroidx.dtb \

	exynos4412-odroidx2.dtb \

	exynos4412-origen.dtb \

	exynos4412-smdk4412.dtb \

	exynos4412-tiny4412.dtb \

arch/arm/boot/dts/exynos3250.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -425,6 +425,19 @@ 
			status = "disabled";

		};



		i2s2: i2s@13970000 {

			compatible = "samsung,s3c6410-i2s";

			reg = <0x13970000 0x100>;

			interrupts = <0 126 0>;

			clocks = <&cmu CLK_I2S>, <&cmu CLK_SCLK_I2S>;

			clock-names = "iis", "i2s_opclk0";

			dmas = <&pdma0 14>, <&pdma0 13>;

			dma-names = "tx", "rx";

			pinctrl-0 = <&i2s2_bus>;

			pinctrl-names = "default";

			status = "disabled";

		};



		pwm: pwm@139D0000 {

			compatible = "samsung,exynos4210-pwm";

			reg = <0x139D0000 0x1000>;

arch/arm/boot/dts/exynos4.dtsi

+30 −0
Original line number Diff line number Diff line
@@ -123,6 +123,12 @@ 
		reg = <0x10440000 0x1000>;

	};



	pmu {

		compatible = "arm,cortex-a9-pmu";

		interrupt-parent = <&combiner>;

		interrupts = <2 2>, <3 2>;

	};



	sys_reg: syscon@10010000 {

		compatible = "samsung,exynos4-sysreg", "syscon";

		reg = <0x10010000 0x400>;
@@ -322,6 +328,23 @@ 
		clocks = <&clock CLK_USB_HOST>;

		clock-names = "usbhost";

		status = "disabled";

		#address-cells = <1>;

		#size-cells = <0>;

		port@0 {

		    reg = <0>;

		    phys = <&exynos_usbphy 1>;

		    status = "disabled";

		};

		port@1 {

		    reg = <1>;

		    phys = <&exynos_usbphy 2>;

		    status = "disabled";

		};

		port@2 {

		    reg = <2>;

		    phys = <&exynos_usbphy 3>;

		    status = "disabled";

		};

	};



	ohci@12590000 {
@@ -331,6 +354,13 @@ 
		clocks = <&clock CLK_USB_HOST>;

		clock-names = "usbhost";

		status = "disabled";

		#address-cells = <1>;

		#size-cells = <0>;

		port@0 {

		    reg = <0>;

		    phys = <&exynos_usbphy 1>;

		    status = "disabled";

		};

	};



	i2s1: i2s@13960000 {

arch/arm/boot/dts/exynos4210.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -93,12 +93,6 @@ 
		#clock-cells = <1>;

	};



	pmu {

		compatible = "arm,cortex-a9-pmu";

		interrupt-parent = <&combiner>;

		interrupts = <2 2>, <3 2>;

	};



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

0 → 100644
+371 −0
Original line number Diff line number Diff line 
/*

 * Common definition for Hardkernel's Exynos4412 based ODROID-X/X2/U2/U3 boards

 * device tree source

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



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

#include "exynos4412.dtsi"



/ {

	firmware@0204F000 {

		compatible = "samsung,secure-firmware";

		reg = <0x0204F000 0x1000>;

	};



	gpio_keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&gpio_power_key>;



		power_key {

			interrupt-parent = <&gpx1>;

			interrupts = <3 0>;

			gpios = <&gpx1 3 1>;

			linux,code = <KEY_POWER>;

			label = "power key";

			debounce-interval = <10>;

			gpio-key,wakeup;

		};

	};



	i2s0: i2s@03830000 {

		pinctrl-0 = <&i2s0_bus>;

		pinctrl-names = "default";

		status = "okay";

		clocks = <&clock_audss EXYNOS_I2S_BUS>,

			 <&clock_audss EXYNOS_DOUT_AUD_BUS>;

		clock-names = "iis", "i2s_opclk0";

	};



	sound: sound {

		compatible = "samsung,odroidx2-audio";

		samsung,i2s-controller = <&i2s0>;

		samsung,audio-codec = <&max98090>;

	};



	mmc@12550000 {

		pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;

		pinctrl-names = "default";

		vmmc-supply = <&ldo20_reg &buck8_reg>;

		status = "okay";



		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;

		samsung,dw-mshc-sdr-timing = <2 3>;

		samsung,dw-mshc-ddr-timing = <1 2>;



		slot@0 {

			reg = <0>;

			bus-width = <8>;

		};

	};



	watchdog@10060000 {

		status = "okay";

	};



	rtc@10070000 {

		status = "okay";

	};



	g2d@10800000 {

		status = "okay";

	};



	camera {

		status = "okay";

		pinctrl-names = "default";

		pinctrl-0 = <>;



		fimc_0: fimc@11800000 {

			status = "okay";

		};



		fimc_1: fimc@11810000 {

			status = "okay";

		};



		fimc_2: fimc@11820000 {

			status = "okay";

		};



		fimc_3: fimc@11830000 {

			status = "okay";

		};

	};



	sdhci@12530000 {

		bus-width = <4>;

		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;

		pinctrl-names = "default";

		vmmc-supply = <&ldo4_reg &ldo21_reg>;

		cd-gpios = <&gpk2 2 0>;

		cd-inverted;

		status = "okay";

	};



	serial@13800000 {

		status = "okay";

	};



	serial@13810000 {

		status = "okay";

	};



	fixed-rate-clocks {

		xxti {

			compatible = "samsung,clock-xxti";

			clock-frequency = <0>;

		};



		xusbxti {

			compatible = "samsung,clock-xusbxti";

			clock-frequency = <24000000>;

		};

	};



	i2c@13860000 {

		pinctrl-0 = <&i2c0_bus>;

		pinctrl-names = "default";

		status = "okay";



		usb3503: usb3503@08 {

			compatible = "smsc,usb3503";

			reg = <0x08>;



			intn-gpios = <&gpx3 0 0>;

			connect-gpios = <&gpx3 4 0>;

			reset-gpios = <&gpx3 5 0>;

			initial-mode = <1>;

		};



		max77686: pmic@09 {

			compatible = "maxim,max77686";

			reg = <0x09>;

			#clock-cells = <1>;



			voltage-regulators {

				ldo1_reg: LDO1 {

					regulator-name = "VDD_ALIVE_1.0V";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				ldo2_reg: LDO2 {

					regulator-name = "VDDQ_M1_2_1.8V";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				ldo3_reg: LDO3 {

					regulator-name = "VDDQ_EXT_1.8V";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				ldo4_reg: LDO4 {

					regulator-name = "VDDQ_MMC2_2.8V";

					regulator-min-microvolt = <2800000>;

					regulator-max-microvolt = <2800000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo5_reg: LDO5 {

					regulator-name = "VDDQ_MMC1_3_1.8V";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo6_reg: LDO6 {

					regulator-name = "VDD10_MPLL_1.0V";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				ldo7_reg: LDO7 {

					regulator-name = "VDD10_XPLL_1.0V";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

				};



				ldo11_reg: LDO11 {

					regulator-name = "VDD18_ABB1_1.8V";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

				};



				ldo12_reg: LDO12 {

					regulator-name = "VDD33_USB_3.3V";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo13_reg: LDO13 {

					regulator-name = "VDDQ_C2C_W_1.8V";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo14_reg: LDO14 {

					regulator-name = "VDD18_ABB0_2_1.8V";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo15_reg: LDO15 {

					regulator-name = "VDD10_HSIC_1.0V";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo16_reg: LDO16 {

					regulator-name = "VDD18_HSIC_1.8V";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo20_reg: LDO20 {

					regulator-name = "LDO20_1.8V";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-boot-on;

				};



				ldo21_reg: LDO21 {

					regulator-name = "LDO21_3.3V";

					regulator-min-microvolt = <3300000>;

					regulator-max-microvolt = <3300000>;

					regulator-always-on;

					regulator-boot-on;

				};



				ldo25_reg: LDO25 {

					regulator-name = "VDDQ_LCD_1.8V";

					regulator-min-microvolt = <1800000>;

					regulator-max-microvolt = <1800000>;

					regulator-always-on;

					regulator-boot-on;

				};



				buck1_reg: BUCK1 {

					regulator-name = "vdd_mif";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

					regulator-boot-on;

				};



				buck2_reg: BUCK2 {

					regulator-name = "vdd_arm";

					regulator-min-microvolt = <900000>;

					regulator-max-microvolt = <1350000>;

					regulator-always-on;

					regulator-boot-on;

				};



				buck3_reg: BUCK3 {

					regulator-name = "vdd_int";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

					regulator-boot-on;

				};



				buck4_reg: BUCK4 {

					regulator-name = "vdd_g3d";

					regulator-min-microvolt = <900000>;

					regulator-max-microvolt = <1100000>;

					regulator-microvolt-offset = <50000>;

				};



				buck5_reg: BUCK5 {

					regulator-name = "VDDQ_CKEM1_2_1.2V";

					regulator-min-microvolt = <1200000>;

					regulator-max-microvolt = <1200000>;

					regulator-always-on;

					regulator-boot-on;

				};



				buck6_reg: BUCK6 {

					regulator-name = "BUCK6_1.35V";

					regulator-min-microvolt = <1350000>;

					regulator-max-microvolt = <1350000>;

					regulator-always-on;

					regulator-boot-on;

				};



				buck7_reg: BUCK7 {

					regulator-name = "BUCK7_2.0V";

					regulator-min-microvolt = <2000000>;

					regulator-max-microvolt = <2000000>;

					regulator-always-on;

				};



				buck8_reg: BUCK8 {

					regulator-name = "BUCK8_2.8V";

					regulator-min-microvolt = <2800000>;

					regulator-max-microvolt = <2800000>;

				};

			};

		};

	};



	i2c@13870000 {

		pinctrl-names = "default";

		pinctrl-0 = <&i2c1_bus>;

		status = "okay";

		max98090: max98090@10 {

			compatible = "maxim,max98090";

			reg = <0x10>;

			interrupt-parent = <&gpx0>;

			interrupts = <0 0>;

		};

	};



	exynos-usbphy@125B0000 {

		status = "okay";

	};



	hsotg@12480000 {

		status = "okay";

		vusb_d-supply = <&ldo15_reg>;

		vusb_a-supply = <&ldo12_reg>;

	};



	ehci: ehci@12580000 {

		status = "okay";

	};

};



&pinctrl_1 {

	gpio_power_key: power_key {

		samsung,pins = "gpx1-3";

		samsung,pin-pud = <0>;

	};

};