mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-19 08:28:51 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
This commit is contained in:
commit
a74ef40a47
@ -159,7 +159,7 @@ F: arch/arm/include/asm/arch-omap*/
|
|||||||
F: arch/arm/include/asm/ti-common/
|
F: arch/arm/include/asm/ti-common/
|
||||||
|
|
||||||
ARM UNIPHIER
|
ARM UNIPHIER
|
||||||
M: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
M: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
T: git git://git.denx.de/u-boot-uniphier.git
|
T: git git://git.denx.de/u-boot-uniphier.git
|
||||||
F: arch/arm/mach-uniphier/
|
F: arch/arm/mach-uniphier/
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
* Device Tree Source for UniPhier PH1-LD4 Reference Board
|
* Device Tree Source for UniPhier PH1-LD4 Reference Board
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Panasonic Corporation
|
* Copyright (C) 2014-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -12,8 +13,8 @@
|
|||||||
/include/ "uniphier-ref-daughter.dtsi"
|
/include/ "uniphier-ref-daughter.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "Panasonic UniPhier PH1-LD4 Reference Board";
|
model = "UniPhier PH1-LD4 Reference Board";
|
||||||
compatible = "panasonic,ph1-ld4-ref", "panasonic,ph1-ld4";
|
compatible = "socionext,ph1-ld4-ref", "socionext,ph1-ld4";
|
||||||
|
|
||||||
memory {
|
memory {
|
||||||
device_type = "memory";
|
device_type = "memory";
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
* Device Tree Source for UniPhier PH1-LD4 SoC
|
* Device Tree Source for UniPhier PH1-LD4 SoC
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Panasonic Corporation
|
* Copyright (C) 2014-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -10,7 +11,7 @@
|
|||||||
/include/ "skeleton.dtsi"
|
/include/ "skeleton.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
compatible = "panasonic,ph1-ld4";
|
compatible = "socionext,ph1-ld4";
|
||||||
|
|
||||||
cpus {
|
cpus {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
@ -30,35 +31,35 @@
|
|||||||
ranges;
|
ranges;
|
||||||
|
|
||||||
uart0: serial@54006800 {
|
uart0: serial@54006800 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006800 0x20>;
|
reg = <0x54006800 0x20>;
|
||||||
clock-frequency = <36864000>;
|
clock-frequency = <36864000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart1: serial@54006900 {
|
uart1: serial@54006900 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006900 0x20>;
|
reg = <0x54006900 0x20>;
|
||||||
clock-frequency = <36864000>;
|
clock-frequency = <36864000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart2: serial@54006a00 {
|
uart2: serial@54006a00 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006a00 0x20>;
|
reg = <0x54006a00 0x20>;
|
||||||
clock-frequency = <36864000>;
|
clock-frequency = <36864000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart3: serial@54006b00 {
|
uart3: serial@54006b00 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006b00 0x20>;
|
reg = <0x54006b00 0x20>;
|
||||||
clock-frequency = <36864000>;
|
clock-frequency = <36864000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c0: i2c@58400000 {
|
i2c0: i2c@58400000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58400000 0x40>;
|
reg = <0x58400000 0x40>;
|
||||||
@ -67,7 +68,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c1: i2c@58480000 {
|
i2c1: i2c@58480000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58480000 0x40>;
|
reg = <0x58480000 0x40>;
|
||||||
@ -76,7 +77,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c2: i2c@58500000 {
|
i2c2: i2c@58500000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58500000 0x40>;
|
reg = <0x58500000 0x40>;
|
||||||
@ -85,7 +86,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c3: i2c@58580000 {
|
i2c3: i2c@58580000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58580000 0x40>;
|
reg = <0x58580000 0x40>;
|
||||||
@ -94,19 +95,19 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
usb0: usb@5a800100 {
|
usb0: usb@5a800100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a800100 0x100>;
|
reg = <0x5a800100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb1: usb@5a810100 {
|
usb1: usb@5a810100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a810100 0x100>;
|
reg = <0x5a810100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb2: usb@5a820100 {
|
usb2: usb@5a820100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a820100 0x100>;
|
reg = <0x5a820100 0x100>;
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
* Device Tree Source for UniPhier PH1-Pro4 Reference Board
|
* Device Tree Source for UniPhier PH1-Pro4 Reference Board
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Panasonic Corporation
|
* Copyright (C) 2014-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -12,8 +13,8 @@
|
|||||||
/include/ "uniphier-ref-daughter.dtsi"
|
/include/ "uniphier-ref-daughter.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "Panasonic UniPhier PH1-Pro4 Reference Board";
|
model = "UniPhier PH1-Pro4 Reference Board";
|
||||||
compatible = "panasonic,ph1-pro4-ref", "panasonic,ph1-pro4";
|
compatible = "socionext,ph1-pro4-ref", "socionext,ph1-pro4";
|
||||||
|
|
||||||
memory {
|
memory {
|
||||||
device_type = "memory";
|
device_type = "memory";
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
* Device Tree Source for UniPhier PH1-Pro4 SoC
|
* Device Tree Source for UniPhier PH1-Pro4 SoC
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Panasonic Corporation
|
* Copyright (C) 2014-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -10,7 +11,7 @@
|
|||||||
/include/ "skeleton.dtsi"
|
/include/ "skeleton.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
compatible = "panasonic,ph1-pro4";
|
compatible = "socionext,ph1-pro4";
|
||||||
|
|
||||||
cpus {
|
cpus {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
@ -36,35 +37,35 @@
|
|||||||
ranges;
|
ranges;
|
||||||
|
|
||||||
uart0: serial@54006800 {
|
uart0: serial@54006800 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006800 0x20>;
|
reg = <0x54006800 0x20>;
|
||||||
clock-frequency = <73728000>;
|
clock-frequency = <73728000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart1: serial@54006900 {
|
uart1: serial@54006900 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006900 0x20>;
|
reg = <0x54006900 0x20>;
|
||||||
clock-frequency = <73728000>;
|
clock-frequency = <73728000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart2: serial@54006a00 {
|
uart2: serial@54006a00 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006a00 0x20>;
|
reg = <0x54006a00 0x20>;
|
||||||
clock-frequency = <73728000>;
|
clock-frequency = <73728000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart3: serial@54006b00 {
|
uart3: serial@54006b00 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006b00 0x20>;
|
reg = <0x54006b00 0x20>;
|
||||||
clock-frequency = <73728000>;
|
clock-frequency = <73728000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c0: i2c@58780000 {
|
i2c0: i2c@58780000 {
|
||||||
compatible = "panasonic,uniphier-fi2c";
|
compatible = "socionext,uniphier-fi2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58780000 0x80>;
|
reg = <0x58780000 0x80>;
|
||||||
@ -73,7 +74,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c1: i2c@58781000 {
|
i2c1: i2c@58781000 {
|
||||||
compatible = "panasonic,uniphier-fi2c";
|
compatible = "socionext,uniphier-fi2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58781000 0x80>;
|
reg = <0x58781000 0x80>;
|
||||||
@ -82,7 +83,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c2: i2c@58782000 {
|
i2c2: i2c@58782000 {
|
||||||
compatible = "panasonic,uniphier-fi2c";
|
compatible = "socionext,uniphier-fi2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58782000 0x80>;
|
reg = <0x58782000 0x80>;
|
||||||
@ -91,7 +92,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c3: i2c@58783000 {
|
i2c3: i2c@58783000 {
|
||||||
compatible = "panasonic,uniphier-fi2c";
|
compatible = "socionext,uniphier-fi2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58783000 0x80>;
|
reg = <0x58783000 0x80>;
|
||||||
@ -102,7 +103,7 @@
|
|||||||
/* i2c4 does not exist */
|
/* i2c4 does not exist */
|
||||||
|
|
||||||
i2c5: i2c@58785000 {
|
i2c5: i2c@58785000 {
|
||||||
compatible = "panasonic,uniphier-fi2c";
|
compatible = "socionext,uniphier-fi2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58785000 0x80>;
|
reg = <0x58785000 0x80>;
|
||||||
@ -111,7 +112,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c6: i2c@58786000 {
|
i2c6: i2c@58786000 {
|
||||||
compatible = "panasonic,uniphier-fi2c";
|
compatible = "socionext,uniphier-fi2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58786000 0x80>;
|
reg = <0x58786000 0x80>;
|
||||||
@ -120,25 +121,25 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
usb2: usb@5a800100 {
|
usb2: usb@5a800100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a800100 0x100>;
|
reg = <0x5a800100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb3: usb@5a810100 {
|
usb3: usb@5a810100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a810100 0x100>;
|
reg = <0x5a810100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb0: usb@65a00000 {
|
usb0: usb@65a00000 {
|
||||||
compatible = "panasonic,uniphier-xhci", "generic-xhci";
|
compatible = "socionext,uniphier-xhci", "generic-xhci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x65a00000 0x100>;
|
reg = <0x65a00000 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb1: usb@65c00000 {
|
usb1: usb@65c00000 {
|
||||||
compatible = "panasonic,uniphier-xhci", "generic-xhci";
|
compatible = "socionext,uniphier-xhci", "generic-xhci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x65c00000 0x100>;
|
reg = <0x65c00000 0x100>;
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
* Device Tree Source for UniPhier PH1-sLD3 Reference Board
|
* Device Tree Source for UniPhier PH1-sLD3 Reference Board
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Panasonic Corporation
|
* Copyright (C) 2014-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -12,8 +13,8 @@
|
|||||||
/include/ "uniphier-ref-daughter.dtsi"
|
/include/ "uniphier-ref-daughter.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "Panasonic UniPhier PH1-sLD3 Reference Board";
|
model = "UniPhier PH1-sLD3 Reference Board";
|
||||||
compatible = "panasonic,ph1-sld3-ref", "panasonic,ph1-sld3";
|
compatible = "socionext,ph1-sld3-ref", "socionext,ph1-sld3";
|
||||||
|
|
||||||
memory {
|
memory {
|
||||||
device_type = "memory";
|
device_type = "memory";
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
* Device Tree Source for UniPhier PH1-sLD3 SoC
|
* Device Tree Source for UniPhier PH1-sLD3 SoC
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Panasonic Corporation
|
* Copyright (C) 2014-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -10,7 +11,7 @@
|
|||||||
/include/ "skeleton.dtsi"
|
/include/ "skeleton.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
compatible = "panasonic,ph1-sld3";
|
compatible = "socionext,ph1-sld3";
|
||||||
|
|
||||||
cpus {
|
cpus {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
@ -36,28 +37,28 @@
|
|||||||
ranges;
|
ranges;
|
||||||
|
|
||||||
uart0: serial@54006800 {
|
uart0: serial@54006800 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006800 0x20>;
|
reg = <0x54006800 0x20>;
|
||||||
clock-frequency = <36864000>;
|
clock-frequency = <36864000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart1: serial@54006900 {
|
uart1: serial@54006900 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006900 0x20>;
|
reg = <0x54006900 0x20>;
|
||||||
clock-frequency = <36864000>;
|
clock-frequency = <36864000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart2: serial@54006a00 {
|
uart2: serial@54006a00 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006a00 0x20>;
|
reg = <0x54006a00 0x20>;
|
||||||
clock-frequency = <36864000>;
|
clock-frequency = <36864000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c0: i2c@58400000 {
|
i2c0: i2c@58400000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58400000 0x40>;
|
reg = <0x58400000 0x40>;
|
||||||
@ -66,7 +67,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c1: i2c@58480000 {
|
i2c1: i2c@58480000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58480000 0x40>;
|
reg = <0x58480000 0x40>;
|
||||||
@ -75,7 +76,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c2: i2c@58500000 {
|
i2c2: i2c@58500000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58500000 0x40>;
|
reg = <0x58500000 0x40>;
|
||||||
@ -84,7 +85,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c3: i2c@58580000 {
|
i2c3: i2c@58580000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58580000 0x40>;
|
reg = <0x58580000 0x40>;
|
||||||
@ -93,25 +94,25 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
usb0: usb@5a800100 {
|
usb0: usb@5a800100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a800100 0x100>;
|
reg = <0x5a800100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb1: usb@5a810100 {
|
usb1: usb@5a810100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a810100 0x100>;
|
reg = <0x5a810100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb2: usb@5a820100 {
|
usb2: usb@5a820100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a820100 0x100>;
|
reg = <0x5a820100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb3: usb@5a830100 {
|
usb3: usb@5a830100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a830100 0x100>;
|
reg = <0x5a830100 0x100>;
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
* Device Tree Source for UniPhier PH1-sLD8 Reference Board
|
* Device Tree Source for UniPhier PH1-sLD8 Reference Board
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Panasonic Corporation
|
* Copyright (C) 2014-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -12,8 +13,8 @@
|
|||||||
/include/ "uniphier-ref-daughter.dtsi"
|
/include/ "uniphier-ref-daughter.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
model = "Panasonic UniPhier PH1-sLD8 Reference Board";
|
model = "UniPhier PH1-sLD8 Reference Board";
|
||||||
compatible = "panasonic,ph1-sld8-ref", "panasonic,ph1-sld8";
|
compatible = "socionext,ph1-sld8-ref", "socionext,ph1-sld8";
|
||||||
|
|
||||||
memory {
|
memory {
|
||||||
device_type = "memory";
|
device_type = "memory";
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
* Device Tree Source for UniPhier PH1-sLD8 SoC
|
* Device Tree Source for UniPhier PH1-sLD8 SoC
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Panasonic Corporation
|
* Copyright (C) 2014-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -10,7 +11,7 @@
|
|||||||
/include/ "skeleton.dtsi"
|
/include/ "skeleton.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
compatible = "panasonic,ph1-sld8";
|
compatible = "socionext,ph1-sld8";
|
||||||
|
|
||||||
cpus {
|
cpus {
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
@ -30,35 +31,35 @@
|
|||||||
ranges;
|
ranges;
|
||||||
|
|
||||||
uart0: serial@54006800 {
|
uart0: serial@54006800 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006800 0x20>;
|
reg = <0x54006800 0x20>;
|
||||||
clock-frequency = <80000000>;
|
clock-frequency = <80000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart1: serial@54006900 {
|
uart1: serial@54006900 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006900 0x20>;
|
reg = <0x54006900 0x20>;
|
||||||
clock-frequency = <80000000>;
|
clock-frequency = <80000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart2: serial@54006a00 {
|
uart2: serial@54006a00 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006a00 0x20>;
|
reg = <0x54006a00 0x20>;
|
||||||
clock-frequency = <80000000>;
|
clock-frequency = <80000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart3: serial@54006b00 {
|
uart3: serial@54006b00 {
|
||||||
compatible = "panasonic,uniphier-uart";
|
compatible = "socionext,uniphier-uart";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x54006b00 0x20>;
|
reg = <0x54006b00 0x20>;
|
||||||
clock-frequency = <80000000>;
|
clock-frequency = <80000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c0: i2c@58400000 {
|
i2c0: i2c@58400000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58400000 0x40>;
|
reg = <0x58400000 0x40>;
|
||||||
@ -67,7 +68,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c1: i2c@58480000 {
|
i2c1: i2c@58480000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58480000 0x40>;
|
reg = <0x58480000 0x40>;
|
||||||
@ -76,7 +77,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c2: i2c@58500000 {
|
i2c2: i2c@58500000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58500000 0x40>;
|
reg = <0x58500000 0x40>;
|
||||||
@ -85,7 +86,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
i2c3: i2c@58580000 {
|
i2c3: i2c@58580000 {
|
||||||
compatible = "panasonic,uniphier-i2c";
|
compatible = "socionext,uniphier-i2c";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
reg = <0x58580000 0x40>;
|
reg = <0x58580000 0x40>;
|
||||||
@ -94,19 +95,19 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
usb0: usb@5a800100 {
|
usb0: usb@5a800100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a800100 0x100>;
|
reg = <0x5a800100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb1: usb@5a810100 {
|
usb1: usb@5a810100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a810100 0x100>;
|
reg = <0x5a810100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
usb2: usb@5a820100 {
|
usb2: usb@5a820100 {
|
||||||
compatible = "panasonic,uniphier-ehci", "generic-ehci";
|
compatible = "socionext,uniphier-ehci", "generic-ehci";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
reg = <0x5a820100 0x100>;
|
reg = <0x5a820100 0x100>;
|
||||||
};
|
};
|
||||||
|
@ -2,7 +2,8 @@
|
|||||||
* Device Tree Source for UniPhier Reference Daughter Board
|
* Device Tree Source for UniPhier Reference Daughter Board
|
||||||
*
|
*
|
||||||
* Copyright (C) 2014-2015 Panasonic Corporation
|
* Copyright (C) 2014-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
|
@ -31,7 +31,7 @@ alias luka Luka Perkov <luka.perkov@sartura.hr>
|
|||||||
alias lukma Lukasz Majewski <l.majewski@samsung.com>
|
alias lukma Lukasz Majewski <l.majewski@samsung.com>
|
||||||
alias macpaul Macpaul Lin <macpaul@andestech.com>
|
alias macpaul Macpaul Lin <macpaul@andestech.com>
|
||||||
alias marex Marek Vasut <marex@denx.de>
|
alias marex Marek Vasut <marex@denx.de>
|
||||||
alias masahiro Masahiro Yamada <yamada.m@jp.panasonic.com>
|
alias masahiro Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
alias monstr Michal Simek <monstr@monstr.eu>
|
alias monstr Michal Simek <monstr@monstr.eu>
|
||||||
alias panto Pantelis Antoniou <panto@antoniou-consulting.com>
|
alias panto Pantelis Antoniou <panto@antoniou-consulting.com>
|
||||||
alias prafulla Prafulla Wadaskar <prafulla@marvell.com>
|
alias prafulla Prafulla Wadaskar <prafulla@marvell.com>
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2014 Panasonic Corporation
|
* Copyright (C) 2014 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -352,8 +353,8 @@ static const struct dm_i2c_ops uniphier_fi2c_ops = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static const struct udevice_id uniphier_fi2c_of_match[] = {
|
static const struct udevice_id uniphier_fi2c_of_match[] = {
|
||||||
{ .compatible = "panasonic,uniphier-fi2c" },
|
{ .compatible = "socionext,uniphier-fi2c" },
|
||||||
{},
|
{ /* sentinel */ }
|
||||||
};
|
};
|
||||||
|
|
||||||
U_BOOT_DRIVER(uniphier_fi2c) = {
|
U_BOOT_DRIVER(uniphier_fi2c) = {
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2014 Panasonic Corporation
|
* Copyright (C) 2014 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -212,8 +213,8 @@ static const struct dm_i2c_ops uniphier_i2c_ops = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static const struct udevice_id uniphier_i2c_of_match[] = {
|
static const struct udevice_id uniphier_i2c_of_match[] = {
|
||||||
{ .compatible = "panasonic,uniphier-i2c" },
|
{ .compatible = "socionext,uniphier-i2c" },
|
||||||
{},
|
{ /* sentinel */ }
|
||||||
};
|
};
|
||||||
|
|
||||||
U_BOOT_DRIVER(uniphier_i2c) = {
|
U_BOOT_DRIVER(uniphier_i2c) = {
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2012-2015 Panasonic Corporation
|
* Copyright (C) 2012-2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -115,8 +116,8 @@ static int uniphier_serial_remove(struct udevice *dev)
|
|||||||
|
|
||||||
#ifdef CONFIG_OF_CONTROL
|
#ifdef CONFIG_OF_CONTROL
|
||||||
static const struct udevice_id uniphier_uart_of_match[] = {
|
static const struct udevice_id uniphier_uart_of_match[] = {
|
||||||
{ .compatible = "panasonic,uniphier-uart" },
|
{ .compatible = "socionext,uniphier-uart" },
|
||||||
{},
|
{ /* sentinel */ }
|
||||||
};
|
};
|
||||||
|
|
||||||
static int uniphier_serial_ofdata_to_platdata(struct udevice *dev)
|
static int uniphier_serial_ofdata_to_platdata(struct udevice *dev)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2014 Panasonic Corporation
|
* Copyright (C) 2014 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -16,7 +17,7 @@
|
|||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
#define FDT gd->fdt_blob
|
#define FDT gd->fdt_blob
|
||||||
#define COMPAT "panasonic,uniphier-ehci"
|
#define COMPAT "socionext,uniphier-ehci"
|
||||||
|
|
||||||
static int get_uniphier_ehci_base(int index, struct ehci_hccr **base)
|
static int get_uniphier_ehci_base(int index, struct ehci_hccr **base)
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (C) 2015 Panasonic Corporation
|
* Copyright (C) 2015 Panasonic Corporation
|
||||||
* Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
* Copyright (C) 2015 Socionext Inc.
|
||||||
|
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: GPL-2.0+
|
* SPDX-License-Identifier: GPL-2.0+
|
||||||
*/
|
*/
|
||||||
@ -19,7 +20,7 @@ static int get_uniphier_xhci_base(int index, struct xhci_hccr **base)
|
|||||||
int count;
|
int count;
|
||||||
|
|
||||||
count = fdtdec_find_aliases_for_id(gd->fdt_blob, "usb",
|
count = fdtdec_find_aliases_for_id(gd->fdt_blob, "usb",
|
||||||
COMPAT_PANASONIC_XHCI, node_list,
|
COMPAT_SOCIONEXT_XHCI, node_list,
|
||||||
ARRAY_SIZE(node_list));
|
ARRAY_SIZE(node_list));
|
||||||
|
|
||||||
if (index >= count)
|
if (index >= count)
|
||||||
|
@ -168,7 +168,7 @@ enum fdt_compat_id {
|
|||||||
COMPAT_AMS_AS3722, /* AMS AS3722 PMIC */
|
COMPAT_AMS_AS3722, /* AMS AS3722 PMIC */
|
||||||
COMPAT_INTEL_ICH_SPI, /* Intel ICH7/9 SPI controller */
|
COMPAT_INTEL_ICH_SPI, /* Intel ICH7/9 SPI controller */
|
||||||
COMPAT_INTEL_QRK_MRC, /* Intel Quark MRC */
|
COMPAT_INTEL_QRK_MRC, /* Intel Quark MRC */
|
||||||
COMPAT_PANASONIC_XHCI, /* Panasonic UniPhier xHCI */
|
COMPAT_SOCIONEXT_XHCI, /* Socionext UniPhier xHCI */
|
||||||
|
|
||||||
COMPAT_COUNT,
|
COMPAT_COUNT,
|
||||||
};
|
};
|
||||||
|
@ -76,7 +76,7 @@ static const char * const compat_names[COMPAT_COUNT] = {
|
|||||||
COMPAT(AMS_AS3722, "ams,as3722"),
|
COMPAT(AMS_AS3722, "ams,as3722"),
|
||||||
COMPAT(INTEL_ICH_SPI, "intel,ich-spi"),
|
COMPAT(INTEL_ICH_SPI, "intel,ich-spi"),
|
||||||
COMPAT(INTEL_QRK_MRC, "intel,quark-mrc"),
|
COMPAT(INTEL_QRK_MRC, "intel,quark-mrc"),
|
||||||
COMPAT(PANASONIC_XHCI, "panasonic,uniphier-xhci"),
|
COMPAT(SOCIONEXT_XHCI, "socionext,uniphier-xhci"),
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *fdtdec_get_compatible(enum fdt_compat_id id)
|
const char *fdtdec_get_compatible(enum fdt_compat_id id)
|
||||||
|
Loading…
Reference in New Issue
Block a user