diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 17:26:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-16 17:26:26 -0500 |
commit | 205dc205ed3ba748bab9770016bbbffb68558146 (patch) | |
tree | 100ae66d7ed97e3ecede3288797aa4e2962f2b0d /arch/arm/boot/dts/at91sam9g45.dtsi | |
parent | 94bbdb63d7ed5ca56b788e43d0ca4a8f9494c9e7 (diff) | |
parent | 1d5f497d87c7d960c27cdc40e7563b0ae88387d3 (diff) |
Merge tag 'dt2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC DT updates part 2 from Arnd Bergmann:
"This is a follow-up to the early ARM SoC DT changes, with additional
content that has external dependencies:
- The Tegra IOMMU DT support depends on changes from the iommu tree,
plus the contents of the arm-soc drivers branch
- The MVEBU PHY support depends on changes from the phy tree
- The AT91 DT support depends on changes from the RTC and DMA-slave
trees
All of these changes just enable additional devices for existing
platforms"
* tag 'dt2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: tegra: Enable IOMMU for display controllers on Tegra124
ARM: tegra: Enable IOMMU for display controllers on Tegra114
ARM: tegra: Enable IOMMU for display controllers on Tegra30
ARM: tegra: Add memory controller support for Tegra124
ARM: tegra: Add memory controller support for Tegra114
ARM: tegra: Add memory controller support for Tegra30
ARM: tegra: Add APB_MISC_GP as a MIPI pad control bank
ARM: mvebu: add PHY support to the dts for the USB controllers on Armada 375
ARM: mvebu: add Device Tree description of USB cluster controller on Armada 375
ARM: at91/dt: at91sam9g45: add ISI node
ARM: at91/dt: enable the RTT block on the at91sam9m10g45ek board
ARM: at91/dt: enable the RTT block on the sam9g20ek board
ARM: at91/dt: add GPBR nodes
ARM: at91/dt: add RTT nodes to at91 dtsis
ARM: at91/dt: at91sam9rl: add rtc
ARM: at91: fix GPLv2 wording
ARM: at91/dt: sama5d4: add DMA support
ARM: at91/dt: sama5d4: use macro instead of numeric value
Diffstat (limited to 'arch/arm/boot/dts/at91sam9g45.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9g45.dtsi | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index 6c0637a4bda5..2a8da8a884b4 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi | |||
@@ -492,6 +492,27 @@ | |||
492 | }; | 492 | }; |
493 | }; | 493 | }; |
494 | 494 | ||
495 | isi { | ||
496 | pinctrl_isi: isi-0 { | ||
497 | atmel,pins = <AT91_PIOB 8 AT91_PERIPH_B AT91_PINCTRL_NONE /* D8 */ | ||
498 | AT91_PIOB 9 AT91_PERIPH_B AT91_PINCTRL_NONE /* D9 */ | ||
499 | AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE /* D10 */ | ||
500 | AT91_PIOB 11 AT91_PERIPH_B AT91_PINCTRL_NONE /* D11 */ | ||
501 | AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE /* D0 */ | ||
502 | AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE /* D1 */ | ||
503 | AT91_PIOB 22 AT91_PERIPH_A AT91_PINCTRL_NONE /* D2 */ | ||
504 | AT91_PIOB 23 AT91_PERIPH_A AT91_PINCTRL_NONE /* D3 */ | ||
505 | AT91_PIOB 24 AT91_PERIPH_A AT91_PINCTRL_NONE /* D4 */ | ||
506 | AT91_PIOB 25 AT91_PERIPH_A AT91_PINCTRL_NONE /* D5 */ | ||
507 | AT91_PIOB 26 AT91_PERIPH_A AT91_PINCTRL_NONE /* D6 */ | ||
508 | AT91_PIOB 27 AT91_PERIPH_A AT91_PINCTRL_NONE /* D7 */ | ||
509 | AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_NONE /* PCK */ | ||
510 | AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE /* VSYNC */ | ||
511 | AT91_PIOB 30 AT91_PERIPH_A AT91_PINCTRL_NONE /* HSYNC */ | ||
512 | AT91_PIOB 31 AT91_PERIPH_A AT91_PINCTRL_NONE /* MCK */>; | ||
513 | }; | ||
514 | }; | ||
515 | |||
495 | usart0 { | 516 | usart0 { |
496 | pinctrl_usart0: usart0-0 { | 517 | pinctrl_usart0: usart0-0 { |
497 | atmel,pins = | 518 | atmel,pins = |
@@ -1035,6 +1056,17 @@ | |||
1035 | }; | 1056 | }; |
1036 | }; | 1057 | }; |
1037 | 1058 | ||
1059 | isi@fffb4000 { | ||
1060 | compatible = "atmel,at91sam9g45-isi"; | ||
1061 | reg = <0xfffb4000 0x4000>; | ||
1062 | interrupts = <26 IRQ_TYPE_LEVEL_HIGH 5>; | ||
1063 | clocks = <&isi_clk>; | ||
1064 | clock-names = "isi_clk"; | ||
1065 | pinctrl-names = "default"; | ||
1066 | pinctrl-0 = <&pinctrl_isi>; | ||
1067 | status = "disabled"; | ||
1068 | }; | ||
1069 | |||
1038 | pwm0: pwm@fffb8000 { | 1070 | pwm0: pwm@fffb8000 { |
1039 | compatible = "atmel,at91sam9rl-pwm"; | 1071 | compatible = "atmel,at91sam9rl-pwm"; |
1040 | reg = <0xfffb8000 0x300>; | 1072 | reg = <0xfffb8000 0x300>; |
@@ -1199,12 +1231,26 @@ | |||
1199 | }; | 1231 | }; |
1200 | }; | 1232 | }; |
1201 | 1233 | ||
1234 | rtc@fffffd20 { | ||
1235 | compatible = "atmel,at91sam9260-rtt"; | ||
1236 | reg = <0xfffffd20 0x10>; | ||
1237 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | ||
1238 | clocks = <&clk32k>; | ||
1239 | status = "disabled"; | ||
1240 | }; | ||
1241 | |||
1202 | rtc@fffffdb0 { | 1242 | rtc@fffffdb0 { |
1203 | compatible = "atmel,at91rm9200-rtc"; | 1243 | compatible = "atmel,at91rm9200-rtc"; |
1204 | reg = <0xfffffdb0 0x30>; | 1244 | reg = <0xfffffdb0 0x30>; |
1205 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; | 1245 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
1206 | status = "disabled"; | 1246 | status = "disabled"; |
1207 | }; | 1247 | }; |
1248 | |||
1249 | gpbr: syscon@fffffd60 { | ||
1250 | compatible = "atmel,at91sam9260-gpbr", "syscon"; | ||
1251 | reg = <0xfffffd60 0x10>; | ||
1252 | status = "disabled"; | ||
1253 | }; | ||
1208 | }; | 1254 | }; |
1209 | 1255 | ||
1210 | fb0: fb@0x00500000 { | 1256 | fb0: fb@0x00500000 { |