summaryrefslogtreecommitdiffstats
path: root/arch/arm/dts/uniphier-ph1-sld3-ref.dts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-03-15 14:31:39 -0400
committerTom Rini <trini@konsulko.com>2015-03-15 14:31:39 -0400
commita74ef40a471d9d4bffb36a8c89744cf6fd631e6f (patch)
treed0e7678f13d9cb3323df2a1c75fa5ef35106e006 /arch/arm/dts/uniphier-ph1-sld3-ref.dts
parent252ed8729d8a2571faacb6fdb3463df2361a733d (diff)
parent6462cdedc20b08ff5aa402a991ec89b3255ba51d (diff)
downloadtalos-obmc-uboot-a74ef40a471d9d4bffb36a8c89744cf6fd631e6f.tar.gz
talos-obmc-uboot-a74ef40a471d9d4bffb36a8c89744cf6fd631e6f.zip
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/dts/uniphier-ph1-sld3-ref.dts')
-rw-r--r--arch/arm/dts/uniphier-ph1-sld3-ref.dts7
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/dts/uniphier-ph1-sld3-ref.dts b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
index 8a7f90ac78..d9616f68a0 100644
--- a/arch/arm/dts/uniphier-ph1-sld3-ref.dts
+++ b/arch/arm/dts/uniphier-ph1-sld3-ref.dts
@@ -2,7 +2,8 @@
* Device Tree Source for UniPhier PH1-sLD3 Reference Board
*
* 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+
*/
@@ -12,8 +13,8 @@
/include/ "uniphier-ref-daughter.dtsi"
/ {
- model = "Panasonic UniPhier PH1-sLD3 Reference Board";
- compatible = "panasonic,ph1-sld3-ref", "panasonic,ph1-sld3";
+ model = "UniPhier PH1-sLD3 Reference Board";
+ compatible = "socionext,ph1-sld3-ref", "socionext,ph1-sld3";
memory {
device_type = "memory";
OpenPOWER on IntegriCloud