Commit 01eacbb8 authored by Arnd Bergmann's avatar Arnd Bergmann
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

Pull "Samsung DT update for 3.18" from Kukjin Kim:

- un-use slot-node and deprecate the supports-highspped
  for dw-mmc
- remove old USB2 PHY node for exynos5250

- exynos4412-odroid-common
  enable PMIC interrupt and i2c improvements

- exynos5250-snow
  fold exynos5250-cros-common
  update display related nodes

- Peach Pit and Pi
  improve power scheme, add support max77802 PMIC,
  add hdmi regulators add thermistor, ISL29018 sensor,
  set i2c clock at 400kHz, add support Atmel touchpad,
  update display related nodes

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'samsung-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: remove old USB2 PHY node for exynos5250
  ARM: dts: remove old USB2 PHY node hook for exynos5250-arndale
  ARM: dts: update display related nodes for exynos5800-peach-pi
  ARM: dts: update display related nodes for exynos5420-peach-pit
  ARM: dts: update display related nodes for exynos5250-snow
  ARM: dts: Add support Atmel touchpad for exynos5800-peach-pi
  ARM: dts: Add support Atmel touchpad for exynos5420-peach-pit
  ARM: dts: Set i2c7 clock at 400kHz for exynos based Peach boards
  ARM: dts: Add ISL29018 sensor for exynos based Peach boards
  ARM: dts: Add thermistor dts fragment used by exynos based Peach boards
  ARM: dts: add hdmi regulators for exynos5420-peach-pit
  ARM: dts: add hdmi regulators for exynos5800-peach-pi
  ARM: dts: Add support max77802 PMIC for exynos based Peach boards
  ARM: dts: Improve Peach Pit and Pi power scheme
  ARM: dts: unuse the slot-node and deprecate the supports-highspeed for dw-mmc in exynos
  ARM: dts: Fold exynos5250-cros-common into exynos5250-snow
  ARM: dts: Fix MMC pinctrl for exynos5250-snow
  ARM: dts: ODROID i2c improvements for exynos4412-odroid-common
  ARM: dts: Enable PMIC interrupts for exynos4412-odroid-common
parents 8446cef1 9b027326

arch/arm/boot/dts/cros-adc-thermistors.dtsi

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

 * Thermistor dts fragment for devices that use Thermistors as

 * children of the IIO based ADC.

 *

 * Currently, used by Exynos5420 based Peach PIT and

 * Exynos5800 based Peach PI.

 *

 * Copyright (c) 2014 Samsung Electronics Co., Ltd.

 *

 * 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.

*/



&adc {

	ncp15wb473@3 {

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

		io-channels = <&adc 3>;

	};

	ncp15wb473@4 {

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

		io-channels = <&adc 4>;

	};

	ncp15wb473@5 {

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

		io-channels = <&adc 5>;

	};

	ncp15wb473@6 {

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

		io-channels = <&adc 6>;

	};

};

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

+2 −6
Original line number Diff line number Diff line
@@ -54,17 +54,13 @@ 
		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>;

		};

		cap-mmc-highspeed;

	};



	watchdog@10060000 {

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

+2 −6
Original line number Diff line number Diff line
@@ -137,17 +137,13 @@ 
		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>;

		};

		cap-mmc-highspeed;

	};



	codec@13400000 {

arch/arm/boot/dts/exynos4412-trats2.dts

+2 −6
Original line number Diff line number Diff line
@@ -520,7 +520,6 @@ 


	mmc@12550000 {

		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		non-removable;

		card-detect-delay = <200>;
@@ -532,11 +531,8 @@ 
		pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;

		pinctrl-names = "default";

		status = "okay";



		slot@0 {

			reg = <0>;

		bus-width = <8>;

		};

		cap-mmc-highspeed;

	};



	serial@13800000 {

arch/arm/boot/dts/exynos5250-arndale.dts

+5 −17
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ 
	mmc_0: mmc@12200000 {

		status = "okay";

		num-slots = <1>;

		supports-highspeed;

		broken-cd;

		card-detect-delay = <200>;

		samsung,dw-mshc-ciu-div = <3>;
@@ -410,17 +409,13 @@ 
		vmmc-supply = <&mmc_reg>;

		pinctrl-names = "default";

		pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_bus8>;



		slot@0 {

			reg = <0>;

		bus-width = <8>;

		};

		cap-mmc-highspeed;

	};



	mmc_2: mmc@12220000 {

		status = "okay";

		num-slots = <1>;

		supports-highspeed;

		card-detect-delay = <200>;

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

		samsung,dw-mshc-sdr-timing = <2 3>;
@@ -428,12 +423,9 @@ 
		vmmc-supply = <&mmc_reg>;

		pinctrl-names = "default";

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



		slot@0 {

			reg = <0>;

		bus-width = <4>;

		disable-wp;

		};

		cap-sd-highspeed;

	};



	i2s0: i2s@03830000 {
@@ -570,8 +562,4 @@ 
			connect-gpios = <&gpd1 7 1>;

		};

	};



	usb@12110000 {

		usb-phy = <&usb2_phy>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE