-
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 branch 'berlin/soc' into next/soc
From Sebastian Hesselbarth: * berlin/soc: ARM: add initial support for Marvell Berlin SoCs ARM: add Armada 1500-mini and Chromecast device tree files ARM: add Armada 1500 and Sony NSZ-GS7 device tree files ARM: add Marvell Berlin UART0 lowlevel debug ARM: add Marvell Berlin SoCs to multi_v7_defconfig ARM: add Marvell Berlin SoC familiy to Marvell doc MAINTAINERS: add ARM Marvell Berlin SoC irqchip: add DesignWare APB ICTL interrupt controller Signed-off-by: Kevin Hilman <khilman@linaro.org>
- Loading branch information
Showing
19 changed files
with
824 additions
and
0 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| Marvell Berlin SoC Family Device Tree Bindings | ||
| --------------------------------------------------------------- | ||
|
|
||
| Boards with a SoC of the Marvell Berlin family, e.g. Armada 1500 | ||
| shall have the following properties: | ||
|
|
||
| * Required root node properties: | ||
| compatible: must contain "marvell,berlin" | ||
|
|
||
| In addition, the above compatible shall be extended with the specific | ||
| SoC and board used. Currently known SoC compatibles are: | ||
| "marvell,berlin2" for Marvell Armada 1500 (BG2, 88DE3100), | ||
| "marvell,berlin2cd" for Marvell Armada 1500-mini (BG2CD, 88DE3005) | ||
| "marvell,berlin2ct" for Marvell Armada ? (BG2CT, 88DE????) | ||
| "marvell,berlin3" for Marvell Armada ? (BG3, 88DE????) | ||
|
|
||
| * Example: | ||
|
|
||
| / { | ||
| model = "Sony NSZ-GS7"; | ||
| compatible = "sony,nsz-gs7", "marvell,berlin2", "marvell,berlin"; | ||
|
|
||
| ... | ||
| } |
32 changes: 32 additions & 0 deletions
32
Documentation/devicetree/bindings/interrupt-controller/snps,dw-apb-ictl.txt
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,32 @@ | ||
| Synopsys DesignWare APB interrupt controller (dw_apb_ictl) | ||
|
|
||
| Synopsys DesignWare provides interrupt controller IP for APB known as | ||
| dw_apb_ictl. The IP is used as secondary interrupt controller in some SoCs with | ||
| APB bus, e.g. Marvell Armada 1500. | ||
|
|
||
| Required properties: | ||
| - compatible: shall be "snps,dw-apb-ictl" | ||
| - reg: physical base address of the controller and length of memory mapped | ||
| region starting with ENABLE_LOW register | ||
| - interrupt-controller: identifies the node as an interrupt controller | ||
| - #interrupt-cells: number of cells to encode an interrupt-specifier, shall be 1 | ||
| - interrupts: interrupt reference to primary interrupt controller | ||
| - interrupt-parent: (optional) reference specific primary interrupt controller | ||
|
|
||
| The interrupt sources map to the corresponding bits in the interrupt | ||
| registers, i.e. | ||
| - 0 maps to bit 0 of low interrupts, | ||
| - 1 maps to bit 1 of low interrupts, | ||
| - 32 maps to bit 0 of high interrupts, | ||
| - 33 maps to bit 1 of high interrupts, | ||
| - (optional) fast interrupts start at 64. | ||
|
|
||
| Example: | ||
| aic: interrupt-controller@3000 { | ||
| compatible = "snps,dw-apb-ictl"; | ||
| reg = <0x3000 0xc00>; | ||
| interrupt-controller; | ||
| #interrupt-cells = <1>; | ||
| interrupt-parent = <&gic>; | ||
| interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>; | ||
| }; |
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
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 |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Device Tree file for Sony NSZ-GS7 | ||
| * | ||
| * Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | ||
| * | ||
| * This file is licensed under the terms of the GNU General Public | ||
| * License version 2. This program is licensed "as is" without any | ||
| * warranty of any kind, whether express or implied. | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
|
|
||
| #include "berlin2.dtsi" | ||
|
|
||
| / { | ||
| model = "Sony NSZ-GS7"; | ||
| compatible = "sony,nsz-gs7", "marvell,berlin2", "marvell,berlin"; | ||
|
|
||
| chosen { | ||
| bootargs = "console=ttyS0,115200 earlyprintk"; | ||
| }; | ||
|
|
||
| memory { | ||
| device_type = "memory"; | ||
| reg = <0x00000000 0x40000000>; /* 1 GB */ | ||
| }; | ||
| }; | ||
|
|
||
| &uart0 { status = "okay"; }; |
Oops, something went wrong.