diff options
-rw-r--r-- | arch/arm/boot/dts/at91rm9200.dtsi | 20 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91rm9200ek.dts | 10 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9n12.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/sama5d3.dtsi | 10 |
4 files changed, 44 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi index 34c03806fe06..92b9e21389db 100644 --- a/arch/arm/boot/dts/at91rm9200.dtsi +++ b/arch/arm/boot/dts/at91rm9200.dtsi | |||
@@ -478,6 +478,15 @@ | |||
478 | }; | 478 | }; |
479 | }; | 479 | }; |
480 | 480 | ||
481 | spi0 { | ||
482 | pinctrl_spi0: spi0-0 { | ||
483 | atmel,pins = | ||
484 | <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA0 periph A SPI0_MISO pin */ | ||
485 | AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA1 periph A SPI0_MOSI pin */ | ||
486 | AT91_PIOA 2 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA2 periph A SPI0_SPCK pin */ | ||
487 | }; | ||
488 | }; | ||
489 | |||
481 | pioA: gpio@fffff400 { | 490 | pioA: gpio@fffff400 { |
482 | compatible = "atmel,at91rm9200-gpio"; | 491 | compatible = "atmel,at91rm9200-gpio"; |
483 | reg = <0xfffff400 0x200>; | 492 | reg = <0xfffff400 0x200>; |
@@ -578,6 +587,17 @@ | |||
578 | interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>; | 587 | interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>; |
579 | status = "disabled"; | 588 | status = "disabled"; |
580 | }; | 589 | }; |
590 | |||
591 | spi0: spi@fffe0000 { | ||
592 | #address-cells = <1>; | ||
593 | #size-cells = <0>; | ||
594 | compatible = "atmel,at91rm9200-spi"; | ||
595 | reg = <0xfffe0000 0x200>; | ||
596 | interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>; | ||
597 | pinctrl-names = "default"; | ||
598 | pinctrl-0 = <&pinctrl_spi0>; | ||
599 | status = "disabled"; | ||
600 | }; | ||
581 | }; | 601 | }; |
582 | 602 | ||
583 | nand0: nand@40000000 { | 603 | nand0: nand@40000000 { |
diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts index 14058125d123..d2d72c3b44c4 100644 --- a/arch/arm/boot/dts/at91rm9200ek.dts +++ b/arch/arm/boot/dts/at91rm9200ek.dts | |||
@@ -53,6 +53,16 @@ | |||
53 | atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>; | 53 | atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>; |
54 | status = "okay"; | 54 | status = "okay"; |
55 | }; | 55 | }; |
56 | |||
57 | spi0: spi@fffe0000 { | ||
58 | status = "okay"; | ||
59 | cs-gpios = <&pioA 3 0>, <0>, <0>, <0>; | ||
60 | mtd_dataflash@0 { | ||
61 | compatible = "atmel,at45", "atmel,dataflash"; | ||
62 | spi-max-frequency = <15000000>; | ||
63 | reg = <0>; | ||
64 | }; | ||
65 | }; | ||
56 | }; | 66 | }; |
57 | 67 | ||
58 | usb0: ohci@00300000 { | 68 | usb0: ohci@00300000 { |
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi index 973bf5fd9800..bb7f564b3a55 100644 --- a/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/arch/arm/boot/dts/at91sam9n12.dtsi | |||
@@ -492,6 +492,9 @@ | |||
492 | compatible = "atmel,at91rm9200-spi"; | 492 | compatible = "atmel,at91rm9200-spi"; |
493 | reg = <0xf0000000 0x100>; | 493 | reg = <0xf0000000 0x100>; |
494 | interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>; | 494 | interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>; |
495 | dmas = <&dma 1 AT91_DMA_CFG_PER_ID(1)>, | ||
496 | <&dma 1 AT91_DMA_CFG_PER_ID(2)>; | ||
497 | dma-names = "tx", "rx"; | ||
495 | pinctrl-names = "default"; | 498 | pinctrl-names = "default"; |
496 | pinctrl-0 = <&pinctrl_spi0>; | 499 | pinctrl-0 = <&pinctrl_spi0>; |
497 | status = "disabled"; | 500 | status = "disabled"; |
@@ -503,6 +506,9 @@ | |||
503 | compatible = "atmel,at91rm9200-spi"; | 506 | compatible = "atmel,at91rm9200-spi"; |
504 | reg = <0xf0004000 0x100>; | 507 | reg = <0xf0004000 0x100>; |
505 | interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>; | 508 | interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>; |
509 | dmas = <&dma 1 AT91_DMA_CFG_PER_ID(3)>, | ||
510 | <&dma 1 AT91_DMA_CFG_PER_ID(4)>; | ||
511 | dma-names = "tx", "rx"; | ||
506 | pinctrl-names = "default"; | 512 | pinctrl-names = "default"; |
507 | pinctrl-0 = <&pinctrl_spi1>; | 513 | pinctrl-0 = <&pinctrl_spi1>; |
508 | status = "disabled"; | 514 | status = "disabled"; |
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index bbf88d722956..a1d5e25a6698 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi | |||
@@ -80,9 +80,12 @@ | |||
80 | spi0: spi@f0004000 { | 80 | spi0: spi@f0004000 { |
81 | #address-cells = <1>; | 81 | #address-cells = <1>; |
82 | #size-cells = <0>; | 82 | #size-cells = <0>; |
83 | compatible = "atmel,at91sam9x5-spi"; | 83 | compatible = "atmel,at91rm9200-spi"; |
84 | reg = <0xf0004000 0x100>; | 84 | reg = <0xf0004000 0x100>; |
85 | interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; | 85 | interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; |
86 | dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(1)>, | ||
87 | <&dma0 2 AT91_DMA_CFG_PER_ID(2)>; | ||
88 | dma-names = "tx", "rx"; | ||
86 | pinctrl-names = "default"; | 89 | pinctrl-names = "default"; |
87 | pinctrl-0 = <&pinctrl_spi0>; | 90 | pinctrl-0 = <&pinctrl_spi0>; |
88 | status = "disabled"; | 91 | status = "disabled"; |
@@ -203,9 +206,12 @@ | |||
203 | spi1: spi@f8008000 { | 206 | spi1: spi@f8008000 { |
204 | #address-cells = <1>; | 207 | #address-cells = <1>; |
205 | #size-cells = <0>; | 208 | #size-cells = <0>; |
206 | compatible = "atmel,at91sam9x5-spi"; | 209 | compatible = "atmel,at91rm9200-spi"; |
207 | reg = <0xf8008000 0x100>; | 210 | reg = <0xf8008000 0x100>; |
208 | interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>; | 211 | interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>; |
212 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(15)>, | ||
213 | <&dma1 2 AT91_DMA_CFG_PER_ID(16)>; | ||
214 | dma-names = "tx", "rx"; | ||
209 | pinctrl-names = "default"; | 215 | pinctrl-names = "default"; |
210 | pinctrl-0 = <&pinctrl_spi1>; | 216 | pinctrl-0 = <&pinctrl_spi1>; |
211 | status = "disabled"; | 217 | status = "disabled"; |