Commit ff3a45b6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-dt-64' of... 

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

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

- to support ARMv8 based exynos7 SoC
  : add initial device tree for pinctrl, PMU, mmc, i2c, rtc,
    watchdog, and adc nodes for exynos7 SoC and exynos7 based
    espresso board.

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

:
  arm64: Enable ARMv8 based exynos7 SoC support
  arm64: dts: Add nodes for mmc, i2c, rtc, watchdog, adc on exynos7
  arm64: dts: Add PMU DT node for exynos7 SoC
  arm64: dts: Add initial pinctrl support to exynos7
  arm64: dts: Add initial device tree support for exynos7

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents eaa27f34 6f56eef1

Documentation/devicetree/bindings/arm/samsung/pmu.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Properties: 
		   - "samsung,exynos5260-pmu" - for Exynos5260 SoC.

		   - "samsung,exynos5410-pmu" - for Exynos5410 SoC,

		   - "samsung,exynos5420-pmu" - for Exynos5420 SoC.

		   - "samsung,exynos7-pmu" - for Exynos7 SoC.

		second value must be always "syscon".



 - reg : offset and length of the register set.

arch/arm64/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -148,6 +148,23 @@ source "kernel/Kconfig.freezer" 


menu "Platform selection"



config ARCH_EXYNOS

	bool

	help

	  This enables support for Samsung Exynos SoC family



config ARCH_EXYNOS7

	bool "ARMv8 based Samsung Exynos7"

	select ARCH_EXYNOS

	select COMMON_CLK_SAMSUNG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS



	help

	  This enables support for Samsung Exynos7 SoC family



config ARCH_SEATTLE

	bool "AMD Seattle SoC Family"

	help

arch/arm64/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ dts-dirs += amd 
dts-dirs += apm

dts-dirs += arm

dts-dirs += cavium

dts-dirs += exynos



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

arch/arm64/boot/dts/exynos/Makefile

0 → 100644
+5 −0
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_EXYNOS7) += exynos7-espresso.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

clean-files	:= *.dtb

arch/arm64/boot/dts/exynos/exynos7-espresso.dts

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

 * SAMSUNG Exynos7 Espresso board device tree source

 *

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

 *		http://www.samsung.com

 *

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



/ {

	model = "Samsung Exynos7 Espresso board based on EXYNOS7";

	compatible = "samsung,exynos7-espresso", "samsung,exynos7";



	aliases {

		serial0 = &serial_2;

		mshc0 = &mmc_0;

		mshc2 = &mmc_2;

	};



	chosen {

		linux,stdout-path = &serial_2;

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0x0 0x40000000 0x0 0xC0000000>;

	};

};



&fin_pll {

	clock-frequency = <24000000>;

};



&serial_2 {

	status = "okay";

};



&rtc {

	status = "okay";

};



&watchdog {

	status = "okay";

};



&adc {

	status = "okay";

};



&mmc_0 {

	status = "okay";

	num-slots = <1>;

	broken-cd;

	cap-mmc-highspeed;

	non-removable;

	card-detect-delay = <200>;

	clock-frequency = <800000000>;

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

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

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

	pinctrl-names = "default";

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

	bus-width = <8>;

};



&mmc_2 {

	status = "okay";

	num-slots = <1>;

	cap-sd-highspeed;

	card-detect-delay = <200>;

	clock-frequency = <400000000>;

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

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

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

	pinctrl-names = "default";

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

	bus-width = <4>;

	disable-wp;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE