leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-uniphier

Browse Source
This commit is contained in:
Tom Rini
2015-05-30 20:16:01 -04:00
parent b1f7ecc9b5 fcb2525d37
commit 43b1ff5f33
56 changed files with 131 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/i2c/Kconfig
View File

@@ -63,13 +63,13 @@ config SYS_I2C_UNIPHIER
depends on ARCH_UNIPHIER && DM_I2C
default y
help
Support for Panasonic UniPhier I2C controller driver. This I2C
controller is used on PH1-LD4, PH1-sLD8 or older UniPhier SoCs.
Support for UniPhier I2C controller driver. This I2C controller
is used on PH1-LD4, PH1-sLD8 or older UniPhier SoCs.
config SYS_I2C_UNIPHIER_F
bool "UniPhier FIFO-builtin I2C driver"
depends on ARCH_UNIPHIER && DM_I2C
default y
help
Support for Panasonic UniPhier FIFO-builtin I2C controller driver.
Support for UniPhier FIFO-builtin I2C controller driver.
This I2C controller is used on PH1-Pro4 or newer UniPhier SoCs.

6
drivers/i2c/i2c-uniphier-f.c
View File

@@ -1,14 +1,12 @@
/*
* Copyright (C) 2014 Panasonic Corporation
* Copyright (C) 2015 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <linux/types.h>
#include <asm/io.h>
#include <linux/io.h>
#include <asm/errno.h>
#include <dm/device.h>
#include <dm/root.h>

6
drivers/i2c/i2c-uniphier.c
View File

@@ -1,14 +1,12 @@
/*
* Copyright (C) 2014 Panasonic Corporation
* Copyright (C) 2015 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <linux/types.h>
#include <asm/io.h>
#include <linux/io.h>
#include <asm/errno.h>
#include <dm/device.h>
#include <dm/root.h>

5
drivers/serial/Kconfig
View File

@@ -77,7 +77,8 @@ config DEBUG_UART_SHIFT
registers, 2=32-bit word registers, etc.
config UNIPHIER_SERIAL
bool "UniPhier on-chip UART support"
bool "Support for UniPhier on-chip UART"
depends on ARCH_UNIPHIER && DM_SERIAL
help
Support for the on-chip UARTs on the Panasonic UniPhier platform.
If you have a UniPhier based board and want to use the on-chip
serial ports, say Y to this option. If unsure, say N.

6
drivers/serial/serial_uniphier.c
View File

@@ -1,13 +1,11 @@
/*
* Copyright (C) 2012-2015 Panasonic Corporation
* Copyright (C) 2015 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <linux/io.h>
#include <linux/serial_reg.h>
#include <asm/io.h>
#include <asm/errno.h>
#include <dm/device.h>
#include <dm/platform_data/serial-uniphier.h>

10
drivers/usb/host/Kconfig
View File

@@ -18,12 +18,11 @@ config USB_XHCI
if USB_XHCI_HCD
config USB_XHCI_UNIPHIER
bool "Support for Panasonic UniPhier on-chip xHCI USB controller"
bool "Support for UniPhier on-chip xHCI USB controller"
depends on ARCH_UNIPHIER
default y
---help---
Enables support for the on-chip xHCI controller on Panasonic
UniPhier SoCs.
Enables support for the on-chip xHCI controller on UniPhier SoCs.
endif
@@ -54,11 +53,10 @@ config USB_EHCI
if USB_EHCI_HCD
config USB_EHCI_UNIPHIER
bool "Support for Panasonic UniPhier on-chip EHCI USB controller"
bool "Support for UniPhier on-chip EHCI USB controller"
depends on ARCH_UNIPHIER && OF_CONTROL
default y
---help---
Enables support for the on-chip EHCI controller on Panasonic
UniPhier SoCs.
Enables support for the on-chip EHCI controller on UniPhier SoCs.
endif

6
drivers/usb/host/ehci-uniphier.c
View File

@@ -1,14 +1,12 @@
/*
* Copyright (C) 2014 Panasonic Corporation
* Copyright (C) 2015 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* Copyright (C) 2014-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <linux/err.h>
#include <asm/io.h>
#include <linux/io.h>
#include <usb.h>
#include <mach/mio-regs.h>
#include <fdtdec.h>

5
drivers/usb/host/xhci-uniphier.c
View File

@@ -1,13 +1,12 @@
/*
* Copyright (C) 2015 Panasonic Corporation
* Copyright (C) 2015 Socionext Inc.
* Author: Masahiro Yamada <yamada.masahiro@socionext.com>
* Copyright (C) 2015 Masahiro Yamada <yamada.masahiro@socionext.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
#include <linux/err.h>
#include <linux/io.h>
#include <usb.h>
#include <fdtdec.h>
#include "xhci.h"