diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-10 08:51:32 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-10 08:51:32 +0100 |
| commit | f4db58d47c68b28dd509ceca39e1aa749c61f828 (patch) | |
| tree | 729f6c5eaf214e091255b9ed6522b7164f61be87 /dts/src/arm64 | |
| parent | 17c6b31c419ccde913457550d7ca3530a6cb430a (diff) | |
| download | barebox-f4db58d47c68b28dd509ceca39e1aa749c61f828.tar.gz barebox-f4db58d47c68b28dd509ceca39e1aa749c61f828.tar.xz | |
dts: update to v4.10-rc5
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm64')
| -rw-r--r-- | dts/src/arm64/amlogic/meson-gxbb-odroidc2.dts | 4 | ||||
| -rw-r--r-- | dts/src/arm64/amlogic/meson-gxbb.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/arm64/exynos/exynos5433.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/arm64/xilinx/zynqmp-ep108.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm64/xilinx/zynqmp.dtsi | 6 |
5 files changed, 10 insertions, 6 deletions
diff --git a/dts/src/arm64/amlogic/meson-gxbb-odroidc2.dts b/dts/src/arm64/amlogic/meson-gxbb-odroidc2.dts index 238fbeacd3..5d28e1cdc9 100644 --- a/dts/src/arm64/amlogic/meson-gxbb-odroidc2.dts +++ b/dts/src/arm64/amlogic/meson-gxbb-odroidc2.dts @@ -137,6 +137,10 @@ }; }; +&scpi_clocks { + status = "disabled"; +}; + &uart_AO { status = "okay"; pinctrl-0 = <&uart_ao_a_pins>; diff --git a/dts/src/arm64/amlogic/meson-gxbb.dtsi b/dts/src/arm64/amlogic/meson-gxbb.dtsi index 596240c38a..b35307321b 100644 --- a/dts/src/arm64/amlogic/meson-gxbb.dtsi +++ b/dts/src/arm64/amlogic/meson-gxbb.dtsi @@ -55,7 +55,7 @@ mboxes = <&mailbox 1 &mailbox 2>; shmem = <&cpu_scp_lpri &cpu_scp_hpri>; - clocks { + scpi_clocks: clocks { compatible = "arm,scpi-clocks"; scpi_dvfs: scpi_clocks@0 { diff --git a/dts/src/arm64/exynos/exynos5433.dtsi b/dts/src/arm64/exynos/exynos5433.dtsi index 64226d5ae4..135890cd8a 100644 --- a/dts/src/arm64/exynos/exynos5433.dtsi +++ b/dts/src/arm64/exynos/exynos5433.dtsi @@ -1367,7 +1367,7 @@ }; amba { - compatible = "arm,amba-bus"; + compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; diff --git a/dts/src/arm64/xilinx/zynqmp-ep108.dts b/dts/src/arm64/xilinx/zynqmp-ep108.dts index 358089687a..ef1b9e573a 100644 --- a/dts/src/arm64/xilinx/zynqmp-ep108.dts +++ b/dts/src/arm64/xilinx/zynqmp-ep108.dts @@ -27,7 +27,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@0 { device_type = "memory"; reg = <0x0 0x0 0x0 0x40000000>; }; diff --git a/dts/src/arm64/xilinx/zynqmp.dtsi b/dts/src/arm64/xilinx/zynqmp.dtsi index 68a908334c..54dc28351c 100644 --- a/dts/src/arm64/xilinx/zynqmp.dtsi +++ b/dts/src/arm64/xilinx/zynqmp.dtsi @@ -72,7 +72,7 @@ <1 10 0xf08>; }; - amba_apu { + amba_apu: amba_apu@0 { compatible = "simple-bus"; #address-cells = <2>; #size-cells = <1>; @@ -175,7 +175,7 @@ }; i2c0: i2c@ff020000 { - compatible = "cdns,i2c-r1p10"; + compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 17 4>; @@ -185,7 +185,7 @@ }; i2c1: i2c@ff030000 { - compatible = "cdns,i2c-r1p10"; + compatible = "cdns,i2c-r1p14", "cdns,i2c-r1p10"; status = "disabled"; interrupt-parent = <&gic>; interrupts = <0 18 4>; |