-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 int…
…o next/cleanup From Nicolas Ferre: First cleanup series for 3.13 - a little non-urgent fix - addition of DT files to MAINTAINERS - more important, the splitting of .dtsi files that allows to precisely choose the peripherals that are present for a particular SoC. It is useful for upcoming move to common cloks. * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: MAINTAINERS: Add patterns for DTS files for AT91 ARM: at91: remove init_machine() as default is suitable ARM: at91/dt: split sama5d3 peripheral definitions ARM: at91/dt: split sam9x5 peripheral definitions ARM: at91: cam60: fix incorrect placement of __initdata tag
- Loading branch information
Showing
29 changed files
with
592 additions
and
311 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| */ | ||
|
|
||
| #include "at91sam9x5.dtsi" | ||
| #include "at91sam9x5_macb0.dtsi" | ||
|
|
||
| / { | ||
| model = "Atmel AT91SAM9G35 SoC"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ | |
| */ | ||
|
|
||
| #include "at91sam9x5.dtsi" | ||
| #include "at91sam9x5_macb0.dtsi" | ||
|
|
||
| / { | ||
| model = "Atmel AT91SAM9X35 SoC"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * at91sam9x5_macb0.dtsi - Device Tree Include file for AT91SAM9x5 SoC with 1 | ||
| * Ethernet interface. | ||
| * | ||
| * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> | ||
| * | ||
| * Licensed under GPLv2. | ||
| */ | ||
|
|
||
| #include <dt-bindings/pinctrl/at91.h> | ||
| #include <dt-bindings/interrupt-controller/irq.h> | ||
|
|
||
| / { | ||
| ahb { | ||
| apb { | ||
| pinctrl@fffff400 { | ||
| macb0 { | ||
| pinctrl_macb0_rmii: macb0_rmii-0 { | ||
| atmel,pins = | ||
| <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB0 periph A */ | ||
| AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB1 periph A */ | ||
| AT91_PIOB 2 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB2 periph A */ | ||
| AT91_PIOB 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB3 periph A */ | ||
| AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB4 periph A */ | ||
| AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB5 periph A */ | ||
| AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB6 periph A */ | ||
| AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB7 periph A */ | ||
| AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB9 periph A */ | ||
| AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB10 periph A */ | ||
| }; | ||
|
|
||
| pinctrl_macb0_rmii_mii: macb0_rmii_mii-0 { | ||
| atmel,pins = | ||
| <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB8 periph A */ | ||
| AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB11 periph A */ | ||
| AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB12 periph A */ | ||
| AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB13 periph A */ | ||
| AT91_PIOB 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB14 periph A */ | ||
| AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB15 periph A */ | ||
| AT91_PIOB 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB16 periph A */ | ||
| AT91_PIOB 17 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB17 periph A */ | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| macb0: ethernet@f802c000 { | ||
| compatible = "cdns,at32ap7000-macb", "cdns,macb"; | ||
| reg = <0xf802c000 0x100>; | ||
| interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_macb0_rmii>; | ||
| status = "disabled"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * at91sam9x5_macb1.dtsi - Device Tree Include file for AT91SAM9x5 SoC with 2 | ||
| * Ethernet interfaces. | ||
| * | ||
| * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> | ||
| * | ||
| * Licensed under GPLv2. | ||
| */ | ||
|
|
||
| #include <dt-bindings/pinctrl/at91.h> | ||
| #include <dt-bindings/interrupt-controller/irq.h> | ||
|
|
||
| / { | ||
| ahb { | ||
| apb { | ||
| pinctrl@fffff400 { | ||
| macb1 { | ||
| pinctrl_macb1_rmii: macb1_rmii-0 { | ||
| atmel,pins = | ||
| <AT91_PIOC 16 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC16 periph B */ | ||
| AT91_PIOC 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC18 periph B */ | ||
| AT91_PIOC 19 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC19 periph B */ | ||
| AT91_PIOC 20 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC20 periph B */ | ||
| AT91_PIOC 21 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC21 periph B */ | ||
| AT91_PIOC 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC27 periph B */ | ||
| AT91_PIOC 28 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC28 periph B */ | ||
| AT91_PIOC 29 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC29 periph B */ | ||
| AT91_PIOC 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* PC30 periph B */ | ||
| AT91_PIOC 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC31 periph B */ | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| macb1: ethernet@f8030000 { | ||
| compatible = "cdns,at32ap7000-macb", "cdns,macb"; | ||
| reg = <0xf8030000 0x100>; | ||
| interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_macb1_rmii>; | ||
| status = "disabled"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * at91sam9x5_usart3.dtsi - Device Tree Include file for AT91SAM9x5 SoC with | ||
| * 4 USART. | ||
| * | ||
| * Copyright (C) 2013 Boris BREZILLON <b.brezillon@overkiz.com> | ||
| * | ||
| * Licensed under GPLv2. | ||
| */ | ||
|
|
||
| #include <dt-bindings/pinctrl/at91.h> | ||
| #include <dt-bindings/interrupt-controller/irq.h> | ||
|
|
||
| / { | ||
| ahb { | ||
| apb { | ||
| pinctrl@fffff400 { | ||
| usart3 { | ||
| pinctrl_usart3: usart3-0 { | ||
| atmel,pins = | ||
| <AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PC22 periph B with pullup */ | ||
| AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC23 periph B */ | ||
| }; | ||
|
|
||
| pinctrl_usart3_rts: usart3_rts-0 { | ||
| atmel,pins = | ||
| <AT91_PIOC 24 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC24 periph B */ | ||
| }; | ||
|
|
||
| pinctrl_usart3_cts: usart3_cts-0 { | ||
| atmel,pins = | ||
| <AT91_PIOC 25 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC25 periph B */ | ||
| }; | ||
|
|
||
| pinctrl_usart3_sck: usart3_sck-0 { | ||
| atmel,pins = | ||
| <AT91_PIOC 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC26 periph B */ | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| usart3: serial@f8028000 { | ||
| compatible = "atmel,at91sam9260-usart"; | ||
| reg = <0xf8028000 0x200>; | ||
| interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&pinctrl_usart3>; | ||
| status = "disabled"; | ||
| }; | ||
| }; | ||
| }; | ||
| }; |
Oops, something went wrong.