Commit cb5a94a4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge tag 'samsung-dt-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Pull "Samsung DTS ARM changes for 4.16" from Krzysztof Kozłowski:

1. Add sound support to Odroid XU4 (and adjustments to Odroid XU3).
2. Enable WiFi on Trats2.
3. Add CPU perf counters to Exynos54xx.
4. Add power domains to certain chipsets.
5. Add Exynos4412 ISP clock controller which finally solves freezes when
   accessing ISP clocks while having the ISP power domain turned off.
6. Add Pseudo and True RNG to Exynos5.
7. Minor fixes for Trats2, Odroid XU3/XU4, Exynos5410.
8. Cleanup of some of DTC warnings

* tag 'samsung-dt-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Use lower case hex addresses in node unit addresses
  ARM: dts: exynos: Add nodes for True Random Number Generator
  ARM: dts: exynos: Add DT nodes for PRNG in Exynos5 SoCs
  ARM: dts: exynos: Add G3D power domain to Exynos5250
  ARM: dts: exynos: Add audio power domain to Exynos5250
  ARM: dts: exynos: Fix power domain node names for Exynos5250
  ARM: dts: exynos: Add missing interrupt-controller properties to Exynos5410 PMU
  ARM: dts: exynos: Add audio power domain support to Exynos542x SoCs
  ARM: dts: exynos: Fix property values of LDO15/17 for Odroid XU3/XU4
  ARM: dts: exynos: Add Exynos4412 ISP clock controller
  ARM: dts: exynos: Move G2D node to exynos5.dtsi
  ARM: dts: exynos: Add CPU perf counters to Exynos54xx boards
  ARM: dts: exynos: Remove duplicate definitions of SSS nodes for Exynos5
  ARM: dts: exynos: Add bcm4334 device node to Trats2
  ARM: dts: exynos: Correct Trats2 panel reset line
  ARM: dts: exynos: Add sound support for Odroid XU4
  ARM: dts: exynos: Switch to dedicated Odroid XU3 sound card binding
parents ffe42395 3be1ecf2

arch/arm/boot/dts/exynos3250.dtsi

+17 −17
Original line number Diff line number Diff line
@@ -164,31 +164,31 @@ 
			syscon = <&pmu_system_controller>;

		};



		pd_cam: cam-power-domain@10023C00 {

		pd_cam: cam-power-domain@10023c00 {

			compatible = "samsung,exynos4210-pd";

			reg = <0x10023C00 0x20>;

			#power-domain-cells = <0>;

		};



		pd_mfc: mfc-power-domain@10023C40 {

		pd_mfc: mfc-power-domain@10023c40 {

			compatible = "samsung,exynos4210-pd";

			reg = <0x10023C40 0x20>;

			#power-domain-cells = <0>;

		};



		pd_g3d: g3d-power-domain@10023C60 {

		pd_g3d: g3d-power-domain@10023c60 {

			compatible = "samsung,exynos4210-pd";

			reg = <0x10023C60 0x20>;

			#power-domain-cells = <0>;

		};



		pd_lcd0: lcd0-power-domain@10023C80 {

		pd_lcd0: lcd0-power-domain@10023c80 {

			compatible = "samsung,exynos4210-pd";

			reg = <0x10023C80 0x20>;

			#power-domain-cells = <0>;

		};



		pd_isp: isp-power-domain@10023CA0 {

		pd_isp: isp-power-domain@10023ca0 {

			compatible = "samsung,exynos4210-pd";

			reg = <0x10023CA0 0x20>;

			#power-domain-cells = <0>;
@@ -204,7 +204,7 @@ 
						 <&cmu CLK_FIN_PLL>;

		};



		cmu_dmc: clock-controller@105C0000 {

		cmu_dmc: clock-controller@105c0000 {

			compatible = "samsung,exynos3250-cmu-dmc";

			reg = <0x105C0000 0x2000>;

			#clock-cells = <1>;
@@ -219,7 +219,7 @@ 
			status = "disabled";

		};



		tmu: tmu@100C0000 {

		tmu: tmu@100c0000 {

			compatible = "samsung,exynos3250-tmu";

			reg = <0x100C0000 0x100>;

			interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
@@ -287,7 +287,7 @@ 
			status = "disabled";

		};



		sysmmu_jpeg: sysmmu@11A60000 {

		sysmmu_jpeg: sysmmu@11a60000 {

			compatible = "samsung,exynos-sysmmu";

			reg = <0x11a60000 0x1000>;

			interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>,
@@ -313,7 +313,7 @@ 
			status = "disabled";

		};



		dsi_0: dsi@11C80000 {

		dsi_0: dsi@11c80000 {

			compatible = "samsung,exynos3250-mipi-dsi";

			reg = <0x11C80000 0x10000>;

			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
@@ -328,7 +328,7 @@ 
			status = "disabled";

		};



		sysmmu_fimd0: sysmmu@11E20000 {

		sysmmu_fimd0: sysmmu@11e20000 {

			compatible = "samsung,exynos-sysmmu";

			reg = <0x11e20000 0x1000>;

			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,
@@ -386,7 +386,7 @@ 
			status = "disabled";

		};



		exynos_usbphy: exynos-usbphy@125B0000 {

		exynos_usbphy: exynos-usbphy@125b0000 {

			compatible = "samsung,exynos3250-usb2-phy";

			reg = <0x125B0000 0x100>;

			samsung,pmureg-phandle = <&pmu_system_controller>;
@@ -425,7 +425,7 @@ 
			};

		};



		adc: adc@126C0000 {

		adc: adc@126c0000 {

			compatible = "samsung,exynos3250-adc",

				     "samsung,exynos-adc-v2";

			reg = <0x126C0000 0x100>;
@@ -544,7 +544,7 @@ 
			status = "disabled";

		};



		i2c_4: i2c@138A0000 {

		i2c_4: i2c@138a0000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";
@@ -557,7 +557,7 @@ 
			status = "disabled";

		};



		i2c_5: i2c@138B0000 {

		i2c_5: i2c@138b0000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";
@@ -570,7 +570,7 @@ 
			status = "disabled";

		};



		i2c_6: i2c@138C0000 {

		i2c_6: i2c@138c0000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";
@@ -583,7 +583,7 @@ 
			status = "disabled";

		};



		i2c_7: i2c@138D0000 {

		i2c_7: i2c@138d0000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";
@@ -641,7 +641,7 @@ 
			status = "disabled";

		};



		pwm: pwm@139D0000 {

		pwm: pwm@139d0000 {

			compatible = "samsung,exynos4210-pwm";

			reg = <0x139D0000 0x1000>;

			interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/exynos4.dtsi

+29 −28
Original line number Diff line number Diff line
@@ -101,28 +101,28 @@ 
		syscon = <&pmu_system_controller>;

	};



	pd_mfc: mfc-power-domain@10023C40 {

	pd_mfc: mfc-power-domain@10023c40 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10023C40 0x20>;

		#power-domain-cells = <0>;

		label = "MFC";

	};



	pd_g3d: g3d-power-domain@10023C60 {

	pd_g3d: g3d-power-domain@10023c60 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10023C60 0x20>;

		#power-domain-cells = <0>;

		label = "G3D";

	};



	pd_lcd0: lcd0-power-domain@10023C80 {

	pd_lcd0: lcd0-power-domain@10023c80 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10023C80 0x20>;

		#power-domain-cells = <0>;

		label = "LCD0";

	};



	pd_tv: tv-power-domain@10023C20 {

	pd_tv: tv-power-domain@10023c20 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10023C20 0x20>;

		#power-domain-cells = <0>;
@@ -130,21 +130,21 @@ 
		label = "TV";

	};



	pd_cam: cam-power-domain@10023C00 {

	pd_cam: cam-power-domain@10023c00 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10023C00 0x20>;

		#power-domain-cells = <0>;

		label = "CAM";

	};



	pd_gps: gps-power-domain@10023CE0 {

	pd_gps: gps-power-domain@10023ce0 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10023CE0 0x20>;

		#power-domain-cells = <0>;

		label = "GPS";

	};



	pd_gps_alive: gps-alive-power-domain@10023D00 {

	pd_gps_alive: gps-alive-power-domain@10023d00 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10023D00 0x20>;

		#power-domain-cells = <0>;
@@ -184,7 +184,7 @@ 
		interrupt-parent = <&gic>;

	};



	dsi_0: dsi@11C80000 {

	dsi_0: dsi@11c80000 {

		compatible = "samsung,exynos4210-mipi-dsi";

		reg = <0x11C80000 0x10000>;

		interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
@@ -297,7 +297,7 @@ 
		status = "disabled";

	};



	keypad: keypad@100A0000 {

	keypad: keypad@100a0000 {

		compatible = "samsung,s5pv210-keypad";

		reg = <0x100A0000 0x100>;

		interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
@@ -342,7 +342,7 @@ 
		status = "disabled";

	};



	exynos_usbphy: exynos-usbphy@125B0000 {

	exynos_usbphy: exynos-usbphy@125b0000 {

		compatible = "samsung,exynos4210-usb2-phy";

		reg = <0x125B0000 0x100>;

		samsung,pmureg-phandle = <&pmu_system_controller>;
@@ -538,7 +538,7 @@ 
		status = "disabled";

	};



	i2c_4: i2c@138A0000 {

	i2c_4: i2c@138a0000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";
@@ -551,7 +551,7 @@ 
		status = "disabled";

	};



	i2c_5: i2c@138B0000 {

	i2c_5: i2c@138b0000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";
@@ -564,7 +564,7 @@ 
		status = "disabled";

	};



	i2c_6: i2c@138C0000 {

	i2c_6: i2c@138c0000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";
@@ -577,7 +577,7 @@ 
		status = "disabled";

	};



	i2c_7: i2c@138D0000 {

	i2c_7: i2c@138d0000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";
@@ -590,7 +590,7 @@ 
		status = "disabled";

	};



	i2c_8: i2c@138E0000 {

	i2c_8: i2c@138e0000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "samsung,s3c2440-hdmiphy-i2c";
@@ -651,7 +651,7 @@ 
		status = "disabled";

	};



	pwm: pwm@139D0000 {

	pwm: pwm@139d0000 {

		compatible = "samsung,exynos4210-pwm";

		reg = <0x139D0000 0x1000>;

		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
@@ -720,7 +720,7 @@ 
		status = "disabled";

	};



	tmu: tmu@100C0000 {

	tmu: tmu@100c0000 {

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

	};
@@ -743,7 +743,7 @@ 
		iommus = <&sysmmu_rotator>;

	};



	hdmi: hdmi@12D00000 {

	hdmi: hdmi@12d00000 {

		compatible = "samsung,exynos4210-hdmi";

		reg = <0x12D00000 0x70000>;

		interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
@@ -755,10 +755,11 @@ 
		phy = <&hdmi_i2c_phy>;

		power-domains = <&pd_tv>;

		samsung,syscon-phandle = <&pmu_system_controller>;

		#sound-dai-cells = <0>;

		status = "disabled";

	};



	hdmicec: cec@100B0000 {

	hdmicec: cec@100b0000 {

		compatible = "samsung,s5p-cec";

		reg = <0x100B0000 0x200>;

		interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;
@@ -771,7 +772,7 @@ 
		status = "disabled";

	};



	mixer: mixer@12C10000 {

	mixer: mixer@12c10000 {

		compatible = "samsung,exynos4210-mixer";

		interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;

		reg = <0x12C10000 0x2100>, <0x12c00000 0x300>;
@@ -910,7 +911,7 @@ 
		#iommu-cells = <0>;

	};



	sysmmu_tv: sysmmu@12E20000 {

	sysmmu_tv: sysmmu@12e20000 {

		compatible = "samsung,exynos-sysmmu";

		reg = <0x12E20000 0x1000>;

		interrupt-parent = <&combiner>;
@@ -921,7 +922,7 @@ 
		#iommu-cells = <0>;

	};



	sysmmu_fimc0: sysmmu@11A20000 {

	sysmmu_fimc0: sysmmu@11a20000 {

		compatible = "samsung,exynos-sysmmu";

		reg = <0x11A20000 0x1000>;

		interrupt-parent = <&combiner>;
@@ -932,7 +933,7 @@ 
		#iommu-cells = <0>;

	};



	sysmmu_fimc1: sysmmu@11A30000 {

	sysmmu_fimc1: sysmmu@11a30000 {

		compatible = "samsung,exynos-sysmmu";

		reg = <0x11A30000 0x1000>;

		interrupt-parent = <&combiner>;
@@ -943,7 +944,7 @@ 
		#iommu-cells = <0>;

	};



	sysmmu_fimc2: sysmmu@11A40000 {

	sysmmu_fimc2: sysmmu@11a40000 {

		compatible = "samsung,exynos-sysmmu";

		reg = <0x11A40000 0x1000>;

		interrupt-parent = <&combiner>;
@@ -954,7 +955,7 @@ 
		#iommu-cells = <0>;

	};



	sysmmu_fimc3: sysmmu@11A50000 {

	sysmmu_fimc3: sysmmu@11a50000 {

		compatible = "samsung,exynos-sysmmu";

		reg = <0x11A50000 0x1000>;

		interrupt-parent = <&combiner>;
@@ -965,7 +966,7 @@ 
		#iommu-cells = <0>;

	};



	sysmmu_jpeg: sysmmu@11A60000 {

	sysmmu_jpeg: sysmmu@11a60000 {

		compatible = "samsung,exynos-sysmmu";

		reg = <0x11A60000 0x1000>;

		interrupt-parent = <&combiner>;
@@ -976,7 +977,7 @@ 
		#iommu-cells = <0>;

	};



	sysmmu_rotator: sysmmu@12A30000 {

	sysmmu_rotator: sysmmu@12a30000 {

		compatible = "samsung,exynos-sysmmu";

		reg = <0x12A30000 0x1000>;

		interrupt-parent = <&combiner>;
@@ -986,7 +987,7 @@ 
		#iommu-cells = <0>;

	};



	sysmmu_fimd0: sysmmu@11E20000 {

	sysmmu_fimd0: sysmmu@11e20000 {

		compatible = "samsung,exynos-sysmmu";

		reg = <0x11E20000 0x1000>;

		interrupt-parent = <&combiner>;

arch/arm/boot/dts/exynos4210.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 
		};

	};



	pd_lcd1: lcd1-power-domain@10023CA0 {

	pd_lcd1: lcd1-power-domain@10023ca0 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10023CA0 0x20>;

		#power-domain-cells = <0>;
@@ -156,7 +156,7 @@ 
		reg = <0x03860000 0x1000>;

	};



	tmu: tmu@100C0000 {

	tmu: tmu@100c0000 {

		compatible = "samsung,exynos4210-tmu";

		interrupt-parent = <&combiner>;

		reg = <0x100C0000 0x100>;
@@ -229,7 +229,7 @@ 
		};

	};



	mixer: mixer@12C10000 {

	mixer: mixer@12c10000 {

		clock-names = "mixer", "hdmi", "sclk_hdmi", "vp", "mout_mixer",

			"sclk_mixer";

		clocks = <&clock CLK_MIXER>, <&clock CLK_HDMI>,
@@ -245,7 +245,7 @@ 
		status = "disabled";

	};



	sysmmu_g2d: sysmmu@12A20000 {

	sysmmu_g2d: sysmmu@12a20000 {

		compatible = "samsung,exynos-sysmmu";

		reg = <0x12A20000 0x1000>;

		interrupt-parent = <&combiner>;

arch/arm/boot/dts/exynos4412-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ 
		};

	};



	pinctrl_3: pinctrl@106E0000 {

	pinctrl_3: pinctrl@106e0000 {

		gpv0: gpv0 {

			gpio-controller;

			#gpio-cells = <2>;

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

+28 −1
Original line number Diff line number Diff line
@@ -300,6 +300,13 @@ 


	};



	wlan_pwrseq: sdhci3-pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&gpj0 0 GPIO_ACTIVE_LOW>;

		clocks = <&max77686 MAX77686_CLK_PMIC>;

		clock-names = "ext_clock";

	};



	sound {

		compatible = "samsung,trats2-audio";

		samsung,i2s-controller = <&i2s0>;
@@ -454,7 +461,7 @@ 
		reg = <0>;

		vdd3-supply = <&lcd_vdd3_reg>;

		vci-supply = <&ldo25_reg>;

		reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpf2 1 GPIO_ACTIVE_HIGH>;

		power-on-delay= <50>;

		reset-delay = <100>;

		init-delay = <100>;
@@ -1350,6 +1357,26 @@ 
	status = "okay";

};



&sdhci_3 {

	#address-cells = <1>;

	#size-cells = <0>;

	non-removable;

	bus-width = <4>;



	mmc-pwrseq = <&wlan_pwrseq>;

	pinctrl-names = "default";

	pinctrl-0 = <&sd3_clk &sd3_cmd &sd3_bus4>;

	status = "okay";



	brcmf: wifi@1 {

		reg = <1>;

		compatible = "brcm,bcm4329-fmac";

		interrupt-parent = <&gpx2>;

		interrupts = <5 IRQ_TYPE_NONE>;

		interrupt-names = "host-wake";

	};

};



&serial_0 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE