diff options
| author | Tom Rini <trini@konsulko.com> | 2015-03-15 14:31:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-03-15 14:31:39 -0400 |
| commit | a74ef40a471d9d4bffb36a8c89744cf6fd631e6f (patch) | |
| tree | d0e7678f13d9cb3323df2a1c75fa5ef35106e006 /drivers/serial/serial_uniphier.c | |
| parent | 252ed8729d8a2571faacb6fdb3463df2361a733d (diff) | |
| parent | 6462cdedc20b08ff5aa402a991ec89b3255ba51d (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'drivers/serial/serial_uniphier.c')
| -rw-r--r-- | drivers/serial/serial_uniphier.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c index a6bd27facff..98e3b812e0b 100644 --- a/drivers/serial/serial_uniphier.c +++ b/drivers/serial/serial_uniphier.c @@ -1,6 +1,7 @@ /* * 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+ */ @@ -115,8 +116,8 @@ static int uniphier_serial_remove(struct udevice *dev) #ifdef CONFIG_OF_CONTROL 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) |