- Add DTSI for Oxford Semiconductor OX820

- Add DTS for Cloud Engines PogoPlug v3 board
 - Fix MAINTAINERS Oxnas entry for dts files
 from http://lkml.kernel.org/r/20161102141850.25164-1-narmstrong@baylibre.com
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJYHGG3AAoJEHfc29rIyEnR4EIQAKYu+f0pEDO+xLj/aNpat+ZQ
 3RzKUTcg+Hgmmxez8abkfdGX13L6v5GLe9/uPdh3SZaqztqtk70JLMUZuZLjQQAw
 dPKFZf/3PKO0hgGogUlxbyYW6njJ24bzJwSwKX2QhE2zzw8kbY1md+8hJfcPR6m5
 c4R6LEnNuTVSv+6xYWTu23J3sguh1yji7KfIFw3WWDNFQ0i+Rd6Zm8WH6q9oWfp3
 3dyU9UliFy+BtVUd684jrpNlKY7lDaCB7qEXeRvMZu5C6dYlaldCrXgHMjqT30M7
 +KZ90w+V8cHb/e2DXFxABjZbVfK+jO0g1uEa/kygtwnA/A4nfdm4Tgyr3vKf2P/l
 qlMiGNMHHOt3MrF8GSGF93RGT+qyxgtN52ILRfFjBRzNBTve18MzYcxEV1c+J6kv
 ZJxjCovVThGZrtVeMFsX4peU72jVusgLdwhoeZr9XiLSu0v+qltE8d+ROKXTZjI7
 Kzu+l24BX6hOSsf0yBRIklGgG0vUN1ViDd54zhl2+rVFnCxuJ4OCuXmRI/YjREVm
 I+VXqjY5gjn1mdoOl1qxNECmqwwMSVUKECcBKuuIOrhjlTm/LcU8rtx6IPhQfHe3
 omjf5h84a9TbFGnR1dnMe/iH7tBjFtj33NiiL5j6YW6f7aJMTtbfUAJwjW/GYrkp
 AqPozhQsinPzFPKCzZDP
 =G8pP
 -----END PGP SIGNATURE-----

Merge tag 'oxnas-arm-soc-dt-for-4.10' of https://github.com/OXNAS/linux into next/dt

Pull "ARM: OXNAS SoC DT updates for 4.10" from Neil Armstrong:

- Add DTSI for Oxford Semiconductor OX820
- Add DTS for Cloud Engines PogoPlug v3 board
- Fix MAINTAINERS Oxnas entry for dts files
from http://lkml.kernel.org/r/20161102141850.25164-1-narmstrong@baylibre.com

* tag 'oxnas-arm-soc-dt-for-4.10' of https://github.com/OXNAS/linux:
  MAINTAINERS: oxnas: Add new files definitions
  ARM: dts: Add support for OX820 and Pogoplug V3
This commit is contained in:
Arnd Bergmann 2016-11-25 23:59:15 +01:00
commit 7677796fe6
5 changed files with 399 additions and 2 deletions

View File

@ -5,5 +5,10 @@ Boards with the OX810SE SoC shall have the following properties:
Required root node property: Required root node property:
compatible: "oxsemi,ox810se" compatible: "oxsemi,ox810se"
Boards with the OX820 SoC shall have the following properties:
Required root node property:
compatible: "oxsemi,ox820"
Board compatible values: Board compatible values:
- "wd,mbwe" (OX810SE) - "wd,mbwe" (OX810SE)
- "cloudengines,pogoplugv3" (OX820)

View File

@ -1479,8 +1479,9 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
L: linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers) L: linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers)
S: Maintained S: Maintained
F: arch/arm/mach-oxnas/ F: arch/arm/mach-oxnas/
F: arch/arm/boot/dts/oxnas* F: arch/arm/boot/dts/ox8*.dtsi
F: arch/arm/boot/dts/wd-mbwe.dts F: arch/arm/boot/dts/wd-mbwe.dts
F: arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts
N: oxnas N: oxnas
ARM/Mediatek RTC DRIVER ARM/Mediatek RTC DRIVER

View File

@ -616,7 +616,8 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
dtb-$(CONFIG_ARCH_PRIMA2) += \ dtb-$(CONFIG_ARCH_PRIMA2) += \
prima2-evb.dtb prima2-evb.dtb
dtb-$(CONFIG_ARCH_OXNAS) += \ dtb-$(CONFIG_ARCH_OXNAS) += \
wd-mbwe.dtb wd-mbwe.dtb \
cloudengines-pogoplug-series-3.dtb
dtb-$(CONFIG_ARCH_QCOM) += \ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8060-dragonboard.dtb \ qcom-apq8060-dragonboard.dtb \
qcom-apq8064-arrow-sd-600eval.dtb \ qcom-apq8064-arrow-sd-600eval.dtb \

View File

@ -0,0 +1,94 @@
/*
* cloudengines-pogoplug-series-3.dtsi - Device tree file for Cloud Engines PogoPlug Series 3
*
* Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
*
* Licensed under GPLv2 or later
*/
/dts-v1/;
#include "ox820.dtsi"
/ {
model = "Cloud Engines PogoPlug Series 3";
compatible = "cloudengines,pogoplugv3", "oxsemi,ox820";
chosen {
bootargs = "earlyprintk";
stdout-path = "serial0:115200n8";
};
memory {
/* 128Mbytes DDR */
reg = <0x60000000 0x8000000>;
};
aliases {
serial0 = &uart0;
gpio0 = &gpio0;
gpio1 = &gpio1;
};
leds {
compatible = "gpio-leds";
blue {
label = "pogoplug:blue";
gpios = <&gpio0 2 0>;
default-state = "keep";
};
orange {
label = "pogoplug:orange";
gpios = <&gpio1 16 1>;
default-state = "keep";
};
green {
label = "pogoplug:green";
gpios = <&gpio1 17 1>;
default-state = "keep";
};
};
};
&uart0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_uart0>;
};
&nandc {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_nand>;
nand@0 {
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
nand-ecc-mode = "soft";
nand-ecc-algo = "hamming";
partition@0 {
label = "boot";
reg = <0x00000000 0x00e00000>;
read-only;
};
partition@e00000 {
label = "ubi";
reg = <0x00e00000 0x07200000>;
};
};
};
&etha {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_etha_mdio>;
};

View File

@ -0,0 +1,296 @@
/*
* ox820.dtsi - Device tree file for Oxford Semiconductor OX820 SoC
*
* Copyright (C) 2016 Neil Armstrong <narmstrong@baylibre.com>
*
* Licensed under GPLv2 or later
*/
/include/ "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/arm-gic.h>
/ {
compatible = "oxsemi,ox820";
cpus {
#address-cells = <1>;
#size-cells = <0>;
enable-method = "oxsemi,ox820-smp";
cpu@0 {
device_type = "cpu";
compatible = "arm,arm11mpcore";
clocks = <&armclk>;
reg = <0>;
};
cpu@1 {
device_type = "cpu";
compatible = "arm,arm11mpcore";
clocks = <&armclk>;
reg = <1>;
};
};
memory {
/* Max 512MB @ 0x60000000 */
reg = <0x60000000 0x20000000>;
};
clocks {
osc: oscillator {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <25000000>;
};
gmacclk: gmacclk {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <125000000>;
};
sysclk: sysclk {
compatible = "fixed-factor-clock";
#clock-cells = <0>;
clock-div = <4>;
clock-mult = <1>;
clocks = <&osc>;
};
plla: plla {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <850000000>;
};
armclk: armclk {
compatible = "fixed-factor-clock";
#clock-cells = <0>;
clock-div = <2>;
clock-mult = <1>;
clocks = <&plla>;
};
};
soc {
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
ranges;
interrupt-parent = <&gic>;
nandc: nand-controller@41000000 {
compatible = "oxsemi,ox820-nand";
reg = <0x41000000 0x100000>;
clocks = <&stdclk 11>;
resets = <&reset 15>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
etha: ethernet@40400000 {
compatible = "oxsemi,ox820-dwmac", "snps,dwmac";
reg = <0x40400000 0x2000>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "macirq", "eth_wake_irq";
mac-address = [000000000000]; /* Filled in by U-Boot */
phy-mode = "rgmii";
clocks = <&stdclk 9>, <&gmacclk>;
clock-names = "gmac", "stmmaceth";
resets = <&reset 6>;
/* Regmap for sys registers */
oxsemi,sys-ctrl = <&sys>;
status = "disabled";
};
apb-bridge@44000000 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
ranges = <0 0x44000000 0x1000000>;
pinctrl: pinctrl {
compatible = "oxsemi,ox820-pinctrl";
/* Regmap for sys registers */
oxsemi,sys-ctrl = <&sys>;
pinctrl_uart0: uart0 {
uart0 {
pins = "gpio30", "gpio31";
function = "fct5";
};
};
pinctrl_uart0_modem: uart0_modem {
uart0_modem_a {
pins = "gpio24", "gpio24", "gpio26", "gpio27";
function = "fct4";
};
uart0_modem_b {
pins = "gpio28", "gpio29";
function = "fct5";
};
};
pinctrl_uart1: uart1 {
uart1 {
pins = "gpio7", "gpio8";
function = "fct4";
};
};
pinctrl_uart1_modem: uart1_modem {
uart1_modem {
pins = "gpio5", "gpio6", "gpio40", "gpio41", "gpio42", "gpio43";
function = "fct4";
};
};
pinctrl_etha_mdio: etha_mdio {
etha_mdio {
pins = "gpio3", "gpio4";
function = "fct1";
};
};
pinctrl_nand: nand {
nand {
pins = "gpio12", "gpio13", "gpio14", "gpio15",
"gpio16", "gpio17", "gpio18", "gpio19",
"gpio20", "gpio21", "gpio22", "gpio23",
"gpio24";
function = "fct1";
};
};
};
gpio0: gpio@000000 {
compatible = "oxsemi,ox820-gpio";
reg = <0x000000 0x100000>;
interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
interrupt-controller;
#interrupt-cells = <2>;
ngpios = <32>;
oxsemi,gpio-bank = <0>;
gpio-ranges = <&pinctrl 0 0 32>;
};
gpio1: gpio@100000 {
compatible = "oxsemi,ox820-gpio";
reg = <0x100000 0x100000>;
interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
#gpio-cells = <2>;
gpio-controller;
interrupt-controller;
#interrupt-cells = <2>;
ngpios = <18>;
oxsemi,gpio-bank = <1>;
gpio-ranges = <&pinctrl 0 32 18>;
};
uart0: serial@200000 {
compatible = "ns16550a";
reg = <0x200000 0x100000>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <0>;
fifo-size = <16>;
reg-io-width = <1>;
current-speed = <115200>;
no-loopback-test;
status = "disabled";
clocks = <&sysclk>;
resets = <&reset 17>;
};
uart1: serial@300000 {
compatible = "ns16550a";
reg = <0x200000 0x100000>;
interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
reg-shift = <0>;
fifo-size = <16>;
reg-io-width = <1>;
current-speed = <115200>;
no-loopback-test;
status = "disabled";
clocks = <&sysclk>;
resets = <&reset 18>;
};
rps@400000 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
ranges = <0 0x400000 0x100000>;
intc: interrupt-controller@0 {
compatible = "oxsemi,ox820-rps-irq", "oxsemi,ox810se-rps-irq";
interrupt-controller;
reg = <0 0x200>;
interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <1>;
valid-mask = <0xFFFFFFFF>;
clear-mask = <0>;
};
timer0: timer@200 {
compatible = "oxsemi,ox820-rps-timer";
reg = <0x200 0x40>;
clocks = <&sysclk>;
interrupt-parent = <&intc>;
interrupts = <4>;
};
};
sys: sys-ctrl@e00000 {
compatible = "oxsemi,ox820-sys-ctrl", "syscon", "simple-mfd";
reg = <0xe00000 0x200000>;
reset: reset-controller {
compatible = "oxsemi,ox820-reset", "oxsemi,ox810se-reset";
#reset-cells = <1>;
};
stdclk: stdclk {
compatible = "oxsemi,ox820-stdclk", "oxsemi,ox810se-stdclk";
#clock-cells = <1>;
};
};
};
apb-bridge@47000000 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "simple-bus";
ranges = <0 0x47000000 0x1000000>;
scu: scu@0 {
compatible = "arm,arm11mp-scu";
reg = <0x0 0x100>;
};
local-timer@600 {
compatible = "arm,arm11mp-twd-timer";
reg = <0x600 0x20>;
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(3)|IRQ_TYPE_LEVEL_HIGH)>;
clocks = <&armclk>;
};
gic: gic@1000 {
compatible = "arm,arm11mp-gic";
interrupt-controller;
#interrupt-cells = <3>;
reg = <0x1000 0x1000>,
<0x100 0x500>;
};
};
};
};