diff options
| author | Boris BREZILLON <b.brezillon@overkiz.com> | 2013-08-07 12:14:26 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-10-16 15:47:07 +0200 |
| commit | d195608acc78db293468694ed5225a39e440429d (patch) | |
| tree | 0018e973d8baf55db02ab43d93c77f5d9bbb165b /arch/arm/boot/dts/at91sam9x35.dtsi | |
| parent | ARM: at91: cam60: fix incorrect placement of __initdata tag (diff) | |
| download | linux-d195608acc78db293468694ed5225a39e440429d.tar.xz linux-d195608acc78db293468694ed5225a39e440429d.zip | |
ARM: at91/dt: split sam9x5 peripheral definitions
This patch splits the sam9x5 peripheral definitions into:
- a common base for all sam9x5 SoCs (at91sam9x5.dtsi)
- several optional peripheral definitions which will be included by specific
sam9x5 SoCs (at91sam9x5_'periph name'.dtsi)
This provides a better representation of the real hardware (drop unneeded
dt nodes) and avoids future peripheral id conflict (lcdc and isi both use
peripheral id 25).
Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x35.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x35.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9x35.dtsi b/arch/arm/boot/dts/at91sam9x35.dtsi index 1a3d525a1f5d..8eac66ce0ab7 100644 --- a/arch/arm/boot/dts/at91sam9x35.dtsi +++ b/arch/arm/boot/dts/at91sam9x35.dtsi @@ -7,6 +7,7 @@ */ #include "at91sam9x5.dtsi" +#include "at91sam9x5_macb0.dtsi" / { model = "Atmel AT91SAM9X35 SoC"; |