Merge tag 'samsung-dt-4.5-2' of... (d731afa4) · Commits · 戴 / test

Merge tag 'samsung-dt-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt Merge "Samsung DeviceTree updates and improvements for 4.5" from Krzysztof Kozlowski: 1. eMMC/SDIO minor fixes usage of bindings on Snow and Peach Chromebooks. 2. Remove FIMD from Odroid XU3-family because on XU3 it cannot be used yet and on XU3-Lite and XU4 it is not supported. 3. Remove deprecated since June 2013 samsung,exynos5-hdmi. 4. Add support for Pseudo Random Generator on Exynos4 (Trats2 for now). This depends on new SSS clock. 5. Add rotator nodes for Exynos4 and Exynos5. 6. Switch DWC3_1 on Odroid XU3 and XU3-Lite to peripheral mode because now it cannot be used as OTG. 7. Cleanup the G2D usage on Exynos4 and add it to a proper domain in case of Exynos4210. 8. Put MDMA1 in proper domain on Exynos4210 as well. 9. Minor cleanups. * tag 'samsung-dt-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: (21 commits) ARM: dts: Unify G2D device node with other devices on exynos4 ARM: dts: Add power domain to G2D device on exynos4210 ARM: dts: MDMA1 device belongs to LCD0 power domain on exynos4210 ARM: dts: Remove unneeded GPIO include in exynos4412-odroidu3 ARM: dts: exynos4210-universal_c210: Disable DMA for UARTs ARM: dts: Use peripheral mode for dwc3_1 on exynos5422-odroidxu3 ARM: dts: Add rotator node on exynos5420 ARM: dts: Add rotator node on exynos5250 ARM: dts: Fix power domain for sysmmu-rotator device on exynos4 ARM: dts: Add rotator nodes on exynos4 ARM: dts: Enable PRNG module on exynos4412-trats2 ARM: dts: Add PRNG module for exynos4 dt-bindings: remove deprecated compatible string from exynos-hdmi ARM: dts: Remove fimd node from exynos5422-odroidxu3-common ARM: dts: Mark eMMC as non-removable in exynos5250-snow-common ARM: dts: Remove broken-cd from eMMC node in exynos5420-peach-pi ARM: dts: Remove broken-cd from eMMC node in exynos5800-peach-pi ARM: dts: Mark SDIO as non-removable in exynos5250-snow-common ARM: dts: Mark SDIO as non-removable in exynos5420-peach-pit ARM: dts: Mark SDIO as non-removable in exynos5800-peach-pi ...

Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt

+3 −4

Original line number	Diff line number	Diff line
		@@ -2,10 +2,9 @@ Device-Tree bindings for drm hdmi driver

		Required properties:
		- compatible: value should be one among the following:
		1) "samsung,exynos5-hdmi" <DEPRECATED>
		2) "samsung,exynos4210-hdmi"
		3) "samsung,exynos4212-hdmi"
		4) "samsung,exynos5420-hdmi"
		1) "samsung,exynos4210-hdmi"
		2) "samsung,exynos4212-hdmi"
		3) "samsung,exynos5420-hdmi"
		- reg: physical base address of the hdmi and length of memory mapped
		region.
		- interrupts: interrupt number to the cpu.

arch/arm/boot/dts/exynos4.dtsi

+17 −1

Original line number	Diff line number	Diff line
		@@ -727,6 +727,15 @@
		iommus = <&sysmmu_jpeg>;
		};

		rotator: rotator@12810000 {
		compatible = "samsung,exynos4210-rotator";
		reg = <0x12810000 0x64>;
		interrupts = <0 83 0>;
		clocks = <&clock CLK_ROTATOR>;
		clock-names = "rotator";
		iommus = <&sysmmu_rotator>;
		};

		hdmi: hdmi@12D00000 {
		compatible = "samsung,exynos4210-hdmi";
		reg = <0x12D00000 0x70000>;
		@@ -954,7 +963,6 @@
		interrupts = <5 0>;
		clock-names = "sysmmu", "master";
		clocks = <&clock CLK_SMMU_ROTATOR>, <&clock CLK_ROTATOR>;
		power-domains = <&pd_lcd0>;
		#iommu-cells = <0>;
		};

		@@ -968,4 +976,12 @@
		power-domains = <&pd_lcd0>;
		#iommu-cells = <0>;
		};

		prng: rng@10830400 {
		compatible = "samsung,exynos4-rng";
		reg = <0x10830400 0x200>;
		clocks = <&clock CLK_SSS>;
		clock-names = "secss";
		status = "disabled";
		};
		};

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

+0 −4

Original line number	Diff line number	Diff line
		@@ -138,10 +138,6 @@
		status = "okay";
		};

		&g2d {
		status = "okay";
		};

		&i2c_0 {
		status = "okay";
		samsung,i2c-sda-delay = <100>;

arch/arm/boot/dts/exynos4210-smdkv310.dts

+0 −4

Original line number	Diff line number	Diff line
		@@ -44,10 +44,6 @@
		};
		};

		&g2d {
		status = "okay";
		};

		&i2c_0 {
		#address-cells = <1>;
		#size-cells = <0>;

arch/arm/boot/dts/exynos4210-universal_c210.dts

+8 −0

Original line number	Diff line number	Diff line
		@@ -560,16 +560,24 @@

		&serial_0 {
		status = "okay";
		/delete-property/dmas;
		/delete-property/dma-names;
		};

		&serial_1 {
		status = "okay";
		/delete-property/dmas;
		/delete-property/dma-names;
		};

		&serial_2 {
		status = "okay";
		/delete-property/dmas;
		/delete-property/dma-names;
		};

		&serial_3 {
		status = "okay";
		/delete-property/dmas;
		/delete-property/dma-names;
		};

Admin message