Commit 7f7bb317 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sirf-dts-for-3.16' of... 

Merge tag 'sirf-dts-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt

Merge "ARM: sirf: dts update for 3.16" from Barry Son:

some minor cleanup and add some missed nodes:
1. move dma channel descriptions to generic dma properity
2. add resets properity for some nodes;
3. add missed pinctrl groups.

* tag 'sirf-dts-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux

:
  ARM: dts: sirf: add resets for dspif, gps and dsp nodes
  ARM: dts: atlas6: add cortex-a9-pmu compatible PMU node
  ARM: dts: sirf: move to use generic dma dt-binding for spi
  ARM: dts: sirf: add pin group for USP0 with only RX or TX frame sync for atlas6

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 70bc6bb3 b01c5905

arch/arm/boot/dts/atlas6.dtsi

+26 −5
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ 
		};

	};



	arm-pmu {

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

		interrupts = <29>;

	};



	axi {

		compatible = "simple-bus";

		#address-cells = <1>;
@@ -167,6 +172,7 @@ 
				compatible = "sirf,prima2-dspif";

				reg = <0xa8000000 0x10000>;

				interrupts = <9>;

				resets = <&rstc 1>;

			};



			gps@a8010000 {
@@ -174,6 +180,7 @@ 
				reg = <0xa8010000 0x10000>;

				interrupts = <7>;

				clocks = <&clks 9>;

				resets = <&rstc 2>;

			};



			dsp@a9000000 {
@@ -181,6 +188,7 @@ 
				reg = <0xa9000000 0x1000000>;

				interrupts = <8>;

				clocks = <&clks 8>;

				resets = <&rstc 0>;

			};

		};
@@ -297,9 +305,9 @@ 
				reg = <0xb00d0000 0x10000>;

				interrupts = <15>;

				sirf,spi-num-chipselects = <1>;

				cs-gpios = <&gpio 0 0>;

				sirf,spi-dma-rx-channel = <25>;

				sirf,spi-dma-tx-channel = <20>;

				dmas = <&dmac1 9>,

				     <&dmac1 4>;

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

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&clks 19>;
@@ -312,8 +320,9 @@ 
				reg = <0xb0170000 0x10000>;

				interrupts = <16>;

				sirf,spi-num-chipselects = <1>;

				sirf,spi-dma-rx-channel = <12>;

				sirf,spi-dma-tx-channel = <13>;

				dmas = <&dmac0 12>,

				     <&dmac0 13>;

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

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&clks 20>;
@@ -554,6 +563,18 @@ 
                                                sirf,function = "usp0_uart_nostreamctrl";

                                        };

                                };

				usp0_only_utfs_pins_a: usp0@2 {

					usp0 {

						sirf,pins = "usp0_only_utfs_grp";

						sirf,function = "usp0_only_utfs";

					};

				};

				usp0_only_urfs_pins_a: usp0@3 {

					usp0 {

						sirf,pins = "usp0_only_urfs_grp";

						sirf,function = "usp0_only_urfs";

					};

				};

                                usp1_pins_a: usp1@0 {

                                        usp1 {

                                                sirf,pins = "usp1grp";

arch/arm/boot/dts/prima2.dtsi

+6 −4
Original line number Diff line number Diff line
@@ -313,8 +313,9 @@ 
				reg = <0xb00d0000 0x10000>;

				interrupts = <15>;

				sirf,spi-num-chipselects = <1>;

				sirf,spi-dma-rx-channel = <25>;

				sirf,spi-dma-tx-channel = <20>;

				dmas = <&dmac1 9>,

				     <&dmac1 4>;

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

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&clks 19>;
@@ -327,8 +328,9 @@ 
				reg = <0xb0170000 0x10000>;

				interrupts = <16>;

				sirf,spi-num-chipselects = <1>;

				sirf,spi-dma-rx-channel = <12>;

				sirf,spi-dma-tx-channel = <13>;

				dmas = <&dmac0 12>,

				     <&dmac0 13>;

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

				#address-cells = <1>;

				#size-cells = <0>;

				clocks = <&clks 20>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE