Commit e3cef9bb authored by Arnd Bergmann's avatar Arnd Bergmann

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
...@@ -118,7 +118,7 @@ macb0: ethernet@f8020000 { ...@@ -118,7 +118,7 @@ macb0: ethernet@f8020000 {
ethernet-phy@1 { ethernet-phy@1 {
reg = <0x1>; reg = <0x1>;
reset-gpios = <&pioE 8 GPIO_ACTIVE_HIGH>; reset-gpios = <&pioE 8 GPIO_ACTIVE_LOW>;
interrupt-parent = <&pioB>; interrupt-parent = <&pioB>;
interrupts = <15 IRQ_TYPE_EDGE_FALLING>; interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
}; };
...@@ -162,7 +162,7 @@ ethernet-phy@1 { ...@@ -162,7 +162,7 @@ ethernet-phy@1 {
reg = <0x1>; reg = <0x1>;
interrupt-parent = <&pioB>; interrupt-parent = <&pioB>;
interrupts = <31 IRQ_TYPE_EDGE_FALLING>; interrupts = <31 IRQ_TYPE_EDGE_FALLING>;
reset-gpios = <&pioE 6 GPIO_ACTIVE_HIGH>; reset-gpios = <&pioE 6 GPIO_ACTIVE_LOW>;
}; };
}; };
......
...@@ -978,7 +978,7 @@ macb0: ethernet@fffbc000 { ...@@ -978,7 +978,7 @@ macb0: ethernet@fffbc000 {
trng@fffcc000 { trng@fffcc000 {
compatible = "atmel,at91sam9g45-trng"; compatible = "atmel,at91sam9g45-trng";
reg = <0xfffcc000 0x4000>; reg = <0xfffcc000 0x100>;
interrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>; interrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>;
clocks = <&trng_clk>; clocks = <&trng_clk>;
}; };
......
...@@ -1168,6 +1168,13 @@ flx4: flexcom@fc018000 { ...@@ -1168,6 +1168,13 @@ flx4: flexcom@fc018000 {
status = "disabled"; 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 { aic: interrupt-controller@fc020000 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
compatible = "atmel,sama5d2-aic"; compatible = "atmel,sama5d2-aic";
......
...@@ -426,6 +426,13 @@ tdes@f803c000 { ...@@ -426,6 +426,13 @@ tdes@f803c000 {
clock-names = "tdes_clk"; 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 { dma0: dma-controller@ffffe600 {
compatible = "atmel,at91sam9g45-dma"; compatible = "atmel,at91sam9g45-dma";
reg = <0xffffe600 0x200>; reg = <0xffffe600 0x200>;
......
...@@ -1202,6 +1202,13 @@ macb1: ethernet@fc028000 { ...@@ -1202,6 +1202,13 @@ macb1: ethernet@fc028000 {
status = "disabled"; status = "disabled";
}; };
trng@fc030000 {
compatible = "atmel,at91sam9g45-trng";
reg = <0xfc030000 0x100>;
interrupts = <53 IRQ_TYPE_LEVEL_HIGH 0>;
clocks = <&trng_clk>;
};
adc0: adc@fc034000 { adc0: adc@fc034000 {
compatible = "atmel,at91sam9x5-adc"; compatible = "atmel,at91sam9x5-adc";
reg = <0xfc034000 0x100>; reg = <0xfc034000 0x100>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment