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

Merge tag 'samsung-dt-gic-flags-4.10' of... 

Merge tag 'samsung-dt-gic-flags-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/dt

Topic branch with DT changes for v4.10.

Fix invalid GIC interrupt flags - type IRQ_TYPE_NONE is not allowed for GIC
interrupts.  Although this was working but with error messages like:
	genirq: Setting trigger mode 0 for irq 16 failed

Use level high interrupt instead of type none.  The choice of level high was
rather an arbitrary decision hoping it will work on each platform.  Tests shown
no issues so far.

* tag 'samsung-dt-gic-flags-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5440
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5260
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos5
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos4
  ARM: dts: exynos: Use human-friendly symbols for interrupt properties in exynos3250
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5440
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5260
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5410/exynos542x
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5250
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos5
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos3250
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4x12
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4210
  ARM: dts: exynos: Fix invalid GIC interrupt flags in exynos4

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a90a6f9c 04a88672

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

+16 −4
Original line number Diff line number Diff line
@@ -362,8 +362,14 @@ 


		interrupt-controller;

		interrupt-parent = <&gic>;

		interrupts = <0 32 0>, <0 33 0>, <0 34 0>, <0 35 0>,

				<0 36 0>, <0 37 0>, <0 38 0>, <0 39 0>;

		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

		#interrupt-cells = <2>;

	};
@@ -373,8 +379,14 @@ 


		interrupt-controller;

		interrupt-parent = <&gic>;

		interrupts = <0 40 0>, <0 41 0>, <0 42 0>, <0 43 0>,

				<0 44 0>, <0 45 0>, <0 46 0>, <0 47 0>;

		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;

		#interrupt-cells = <2>;

	};

arch/arm/boot/dts/exynos3250.dtsi

+58 −39
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include "exynos4-cpu-thermal.dtsi"

#include "exynos-syscon-restart.dtsi"

#include <dt-bindings/clock/exynos3250.h>

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

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



/ {

	compatible = "samsung,exynos3250";
@@ -211,7 +213,8 @@ 
		rtc: rtc@10070000 {

			compatible = "samsung,s3c6410-rtc";

			reg = <0x10070000 0x100>;

			interrupts = <0 73 0>, <0 74 0>;

			interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-parent = <&pmu_system_controller>;

			status = "disabled";

		};
@@ -219,7 +222,7 @@ 
		tmu: tmu@100C0000 {

			compatible = "samsung,exynos3250-tmu";

			reg = <0x100C0000 0x100>;

			interrupts = <0 216 0>;

			interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_TMU_APBIF>;

			clock-names = "tmu_apbif";

			#include "exynos4412-tmu-sensor-conf.dtsi"
@@ -234,14 +237,21 @@ 
			      <0x10482000 0x1000>,

			      <0x10484000 0x2000>,

			      <0x10486000 0x2000>;

			interrupts = <1 9 0xf04>;

			interrupts = <GIC_PPI 9

					(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;

		};



		mct@10050000 {

			compatible = "samsung,exynos4210-mct";

			reg = <0x10050000 0x800>;

			interrupts = <0 218 0>, <0 219 0>, <0 220 0>, <0 221 0>,

				     <0 223 0>, <0 226 0>, <0 227 0>, <0 228 0>;

			interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 228 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_FIN_PLL>, <&cmu CLK_MCT>;

			clock-names = "fin_pll", "mct";

		};
@@ -249,24 +259,24 @@ 
		pinctrl_1: pinctrl@11000000 {

			compatible = "samsung,exynos3250-pinctrl";

			reg = <0x11000000 0x1000>;

			interrupts = <0 225 0>;

			interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;



			wakeup-interrupt-controller {

				compatible = "samsung,exynos4210-wakeup-eint";

				interrupts = <0 48 0>;

				interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

			};

		};



		pinctrl_0: pinctrl@11400000 {

			compatible = "samsung,exynos3250-pinctrl";

			reg = <0x11400000 0x1000>;

			interrupts = <0 240 0>;

			interrupts = <GIC_SPI 240 IRQ_TYPE_LEVEL_HIGH>;

		};



		jpeg: codec@11830000 {

			compatible = "samsung,exynos3250-jpeg";

			reg = <0x11830000 0x1000>;

			interrupts = <0 171 0>;

			interrupts = <GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_JPEG>, <&cmu CLK_SCLK_JPEG>;

			clock-names = "jpeg", "sclk";

			power-domains = <&pd_cam>;
@@ -280,7 +290,8 @@ 
		sysmmu_jpeg: sysmmu@11A60000 {

			compatible = "samsung,exynos-sysmmu";

			reg = <0x11a60000 0x1000>;

			interrupts = <0 156 0>, <0 161 0>;

			interrupts = <GIC_SPI 156 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "sysmmu", "master";

			clocks = <&cmu CLK_SMMUJPEG>, <&cmu CLK_JPEG>;

			power-domains = <&pd_cam>;
@@ -291,7 +302,9 @@ 
			compatible = "samsung,exynos3250-fimd";

			reg = <0x11c00000 0x30000>;

			interrupt-names = "fifo", "vsync", "lcd_sys";

			interrupts = <0 84 0>, <0 85 0>, <0 86 0>;

			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_SCLK_FIMD0>, <&cmu CLK_FIMD0>;

			clock-names = "sclk_fimd", "fimd";

			power-domains = <&pd_lcd0>;
@@ -303,7 +316,7 @@ 
		dsi_0: dsi@11C80000 {

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

			reg = <0x11C80000 0x10000>;

			interrupts = <0 83 0>;

			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

			samsung,phy-type = <0>;

			power-domains = <&pd_lcd0>;

			phys = <&mipi_phy 1>;
@@ -318,7 +331,8 @@ 
		sysmmu_fimd0: sysmmu@11E20000 {

			compatible = "samsung,exynos-sysmmu";

			reg = <0x11e20000 0x1000>;

			interrupts = <0 80 0>, <0 81 0>;

			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "sysmmu", "master";

			clocks = <&cmu CLK_SMMUFIMD0>, <&cmu CLK_FIMD0>;

			power-domains = <&pd_lcd0>;
@@ -328,7 +342,7 @@ 
		hsotg: hsotg@12480000 {

			compatible = "snps,dwc2";

			reg = <0x12480000 0x20000>;

			interrupts = <0 141 0>;

			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_USBOTG>;

			clock-names = "otg";

			phys = <&exynos_usbphy 0>;
@@ -339,7 +353,7 @@ 
		mshc_0: mshc@12510000 {

			compatible = "samsung,exynos5420-dw-mshc";

			reg = <0x12510000 0x1000>;

			interrupts = <0 142 0>;

			interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_SDMMC0>, <&cmu CLK_SCLK_MMC0>;

			clock-names = "biu", "ciu";

			fifo-depth = <0x80>;
@@ -351,7 +365,7 @@ 
		mshc_1: mshc@12520000 {

			compatible = "samsung,exynos5420-dw-mshc";

			reg = <0x12520000 0x1000>;

			interrupts = <0 143 0>;

			interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_SDMMC1>, <&cmu CLK_SCLK_MMC1>;

			clock-names = "biu", "ciu";

			fifo-depth = <0x80>;
@@ -363,7 +377,7 @@ 
		mshc_2: mshc@12530000 {

			compatible = "samsung,exynos5250-dw-mshc";

			reg = <0x12530000 0x1000>;

			interrupts = <0 144 0>;

			interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_SDMMC2>, <&cmu CLK_SCLK_MMC2>;

			clock-names = "biu", "ciu";

			fifo-depth = <0x80>;
@@ -391,7 +405,7 @@ 
			pdma0: pdma@12680000 {

				compatible = "arm,pl330", "arm,primecell";

				reg = <0x12680000 0x1000>;

				interrupts = <0 138 0>;

				interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&cmu CLK_PDMA0>;

				clock-names = "apb_pclk";

				#dma-cells = <1>;
@@ -402,7 +416,7 @@ 
			pdma1: pdma@12690000 {

				compatible = "arm,pl330", "arm,primecell";

				reg = <0x12690000 0x1000>;

				interrupts = <0 139 0>;

				interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&cmu CLK_PDMA1>;

				clock-names = "apb_pclk";

				#dma-cells = <1>;
@@ -415,7 +429,7 @@ 
			compatible = "samsung,exynos3250-adc",

				     "samsung,exynos-adc-v2";

			reg = <0x126C0000 0x100>;

			interrupts = <0 137 0>;

			interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "adc", "sclk";

			clocks = <&cmu CLK_TSADC>, <&cmu CLK_SCLK_TSADC>;

			#io-channel-cells = <1>;
@@ -427,7 +441,7 @@ 
		mfc: codec@13400000 {

			compatible = "samsung,mfc-v7";

			reg = <0x13400000 0x10000>;

			interrupts = <0 102 0>;

			interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "mfc", "sclk_mfc";

			clocks = <&cmu CLK_MFC>, <&cmu CLK_SCLK_MFC>;

			power-domains = <&pd_mfc>;
@@ -437,7 +451,8 @@ 
		sysmmu_mfc: sysmmu@13620000 {

			compatible = "samsung,exynos-sysmmu";

			reg = <0x13620000 0x1000>;

			interrupts = <0 96 0>, <0 98 0>;

			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;

			clock-names = "sysmmu", "master";

			clocks = <&cmu CLK_SMMUMFC_L>, <&cmu CLK_MFC>;

			power-domains = <&pd_mfc>;
@@ -447,7 +462,7 @@ 
		serial_0: serial@13800000 {

			compatible = "samsung,exynos4210-uart";

			reg = <0x13800000 0x100>;

			interrupts = <0 109 0>;

			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_UART0>, <&cmu CLK_SCLK_UART0>;

			clock-names = "uart", "clk_uart_baud0";

			pinctrl-names = "default";
@@ -458,7 +473,7 @@ 
		serial_1: serial@13810000 {

			compatible = "samsung,exynos4210-uart";

			reg = <0x13810000 0x100>;

			interrupts = <0 110 0>;

			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_UART1>, <&cmu CLK_SCLK_UART1>;

			clock-names = "uart", "clk_uart_baud0";

			pinctrl-names = "default";
@@ -469,7 +484,7 @@ 
		serial_2: serial@13820000 {

			compatible = "samsung,exynos4210-uart";

			reg = <0x13820000 0x100>;

			interrupts = <0 111 0>;

			interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_UART2>, <&cmu CLK_SCLK_UART2>;

			clock-names = "uart", "clk_uart_baud0";

			pinctrl-names = "default";
@@ -482,7 +497,7 @@ 
			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";

			reg = <0x13860000 0x100>;

			interrupts = <0 113 0>;

			interrupts = <GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_I2C0>;

			clock-names = "i2c";

			pinctrl-names = "default";
@@ -495,7 +510,7 @@ 
			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";

			reg = <0x13870000 0x100>;

			interrupts = <0 114 0>;

			interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_I2C1>;

			clock-names = "i2c";

			pinctrl-names = "default";
@@ -508,7 +523,7 @@ 
			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";

			reg = <0x13880000 0x100>;

			interrupts = <0 115 0>;

			interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_I2C2>;

			clock-names = "i2c";

			pinctrl-names = "default";
@@ -521,7 +536,7 @@ 
			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";

			reg = <0x13890000 0x100>;

			interrupts = <0 116 0>;

			interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_I2C3>;

			clock-names = "i2c";

			pinctrl-names = "default";
@@ -534,7 +549,7 @@ 
			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";

			reg = <0x138A0000 0x100>;

			interrupts = <0 117 0>;

			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_I2C4>;

			clock-names = "i2c";

			pinctrl-names = "default";
@@ -547,7 +562,7 @@ 
			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";

			reg = <0x138B0000 0x100>;

			interrupts = <0 118 0>;

			interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_I2C5>;

			clock-names = "i2c";

			pinctrl-names = "default";
@@ -560,7 +575,7 @@ 
			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";

			reg = <0x138C0000 0x100>;

			interrupts = <0 119 0>;

			interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_I2C6>;

			clock-names = "i2c";

			pinctrl-names = "default";
@@ -573,7 +588,7 @@ 
			#size-cells = <0>;

			compatible = "samsung,s3c2440-i2c";

			reg = <0x138D0000 0x100>;

			interrupts = <0 120 0>;

			interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_I2C7>;

			clock-names = "i2c";

			pinctrl-names = "default";
@@ -584,7 +599,7 @@ 
		spi_0: spi@13920000 {

			compatible = "samsung,exynos4210-spi";

			reg = <0x13920000 0x100>;

			interrupts = <0 121 0>;

			interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&pdma0 7>, <&pdma0 6>;

			dma-names = "tx", "rx";

			#address-cells = <1>;
@@ -600,7 +615,7 @@ 
		spi_1: spi@13930000 {

			compatible = "samsung,exynos4210-spi";

			reg = <0x13930000 0x100>;

			interrupts = <0 122 0>;

			interrupts = <GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&pdma1 7>, <&pdma1 6>;

			dma-names = "tx", "rx";

			#address-cells = <1>;
@@ -616,7 +631,7 @@ 
		i2s2: i2s@13970000 {

			compatible = "samsung,s3c6410-i2s";

			reg = <0x13970000 0x100>;

			interrupts = <0 126 0>;

			interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&cmu CLK_I2S>, <&cmu CLK_SCLK_I2S>;

			clock-names = "iis", "i2s_opclk0";

			dmas = <&pdma0 14>, <&pdma0 13>;
@@ -629,15 +644,19 @@ 
		pwm: pwm@139D0000 {

			compatible = "samsung,exynos4210-pwm";

			reg = <0x139D0000 0x1000>;

			interrupts = <0 104 0>, <0 105 0>, <0 106 0>,

				     <0 107 0>, <0 108 0>;

			interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

			#pwm-cells = <3>;

			status = "disabled";

		};



		pmu {

			compatible = "arm,cortex-a7-pmu";

			interrupts = <0 18 0>, <0 19 0>;

			interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;

		};



		ppmu_dmc0: ppmu_dmc0@106a0000 {

arch/arm/boot/dts/exynos4.dtsi

+51 −44
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 


#include <dt-bindings/clock/exynos4.h>

#include <dt-bindings/clock/exynos-audss-clk.h>

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

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

#include "exynos-syscon-restart.dtsi"



/ {
@@ -173,7 +175,7 @@ 
	dsi_0: dsi@11C80000 {

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

		reg = <0x11C80000 0x10000>;

		interrupts = <0 79 0>;

		interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;

		power-domains = <&pd_lcd0>;

		phys = <&mipi_phy 1>;

		phy-names = "dsim";
@@ -196,7 +198,7 @@ 
		fimc_0: fimc@11800000 {

			compatible = "samsung,exynos4210-fimc";

			reg = <0x11800000 0x1000>;

			interrupts = <0 84 0>;

			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_FIMC0>, <&clock CLK_SCLK_FIMC0>;

			clock-names = "fimc", "sclk_fimc";

			power-domains = <&pd_cam>;
@@ -208,7 +210,7 @@ 
		fimc_1: fimc@11810000 {

			compatible = "samsung,exynos4210-fimc";

			reg = <0x11810000 0x1000>;

			interrupts = <0 85 0>;

			interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_FIMC1>, <&clock CLK_SCLK_FIMC1>;

			clock-names = "fimc", "sclk_fimc";

			power-domains = <&pd_cam>;
@@ -220,7 +222,7 @@ 
		fimc_2: fimc@11820000 {

			compatible = "samsung,exynos4210-fimc";

			reg = <0x11820000 0x1000>;

			interrupts = <0 86 0>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_FIMC2>, <&clock CLK_SCLK_FIMC2>;

			clock-names = "fimc", "sclk_fimc";

			power-domains = <&pd_cam>;
@@ -232,7 +234,7 @@ 
		fimc_3: fimc@11830000 {

			compatible = "samsung,exynos4210-fimc";

			reg = <0x11830000 0x1000>;

			interrupts = <0 87 0>;

			interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_FIMC3>, <&clock CLK_SCLK_FIMC3>;

			clock-names = "fimc", "sclk_fimc";

			power-domains = <&pd_cam>;
@@ -244,7 +246,7 @@ 
		csis_0: csis@11880000 {

			compatible = "samsung,exynos4210-csis";

			reg = <0x11880000 0x4000>;

			interrupts = <0 78 0>;

			interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_CSIS0>, <&clock CLK_SCLK_CSIS0>;

			clock-names = "csis", "sclk_csis";

			bus-width = <4>;
@@ -259,7 +261,7 @@ 
		csis_1: csis@11890000 {

			compatible = "samsung,exynos4210-csis";

			reg = <0x11890000 0x4000>;

			interrupts = <0 80 0>;

			interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_CSIS1>, <&clock CLK_SCLK_CSIS1>;

			clock-names = "csis", "sclk_csis";

			bus-width = <2>;
@@ -275,7 +277,7 @@ 
	watchdog: watchdog@10060000 {

		compatible = "samsung,s3c2410-wdt";

		reg = <0x10060000 0x100>;

		interrupts = <0 43 0>;

		interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_WDT>;

		clock-names = "watchdog";

		status = "disabled";
@@ -285,7 +287,8 @@ 
		compatible = "samsung,s3c6410-rtc";

		reg = <0x10070000 0x100>;

		interrupt-parent = <&pmu_system_controller>;

		interrupts = <0 44 0>, <0 45 0>;

		interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_RTC>;

		clock-names = "rtc";

		status = "disabled";
@@ -294,7 +297,7 @@ 
	keypad: keypad@100A0000 {

		compatible = "samsung,s5pv210-keypad";

		reg = <0x100A0000 0x100>;

		interrupts = <0 109 0>;

		interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_KEYIF>;

		clock-names = "keypad";

		status = "disabled";
@@ -303,7 +306,7 @@ 
	sdhci_0: sdhci@12510000 {

		compatible = "samsung,exynos4210-sdhci";

		reg = <0x12510000 0x100>;

		interrupts = <0 73 0>;

		interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_SDMMC0>, <&clock CLK_SCLK_MMC0>;

		clock-names = "hsmmc", "mmc_busclk.2";

		status = "disabled";
@@ -312,7 +315,7 @@ 
	sdhci_1: sdhci@12520000 {

		compatible = "samsung,exynos4210-sdhci";

		reg = <0x12520000 0x100>;

		interrupts = <0 74 0>;

		interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_SDMMC1>, <&clock CLK_SCLK_MMC1>;

		clock-names = "hsmmc", "mmc_busclk.2";

		status = "disabled";
@@ -321,7 +324,7 @@ 
	sdhci_2: sdhci@12530000 {

		compatible = "samsung,exynos4210-sdhci";

		reg = <0x12530000 0x100>;

		interrupts = <0 75 0>;

		interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_SDMMC2>, <&clock CLK_SCLK_MMC2>;

		clock-names = "hsmmc", "mmc_busclk.2";

		status = "disabled";
@@ -330,7 +333,7 @@ 
	sdhci_3: sdhci@12540000 {

		compatible = "samsung,exynos4210-sdhci";

		reg = <0x12540000 0x100>;

		interrupts = <0 76 0>;

		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_SDMMC3>, <&clock CLK_SCLK_MMC3>;

		clock-names = "hsmmc", "mmc_busclk.2";

		status = "disabled";
@@ -349,7 +352,7 @@ 
	hsotg: hsotg@12480000 {

		compatible = "samsung,s3c6400-hsotg";

		reg = <0x12480000 0x20000>;

		interrupts = <0 71 0>;

		interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_USB_DEVICE>;

		clock-names = "otg";

		phys = <&exynos_usbphy 0>;
@@ -360,7 +363,7 @@ 
	ehci: ehci@12580000 {

		compatible = "samsung,exynos4210-ehci";

		reg = <0x12580000 0x100>;

		interrupts = <0 70 0>;

		interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_USB_HOST>;

		clock-names = "usbhost";

		status = "disabled";
@@ -386,7 +389,7 @@ 
	ohci: ohci@12590000 {

		compatible = "samsung,exynos4210-ohci";

		reg = <0x12590000 0x100>;

		interrupts = <0 70 0>;

		interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_USB_HOST>;

		clock-names = "usbhost";

		status = "disabled";
@@ -428,7 +431,7 @@ 
	mfc: codec@13400000 {

		compatible = "samsung,mfc-v5";

		reg = <0x13400000 0x10000>;

		interrupts = <0 94 0>;

		interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;

		power-domains = <&pd_mfc>;

		clocks = <&clock CLK_MFC>, <&clock CLK_SCLK_MFC>;

		clock-names = "mfc", "sclk_mfc";
@@ -439,7 +442,7 @@ 
	serial_0: serial@13800000 {

		compatible = "samsung,exynos4210-uart";

		reg = <0x13800000 0x100>;

		interrupts = <0 52 0>;

		interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;

		clock-names = "uart", "clk_uart_baud0";

		dmas = <&pdma0 15>, <&pdma0 16>;
@@ -450,7 +453,7 @@ 
	serial_1: serial@13810000 {

		compatible = "samsung,exynos4210-uart";

		reg = <0x13810000 0x100>;

		interrupts = <0 53 0>;

		interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;

		clock-names = "uart", "clk_uart_baud0";

		dmas = <&pdma1 15>, <&pdma1 16>;
@@ -461,7 +464,7 @@ 
	serial_2: serial@13820000 {

		compatible = "samsung,exynos4210-uart";

		reg = <0x13820000 0x100>;

		interrupts = <0 54 0>;

		interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;

		clock-names = "uart", "clk_uart_baud0";

		dmas = <&pdma0 17>, <&pdma0 18>;
@@ -472,7 +475,7 @@ 
	serial_3: serial@13830000 {

		compatible = "samsung,exynos4210-uart";

		reg = <0x13830000 0x100>;

		interrupts = <0 55 0>;

		interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;

		clock-names = "uart", "clk_uart_baud0";

		dmas = <&pdma1 17>, <&pdma1 18>;
@@ -485,7 +488,7 @@ 
		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";

		reg = <0x13860000 0x100>;

		interrupts = <0 58 0>;

		interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_I2C0>;

		clock-names = "i2c";

		pinctrl-names = "default";
@@ -498,7 +501,7 @@ 
		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";

		reg = <0x13870000 0x100>;

		interrupts = <0 59 0>;

		interrupts = <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_I2C1>;

		clock-names = "i2c";

		pinctrl-names = "default";
@@ -511,7 +514,7 @@ 
		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";

		reg = <0x13880000 0x100>;

		interrupts = <0 60 0>;

		interrupts = <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_I2C2>;

		clock-names = "i2c";

		pinctrl-names = "default";
@@ -524,7 +527,7 @@ 
		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";

		reg = <0x13890000 0x100>;

		interrupts = <0 61 0>;

		interrupts = <GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_I2C3>;

		clock-names = "i2c";

		pinctrl-names = "default";
@@ -537,7 +540,7 @@ 
		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";

		reg = <0x138A0000 0x100>;

		interrupts = <0 62 0>;

		interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_I2C4>;

		clock-names = "i2c";

		pinctrl-names = "default";
@@ -550,7 +553,7 @@ 
		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";

		reg = <0x138B0000 0x100>;

		interrupts = <0 63 0>;

		interrupts = <GIC_SPI 63 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_I2C5>;

		clock-names = "i2c";

		pinctrl-names = "default";
@@ -563,7 +566,7 @@ 
		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";

		reg = <0x138C0000 0x100>;

		interrupts = <0 64 0>;

		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_I2C6>;

		clock-names = "i2c";

		pinctrl-names = "default";
@@ -576,7 +579,7 @@ 
		#size-cells = <0>;

		compatible = "samsung,s3c2440-i2c";

		reg = <0x138D0000 0x100>;

		interrupts = <0 65 0>;

		interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_I2C7>;

		clock-names = "i2c";

		pinctrl-names = "default";
@@ -589,7 +592,7 @@ 
		#size-cells = <0>;

		compatible = "samsung,s3c2440-hdmiphy-i2c";

		reg = <0x138E0000 0x100>;

		interrupts = <0 93 0>;

		interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_I2C_HDMI>;

		clock-names = "i2c";

		status = "disabled";
@@ -603,7 +606,7 @@ 
	spi_0: spi@13920000 {

		compatible = "samsung,exynos4210-spi";

		reg = <0x13920000 0x100>;

		interrupts = <0 66 0>;

		interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;

		dmas = <&pdma0 7>, <&pdma0 6>;

		dma-names = "tx", "rx";

		#address-cells = <1>;
@@ -618,7 +621,7 @@ 
	spi_1: spi@13930000 {

		compatible = "samsung,exynos4210-spi";

		reg = <0x13930000 0x100>;

		interrupts = <0 67 0>;

		interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;

		dmas = <&pdma1 7>, <&pdma1 6>;

		dma-names = "tx", "rx";

		#address-cells = <1>;
@@ -633,7 +636,7 @@ 
	spi_2: spi@13940000 {

		compatible = "samsung,exynos4210-spi";

		reg = <0x13940000 0x100>;

		interrupts = <0 68 0>;

		interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;

		dmas = <&pdma0 9>, <&pdma0 8>;

		dma-names = "tx", "rx";

		#address-cells = <1>;
@@ -648,7 +651,11 @@ 
	pwm: pwm@139D0000 {

		compatible = "samsung,exynos4210-pwm";

		reg = <0x139D0000 0x1000>;

		interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>, <0 41 0>;

		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_PWM>;

		clock-names = "timers";

		#pwm-cells = <3>;
@@ -665,7 +672,7 @@ 
		pdma0: pdma@12680000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x12680000 0x1000>;

			interrupts = <0 35 0>;

			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_PDMA0>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;
@@ -676,7 +683,7 @@ 
		pdma1: pdma@12690000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x12690000 0x1000>;

			interrupts = <0 36 0>;

			interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_PDMA1>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;
@@ -687,7 +694,7 @@ 
		mdma1: mdma@12850000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x12850000 0x1000>;

			interrupts = <0 34 0>;

			interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clock CLK_MDMA>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;
@@ -717,7 +724,7 @@ 
	jpeg_codec: jpeg-codec@11840000 {

		compatible = "samsung,exynos4210-jpeg";

		reg = <0x11840000 0x1000>;

		interrupts = <0 88 0>;

		interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_JPEG>;

		clock-names = "jpeg";

		power-domains = <&pd_cam>;
@@ -727,7 +734,7 @@ 
	rotator: rotator@12810000 {

		compatible = "samsung,exynos4210-rotator";

		reg = <0x12810000 0x64>;

		interrupts = <0 83 0>;

		interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_ROTATOR>;

		clock-names = "rotator";

		iommus = <&sysmmu_rotator>;
@@ -736,7 +743,7 @@ 
	hdmi: hdmi@12D00000 {

		compatible = "samsung,exynos4210-hdmi";

		reg = <0x12D00000 0x70000>;

		interrupts = <0 92 0>;

		interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;

		clock-names = "hdmi", "sclk_hdmi", "sclk_pixel", "sclk_hdmiphy",

			"mout_hdmi";

		clocks = <&clock CLK_HDMI>, <&clock CLK_SCLK_HDMI>,
@@ -751,7 +758,7 @@ 
	hdmicec: cec@100B0000 {

		compatible = "samsung,s5p-cec";

		reg = <0x100B0000 0x200>;

		interrupts = <0 114 0>;

		interrupts = <GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_HDMI_CEC>;

		clock-names = "hdmicec";

		samsung,syscon-phandle = <&pmu_system_controller>;
@@ -762,7 +769,7 @@ 


	mixer: mixer@12C10000 {

		compatible = "samsung,exynos4210-mixer";

		interrupts = <0 91 0>;

		interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;

		reg = <0x12C10000 0x2100>, <0x12c00000 0x300>;

		power-domains = <&pd_tv>;

		iommus = <&sysmmu_tv>;
@@ -989,7 +996,7 @@ 
	sss: sss@10830000 {

		compatible = "samsung,exynos4210-secss";

		reg = <0x10830000 0x300>;

		interrupts = <0 112 0>;

		interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_SSS>;

		clock-names = "secss";

	};

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

+16 −4

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/exynos4210.dtsi

+24 −12

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE