diff options
100 files changed, 2728 insertions, 517 deletions
diff --git a/Documentation/arm/Atmel/README b/Documentation/arm/Atmel/README index c53a19b4aab2..0931cf7e2e56 100644 --- a/Documentation/arm/Atmel/README +++ b/Documentation/arm/Atmel/README | |||
| @@ -90,6 +90,11 @@ the Atmel website: http://www.atmel.com. | |||
| 90 | + Datasheet | 90 | + Datasheet |
| 91 | http://www.atmel.com/Images/Atmel-11238-32-bit-Cortex-A5-Microcontroller-SAMA5D4_Datasheet.pdf | 91 | http://www.atmel.com/Images/Atmel-11238-32-bit-Cortex-A5-Microcontroller-SAMA5D4_Datasheet.pdf |
| 92 | 92 | ||
| 93 | - sama5d2 family | ||
| 94 | - sama5d27 | ||
| 95 | + Datasheet | ||
| 96 | Coming soon | ||
| 97 | |||
| 93 | 98 | ||
| 94 | Linux kernel information | 99 | Linux kernel information |
| 95 | ------------------------ | 100 | ------------------------ |
diff --git a/Documentation/devicetree/bindings/arm/atmel-at91.txt b/Documentation/devicetree/bindings/arm/atmel-at91.txt index dd998b9c0433..23c097812d98 100644 --- a/Documentation/devicetree/bindings/arm/atmel-at91.txt +++ b/Documentation/devicetree/bindings/arm/atmel-at91.txt | |||
| @@ -27,6 +27,8 @@ compatible: must be one of: | |||
| 27 | o "atmel,at91sam9xe" | 27 | o "atmel,at91sam9xe" |
| 28 | * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific | 28 | * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific |
| 29 | SoC family: | 29 | SoC family: |
| 30 | o "atmel,sama5d2" shall be extended with the specific SoC compatible: | ||
| 31 | - "atmel,sama5d27" | ||
| 30 | o "atmel,sama5d3" shall be extended with the specific SoC compatible: | 32 | o "atmel,sama5d3" shall be extended with the specific SoC compatible: |
| 31 | - "atmel,sama5d31" | 33 | - "atmel,sama5d31" |
| 32 | - "atmel,sama5d33" | 34 | - "atmel,sama5d33" |
diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt index 100307304766..6831d025ec24 100644 --- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt +++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt | |||
| @@ -305,12 +305,13 @@ Secure Non-Volatile Storage (SNVS) Node | |||
| 305 | Node defines address range and the associated | 305 | Node defines address range and the associated |
| 306 | interrupt for the SNVS function. This function | 306 | interrupt for the SNVS function. This function |
| 307 | monitors security state information & reports | 307 | monitors security state information & reports |
| 308 | security violations. | 308 | security violations. This also included rtc, |
| 309 | system power off and ON/OFF key. | ||
| 309 | 310 | ||
| 310 | - compatible | 311 | - compatible |
| 311 | Usage: required | 312 | Usage: required |
| 312 | Value type: <string> | 313 | Value type: <string> |
| 313 | Definition: Must include "fsl,sec-v4.0-mon". | 314 | Definition: Must include "fsl,sec-v4.0-mon" and "syscon". |
| 314 | 315 | ||
| 315 | - reg | ||