diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-09 08:42:12 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-02-11 09:50:08 +0100 |
commit | e85ff327c2aeaa7ea5d53e308b4b4d0aef8dddd4 (patch) | |
tree | cb0a6ea5bc45dd9e689b5d53cde01ed7f0621424 /dts | |
parent | c61cf95d46c8e6596e92b28e277eb7828d3797c9 (diff) | |
download | barebox-e85ff327c2aeaa7ea5d53e308b4b4d0aef8dddd4.tar.gz barebox-e85ff327c2aeaa7ea5d53e308b4b4d0aef8dddd4.tar.xz |
dts: update to v3.18-rc5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts')
-rw-r--r-- | dts/Bindings/ata/sata_rcar.txt | 6 | ||||
-rw-r--r-- | dts/include/dt-bindings/pinctrl/dra.h | 4 | ||||
-rw-r--r-- | dts/src/arm/am335x-evm.dts | 2 | ||||
-rw-r--r-- | dts/src/arm/am437x-gp-evm.dts | 4 | ||||
-rw-r--r-- | dts/src/arm/am437x-sk-evm.dts | 4 | ||||
-rw-r--r-- | dts/src/arm/am43x-epos-evm.dts | 4 | ||||
-rw-r--r-- | dts/src/arm/sama5d31.dtsi | 2 | ||||
-rw-r--r-- | dts/src/arm/sama5d33.dtsi | 2 | ||||
-rw-r--r-- | dts/src/arm/sama5d34.dtsi | 2 | ||||
-rw-r--r-- | dts/src/arm/sama5d35.dtsi | 2 | ||||
-rw-r--r-- | dts/src/arm/sama5d36.dtsi | 2 | ||||
-rw-r--r-- | dts/src/arm/sama5d3xcm.dtsi | 2 | ||||
-rw-r--r-- | dts/src/arm64/apm-storm.dtsi | 10 | ||||
-rw-r--r-- | dts/src/xtensa/lx200mx.dts | 16 |
14 files changed, 40 insertions, 22 deletions
diff --git a/dts/Bindings/ata/sata_rcar.txt b/dts/Bindings/ata/sata_rcar.txt index 1e6111333f..80ae87a078 100644 --- a/dts/Bindings/ata/sata_rcar.txt +++ b/dts/Bindings/ata/sata_rcar.txt @@ -3,8 +3,10 @@ Required properties: - compatible : should contain one of the following: - "renesas,sata-r8a7779" for R-Car H1 - - "renesas,sata-r8a7790" for R-Car H2 - - "renesas,sata-r8a7791" for R-Car M2 + - "renesas,sata-r8a7790-es1" for R-Car H2 ES1 + - "renesas,sata-r8a7790" for R-Car H2 other than ES1 + - "renesas,sata-r8a7791" for R-Car M2-W + - "renesas,sata-r8a7793" for R-Car M2-N - reg : address and length of the SATA registers; - interrupts : must consist of one interrupt specifier. diff --git a/dts/include/dt-bindings/pinctrl/dra.h b/dts/include/dt-bindings/pinctrl/dra.h index 3d33794e4f..7448edff47 100644 --- a/dts/include/dt-bindings/pinctrl/dra.h +++ b/dts/include/dt-bindings/pinctrl/dra.h @@ -40,8 +40,8 @@ /* Active pin states */ #define PIN_OUTPUT (0 | PULL_DIS) -#define PIN_OUTPUT_PULLUP (PIN_OUTPUT | PULL_ENA | PULL_UP) -#define PIN_OUTPUT_PULLDOWN (PIN_OUTPUT | PULL_ENA) +#define PIN_OUTPUT_PULLUP (PULL_UP) +#define PIN_OUTPUT_PULLDOWN (0) #define PIN_INPUT (INPUT_EN | PULL_DIS) #define PIN_INPUT_SLEW (INPUT_EN | SLEWCONTROL) #define PIN_INPUT_PULLUP (PULL_ENA | INPUT_EN | PULL_UP) diff --git a/dts/src/arm/am335x-evm.dts b/dts/src/arm/am335x-evm.dts index e2156a583d..c4b968f0fe 100644 --- a/dts/src/arm/am335x-evm.dts +++ b/dts/src/arm/am335x-evm.dts @@ -489,7 +489,7 @@ reg = <0x00060000 0x00020000>; }; partition@4 { - label = "NAND.u-boot-spl"; + label = "NAND.u-boot-spl-os"; reg = <0x00080000 0x00040000>; }; partition@5 { diff --git a/dts/src/arm/am437x-gp-evm.dts b/dts/src/arm/am437x-gp-evm.dts index e7ac47fa66..a521ac0a7d 100644 --- a/dts/src/arm/am437x-gp-evm.dts +++ b/dts/src/arm/am437x-gp-evm.dts @@ -291,8 +291,8 @@ dcdc3: regulator-dcdc3 { compatible = "ti,tps65218-dcdc3"; regulator-name = "vdcdc3"; - regulator-min-microvolt = <1350000>; - regulator-max-microvolt = <1350000>; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; regulator-boot-on; regulator-always-on; }; diff --git a/dts/src/arm/am437x-sk-evm.dts b/dts/src/arm/am437x-sk-evm.dts index 859ff3d620..87aa4f3b8b 100644 --- a/dts/src/arm/am437x-sk-evm.dts +++ b/dts/src/arm/am437x-sk-evm.dts @@ -363,8 +363,8 @@ dcdc3: regulator-dcdc3 { compatible = "ti,tps65218-dcdc3"; regulator-name = "vdds_ddr"; - regulator-min-microvolt = <1350000>; - regulator-max-microvolt = <1350000>; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; regulator-boot-on; regulator-always-on; }; diff --git a/dts/src/arm/am43x-epos-evm.dts b/dts/src/arm/am43x-epos-evm.dts index ac3e485993..f7e9bba10b 100644 --- a/dts/src/arm/am43x-epos-evm.dts +++ b/dts/src/arm/am43x-epos-evm.dts @@ -358,8 +358,8 @@ dcdc3: regulator-dcdc3 { compatible = "ti,tps65218-dcdc3"; regulator-name = "vdcdc3"; - regulator-min-microvolt = <1350000>; - regulator-max-microvolt = <1350000>; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; regulator-boot-on; regulator-always-on; }; diff --git a/dts/src/arm/sama5d31.dtsi b/dts/src/arm/sama5d31.dtsi index 7997dc9863..883878b329 100644 --- a/dts/src/arm/sama5d31.dtsi +++ b/dts/src/arm/sama5d31.dtsi @@ -12,5 +12,5 @@ #include "sama5d3_uart.dtsi" / { - compatible = "atmel,samad31", "atmel,sama5d3", "atmel,sama5"; + compatible = "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; }; diff --git a/dts/src/arm/sama5d33.dtsi b/dts/src/arm/sama5d33.dtsi index 39f832253c..4b4434aca3 100644 --- a/dts/src/arm/sama5d33.dtsi +++ b/dts/src/arm/sama5d33.dtsi @@ -10,5 +10,5 @@ #include "sama5d3_gmac.dtsi" / { - compatible = "atmel,samad33", "atmel,sama5d3", "atmel,sama5"; + compatible = "atmel,sama5d33", "atmel,sama5d3", "atmel,sama5"; }; diff --git a/dts/src/arm/sama5d34.dtsi b/dts/src/arm/sama5d34.dtsi index 89cda2c0da..aa01573fde 100644 --- a/dts/src/arm/sama5d34.dtsi +++ b/dts/src/arm/sama5d34.dtsi @@ -12,5 +12,5 @@ #include "sama5d3_mci2.dtsi" / { - compatible = "atmel,samad34", "atmel,sama5d3", "atmel,sama5"; + compatible = "atmel,sama5d34", "atmel,sama5d3", "atmel,sama5"; }; diff --git a/dts/src/arm/sama5d35.dtsi b/dts/src/arm/sama5d35.dtsi index d20cd71b5f..16c39f4c96 100644 --- a/dts/src/arm/sama5d35.dtsi +++ b/dts/src/arm/sama5d35.dtsi @@ -14,5 +14,5 @@ #include "sama5d3_tcb1.dtsi" / { - compatible = "atmel,samad35", "atmel,sama5d3", "atmel,sama5"; + compatible = "atmel,sama5d35", "atmel,sama5d3", "atmel,sama5"; }; diff --git a/dts/src/arm/sama5d36.dtsi b/dts/src/arm/sama5d36.dtsi index db58cad6ac..e85139ef40 100644 --- a/dts/src/arm/sama5d36.dtsi +++ b/dts/src/arm/sama5d36.dtsi @@ -16,5 +16,5 @@ #include "sama5d3_uart.dtsi" / { - compatible = "atmel,samad36", "atmel,sama5d3", "atmel,sama5"; + compatible = "atmel,sama5d36", "atmel,sama5d3", "atmel,sama5"; }; diff --git a/dts/src/arm/sama5d3xcm.dtsi b/dts/src/arm/sama5d3xcm.dtsi index 962dc28dc3..cfcd200b0c 100644 --- a/dts/src/arm/sama5d3xcm.dtsi +++ b/dts/src/arm/sama5d3xcm.dtsi @@ -8,7 +8,7 @@ */ / { - compatible = "atmel,samad3xcm", "atmel,sama5d3", "atmel,sama5"; + compatible = "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5"; chosen { bootargs = "console=ttyS0,115200 rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs"; diff --git a/dts/src/arm64/apm-storm.dtsi b/dts/src/arm64/apm-storm.dtsi index 295c72d52a..f1ad9c2ab2 100644 --- a/dts/src/arm64/apm-storm.dtsi +++ b/dts/src/arm64/apm-storm.dtsi @@ -599,7 +599,7 @@ compatible = "apm,xgene-enet"; status = "disabled"; reg = <0x0 0x17020000 0x0 0xd100>, - <0x0 0X17030000 0x0 0X400>, + <0x0 0X17030000 0x0 0Xc300>, <0x0 0X10000000 0x0 0X200>; reg-names = "enet_csr", "ring_csr", "ring_cmd"; interrupts = <0x0 0x3c 0x4>; @@ -624,9 +624,9 @@ sgenet0: ethernet@1f210000 { compatible = "apm,xgene-enet"; status = "disabled"; - reg = <0x0 0x1f210000 0x0 0x10000>, - <0x0 0x1f200000 0x0 0X10000>, - <0x0 0x1B000000 0x0 0X20000>; + reg = <0x0 0x1f210000 0x0 0xd100>, + <0x0 0x1f200000 0x0 0Xc300>, + <0x0 0x1B000000 0x0 0X200>; reg-names = "enet_csr", "ring_csr", "ring_cmd"; interrupts = <0x0 0xA0 0x4>; dma-coherent; @@ -639,7 +639,7 @@ compatible = "apm,xgene-enet"; status = "disabled"; reg = <0x0 0x1f610000 0x0 0xd100>, - <0x0 0x1f600000 0x0 0X400>, + <0x0 0x1f600000 0x0 0Xc300>, <0x0 0x18000000 0x0 0X200>; reg-names = "enet_csr", "ring_csr", "ring_cmd"; interrupts = <0x0 0x60 0x4>; diff --git a/dts/src/xtensa/lx200mx.dts b/dts/src/xtensa/lx200mx.dts new file mode 100644 index 0000000000..249822b99b --- /dev/null +++ b/dts/src/xtensa/lx200mx.dts @@ -0,0 +1,16 @@ +/dts-v1/; +/include/ "xtfpga.dtsi" +/include/ "xtfpga-flash-16m.dtsi" + +/ { + compatible = "cdns,xtensa-lx200"; + memory@0 { + device_type = "memory"; + reg = <0x00000000 0x06000000>; + }; + pic: pic { + compatible = "cdns,xtensa-mx"; + #interrupt-cells = <2>; + interrupt-controller; + }; +}; |