Commit 036f8d06 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-exynos3250-artik5-4.7' of... 

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

Merge "Topic branch for Device Tree changes for Exynos 3250 for v4.7" from Krzysztof Kozlowski:

Merge necessary new clocks from Sylwester (used by new board) and add support
for Exynos3250-based Artik5 board.

* tag 'samsung-dt-exynos3250-artik5-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Add MSHC2 DT node for SD card for exynos3250-artik5-eval board
  ARM: dts: exynos: Add exynos3250-artik5 dtsi file for ARTIK5 module
  ARM: dts: exynos: Add MSHC2 DT node for Exynos3250 SoC
  ARM: dts: exynos: Add UART2 DT node for Exynos3250 SoC
  ARM: dts: exynos: Add initial gpio setting of MMC2 device for exynos3250-monk
  ARM: dts: exynos: Add initial pin configuration for exynos3250-rinato
  clk: samsung: exynos3250: Add MMC2 clock
  clk: samsung: exynos3250: Add UART2 clock
  dt-bindings: Add the clock id of UART2 and MMC2 for Exynos3250
parents 8bd641ff e70c7ae1

Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


Required root node properties:

    - compatible = should be one or more of the following.

	- "samsung,artik5"	- for Exynos3250-based Samsung ARTIK5 module.

	- "samsung,artik5-eval" - for Exynos3250-based Samsung ARTIK5 eval board.

	- "samsung,monk"	- for Exynos3250-based Samsung Simband board.

	- "samsung,rinato"	- for Exynos3250-based Samsung Gear2 board.

	- "samsung,smdkv310"	- for Exynos4210-based Samsung SMDKV310 eval board.

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ dtb-$(CONFIG_ARCH_DIGICOLOR) += \ 
dtb-$(CONFIG_ARCH_EFM32) += \

	efm32gg-dk3750.dtb

dtb-$(CONFIG_ARCH_EXYNOS3) += \

	exynos3250-artik5-eval.dtb \

	exynos3250-monk.dtb \

	exynos3250-rinato.dtb

dtb-$(CONFIG_ARCH_EXYNOS4) += \

arch/arm/boot/dts/exynos3250-artik5-eval.dts

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

 * Samsung's Exynos3250 based ARTIK5 evaluation board device tree source

 *

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

 *		http://www.samsung.com

 *

 * Device tree source file for Samsung's ARTIK5 evaluation board

 * which is based on Samsung Exynos3250 SoC.

 *

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

 */



/dts-v1/;

#include "exynos3250-artik5.dtsi"



/ {

	model = "Samsung ARTIK5 evaluation board";

	compatible = "samsung,artik5-eval", "samsung,artik5",

			"samsung,exynos3250", "samsung,exynos3";

};



&mshc_2 {

	num-slots = <1>;

	cap-sd-highspeed;

	disable-wp;

	vqmmc-supply = <&ldo3_reg>;

	card-detect-delay = <200>;

	clock-frequency = <100000000>;

	clock-freq-min-max = <400000 100000000>;

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

	samsung,dw-mshc-sdr-timing = <0 1>;

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

	pinctrl-names = "default";

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

	bus-width = <4>;

	status = "okay";

};



&serial_2 {

	status = "okay";

};

arch/arm/boot/dts/exynos3250-artik5.dtsi

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

 * Samsung's Exynos3250 based ARTIK5 module device tree source

 *

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

 *		http://www.samsung.com

 *

 * Device tree source file for Samsung's ARTIK5 module which is based on

 * Samsung Exynos3250 SoC.

 *

 * 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 "exynos3250.dtsi"

#include <dt-bindings/clock/samsung,s2mps11.h>

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

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



/ {

	compatible = "samsung,artik5", "samsung,exynos3250", "samsung,exynos3";



	chosen {

		stdout-path = &serial_2;

	};



	memory {

		reg = <0x40000000 0x1ff00000>;

	};



	firmware@0205f000 {

		compatible = "samsung,secure-firmware";

		reg = <0x0205f000 0x1000>;

	};



	thermal-zones {

		cpu_thermal: cpu-thermal {

			cooling-maps {

				map0 {

					/* Corresponds to 500MHz */

					cooling-device = <&cpu0 5 5>;

				};

				map1 {

					/* Corresponds to 200MHz */

					cooling-device = <&cpu0 8 8>;

				};

			};

		};

	};

};



&adc {

	vdd-supply = <&ldo7_reg>;

	assigned-clocks = <&cmu CLK_SCLK_TSADC>;

	assigned-clock-rates = <6000000>;

};



&cpu0 {

	cpu0-supply = <&buck2_reg>;

};



&i2c_0 {

	#address-cells = <1>;

	#size-cells = <0>;

	samsung,i2c-sda-delay = <100>;

	samsung,i2c-slave-addr = <0x10>;

	samsung,i2c-max-bus-freq = <100000>;

	status = "okay";



	s2mps14_pmic@66 {

		compatible = "samsung,s2mps14-pmic";

		interrupt-parent = <&gpx3>;

		interrupts = <5 IRQ_TYPE_NONE>;

		reg = <0x66>;



		s2mps14_osc: clocks {

			compatible = "samsung,s2mps14-clk";

			#clock-cells = <1>;

			clock-output-names = "s2mps14_ap", "unused",

				"s2mps14_bt";

		};



		regulators {

			ldo1_reg: LDO1 {

				/* VDD_ALIVE15x */

				regulator-name = "VLDO1_1.0V";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

			};



			ldo2_reg: LDO2 {

				/* VDDQM176 ~ VDDQM185 */

				regulator-name = "VLDO2_1.2V";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1200000>;

				regulator-always-on;

			};



			ldo3_reg: LDO3 {

				/*

				 * VDD1_E106 ~ VDD1_E111

				 * DVDD_RTC_AP, DVDD_MMC2_AP

				 */

				regulator-name = "VLDO3_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

			};



			ldo4_reg: LDO4 {

				/*  AVDD_PLL1120 ~ AVDD_PLL11201 */

				regulator-name = "VLDO4_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

			};



			ldo5_reg: LDO5 {

				/* VDDI_PLL_ISO141 ~ VDDI_PLL_ISO142 */

				regulator-name = "VLDO5_1.0V";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

			};



			ldo6_reg: LDO6 {

				/* VDD_USB, VDD10_HSIC */

				regulator-name = "VLDO6_1.0V";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

			};



			ldo7_reg: LDO7 {

				/*

				 * VDD18P, AVDD18_TS, AVDD18_HSIC, AVDD_PLL2,

				 * AVDD_ADC, AVDD_ABB_0, M4S_VDD18

				 */

				regulator-name = "VLDO7_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

			};



			ldo8_reg: LDO8 {

				/* AVDD33_UOTG */

				regulator-name = "VLDO8_3.0V";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

				regulator-always-on;

			};



			ldo9_reg: LDO9 {

				/* VDDQ_E86 ~ VDDQ_E105*/

				regulator-name = "VLDO9_1.2V";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1200000>;

				regulator-always-on;

			};



			ldo10_reg: LDO10 {

				regulator-name = "VLDO10_1.0V";

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1000000>;

			};



			ldo11_reg: LDO11 {

				/* VDD74 ~ VDD75 */

				regulator-name = "VLDO11_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				samsung,ext-control-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;

			};



			ldo12_reg: LDO12 {

				/* VDD72 ~ VDD73 */

				regulator-name = "VLDO12_2.8V";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				samsung,ext-control-gpios = <&gpk0 2 GPIO_ACTIVE_HIGH>;

			};



			ldo13_reg: LDO13 {

				regulator-name = "VLDO13_2.8V";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

			};



			ldo14_reg: LDO14 {

				regulator-name = "VLDO14_2.7V";

				regulator-min-microvolt = <2700000>;

				regulator-max-microvolt = <2700000>;

			};



			ldo15_reg: LDO15 {

				regulator-name = "VLDO_3.3V";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

			};



			ldo16_reg: LDO16 {

				regulator-name = "VLDO16_3.3V";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

			};



			ldo17_reg: LDO17 {

				regulator-name = "VLDO17_3.0V";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

			};



			ldo18_reg: LDO18 {

				/* DVDD_MMC2_AP */

				regulator-name = "VLDO18_2.8V";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

			};



			ldo19_reg: LDO19 {

				regulator-name = "VLDO19_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

			};



			ldo20_reg: LDO20 {

				regulator-name = "VLDO20_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

			};



			ldo21_reg: LDO21 {

				regulator-name = "VLDO21_1.25V";

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <1250000>;

			};



			ldo22_reg: LDO22 {

				regulator-name = "VLDO22_1.2V";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1200000>;

			};



			ldo23_reg: LDO23 {

				/* Xi2c3_SDA/SCL, Xi2c7_SDA/SCL, WLAN_SDIO */

				regulator-name = "VLDO23_1.8V";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

			};



			ldo24_reg: LDO24 {

				regulator-name = "VLDO24_3.0V";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

			};



			ldo25_reg: LDO25 {

				regulator-name = "VLDO25_3.0V";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

			};



			buck1_reg: BUCK1 {

				/* VDD_MIF */

				regulator-name = "VBUCK1_1.0V";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

			};



			buck2_reg: BUCK2 {

				/* VDD_CPU */

				regulator-name = "VBUCK2_1.2V";

				regulator-min-microvolt = <850000>;

				regulator-max-microvolt = <1200000>;

				regulator-always-on;

			};



			buck3_reg: BUCK3 {

				/* VDD_G3D */

				regulator-name = "VBUCK3_1.0V";

				regulator-min-microvolt = <850000>;

				regulator-max-microvolt = <1000000>;

				regulator-always-on;

			};



			buck4_reg: BUCK4 {

				regulator-name = "VBUCK4_1.95V";

				regulator-min-microvolt = <1950000>;

				regulator-max-microvolt = <1950000>;

				regulator-always-on;

			};



			buck5_reg: BUCK5 {

				regulator-name = "VBUCK5_1.35V";

				regulator-min-microvolt = <1350000>;

				regulator-max-microvolt = <1350000>;

				regulator-always-on;

			};

		};

	};

};



&mshc_0 {

	num-slots = <1>;

	non-removable;

	cap-mmc-highspeed;

	card-detect-delay = <200>;

	vmmc-supply = <&ldo12_reg>;

	clock-frequency = <100000000>;

	clock-freq-min-max = <400000 100000000>;

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

	samsung,dw-mshc-sdr-timing = <0 1>;

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

	pinctrl-names = "default";

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

	bus-width = <8>;

	status = "okay";

};



&rtc {

	clocks = <&cmu CLK_RTC>, <&s2mps14_osc S2MPS11_CLK_AP>;

	clock-names = "rtc", "rtc_src";

	status = "okay";

};



&tmu {

	status = "okay";

};



&xusbxti {

	clock-frequency = <24000000>;

};

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

+11 −1
Original line number Diff line number Diff line
@@ -558,7 +558,17 @@ 


&pinctrl_1 {

	pinctrl-names = "default";

	pinctrl-0 = <&sleep1>;

	pinctrl-0 = <&initial1 &sleep1>;



	initial1: initial-state {

		PIN_IN(gpk2-0, DOWN, LV1);

		PIN_IN(gpk2-1, DOWN, LV1);

		PIN_IN(gpk2-2, DOWN, LV1);

		PIN_IN(gpk2-3, DOWN, LV1);

		PIN_IN(gpk2-4, DOWN, LV1);

		PIN_IN(gpk2-5, DOWN, LV1);

		PIN_IN(gpk2-6, DOWN, LV1);

	};



	sleep1: sleep-state {

		PIN_SLP(gpe0-0, PREV, NONE);

CRA Git | Maintained and supported by SUSTech CRA and CCSE