Commit 85b40cf3 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge tag 'samsung-dt-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

 into next/dt

Samsung DTS ARM changes for v4.19

1. Add two new S5Pv210 boards: Samsung Galaxy S and Samsung Galaxy S 4G
   mobile phones.  Both are from family codenamed Aries.  The Samsung
   Galaxy S was released on the market in 2010 with Android operating
   system.  At that time, it was the Samsung's flagship model.
   This brings support for storage (SD card and internal memory), PMIC,
   RTC, fuel-gauge, keys, USB (in peripherial mode) and WiFi.

2. Add missing secondary CPU properties.
3. Cleanup from old files and properties.

* tag 'samsung-dt-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  dt-bindings: samsung: Document bindings for SGH-T959P board
  dt-bindings: samsung: Document bindings for Samsung aries boards
  ARM: dts: s5pv210: Add initial DTS for SGH-T959P phone
  ARM: dts: s5pv210: Add initial DTS for Samsung Galaxy S phone
  ARM: dts: s5pv210: Add initial DTS for Samsung Aries based phones
  ARM: dts: s5pv210: Add missing interrupt-controller property to gph2
  ARM: dts: exynos: remove no longer needed samsung thermal properties
  dt-bindings: arm: Remove obsolete insignal-boards.txt
  ARM: dts: exynos: Add missing CPU clocks to secondary CPUs on Exynos542x
  arm: dts: exynos: Add missing cooling device properties for CPUs

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4167ff9f 57f4e8bc

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

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
* Insignal's Exynos4210 based Origen evaluation board



Origen low-cost evaluation board is based on Samsung's Exynos4210 SoC.



Required root node properties:

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

        (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.

        (b) "samsung,exynos4210"  - for boards based on Exynos4210 SoC.

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

+4 −1
Original line number Diff line number Diff line 
* Samsung's Exynos SoC based boards

* Samsung's Exynos and S5P SoC based boards



Required root node properties:

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

	- "samsung,aries"	- for S5PV210-based Samsung Aries board.

	- "samsung,fascinate4g"	- for S5PV210-based Samsung Galaxy S Fascinate 4G (SGH-T959P) board.

	- "samsung,galaxys"	- for S5PV210-based Samsung Galaxy S (i9000)  board.

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

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -860,6 +860,8 @@ dtb-$(CONFIG_ARCH_S3C64XX) += \ 
	s3c6410-smdk6410.dtb

dtb-$(CONFIG_ARCH_S5PV210) += \

	s5pv210-aquila.dtb \

	s5pv210-fascinate4g.dtb \

	s5pv210-galaxys.dtb \

	s5pv210-goni.dtb \

	s5pv210-smdkc110.dtb \

	s5pv210-smdkv210.dtb \

arch/arm/boot/dts/exynos3250.dtsi

+17 −1
Original line number Diff line number Diff line
@@ -78,6 +78,22 @@ 
			compatible = "arm,cortex-a7";

			reg = <1>;

			clock-frequency = <1000000000>;

			clocks = <&cmu CLK_ARM_CLK>;

			clock-names = "cpu";

			#cooling-cells = <2>;



			operating-points = <

				1000000 1150000

				900000  1112500

				800000  1075000

				700000  1037500

				600000  1000000

				500000  962500

				400000  925000

				300000  887500

				200000  850000

				100000  850000

			>;

		};

	};
@@ -226,7 +242,7 @@ 
			interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_TMU_APBIF>;

			clock-names = "tmu_apbif";

			#include "exynos4412-tmu-sensor-conf.dtsi"

			#thermal-sensor-cells = <0>;

			status = "disabled";

		};

arch/arm/boot/dts/exynos4.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -735,7 +735,7 @@ 
			reg = <0x100C0000 0x100>;

			interrupts = <2 4>;

			status = "disabled";

			#include "exynos4412-tmu-sensor-conf.dtsi"

			#thermal-sensor-cells = <0>;

		};



		jpeg_codec: jpeg-codec@11840000 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE