sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

ARM: dts: uniphier: sync DT with latest Linux 

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-10-07 16:43:00 +09:00
parent 805dc44cc8
commit 52159d27ff
32 changed files with 296 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/dts/Makefile
View File

@ -79,18 +79,18 @@ dtb-$(CONFIG_ARCH_MVEBU) += \
armada-xp-theadorable.dtb armada-xp-theadorable.dtb
dtb-$(CONFIG_ARCH_UNIPHIER) += \ dtb-$(CONFIG_ARCH_UNIPHIER) += \
uniphier-ph1-ld11-ref.dtb \ uniphier-ld11-ref.dtb \
uniphier-ph1-ld20-ref.dtb \ uniphier-ld20-ref.dtb \
uniphier-ph1-ld4-ref.dtb \ uniphier-ld4-ref.dtb \
uniphier-ph1-ld6b-ref.dtb \ uniphier-ld6b-ref.dtb \
uniphier-ph1-pro4-ace.dtb \ uniphier-pro4-ace.dtb \
uniphier-ph1-pro4-ref.dtb \ uniphier-pro4-ref.dtb \
uniphier-ph1-pro4-sanji.dtb \ uniphier-pro4-sanji.dtb \
uniphier-ph1-pro5-4kbox.dtb \ uniphier-pro5-4kbox.dtb \
uniphier-ph1-sld3-ref.dtb \ uniphier-pxs2-gentil.dtb \
uniphier-ph1-sld8-ref.dtb \ uniphier-pxs2-vodka.dtb \
uniphier-proxstream2-gentil.dtb \ uniphier-sld3-ref.dtb \
uniphier-proxstream2-vodka.dtb uniphier-sld8-ref.dtb
dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \ dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb \
zynq-zc706.dtb \ zynq-zc706.dtb \
zynq-zed.dtb \ zynq-zed.dtb \

8
arch/arm/dts/uniphier-common32.dtsi
View File

@ -1,7 +1,8 @@
/* /*
* Device Tree Source commonly used by UniPhier ARM SoCs * Device Tree Source commonly used by UniPhier ARM SoCs
* *
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
@ -9,6 +10,11 @@
/include/ "skeleton.dtsi" /include/ "skeleton.dtsi"
/ { / {
psci {
compatible = "arm,psci-0.2";
method = "smc";
};
clocks { clocks {
refclk: ref { refclk: ref {
#clock-cells = <0>; #clock-cells = <0>;

9
arch/arm/dts/uniphier-ph1-ld11-ref.dts → arch/arm/dts/uniphier-ld11-ref.dts
View File

@ -1,5 +1,5 @@
/* /*
* Device Tree Source for UniPhier PH1-LD11 Reference Board * Device Tree Source for UniPhier LD11 Reference Board
* *
* Copyright (C) 2016 Socionext Inc. * Copyright (C) 2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com> * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
@ -8,12 +8,13 @@
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-ld11.dtsi" /include/ "uniphier-ld11.dtsi"
/include/ "uniphier-ref-daughter.dtsi"
/include/ "uniphier-support-card.dtsi" /include/ "uniphier-support-card.dtsi"
/ { / {
model = "UniPhier PH1-LD11 Reference Board"; model = "UniPhier LD11 Reference Board";
compatible = "socionext,ph1-ld11-ref", "socionext,ph1-ld11"; compatible = "socionext,uniphier-ld11-ref", "socionext,uniphier-ld11";
aliases { aliases {
serial0 = &serial0; serial0 = &serial0;

16
arch/arm/dts/uniphier-ph1-ld11.dtsi → arch/arm/dts/uniphier-ld11.dtsi
View File

@ -1,5 +1,5 @@
/* /*
* Device Tree Source for UniPhier PH1-LD11 SoC * Device Tree Source for UniPhier LD11 SoC
* *
* Copyright (C) 2016 Socionext Inc. * Copyright (C) 2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com> * Author: Masahiro Yamada <yamada.masahiro@socionext.com>
@ -10,7 +10,7 @@
/memreserve/ 0x80000000 0x00000008; /* cpu-release-addr */ /memreserve/ 0x80000000 0x00000008; /* cpu-release-addr */
/ { / {
compatible = "socionext,ph1-ld11"; compatible = "socionext,uniphier-ld11";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
@ -230,7 +230,9 @@
interrupts = <0 243 4>; interrupts = <0 243 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb0>; pinctrl-0 = <&pinctrl_usb0>;
clocks = <&mio_clk 3>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
<&mio_rst 12>;
}; };
usb1: usb@5a810100 { usb1: usb@5a810100 {
@ -240,7 +242,9 @@
interrupts = <0 244 4>; interrupts = <0 244 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb1>; pinctrl-0 = <&pinctrl_usb1>;
clocks = <&mio_clk 4>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
<&mio_rst 13>;
}; };
usb2: usb@5a820100 { usb2: usb@5a820100 {
@ -250,7 +254,9 @@
interrupts = <0 245 4>; interrupts = <0 245 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb2>; pinctrl-0 = <&pinctrl_usb2>;
clocks = <&mio_clk 5>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
<&mio_rst 14>;
}; };
mioctrl@5b3e0000 { mioctrl@5b3e0000 {

11
arch/arm/dts/uniphier-ph1-ld20-ref.dts → arch/arm/dts/uniphier-ld20-ref.dts
View File

@ -1,19 +1,20 @@
/* /*
* Device Tree Source for UniPhier PH1-LD20 Reference Board * Device Tree Source for UniPhier LD20 Reference Board
* *
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-ld20.dtsi" /include/ "uniphier-ld20.dtsi"
/include/ "uniphier-ref-daughter.dtsi" /include/ "uniphier-ref-daughter.dtsi"
/include/ "uniphier-support-card.dtsi" /include/ "uniphier-support-card.dtsi"
/ { / {
model = "UniPhier PH1-LD20 Reference Board"; model = "UniPhier LD20 Reference Board";
compatible = "socionext,ph1-ld20-ref", "socionext,ph1-ld20"; compatible = "socionext,uniphier-ld20-ref", "socionext,uniphier-ld20";
aliases { aliases {
serial0 = &serial0; serial0 = &serial0;

9
arch/arm/dts/uniphier-ph1-ld20.dtsi → arch/arm/dts/uniphier-ld20.dtsi
View File

@ -1,7 +1,8 @@
/* /*
* Device Tree Source for UniPhier PH1-LD20 SoC * Device Tree Source for UniPhier LD20 SoC
* *
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
@ -9,7 +10,7 @@
/memreserve/ 0x80000000 0x00000008; /* cpu-release-addr */ /memreserve/ 0x80000000 0x00000008; /* cpu-release-addr */
/ { / {
compatible = "socionext,ph1-ld20"; compatible = "socionext,uniphier-ld20";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
@ -271,6 +272,8 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
reset-names = "host";
resets = <&mio_rst 0>;
bus-width = <4>; bus-width = <4>;
}; };

11
arch/arm/dts/uniphier-ph1-ld4-ref.dts → arch/arm/dts/uniphier-ld4-ref.dts
View File

@ -1,19 +1,20 @@
/* /*
* Device Tree Source for UniPhier PH1-LD4 Reference Board * Device Tree Source for UniPhier LD4 Reference Board
* *
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-ld4.dtsi" /include/ "uniphier-ld4.dtsi"
/include/ "uniphier-ref-daughter.dtsi" /include/ "uniphier-ref-daughter.dtsi"
/include/ "uniphier-support-card.dtsi" /include/ "uniphier-support-card.dtsi"
/ { / {
model = "UniPhier PH1-LD4 Reference Board"; model = "UniPhier LD4 Reference Board";
compatible = "socionext,ph1-ld4-ref", "socionext,ph1-ld4"; compatible = "socionext,uniphier-ld4-ref", "socionext,uniphier-ld4";
memory { memory {
device_type = "memory"; device_type = "memory";

24
arch/arm/dts/uniphier-ph1-ld4.dtsi → arch/arm/dts/uniphier-ld4.dtsi
View File

@ -1,7 +1,8 @@
/* /*
* Device Tree Source for UniPhier PH1-LD4 SoC * Device Tree Source for UniPhier LD4 SoC
* *
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
@ -9,7 +10,7 @@
/include/ "uniphier-common32.dtsi" /include/ "uniphier-common32.dtsi"
/ { / {
compatible = "socionext,ph1-ld4"; compatible = "socionext,uniphier-ld4";
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
@ -19,6 +20,7 @@
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <0>; reg = <0>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
}; };
@ -223,6 +225,8 @@
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_1v8>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>;
bus-width = <4>; bus-width = <4>;
}; };
@ -235,6 +239,8 @@
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
pinctrl-1 = <&pinctrl_emmc_1v8>; pinctrl-1 = <&pinctrl_emmc_1v8>;
clocks = <&mio_clk 1>; clocks = <&mio_clk 1>;
reset-names = "host", "bridge", "hw-reset";
resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
}; };
@ -246,7 +252,9 @@
interrupts = <0 80 4>; interrupts = <0 80 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb0>; pinctrl-0 = <&pinctrl_usb0>;
clocks = <&mio_clk 3>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
<&mio_rst 12>;
}; };
usb1: usb@5a810100 { usb1: usb@5a810100 {
@ -256,7 +264,9 @@
interrupts = <0 81 4>; interrupts = <0 81 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb1>; pinctrl-0 = <&pinctrl_usb1>;
clocks = <&mio_clk 4>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
<&mio_rst 13>;
}; };
usb2: usb@5a820100 { usb2: usb@5a820100 {
@ -266,7 +276,9 @@
interrupts = <0 82 4>; interrupts = <0 82 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb2>; pinctrl-0 = <&pinctrl_usb2>;
clocks = <&mio_clk 5>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
<&mio_rst 14>;
}; };
aidet@61830000 { aidet@61830000 {

11
arch/arm/dts/uniphier-ph1-ld6b-ref.dts → arch/arm/dts/uniphier-ld6b-ref.dts
View File

@ -1,19 +1,20 @@
/* /*
* Device Tree Source for UniPhier PH1-LD6b Reference Board * Device Tree Source for UniPhier LD6b Reference Board
* *
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-ld6b.dtsi" /include/ "uniphier-ld6b.dtsi"
/include/ "uniphier-ref-daughter.dtsi" /include/ "uniphier-ref-daughter.dtsi"
/include/ "uniphier-support-card.dtsi" /include/ "uniphier-support-card.dtsi"
/ { / {
model = "UniPhier PH1-LD6b Reference Board"; model = "UniPhier LD6b Reference Board";
compatible = "socionext,ph1-ld6b-ref", "socionext,ph1-ld6b"; compatible = "socionext,uniphier-ld6b-ref", "socionext,uniphier-ld6b";
memory { memory {
device_type = "memory"; device_type = "memory";

32
arch/arm/dts/uniphier-ld6b.dtsi Normal file
View File

@ -0,0 +1,32 @@
/*
* Device Tree Source for UniPhier LD6b SoC
*
* Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+ X11
*/
/*
* LD6b consists of two silicon dies: D-chip and A-chip.
* The D-chip (digital chip) is the same as the PXs2 die.
* Reuse the PXs2 device tree with some properties overridden.
*/
/include/ "uniphier-pxs2.dtsi"
/ {
compatible = "socionext,uniphier-ld6b";
};
/* UART3 unavailable: the pads are not wired to the package balls */
&serial3 {
status = "disabled";
};
/*
* LD6b and PXs2 have completely different packages,
* which makes the pinctrl driver unshareable.
*/
&pinctrl {
compatible = "socionext,uniphier-ld6b-pinctrl";
};

31
arch/arm/dts/uniphier-ph1-ld6b.dtsi
View File

@ -1,31 +0,0 @@
/*
* Device Tree Source for UniPhier PH1-LD6b SoC
*
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+ X11
*/
/*
* PH1-LD6b consists of two silicon dies: D-chip and A-chip.
* The D-chip (digital chip) is the same as the ProXstream2 die.
* Reuse the ProXstream2 device tree with some properties overridden.
*/
/include/ "uniphier-proxstream2.dtsi"
/ {
compatible = "socionext,ph1-ld6b";
};
/* UART3 unavailable: the pads are not wired to the package balls */
&serial3 {
status = "disabled";
};
/*
* PH1-LD6b and ProXstream2 have completely different packages,
* which makes the pinctrl driver unshareable.
*/
&pinctrl {
compatible = "socionext,uniphier-ld6b-pinctrl";
};

15
arch/arm/dts/uniphier-ph1-pro4-ace.dts → arch/arm/dts/uniphier-pro4-ace.dts
View File

@ -1,17 +1,18 @@
/* /*
* Device Tree Source for UniPhier PH1-Pro4 Ace Board * Device Tree Source for UniPhier Pro4 Ace Board
* *
* Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-pro4.dtsi" /include/ "uniphier-pro4.dtsi"
/ { / {
model = "UniPhier PH1-Pro4 Ace Board"; model = "UniPhier Pro4 Ace Board";
compatible = "socionext,ph1-pro4-ace", "socionext,ph1-pro4"; compatible = "socionext,uniphier-pro4-ace", "socionext,uniphier-pro4";
memory { memory {
device_type = "memory"; device_type = "memory";
@ -50,8 +51,8 @@
&i2c0 { &i2c0 {
status = "okay"; status = "okay";
eeprom { eeprom@54 {
compatible = "24c64", "i2c-eeprom"; compatible = "st,24c64", "i2c-eeprom";
reg = <0x54>; reg = <0x54>;
u-boot,i2c-offset-len = <2>; u-boot,i2c-offset-len = <2>;
}; };

11
arch/arm/dts/uniphier-ph1-pro4-ref.dts → arch/arm/dts/uniphier-pro4-ref.dts
View File

@ -1,19 +1,20 @@
/* /*
* Device Tree Source for UniPhier PH1-Pro4 Reference Board * Device Tree Source for UniPhier Pro4 Reference Board
* *
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-pro4.dtsi" /include/ "uniphier-pro4.dtsi"
/include/ "uniphier-ref-daughter.dtsi" /include/ "uniphier-ref-daughter.dtsi"
/include/ "uniphier-support-card.dtsi" /include/ "uniphier-support-card.dtsi"
/ { / {
model = "UniPhier PH1-Pro4 Reference Board"; model = "UniPhier Pro4 Reference Board";
compatible = "socionext,ph1-pro4-ref", "socionext,ph1-pro4"; compatible = "socionext,uniphier-pro4-ref", "socionext,uniphier-pro4";
memory { memory {
device_type = "memory"; device_type = "memory";

15
arch/arm/dts/uniphier-ph1-pro4-sanji.dts → arch/arm/dts/uniphier-pro4-sanji.dts
View File

@ -1,17 +1,18 @@
/* /*
* Device Tree Source for UniPhier PH1-Pro4 Sanji Board * Device Tree Source for UniPhier Pro4 Sanji Board
* *
* Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-pro4.dtsi" /include/ "uniphier-pro4.dtsi"
/ { / {
model = "UniPhier PH1-Pro4 Sanji Board"; model = "UniPhier Pro4 Sanji Board";
compatible = "socionext,ph1-pro4-sanji", "socionext,ph1-pro4"; compatible = "socionext,uniphier-pro4-sanji", "socionext,uniphier-pro4";
memory { memory {
device_type = "memory"; device_type = "memory";
@ -45,8 +46,8 @@
&i2c0 { &i2c0 {
status = "okay"; status = "okay";
eeprom { eeprom@54 {
compatible = "24c64", "i2c-eeprom"; compatible = "st,24c64", "i2c-eeprom";
reg = <0x54>; reg = <0x54>;
u-boot,i2c-offset-len = <2>; u-boot,i2c-offset-len = <2>;
}; };

23
arch/arm/dts/uniphier-ph1-pro4.dtsi → arch/arm/dts/uniphier-pro4.dtsi
View File

@ -1,7 +1,8 @@
/* /*
* Device Tree Source for UniPhier PH1-Pro4 SoC * Device Tree Source for UniPhier Pro4 SoC
* *
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
@ -9,17 +10,17 @@
/include/ "uniphier-common32.dtsi" /include/ "uniphier-common32.dtsi"
/ { / {
compatible = "socionext,ph1-pro4"; compatible = "socionext,uniphier-pro4";
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "socionext,uniphier-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <0>; reg = <0>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
@ -27,6 +28,7 @@
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <1>; reg = <1>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
}; };
@ -352,6 +354,8 @@
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_1v8>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>;
bus-width = <4>; bus-width = <4>;
}; };
@ -364,6 +368,8 @@
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
pinctrl-1 = <&pinctrl_emmc_1v8>; pinctrl-1 = <&pinctrl_emmc_1v8>;
clocks = <&mio_clk 1>; clocks = <&mio_clk 1>;
reset-names = "host", "bridge", "hw-reset";
resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
}; };
@ -377,6 +383,7 @@
pinctrl-0 = <&pinctrl_sd1>; pinctrl-0 = <&pinctrl_sd1>;
pinctrl-1 = <&pinctrl_sd1_1v8>; pinctrl-1 = <&pinctrl_sd1_1v8>;
clocks = <&mio_clk 2>; clocks = <&mio_clk 2>;
resets = <&mio_rst 2>, <&mio_rst 5>;
bus-width = <4>; bus-width = <4>;
}; };
@ -387,7 +394,9 @@
interrupts = <0 80 4>; interrupts = <0 80 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb2>; pinctrl-0 = <&pinctrl_usb2>;
clocks = <&mio_clk 3>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
<&mio_rst 12>;
}; };
usb3: usb@5a810100 { usb3: usb@5a810100 {
@ -397,7 +406,9 @@
interrupts = <0 81 4>; interrupts = <0 81 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb3>; pinctrl-0 = <&pinctrl_usb3>;
clocks = <&mio_clk 4>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
<&mio_rst 13>;
}; };
aidet@5fc20000 { aidet@5fc20000 {

11
arch/arm/dts/uniphier-ph1-pro5-4kbox.dts → arch/arm/dts/uniphier-pro5-4kbox.dts
View File

@ -1,17 +1,18 @@
/* /*
* Device Tree Source for UniPhier PH1-Pro5 4KBOX Board (EVB-Pro5-4KBOX-M-V0) * Device Tree Source for UniPhier Pro5 4KBOX Board (EVB-Pro5-4KBOX-M-V0)
* *
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-pro5.dtsi" /include/ "uniphier-pro5.dtsi"
/ { / {
model = "UniPhier PH1-Pro5 4KBOX Board"; model = "UniPhier Pro5 4KBOX Board";
compatible = "socionext,ph1-pro5-4kbox", "socionext,ph1-pro5"; compatible = "socionext,uniphier-pro5-4kbox", "socionext,uniphier-pro5";
memory { memory {
device_type = "memory"; device_type = "memory";

14
arch/arm/dts/uniphier-ph1-pro5.dtsi → arch/arm/dts/uniphier-pro5.dtsi
View File

@ -1,7 +1,8 @@
/* /*
* Device Tree Source for UniPhier PH1-Pro5 SoC * Device Tree Source for UniPhier Pro5 SoC
* *
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
@ -9,17 +10,17 @@
/include/ "uniphier-common32.dtsi" /include/ "uniphier-common32.dtsi"
/ { / {
compatible = "socionext,ph1-pro5"; compatible = "socionext,uniphier-pro5";
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "socionext,uniphier-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <0>; reg = <0>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
@ -27,6 +28,7 @@
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <1>; reg = <1>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
}; };
@ -362,6 +364,8 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
clocks = <&mio_clk 1>; clocks = <&mio_clk 1>;
reset-names = "host", "hw-reset";
resets = <&mio_rst 1>, <&mio_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
}; };
@ -375,6 +379,8 @@
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_1v8>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
reset-names = "host";
resets = <&mio_rst 0>;
bus-width = <4>; bus-width = <4>;
}; };

16
arch/arm/dts/uniphier-proxstream2-gentil.dts → arch/arm/dts/uniphier-pxs2-gentil.dts
View File

@ -1,17 +1,19 @@
/* /*
* Device Tree Source for UniPhier ProXstream2 Gentil Board * Device Tree Source for UniPhier PXs2 Gentil Board
* *
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-proxstream2.dtsi" /include/ "uniphier-pxs2.dtsi"
/ { / {
model = "UniPhier ProXstream2 Gentil Board"; model = "UniPhier PXs2 Gentil Board";
compatible = "socionext,proxstream2-gentil", "socionext,proxstream2"; compatible = "socionext,uniphier-pxs2-gentil",
"socionext,uniphier-pxs2";
memory { memory {
device_type = "memory"; device_type = "memory";
@ -41,8 +43,8 @@
&i2c0 { &i2c0 {
status = "okay"; status = "okay";
eeprom { eeprom@54 {
compatible = "24c64", "i2c-eeprom"; compatible = "st,24c64", "i2c-eeprom";
reg = <0x54>; reg = <0x54>;
u-boot,i2c-offset-len = <2>; u-boot,i2c-offset-len = <2>;
}; };

11
arch/arm/dts/uniphier-proxstream2-vodka.dts → arch/arm/dts/uniphier-pxs2-vodka.dts
View File

@ -1,17 +1,18 @@
/* /*
* Device Tree Source for UniPhier ProXstream2 Vodka Board * Device Tree Source for UniPhier PXs2 Vodka Board
* *
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-proxstream2.dtsi" /include/ "uniphier-pxs2.dtsi"
/ { / {
model = "UniPhier ProXstream2 Vodka Board"; model = "UniPhier PXs2 Vodka Board";
compatible = "socionext,proxstream2-vodka", "socionext,proxstream2"; compatible = "socionext,uniphier-pxs2-vodka", "socionext,uniphier-pxs2";
memory { memory {
device_type = "memory"; device_type = "memory";

16
arch/arm/dts/uniphier-proxstream2.dtsi → arch/arm/dts/uniphier-pxs2.dtsi
View File

@ -1,7 +1,8 @@
/* /*
* Device Tree Source for UniPhier ProXstream2 SoC * Device Tree Source for UniPhier PXs2 SoC
* *
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
@ -9,17 +10,17 @@
/include/ "uniphier-common32.dtsi" /include/ "uniphier-common32.dtsi"
/ { / {
compatible = "socionext,proxstream2"; compatible = "socionext,uniphier-pxs2";
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "socionext,uniphier-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <0>; reg = <0>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
@ -27,6 +28,7 @@
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <1>; reg = <1>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
@ -34,6 +36,7 @@
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <2>; reg = <2>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
@ -41,6 +44,7 @@
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <3>; reg = <3>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
}; };
@ -361,6 +365,8 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
clocks = <&mio_clk 1>; clocks = <&mio_clk 1>;
reset-names = "host", "hw-reset";
resets = <&mio_rst 1>, <&mio_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
}; };
@ -374,6 +380,8 @@
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_1v8>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
reset-names = "host";
resets = <&mio_rst 0>;
bus-width = <4>; bus-width = <4>;
}; };

11
arch/arm/dts/uniphier-ph1-sld3-ref.dts → arch/arm/dts/uniphier-sld3-ref.dts
View File

@ -1,19 +1,20 @@
/* /*
* Device Tree Source for UniPhier PH1-sLD3 Reference Board * Device Tree Source for UniPhier sLD3 Reference Board
* *
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-sld3.dtsi" /include/ "uniphier-sld3.dtsi"
/include/ "uniphier-ref-daughter.dtsi" /include/ "uniphier-ref-daughter.dtsi"
/include/ "uniphier-support-card.dtsi" /include/ "uniphier-support-card.dtsi"
/ { / {
model = "UniPhier PH1-sLD3 Reference Board"; model = "UniPhier sLD3 Reference Board";
compatible = "socionext,ph1-sld3-ref", "socionext,ph1-sld3"; compatible = "socionext,uniphier-sld3-ref", "socionext,uniphier-sld3";
memory { memory {
device_type = "memory"; device_type = "memory";

48
arch/arm/dts/uniphier-ph1-sld3.dtsi → arch/arm/dts/uniphier-sld3.dtsi
View File

@ -1,7 +1,8 @@
/* /*
* Device Tree Source for UniPhier PH1-sLD3 SoC * Device Tree Source for UniPhier sLD3 SoC
* *
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
@ -9,26 +10,34 @@
/include/ "skeleton.dtsi" /include/ "skeleton.dtsi"
/ { / {
compatible = "socionext,ph1-sld3"; compatible = "socionext,uniphier-sld3";
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "socionext,uniphier-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <0>; reg = <0>;
enable-method = "psci";
next-level-cache = <&l2>;
}; };
cpu@1 { cpu@1 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <1>; reg = <1>;
enable-method = "psci";
next-level-cache = <&l2>;
}; };
}; };
psci {
compatible = "arm,psci-0.2";
method = "smc";
};
clocks { clocks {
refclk: ref { refclk: ref {
#clock-cells = <0>; #clock-cells = <0>;
@ -79,6 +88,18 @@
<0x20000100 0x100>; <0x20000100 0x100>;
}; };
l2: l2-cache@500c0000 {
compatible = "socionext,uniphier-system-cache";
reg = <0x500c0000 0x2000>, <0x503c0100 0x4>,
<0x506c0000 0x400>;
interrupts = <0 174 4>, <0 175 4>;
cache-unified;
cache-size = <(512 * 1024)>;
cache-sets = <256>;
cache-line-size = <128>;
cache-level = <2>;
};
serial0: serial@54006800 { serial0: serial@54006800 {
compatible = "socionext,uniphier-uart"; compatible = "socionext,uniphier-uart";
status = "disabled"; status = "disabled";
@ -280,6 +301,7 @@
system_bus: system-bus@58c00000 { system_bus: system-bus@58c00000 {
compatible = "socionext,uniphier-system-bus"; compatible = "socionext,uniphier-system-bus";
status = "disabled";
reg = <0x58c00000 0x400>; reg = <0x58c00000 0x400>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <1>;
@ -317,6 +339,7 @@
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
pinctrl-1 = <&pinctrl_emmc_1v8>; pinctrl-1 = <&pinctrl_emmc_1v8>;
clocks = <&mio_clk 1>; clocks = <&mio_clk 1>;
resets = <&mio_rst 1>, <&mio_rst 4>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
}; };
@ -330,6 +353,7 @@
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_1v8>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
resets = <&mio_rst 0>, <&mio_rst 3>;
bus-width = <4>; bus-width = <4>;
}; };
@ -340,7 +364,9 @@
interrupts = <0 80 4>; interrupts = <0 80 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb0>; pinctrl-0 = <&pinctrl_usb0>;
clocks = <&mio_clk 3>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
<&mio_rst 12>;
}; };
usb1: usb@5a810100 { usb1: usb@5a810100 {
@ -350,7 +376,9 @@
interrupts = <0 81 4>; interrupts = <0 81 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb1>; pinctrl-0 = <&pinctrl_usb1>;
clocks = <&mio_clk 4>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
<&mio_rst 13>;
}; };
usb2: usb@5a820100 { usb2: usb@5a820100 {
@ -360,7 +388,9 @@
interrupts = <0 82 4>; interrupts = <0 82 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb2>; pinctrl-0 = <&pinctrl_usb2>;
clocks = <&mio_clk 5>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
<&mio_rst 14>;
}; };
usb3: usb@5a830100 { usb3: usb@5a830100 {
@ -370,7 +400,9 @@
interrupts = <0 83 4>; interrupts = <0 83 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb3>; pinctrl-0 = <&pinctrl_usb3>;
clocks = <&mio_clk 7>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 11>, <&mio_clk 15>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 11>,
<&mio_rst 15>;
}; };
soc-glue@5f800000 { soc-glue@5f800000 {

11
arch/arm/dts/uniphier-ph1-sld8-ref.dts → arch/arm/dts/uniphier-sld8-ref.dts
View File

@ -1,19 +1,20 @@
/* /*
* Device Tree Source for UniPhier PH1-sLD8 Reference Board * Device Tree Source for UniPhier sLD8 Reference Board
* *
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
/dts-v1/; /dts-v1/;
/include/ "uniphier-ph1-sld8.dtsi" /include/ "uniphier-sld8.dtsi"
/include/ "uniphier-ref-daughter.dtsi" /include/ "uniphier-ref-daughter.dtsi"
/include/ "uniphier-support-card.dtsi" /include/ "uniphier-support-card.dtsi"
/ { / {
model = "UniPhier PH1-sLD8 Reference Board"; model = "UniPhier sLD8 Reference Board";
compatible = "socionext,ph1-sld8-ref", "socionext,ph1-sld8"; compatible = "socionext,uniphier-sld8-ref", "socionext,uniphier-sld8";
memory { memory {
device_type = "memory"; device_type = "memory";

24
arch/arm/dts/uniphier-ph1-sld8.dtsi → arch/arm/dts/uniphier-sld8.dtsi
View File

@ -1,7 +1,8 @@
/* /*
* Device Tree Source for UniPhier PH1-sLD8 SoC * Device Tree Source for UniPhier sLD8 SoC
* *
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com> * Copyright (C) 2015-2016 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* *
* SPDX-License-Identifier: GPL-2.0+ X11 * SPDX-License-Identifier: GPL-2.0+ X11
*/ */
@ -9,7 +10,7 @@
/include/ "uniphier-common32.dtsi" /include/ "uniphier-common32.dtsi"
/ { / {
compatible = "socionext,ph1-sld8"; compatible = "socionext,uniphier-sld8";
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
@ -19,6 +20,7 @@
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a9"; compatible = "arm,cortex-a9";
reg = <0>; reg = <0>;
enable-method = "psci";
next-level-cache = <&l2>; next-level-cache = <&l2>;
}; };
}; };
@ -223,6 +225,8 @@
pinctrl-0 = <&pinctrl_sd>; pinctrl-0 = <&pinctrl_sd>;
pinctrl-1 = <&pinctrl_sd_1v8>; pinctrl-1 = <&pinctrl_sd_1v8>;
clocks = <&mio_clk 0>; clocks = <&mio_clk 0>;
reset-names = "host", "bridge";
resets = <&mio_rst 0>, <&mio_rst 3>;
bus-width = <4>; bus-width = <4>;
}; };
@ -235,6 +239,8 @@
pinctrl-0 = <&pinctrl_emmc>; pinctrl-0 = <&pinctrl_emmc>;
pinctrl-1 = <&pinctrl_emmc_1v8>; pinctrl-1 = <&pinctrl_emmc_1v8>;
clocks = <&mio_clk 1>; clocks = <&mio_clk 1>;
reset-names = "host", "bridge", "hw-reset";
resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;
bus-width = <8>; bus-width = <8>;
non-removable; non-removable;
}; };
@ -246,7 +252,9 @@
interrupts = <0 80 4>; interrupts = <0 80 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb0>; pinctrl-0 = <&pinctrl_usb0>;
clocks = <&mio_clk 3>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 8>, <&mio_clk 12>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 8>,
<&mio_rst 12>;
}; };
usb1: usb@5a810100 { usb1: usb@5a810100 {
@ -256,7 +264,9 @@
interrupts = <0 81 4>; interrupts = <0 81 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb1>; pinctrl-0 = <&pinctrl_usb1>;
clocks = <&mio_clk 4>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 9>, <&mio_clk 13>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 9>,
<&mio_rst 13>;
}; };
usb2: usb@5a820100 { usb2: usb@5a820100 {
@ -266,7 +276,9 @@
interrupts = <0 82 4>; interrupts = <0 82 4>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb2>; pinctrl-0 = <&pinctrl_usb2>;
clocks = <&mio_clk 5>, <&mio_clk 6>; clocks = <&mio_clk 7>, <&mio_clk 10>, <&mio_clk 14>;
resets = <&sys_rst 8>, <&mio_rst 7>, <&mio_rst 10>,
<&mio_rst 14>;
}; };
aidet@61830000 { aidet@61830000 {

26
arch/arm/mach-uniphier/boards.c
View File

@ -250,35 +250,35 @@ struct uniphier_board_id {
static const struct uniphier_board_id uniphier_boards[] = { static const struct uniphier_board_id uniphier_boards[] = {
#if defined(CONFIG_ARCH_UNIPHIER_SLD3) #if defined(CONFIG_ARCH_UNIPHIER_SLD3)
{ "socionext,ph1-sld3", &uniphier_sld3_data, }, { "socionext,uniphier-sld3", &uniphier_sld3_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD4) #if defined(CONFIG_ARCH_UNIPHIER_LD4)
{ "socionext,ph1-ld4", &uniphier_ld4_data, }, { "socionext,uniphier-ld4", &uniphier_ld4_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO4) #if defined(CONFIG_ARCH_UNIPHIER_PRO4)
{ "socionext,ph1-pro4-ace", &uniphier_pro4_2g_data, }, { "socionext,uniphier-pro4-ace", &uniphier_pro4_2g_data, },
{ "socionext,ph1-pro4-sanji", &uniphier_pro4_2g_data, }, { "socionext,uniphier-pro4-sanji", &uniphier_pro4_2g_data, },
{ "socionext,ph1-pro4", &uniphier_pro4_data, }, { "socionext,uniphier-pro4", &uniphier_pro4_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_SLD8) #if defined(CONFIG_ARCH_UNIPHIER_SLD8)
{ "socionext,ph1-sld8", &uniphier_sld8_data, }, { "socionext,uniphier-sld8", &uniphier_sld8_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PRO5) #if defined(CONFIG_ARCH_UNIPHIER_PRO5)
{ "socionext,ph1-pro5", &uniphier_pro5_data, }, { "socionext,uniphier-pro5", &uniphier_pro5_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_PXS2) #if defined(CONFIG_ARCH_UNIPHIER_PXS2)
{ "socionext,proxstream2", &uniphier_pxs2_data, }, { "socionext,uniphier-pxs2", &uniphier_pxs2_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD6B) #if defined(CONFIG_ARCH_UNIPHIER_LD6B)
{ "socionext,ph1-ld6b", &uniphier_ld6b_data, }, { "socionext,uniphier-ld6b", &uniphier_ld6b_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD11) #if defined(CONFIG_ARCH_UNIPHIER_LD11)
{ "socionext,ph1-ld11", &uniphier_ld11_data, }, { "socionext,uniphier-ld11", &uniphier_ld11_data, },
#endif #endif
#if defined(CONFIG_ARCH_UNIPHIER_LD20) #if defined(CONFIG_ARCH_UNIPHIER_LD20)
{ "socionext,ph1-ld21", &uniphier_ld21_data, }, { "socionext,uniphier-ld21", &uniphier_ld21_data, },
{ "socionext,ph1-ld20-ref", &uniphier_ld20_ref_data, }, { "socionext,uniphier-ld20-ref", &uniphier_ld20_ref_data, },
{ "socionext,ph1-ld20", &uniphier_ld20_data, }, { "socionext,uniphier-ld20", &uniphier_ld20_data, },
#endif #endif
}; };

2
configs/uniphier_ld11_defconfig
View File

@ -5,7 +5,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_LD11=y CONFIG_ARCH_UNIPHIER_LD11=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld11-ref" CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld11-ref"
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set

2
configs/uniphier_ld20_defconfig
View File

@ -5,7 +5,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_LD20=y CONFIG_ARCH_UNIPHIER_LD20=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld20-ref" CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld20-ref"
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_CMD_XIMG is not set # CONFIG_CMD_XIMG is not set

2
configs/uniphier_ld4_sld8_defconfig
View File

@ -7,7 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_LD4_SLD8=y CONFIG_ARCH_UNIPHIER_LD4_SLD8=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref" CONFIG_DEFAULT_DEVICE_TREE="uniphier-ld4-ref"
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y

2
configs/uniphier_pro4_defconfig
View File

@ -6,7 +6,7 @@ CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref" CONFIG_DEFAULT_DEVICE_TREE="uniphier-pro4-ref"
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y

2
configs/uniphier_pxs2_ld6b_defconfig
View File

@ -7,7 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-proxstream2-vodka" CONFIG_DEFAULT_DEVICE_TREE="uniphier-pxs2-vodka"
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y

2
configs/uniphier_sld3_defconfig
View File

@ -7,7 +7,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_ARCH_UNIPHIER_SLD3=y CONFIG_ARCH_UNIPHIER_SLD3=y
CONFIG_MICRO_SUPPORT_CARD=y CONFIG_MICRO_SUPPORT_CARD=y
CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_SYS_TEXT_BASE=0x84000000
CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld3-ref" CONFIG_DEFAULT_DEVICE_TREE="uniphier-sld3-ref"
CONFIG_SPL_NOR_SUPPORT=y CONFIG_SPL_NOR_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y

32
doc/README.uniphier
View File

@ -28,45 +28,45 @@ Tested toolchains
Compile the source Compile the source
------------------ ------------------
PH1-sLD3 reference board: sLD3 reference board:
$ make uniphier_sld3_defconfig $ make uniphier_sld3_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- $ make CROSS_COMPILE=arm-linux-gnueabi-
PH1-LD4 reference board: LD4 reference board:
$ make uniphier_ld4_sld8_defconfig $ make uniphier_ld4_sld8_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- $ make CROSS_COMPILE=arm-linux-gnueabi-
PH1-sLD8 reference board: sLD8 reference board:
$ make uniphier_ld4_sld8_defconfig $ make uniphier_ld4_sld8_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-sld8-ref $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-sld8-ref
PH1-Pro4 reference board: Pro4 reference board:
$ make uniphier_pro4_defconfig $ make uniphier_pro4_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- $ make CROSS_COMPILE=arm-linux-gnueabi-
PH1-Pro4 Ace board: Pro4 Ace board:
$ make uniphier_pro4_defconfig $ make uniphier_pro4_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-pro4-ace $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-pro4-ace
PH1-Pro4 Sanji board: Pro4 Sanji board:
$ make uniphier_pro4_defconfig $ make uniphier_pro4_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-pro4-sanji $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-pro4-sanji
PH1-Pro5 4KBOX Board: Pro5 4KBOX Board:
$ make uniphier_pxs2_ld6b_defconfig $ make uniphier_pxs2_ld6b_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-pro5-4kbox $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-pro5-4kbox
ProXstream2 Gentil board: PXs2 Gentil board:
$ make uniphier_pxs2_ld6b_defconfig $ make uniphier_pxs2_ld6b_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-proxstream2-gentil $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-pxs2-gentil
ProXstream2 Vodka board: PXs2 Vodka board:
$ make uniphier_pxs2_ld6b_defconfig $ make uniphier_pxs2_ld6b_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- $ make CROSS_COMPILE=arm-linux-gnueabi-
PH1-LD6b reference board: LD6b reference board:
$ make uniphier_pxs2_ld6b_defconfig $ make uniphier_pxs2_ld6b_defconfig
$ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-ld6b-ref $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ld6b-ref
You may wish to change the "CROSS_COMPILE=arm-linux-gnueabi-" You may wish to change the "CROSS_COMPILE=arm-linux-gnueabi-"
to use your favorite compiler. to use your favorite compiler.