Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'at91-dt3' of... 

Merge tag 'at91-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt

Merge "Third batch of DT changes for 4.7" from Nicolas Ferre:

- a fix for the VInCo platform: reset gpio specification for Ethernet
- addition of True Random Number Generator (TRNG) for all sama5 platforms
- trivial adjustment of TRNG register map size for at91sam9g45 family

* tag 'at91-dt3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: dts: at91: sama5d4: add trng node
  ARM: dts: at91: sama5d3: add trng node
  ARM: dts: at91: sama5d2: add trng node
  ARM: dts: at91: at91sam9g45 family: reduce the trng register map size
  ARM: dts: at91: VInCo: fix phy reset gpio flag
parents 3a99f3d8 00bf4f78

arch/arm/boot/dts/at91-vinco.dts

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 


				ethernet-phy@1 {

					reg = <0x1>;

					reset-gpios = <&pioE 8 GPIO_ACTIVE_HIGH>;

					reset-gpios = <&pioE 8 GPIO_ACTIVE_LOW>;

					interrupt-parent = <&pioB>;

					interrupts = <15 IRQ_TYPE_EDGE_FALLING>;

				};
@@ -162,7 +162,7 @@ 
					reg = <0x1>;

					interrupt-parent = <&pioB>;

					interrupts = <31 IRQ_TYPE_EDGE_FALLING>;

					reset-gpios = <&pioE 6 GPIO_ACTIVE_HIGH>;

					reset-gpios = <&pioE 6 GPIO_ACTIVE_LOW>;

				};

			};

arch/arm/boot/dts/at91sam9g45.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ 


			trng@fffcc000 {

				compatible = "atmel,at91sam9g45-trng";

				reg = <0xfffcc000 0x4000>;

				reg = <0xfffcc000 0x100>;

				interrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&trng_clk>;

			};

arch/arm/boot/dts/sama5d2.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -1168,6 +1168,13 @@ 
				status = "disabled";

			};



			trng@fc01c000 {

				compatible = "atmel,at91sam9g45-trng";

				reg = <0xfc01c000 0x100>;

				interrupts = <47 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&trng_clk>;

			};



			aic: interrupt-controller@fc020000 {

				#interrupt-cells = <3>;

				compatible = "atmel,sama5d2-aic";

arch/arm/boot/dts/sama5d3.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -426,6 +426,13 @@ 
				clock-names = "tdes_clk";

			};



			trng@f8040000 {

				compatible = "atmel,at91sam9g45-trng";

				reg = <0xf8040000 0x100>;

				interrupts = <45 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&trng_clk>;

			};



			dma0: dma-controller@ffffe600 {

				compatible = "atmel,at91sam9g45-dma";

				reg = <0xffffe600 0x200>;

arch/arm/boot/dts/sama5d4.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,13 @@ 
				status = "disabled";

			};



			trng@fc030000 {

				compatible = "atmel,at91sam9g45-trng";

				reg = <0xfc030000 0x100>;

				interrupts = <53 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&trng_clk>;

			};



			adc0: adc@fc034000 {

				compatible = "atmel,at91sam9x5-adc";

				reg = <0xfc034000 0x100>;