Merge branch 'next-dev' into thunder-boot

UPSTREAM: usb: r8a66597: Add optional DM VBUS regulator support

Add DM regulator support for toggling VBUS, this is useful on boards
which control the VBUS e.g. through GPIO.

Change-Id: I0f6e296d34

UPSTREAM: usb: r8a66597: Add optional DM VBUS regulator support

Add DM regulator support for toggling VBUS, this is useful on boards
which control the VBUS e.g. through GPIO.

Change-Id: I0f6e296d34613ada8d7e96a8ec86a4288614822c
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 769a9cd4bbd7ae9b8170b3dd6ba54b84fde59224)

show more ...

UPSTREAM: usb: r8a66597: Checkpatch cleanup

Fix remaining checkpatch complaints in the driver.

Change-Id: Ic58362d2e4a9a6a560ceb5c12fbfb502b814ad6f
Signed-off-by: Marek Vasut <marek.vasut+renesas@g

UPSTREAM: usb: r8a66597: Checkpatch cleanup

Fix remaining checkpatch complaints in the driver.

Change-Id: Ic58362d2e4a9a6a560ceb5c12fbfb502b814ad6f
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 8b5483015496100b3f5a790a58cc3019815654e0)

show more ...

UPSTREAM: usb: r8a66597: Convert to USB DM

Convert the R8A66597 USB driver to DM and add support for DT probing.
Drop support for legacy non-DM and non-DT probing, since there are no
platform using

UPSTREAM: usb: r8a66597: Convert to USB DM

Convert the R8A66597 USB driver to DM and add support for DT probing.
Drop support for legacy non-DM and non-DT probing, since there are no
platform using that.

Change-Id: Ic4a15ca6cdbea7782257b37683a62a971f4902bc
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 7f3858f90d01cca631d7c6b40301618af060acd7)

show more ...

UPSTREAM: usb: r8a66597: Remove BE support

While the USB controller can work both in LE and BE modes, there is
no user for the BE mode, so drop it. If there ever is a user for it,
it can be easily r

UPSTREAM: usb: r8a66597: Remove BE support

While the USB controller can work both in LE and BE modes, there is
no user for the BE mode, so drop it. If there ever is a user for it,
it can be easily re-added back.

Change-Id: Icbafe9f751113a669c5322af618bcc27bf20ac75
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 81644e01c02967edd3da7eb6c776478a34fa7370)

show more ...

UPSTREAM: usb: r8a66597: Make CONFIG_RZA_USB default

No other platforms use this r8a66597 controller but RZ/A1,
make RZ/A1 support the default and drop all the other SoC
support to remove ifdeffery.

UPSTREAM: usb: r8a66597: Make CONFIG_RZA_USB default

No other platforms use this r8a66597 controller but RZ/A1,
make RZ/A1 support the default and drop all the other SoC
support to remove ifdeffery.

Change-Id: I15bd3497d23c34c6cd43c849f09ec3904ec898da
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 3ff134b7f1c06f8482ef8ab296d5a89743d219db)

show more ...

UPSTREAM: usb: r8a66597: Remove CONFIG_SUPERH_ON_CHIP_R8A66597

Remove CONFIG_SUPERH_ON_CHIP_R8A66597 macro, which is unused.

Change-Id: I27a8ff1b6487ebc2db6ce50fa2b034030e84f156
Signed-off-by: Mare

UPSTREAM: usb: r8a66597: Remove CONFIG_SUPERH_ON_CHIP_R8A66597

Remove CONFIG_SUPERH_ON_CHIP_R8A66597 macro, which is unused.

Change-Id: I27a8ff1b6487ebc2db6ce50fa2b034030e84f156
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 0b80f212824f632f1acb0d74fd932c05a0262fc3)

show more ...

UPSTREAM: usb: host: Drop unused hcd_name from r8a66597-hcd.c

The variable hcd_name is unsued, drop.

Change-Id: Ifdf235cabe480114f966bd3fd24260078d2359e0
Cc: Marek Vasut <marex@denx.de>
Cc: Chris B

UPSTREAM: usb: host: Drop unused hcd_name from r8a66597-hcd.c

The variable hcd_name is unsued, drop.

Change-Id: Ifdf235cabe480114f966bd3fd24260078d2359e0
Cc: Marek Vasut <marex@denx.de>
Cc: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 40b61180c1b0fcfceb82e80fb03ce0e88b31e7ab)

show more ...

UPSTREAM: usb: r8a66597: convert wait loop to readw_poll_timeout

It is better to use an existing wait loop implementation.

Change-Id: I0e17c681c338573e64b912f0b6ce4ad86f336471
Signed-off-by: Chris

UPSTREAM: usb: r8a66597: convert wait loop to readw_poll_timeout

It is better to use an existing wait loop implementation.

Change-Id: I0e17c681c338573e64b912f0b6ce4ad86f336471
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 243fd6420d2275275b8267ead971a7dbd69b369f)

show more ...

UPSTREAM: usb: r8a66597: Add support for RZ/A series

While the USB HW in the RZ/A is basically the same, there are some
differences from the original versions that were in the SH SoCs.

Change-Id: I

UPSTREAM: usb: r8a66597: Add support for RZ/A series

While the USB HW in the RZ/A is basically the same, there are some
differences from the original versions that were in the SH SoCs.

Change-Id: I3e285f8060b152bbd41041ba632d057e6b8fde8c
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 11f4678962960636f1a07cea8d040f468463f8c3)

show more ...

Move console definitions into a new console.h file

The console includes a global variable and several functions that are only
used by a small subset of U-Boot files. Before adding more functions, mo

Move console definitions into a new console.h file

The console includes a global variable and several functions that are only
used by a small subset of U-Boot files. Before adding more functions, move
the definitions into their own header file.

Signed-off-by: Simon Glass <sjg@chromium.org>

show more ...

usb: Update some EHCI driver licenses to use SPDX

A few drivers still write out the license in full. Fix these.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Marek Vasut <marex@denx.de>

include: move various macros to include/linux/kernel.h

U-Boot has imported various utility macros from Linux
scattering them to various places without consistency.

In include/common.h are min, max,

include: move various macros to include/linux/kernel.h

U-Boot has imported various utility macros from Linux
scattering them to various places without consistency.

In include/common.h are min, max, min3, max3, ARRAY_SIZE, ALIGN,
container_of, DIV_ROUND_UP, etc.
In include/linux/compat.h are min_t, max_t, round_up, round_down,
etc.
We also have duplicated defines of min_t in some *.c files.

Moreover, we are suffering from too cluttered include/common.h.

This commit moves various macros that originate in
include/linux/kernel.h of Linux to their original position.

Note:
This commit simply moves the macros; the macros roundup,
min, max, min2, max3, ARRAY_SIZE are different
from those of Linux at this point.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

show more ...

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

Signed-off-by: Stefano Babic <sbabic@denx.de>

Conflicts:
boards.cfg

usb: r8a66597: Fix initilization size of r8a66597 info structure

Initialization of r8a66597 info structure is not enough.
Because initilization was used size of pointer.
This fixes that use size of

usb: r8a66597: Fix initilization size of r8a66597 info structure

Initialization of r8a66597 info structure is not enough.
Because initilization was used size of pointer.
This fixes that use size of r8a6659 info structure.

Signed-off-by: Yasuhisa Umano <yasuhisa.umano.zc@renesas.com>

show more ...

usb: r8a66597: Fix initialization hub that using R8A66597_MAX_ROOT_HUB

This driver is processed as two USB hub despite one.
The number of root hub is defined in R8A66597_MAX_ROOT_HUB.
This fixes tha

usb: r8a66597: Fix initialization hub that using R8A66597_MAX_ROOT_HUB

This driver is processed as two USB hub despite one.
The number of root hub is defined in R8A66597_MAX_ROOT_HUB.
This fixes that register is accessed by using the definition
of R8A66597_MAX_ROOT_HUB.

Signed-off-by: Yasuhisa Umano <yasuhisa.umano.zc@renesas.com>

show more ...

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

Conflicts:
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg

Signed-off-by: Stefano Babic

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

Conflicts:
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx23.cfg
arch/arm/cpu/arm926ejs/mxs/mxsimage.mx28.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>

show more ...

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

usb: create common header virtual root hub descriptors

Many USB host controller drivers contain almost identical copies of the
same virtual root hub descriptors. Put these into a common file to avoi

usb: create common header virtual root hub descriptors

Many USB host controller drivers contain almost identical copies of the
same virtual root hub descriptors. Put these into a common file to avoid
duplication.

Note that there were some very minor differences between the descriptors
in the various files, such as:

- USB 1.0 vs. USB 1.1
- Manufacturer/Device ID
- Max packet size
- String content

I assume these aren't relevant.

Cc: Thomas Lange <thomas@corelatus.se>
Cc: Shinya Kuribayashi <skuribay@pobox.com>
Cc: Gary Jennejohn <garyj@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Eric Millbrandt <emillbrandt@coldhaus.com>
Cc: Pierre Aubert <p.aubert@staubli.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Daniel Hellstrom <daniel@gaisler.com>
Cc: Denis Peter <d.peter@mpl.ch>
Cc: Rodolfo Giometti <giometti@linux.it>
Cc: Zhang Wei <wei.zhang@freescale.com>
Cc: Mateusz Zalega <m.zalega@samsung.com>
Cc: Remy Bohmer <linux@bohmer.net>
Cc: Markus Klotzbuecher <mk@denx.de>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Cc: Gary Jennejohn <garyj@denx.de>
Cc: C Nauman <cnauman@diagraph.com>
Cc: David Müller <d.mueller@elsoft.ch>
Cc: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Cc: Thomas Abraham <t-abraham@ti.com>
Cc: Tom Rini <trini@ti.com>
Cc: Andrew Murray <amurray@embedded-bits.co.uk>
Cc: Matej Frančeškin <matej.franceskin@comtrade.com>
Cc: Cliff Cai <cliff.cai@analog.com>
Cc: Bryan Wu <cooloney@gmail.com>
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>

show more ...

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

usb: add enum usb_init_type parameter to usb_lowlevel_init

This parameter will later be used to verify OTG ports.

Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>

Merge samsung, imx, tegra into u-boot-arm/master

This commit merges branches from samsung, imx and tegra
meant to fix merge issues between u-boot/master and
u-boot-arm/master, as well as a few manua

Merge samsung, imx, tegra into u-boot-arm/master

This commit merges branches from samsung, imx and tegra
meant to fix merge issues between u-boot/master and
u-boot-arm/master, as well as a few manual merge fixes.

show more ...

Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

Conflicts:
README
arch/arm/cpu/armv7/exynos/clock.c
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/po

Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

Conflicts:
README
arch/arm/cpu/armv7/exynos/clock.c
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h

show more ...

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

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk

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

Conflicts:
README
board/samsung/universal_c210/universal.c
drivers/misc/Makefile
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/seaboard.h

show more ...

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

Conflicts:
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/woodburn_common.h
board/w

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

Conflicts:
drivers/power/power_fsl.c
include/configs/mx35pdk.h
include/configs/mx53loco.h
include/configs/woodburn_common.h
board/woodburn/woodburn.c

These boards still use the old old PMIC framework, so they
do not merge properly after the power framework was merged into
mainline.

Fix all conflicts and update woodburn to use Power Framework.

Signed-off-by: Stefano Babic <sbabic@denx.de>

show more ...