aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2017-06-18 23:12:57 -0400
committerOlof Johansson <olof@lixom.net>2017-06-18 23:12:57 -0400
commitd828e97815f7aa7dd7d3e26a23073a7776ffa7b9 (patch)
tree156916bdfe4d5ab8c717a0af24cae7efcfa465d7
parentd8a4109634d69e4022c72354ce6a5204161b8fe8 (diff)
parent1b6d58acdb26de8995f854cbf8b0d7214eefd884 (diff)
Merge tag 'uniphier-dt64-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt64
UniPhier ARM64 SoC DT updates for v4.13 - specify timing delay properties of eMMC - fix W=1 build warnings - increase memory reserve size - use SPDX License Identifier - add new board support (LD11/LD20 global) * tag 'uniphier-dt64-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier: arm64: dts: uniphier: add support for LD20 Global board arm64: dts: uniphier: add support for LD11 Global board arm64: dts: uniphier: use SPDX-License-Identifier arm64: dts: uniphier: reserve more memory for LD11/LD20 arm64: dts: uniphier: fix simple-bus unit address format error arm64: dts: uniphier: Use - instead of @ for DT OPP entries arm64: dts: uniphier: add cdns, phy-dll-delay-sdclk(-hsmmc) for eMMC arm64: dts: uniphier: add input-delay properties to Cadence eMMC node Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm64/boot/dts/socionext/Makefile2
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts70
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts38
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi61
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts52
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts38
-rw-r--r--arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi79
7 files changed, 165 insertions, 175 deletions
diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile
index 5538598b302c..4a13a3a97101 100644
--- a/arch/arm64/boot/dts/socionext/Makefile
+++ b/arch/arm64/boot/dts/socionext/Makefile
@@ -1,5 +1,7 @@
1dtb-$(CONFIG_ARCH_UNIPHIER) += \ 1dtb-$(CONFIG_ARCH_UNIPHIER) += \
2 uniphier-ld11-global.dtb \
2 uniphier-ld11-ref.dtb \ 3 uniphier-ld11-ref.dtb \
4 uniphier-ld20-global.dtb \
3 uniphier-ld20-ref.dtb 5 uniphier-ld20-ref.dtb
4 6
5always := $(dtb-y) 7always := $(dtb-y)
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
new file mode 100644
index 000000000000..115357018ef7
--- /dev/null
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts
@@ -0,0 +1,70 @@
1/*
2 * Device Tree Source for UniPhier LD11 Global Board
3 *
4 * Copyright (C) 2016-2017 Socionext Inc.
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
7 *
8 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
9 */
10
11/dts-v1/;
12/include/ "uniphier-ld11.dtsi"
13
14/ {
15 model = "UniPhier LD11 Global Board (REF_LD11_GP)";
16 compatible = "socionext,uniphier-ld11-global",
17 "socionext,uniphier-ld11";
18
19 chosen {
20 stdout-path = "serial0:115200n8";
21 };
22
23 aliases {
24 serial0 = &serial0;
25 serial1 = &serial1;
26 serial2 = &serial2;
27 serial3 = &serial3;
28 i2c0 = &i2c0;
29 i2c1 = &i2c1;
30 i2c2 = &i2c2;
31 i2c3 = &i2c3;
32 i2c4 = &i2c4;
33 i2c5 = &i2c5;
34 };
35
36 memory@80000000 {
37 device_type = "memory";
38 reg = <0 0x80000000 0 0x40000000>;
39 };
40};
41
42&serial0 {
43 status = "okay";
44};
45
46&serial1 {
47 status = "okay";
48};
49
50&i2c0 {
51 status = "okay";
52
53 eeprom@50 {
54 compatible = "st,24c64", "atmel,24c64";
55 reg = <0x50>;
56 pagesize = <32>;
57 };
58};
59
60&usb0 {
61 status = "okay";
62};
63
64&usb1 {
65 status = "okay";
66};
67
68&usb2 {
69 status = "okay";
70};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
index 0173e93ab141..cc8ebe34c27c 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts
@@ -4,43 +4,7 @@
4 * Copyright (C) 2016 Socionext Inc. 4 * Copyright (C) 2016 Socionext Inc.
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 * 6 *
7 * This file is dual-licensed: you can use it either under the terms 7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 * of the GPL or the X11 license, at your option. Note that this dual
9 * licensing only applies to this file, and not this project as a
10 * whole.
11 *
12 * a) This file is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License as
14 * published by the Free Software Foundation; either version 2 of the
15 * License, or (at your option) any later version.
16 *
17 * This file is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU General Public License for more details.
21 *
22 * Or, alternatively,
23 *
24 * b) Permission is hereby granted, free of charge, to any person
25 * obtaining a copy of this software and associated documentation
26 * files (the "Software"), to deal in the Software without
27 * restriction, including without limitation the rights to use,
28 * copy, modify, merge, publish, distribute, sublicense, and/or
29 * sell copies of the Software, and to permit persons to whom the
30 * Software is furnished to do so, subject to the following
31 * conditions:
32 *
33 * The above copyright notice and this permission notice shall be
34 * included in all copies or substantial portions of the Software.
35 *
36 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
37 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
38 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
39 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
40 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
41 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
42 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
43 * OTHER DEALINGS IN THE SOFTWARE.
44 */ 8 */
45 9
46/dts-v1/; 10/dts-v1/;
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
index 151c043b4835..bdce5b89baec 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
@@ -4,46 +4,10 @@
4 * Copyright (C) 2016 Socionext Inc. 4 * Copyright (C) 2016 Socionext Inc.
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 * 6 *
7 * This file is dual-licensed: you can use it either under the terms 7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 * of the GPL or the X11 license, at your option. Note that this dual
9 * licensing only applies to this file, and not this project as a
10 * whole.
11 *
12 * a) This file is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License as
14 * published by the Free Software Foundation; either version 2 of the
15 * License, or (at your option) any later version.
16 *
17 * This file is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU General Public License for more details.
21 *
22 * Or, alternatively,
23 *
24 * b) Permission is hereby granted, free of charge, to any person
25 * obtaining a copy of this software and associated documentation
26 * files (the "Software"), to deal in the Software without
27 * restriction, including without limitation the rights to use,
28 * copy, modify, merge, publish, distribute, sublicense, and/or
29 * sell copies of the Software, and to permit persons to whom the
30 * Software is furnished to do so, subject to the following
31 * conditions:
32 *
33 * The above copyright notice and this permission notice shall be
34 * included in all copies or substantial portions of the Software.
35 *
36 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
37 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
38 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
39 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
40 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
41 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
42 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
43 * OTHER DEALINGS IN THE SOFTWARE.
44 */ 8 */
45 9
46/memreserve/ 0x80000000 0x00080000; 10/memreserve/ 0x80000000 0x02000000;
47 11
48/ { 12/ {
49 compatible = "socionext,uniphier-ld11"; 13 compatible = "socionext,uniphier-ld11";
@@ -89,31 +53,31 @@
89 compatible = "operating-points-v2"; 53 compatible = "operating-points-v2";
90 opp-shared; 54 opp-shared;
91 55
92 opp@245000000 { 56 opp-245000000 {
93 opp-hz = /bits/ 64 <245000000>; 57 opp-hz = /bits/ 64 <245000000>;
94 clock-latency-ns = <300>; 58 clock-latency-ns = <300>;
95 }; 59 };
96 opp@250000000 { 60 opp-250000000 {
97 opp-hz = /bits/ 64 <250000000>; 61 opp-hz = /bits/ 64 <250000000>;
98 clock-latency-ns = <300>; 62 clock-latency-ns = <300>;
99 }; 63 };
100 opp@490000000 { 64 opp-490000000 {
101 opp-hz = /bits/ 64 <490000000>; 65 opp-hz = /bits/ 64 <490000000>;
102 clock-latency-ns = <300>; 66 clock-latency-ns = <300>;
103 }; 67 };
104 opp@500000000 { 68 opp-500000000 {
105 opp-hz = /bits/ 64 <500000000>; 69 opp-hz = /bits/ 64 <500000000>;
106 clock-latency-ns = <300>; 70 clock-latency-ns = <300>;
107 }; 71 };
108 opp@653334000 { 72 opp-653334000 {
109 opp-hz = /bits/ 64 <653334000>; 73 opp-hz = /bits/ 64 <653334000>;
110 clock-latency-ns = <300>; 74 clock-latency-ns = <300>;
111 }; 75 };
112 opp@666667000 { 76 opp-666667000 {
113 opp-hz = /bits/ 64 <666667000>; 77 opp-hz = /bits/ 64 <666667000>;
114 clock-latency-ns = <300>; 78 clock-latency-ns = <300>;
115 }; 79 };
116 opp@980000000 { 80 opp-980000000 {
117 opp-hz = /bits/ 64 <980000000>; 81 opp-hz = /bits/ 64 <980000000>;
118 clock-latency-ns = <300>; 82 clock-latency-ns = <300>;
119 }; 83 };
@@ -268,7 +232,7 @@
268 pinctrl-0 = <&pinctrl_system_bus>; 232 pinctrl-0 = <&pinctrl_system_bus>;
269 }; 233 };
270 234
271 smpctrl@59800000 { 235 smpctrl@59801000 {
272 compatible = "socionext,uniphier-smpctrl"; 236 compatible = "socionext,uniphier-smpctrl";
273 reg = <0x59801000 0x400>; 237 reg = <0x59801000 0x400>;
274 }; 238 };
@@ -310,6 +274,11 @@
310 bus-width = <8>; 274 bus-width = <8>;
311 mmc-ddr-1_8v; 275 mmc-ddr-1_8v;
312 mmc-hs200-1_8v; 276 mmc-hs200-1_8v;
277 cdns,phy-input-delay-legacy = <4>;
278 cdns,phy-input-delay-mmc-highspeed = <2>;
279 cdns,phy-input-delay-mmc-ddr = <3>;
280 cdns,phy-dll-delay-sdclk = <21>;
281 cdns,phy-dll-delay-sdclk-hsmmc = <21>;
313 }; 282 };
314 283
315 usb0: usb@5a800100 { 284 usb0: usb@5a800100 {
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
new file mode 100644
index 000000000000..9f620d4101b5
--- /dev/null
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts
@@ -0,0 +1,52 @@
1/*
2 * Device Tree Source for UniPhier LD20 Global Board
3 *
4 * Copyright (C) 2015-2017 Socionext Inc.
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 * Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
7 *
8 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
9 */
10
11/dts-v1/;
12/include/ "uniphier-ld20.dtsi"
13
14/ {
15 model = "UniPhier LD20 Global Board (REF_LD20_GP)";
16 compatible = "socionext,uniphier-ld20-global",
17 "socionext,uniphier-ld20";
18
19 chosen {
20 stdout-path = "serial0:115200n8";
21 };
22
23 aliases {
24 serial0 = &serial0;
25 serial1 = &serial1;
26 serial2 = &serial2;
27 serial3 = &serial3;
28 i2c0 = &i2c0;
29 i2c1 = &i2c1;
30 i2c2 = &i2c2;
31 i2c3 = &i2c3;
32 i2c4 = &i2c4;
33 i2c5 = &i2c5;
34 };
35
36 memory@80000000 {
37 device_type = "memory";
38 reg = <0 0x80000000 0 0xc0000000>;
39 };
40};
41
42&serial0 {
43 status = "okay";
44};
45
46&serial1 {
47 status = "okay";
48};
49
50&i2c0 {
51 status = "okay";
52};
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
index fca4c479b469..494166aee24c 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts
@@ -4,43 +4,7 @@
4 * Copyright (C) 2015-2016 Socionext Inc. 4 * Copyright (C) 2015-2016 Socionext Inc.
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 * 6 *
7 * This file is dual-licensed: you can use it either under the terms 7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 * of the GPL or the X11 license, at your option. Note that this dual
9 * licensing only applies to this file, and not this project as a
10 * whole.
11 *
12 * a) This file is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License as
14 * published by the Free Software Foundation; either version 2 of the
15 * License, or (at your option) any later version.
16 *
17 * This file is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU General Public License for more details.
21 *
22 * Or, alternatively,
23 *
24 * b) Permission is hereby granted, free of charge, to any person
25 * obtaining a copy of this software and associated documentation
26 * files (the "Software"), to deal in the Software without
27 * restriction, including without limitation the rights to use,
28 * copy, modify, merge, publish, distribute, sublicense, and/or
29 * sell copies of the Software, and to permit persons to whom the
30 * Software is furnished to do so, subject to the following
31 * conditions:
32 *
33 * The above copyright notice and this permission notice shall be
34 * included in all copies or substantial portions of the Software.
35 *
36 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
37 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
38 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
39 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
40 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
41 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
42 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
43 * OTHER DEALINGS IN THE SOFTWARE.
44 */ 8 */
45 9
46/dts-v1/; 10/dts-v1/;
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
index 6193f11acb78..de1e75362817 100644
--- a/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
+++ b/arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
@@ -4,46 +4,10 @@
4 * Copyright (C) 2015-2016 Socionext Inc. 4 * Copyright (C) 2015-2016 Socionext Inc.
5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com> 5 * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
6 * 6 *
7 * This file is dual-licensed: you can use it either under the terms 7 * SPDX-License-Identifier: (GPL-2.0+ OR MIT)
8 * of the GPL or the X11 license, at your option. Note that this dual
9 * licensing only applies to this file, and not this project as a
10 * whole.
11 *
12 * a) This file is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License as
14 * published by the Free Software Foundation; either version 2 of the
15 * License, or (at your option) any later version.
16 *
17 * This file is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU General Public License for more details.
21 *
22 * Or, alternatively,
23 *
24 * b) Permission is hereby granted, free of charge, to any person
25 * obtaining a copy of this software and associated documentation
26 * files (the "Software"), to deal in the Software without
27 * restriction, including without limitation the rights to use,
28 * copy, modify, merge, publish, distribute, sublicense, and/or
29 * sell copies of the Software, and to permit persons to whom the
30 * Software is furnished to do so, subject to the following
31 * conditions:
32 *
33 * The above copyright notice and this permission notice shall be
34 * included in all copies or substantial portions of the Software.
35 *
36 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
37 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
38 * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
39 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
40 * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
41 * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
42 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
43 * OTHER DEALINGS IN THE SOFTWARE.
44 */ 8 */
45 9
46/memreserve/ 0x80000000 0x00080000; 10/memreserve/ 0x80000000 0x02000000;
47 11
48/ { 12/ {
49 compatible = "socionext,uniphier-ld20"; 13 compatible = "socionext,uniphier-ld20";
@@ -116,35 +80,35 @@
116 compatible = "operating-points-v2"; 80 compatible = "operating-points-v2";
117 opp-shared; 81 opp-shared;
118 82
119 opp@250000000 { 83 opp-250000000 {
120 opp-hz = /bits/ 64 <250000000>; 84 opp-hz = /bits/ 64 <250000000>;
121 clock-latency-ns = <300>; 85 clock-latency-ns = <300>;
122 }; 86 };
123 opp@275000000 { 87 opp-275000000 {
124 opp-hz = /bits/ 64 <275000000>; 88 opp-hz = /bits/ 64 <275000000>;
125 clock-latency-ns = <300>; 89 clock-latency-ns = <300>;
126 }; 90 };
127 opp@500000000 { 91 opp-500000000 {
128 opp-hz = /bits/ 64 <500000000>; 92 opp-hz = /bits/ 64 <500000000>;
129 clock-latency-ns = <300>; 93 clock-latency-ns = <300>;
130 }; 94 };
131 opp@550000000 { 95 opp-550000000 {
132 opp-hz = /bits/ 64 <550000000>; 96 opp-hz = /bits/ 64 <550000000>;
133 clock-latency-ns = <300>; 97 clock-latency-ns = <300>;
134 }; 98 };
135 opp@666667000 { 99 opp-666667000 {
136 opp-hz = /bits/ 64 <666667000>; 100 opp-hz = /bits/ 64 <666667000>;
137 clock-latency-ns = <300>; 101 clock-latency-ns = <300>;
138 }; 102 };
139 opp@733334000 { 103 opp-733334000 {
140 opp-hz = /bits/ 64 <733334000>; 104 opp-hz = /bits/ 64 <733334000>;
141 clock-latency-ns = <300>; 105 clock-latency-ns = <300>;
142 }; 106 };
143 opp@1000000000 { 107 opp-1000000000 {
144 opp-hz = /bits/ 64 <1000000000>; 108 opp-hz = /bits/ 64 <1000000000>;
145 clock-latency-ns = <300>; 109 clock-latency-ns = <300>;
146 }; 110 };
147 opp@1100000000 { 111 opp-1100000000 {
148 opp-hz = /bits/ 64 <1100000000>; 112 opp-hz = /bits/ 64 <1100000000>;
149 clock-latency-ns = <300>; 113 clock-latency-ns = <300>;
150 }; 114 };
@@ -154,35 +118,35 @@
154 compatible = "operating-points-v2"; 118 compatible = "operating-points-v2";
155 opp-shared; 119 opp-shared;
156 120
157 opp@250000000 { 121 opp-250000000 {
158 opp-hz = /bits/ 64 <250000000>; 122 opp-hz = /bits/ 64 <250000000>;
159 clock-latency-ns = <300>; 123 clock-latency-ns = <300>;
160 }; 124 };
161 opp@275000000 { 125 opp-275000000 {
162 opp-hz = /bits/ 64 <275000000>; 126 opp-hz = /bits/ 64 <275000000>;
163 clock-latency-ns = <300>; 127 clock-latency-ns = <300>;
164 }; 128 };
165 opp@500000000 { 129 opp-500000000 {
166 opp-hz = /bits/ 64 <500000000>; 130 opp-hz = /bits/ 64 <500000000>;
167 clock-latency-ns = <300>; 131 clock-latency-ns = <300>;
168 }; 132 };
169 opp@550000000 { 133 opp-550000000 {
170 opp-hz = /bits/ 64 <550000000>; 134 opp-hz = /bits/ 64 <550000000>;
171 clock-latency-ns = <300>; 135 clock-latency-ns = <300>;
172 }; 136 };
173 opp@666667000 { 137 opp-666667000 {
174 opp-hz = /bits/ 64 <666667000>; 138 opp-hz = /bits/ 64 <666667000>;
175 clock-latency-ns = <300>; 139 clock-latency-ns = <300>;
176 }; 140 };
177 opp@733334000 { 141 opp-733334000 {
178 opp-hz = /bits/ 64 <733334000>; 142 opp-hz = /bits/ 64 <733334000>;
179 clock-latency-ns = <300>; 143 clock-latency-ns = <300>;
180 }; 144 };
181 opp@1000000000 { 145 opp-1000000000 {
182 opp-hz = /bits/ 64 <1000000000>; 146 opp-hz = /bits/ 64 <1000000000>;
183 clock-latency-ns = <300>; 147 clock-latency-ns = <300>;
184 }; 148 };
185 opp@1100000000 { 149 opp-1100000000 {
186 opp-hz = /bits/ 64 <1100000000>; 150 opp-hz = /bits/ 64 <1100000000>;
187 clock-latency-ns = <300>; 151 clock-latency-ns = <300>;
188 }; 152 };
@@ -337,7 +301,7 @@
337 pinctrl-0 = <&pinctrl_system_bus>; 301 pinctrl-0 = <&pinctrl_system_bus>;
338 }; 302 };
339 303
340 smpctrl@59800000 { 304 smpctrl@59801000 {
341 compatible = "socionext,uniphier-smpctrl"; 305 compatible = "socionext,uniphier-smpctrl";
342 reg = <0x59801000 0x400>; 306 reg = <0x59801000 0x400>;
343 }; 307 };
@@ -384,6 +348,11 @@
384 bus-width = <8>; 348 bus-width = <8>;
385 mmc-ddr-1_8v; 349 mmc-ddr-1_8v;
386 mmc-hs200-1_8v; 350 mmc-hs200-1_8v;
351 cdns,phy-input-delay-legacy = <4>;
352 cdns,phy-input-delay-mmc-highspeed = <2>;
353 cdns,phy-input-delay-mmc-ddr = <3>;
354 cdns,phy-dll-delay-sdclk = <21>;
355 cdns,phy-dll-delay-sdclk-hsmmc = <21>;
387 }; 356 };
388 357
389 soc-glue@5f800000 { 358 soc-glue@5f800000 {