Merge branch 'next-dev' into thunder-boot

UPSTREAM: usb: ehci-generic: don't probe fail if there is no clk_enable() ops

Some clock driver do not have a clk_enable() call back, and we should not
treat this as fail in ehci probe like other mo

UPSTREAM: usb: ehci-generic: don't probe fail if there is no clk_enable() ops

Some clock driver do not have a clk_enable() call back, and we should not
treat this as fail in ehci probe like other modules, eg. clk_enabl_bulk()
do not return fail if ret value is '-ENOSYS'

Change-Id: I4686a87238ff5dff7a8f1c2e4df03cce4581aa0b
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
(cherry picked from commit 54a0c7b2e7a233aa3975771592afb8e0e2f6acc0)

show more ...

UPSTREAM: usb: ehci-generic: Add vbus-supply regulator support

Add vbus-supply regulator support.
On some board vbus is not controlled by the phy but by
an external regulator.

Change-Id: I1d2851dd9

UPSTREAM: usb: ehci-generic: Add vbus-supply regulator support

Add vbus-supply regulator support.
On some board vbus is not controlled by the phy but by
an external regulator.

Change-Id: I1d2851dd9bc1294d0e7bbeff3e6695ca1235d247
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 5c349e179db794eff99dd5d3bbac6845d173709e)

show more ...

UPSTREAM: usb: ehci: Make the PHY handling generic

Pull out the EHCI PHY functions into the ehci-hcd.c to let other
EHCI drivers use them.

Change-Id: I5b1cbaf7acb4cee6034e891ee7aecf0ca7d50728
Signe

UPSTREAM: usb: ehci: Make the PHY handling generic

Pull out the EHCI PHY functions into the ehci-hcd.c to let other
EHCI drivers use them.

Change-Id: I5b1cbaf7acb4cee6034e891ee7aecf0ca7d50728
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit b43cdf9b3fe246a8920d2b62ee41fc1722315ef0)

show more ...

UPSTREAM: usb: ehci-generic: replace pr_err() by dev_err()

As we get access to struct udevice, use dev_err() instead
of pr_err().

Conflicts:
drivers/usb/host/ehci-generic.c

Change-Id: I7f97a466ce

UPSTREAM: usb: ehci-generic: replace pr_err() by dev_err()

As we get access to struct udevice, use dev_err() instead
of pr_err().

Conflicts:
drivers/usb/host/ehci-generic.c

Change-Id: I7f97a466cee007c6c5b1ffd7fefd29ed7c528d54
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
(cherry picked from commit df7777ab4386a5982d978a558e9b973085654c5e)

show more ...

UPSTREAM: usb: ehci-generic: factorize PHY operation

Factorize PHY get/init/poweron and PHY poweroff/exit operations
into separate function, it simplify the error path.

Change-Id: Ic59fcd93c52fc490

UPSTREAM: usb: ehci-generic: factorize PHY operation

Factorize PHY get/init/poweron and PHY poweroff/exit operations
into separate function, it simplify the error path.

Change-Id: Ic59fcd93c52fc4908eb356b7e188cc5d48441645
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit 20f06a48332d8dec255e3e808c3c97bb3222c2fd)

show more ...

UPSTREAM: usb: ehci-generic: handle phy power on/off

Add generic_phy_power_on() and generic_phy_power_off()
calls to switch ON/OFF phy during probe and remove functions.

Change-Id: Ic25c41efcdca60c

UPSTREAM: usb: ehci-generic: handle phy power on/off

Add generic_phy_power_on() and generic_phy_power_off()
calls to switch ON/OFF phy during probe and remove functions.

Change-Id: Ic25c41efcdca60c303c218241eed3139b1323e35
Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
(cherry picked from commit a800a6793f095746173834ead6b3663bc3c0542c)

show more ...

usb: host: amend clock exception handling for ehci and ohci

Some platforms, like Rockchip, not implement clk_enable/clk_disable
APIs, add 'ENOSYS' condition to exclude it.

Change-Id: Ic79122dcad30d

usb: host: amend clock exception handling for ehci and ohci

Some platforms, like Rockchip, not implement clk_enable/clk_disable
APIs, add 'ENOSYS' condition to exclude it.

Change-Id: Ic79122dcad30d318d9326aeb287d0b15c99bfbae
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>

show more ...

treewide: replace with error() with pr_err()

U-Boot widely uses error() as a bit noisier variant of printf().

This macro causes name conflict with the following line in
include/linux/compiler-gcc.h

treewide: replace with error() with pr_err()

U-Boot widely uses error() as a bit noisier variant of printf().

This macro causes name conflict with the following line in
include/linux/compiler-gcc.h:

# define __compiletime_error(message) __attribute__((error(message)))

This prevents us from using __compiletime_error(), and makes it
difficult to fully sync BUILD_BUG macros with Linux. (Notice
Linux's BUILD_BUG_ON_MSG is implemented by using compiletime_assert().)

Let's convert error() into now treewide-available pr_err().

Done with the help of Coccinelle, excluing tools/ directory.

The semantic patch I used is as follows:

// <smpl>
@@@@
-error
+pr_err
(...)
// </smpl>

Change-Id: I921807c1770d36a91e692c48ab477558bb2ed0b8
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
[trini: Re-run Coccinelle]
Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 9b643e312d528f291966c1f30b0d90bf3b1d43dc)

show more ...

UPSTREAM: usb: host: ehci-generic: convert to livetree

Update the generic EHCI driver to support a live tree.

Change-Id: I07159bf921cda3d42247d2134a4f5a6bd7d65bb5
Signed-off-by: Philipp Tomsich <ph

UPSTREAM: usb: host: ehci-generic: convert to livetree

Update the generic EHCI driver to support a live tree.

Change-Id: I07159bf921cda3d42247d2134a4f5a6bd7d65bb5
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
(cherry picked from commit 6e652e3a7d15b896fd82b717c6eca74b70a33b7a)

show more ...

Merge git://git.denx.de/u-boot-usb

usb: host: ehci-generic: initialize PHY only when found

Call generic_phy_init() only when a PHY was found.
This will avoid a crash if no "phys" property is found in DT.

Signed-off-by: Patrice Chota

usb: host: ehci-generic: initialize PHY only when found

Call generic_phy_init() only when a PHY was found.
This will avoid a crash if no "phys" property is found in DT.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reported-by: Patrick Delaunay <patrick.delaunay@st.com>

show more ...

usb: host: ehci-generic: add generic PHY support

Extend ehci-generic driver with generic PHY framework

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Simon Glass <sjg@chromium

usb: host: ehci-generic: add generic PHY support

Extend ehci-generic driver with generic PHY framework

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

show more ...

usb: host: ehci-generic: add error path and .remove callback

Use an array to save enabled clocks reference and deasserted resets
in order to respectively disabled and asserted them in case of error

usb: host: ehci-generic: add error path and .remove callback

Use an array to save enabled clocks reference and deasserted resets
in order to respectively disabled and asserted them in case of error
during probe() or during driver removal.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

show more ...

usb: host: ehci-generic: replace printf() by error()

this allows to get file, line and function location
of the current error message.

Signed-off-by: patrice chotard <patrice.chotard@st.com>
Review

usb: host: ehci-generic: replace printf() by error()

this allows to get file, line and function location
of the current error message.

Signed-off-by: patrice chotard <patrice.chotard@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

show more ...

dm: Rename dev_addr..() functions

These support the flat device tree. We want to use the dev_read_..()
prefix for functions that support both flat tree and live tree. So rename
the existing function

dm: Rename dev_addr..() functions

These support the flat device tree. We want to use the dev_read_..()
prefix for functions that support both flat tree and live tree. So rename
the existing functions to avoid confusion.

In the end we will have:

1. dev_read_addr...() - works on devices, supports flat/live tree
2. devfdt_get_addr...() - current functions, flat tree only
3. of_get_address() etc. - new functions, live tree only

All drivers will be written to use 1. That function will in turn call
either 2 or 3 depending on whether the flat or live tree is in use.

Note this involves changing some dead code - the imx_lpi2c.c file.

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

show more ...

usb: ehci-generic: support reset control for generic EHCI

This driver is designed in a generic manner, so resets should be
handled generically as well.

Signed-off-by: Masahiro Yamada <yamada.masahi

usb: ehci-generic: support reset control for generic EHCI

This driver is designed in a generic manner, so resets should be
handled generically as well.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

show more ...

usb: replace ehci_*_remove() with usb_deregister()

The remove callbacks of EHCI drivers are often just a wrapper of
ehci_deregister.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
A

usb: replace ehci_*_remove() with usb_deregister()

The remove callbacks of EHCI drivers are often just a wrapper of
ehci_deregister.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Stephen Warren <swarren@nvidia.com>

show more ...

Merge git://git.denx.de/u-boot-dm

clk: convert API to match reset/mailbox style

The following changes are made to the clock API:
* The concept of "clocks" and "peripheral clocks" are unified; each clock
provider now implements a s

clk: convert API to match reset/mailbox style

The following changes are made to the clock API:
* The concept of "clocks" and "peripheral clocks" are unified; each clock
provider now implements a single set of clocks. This provides a simpler
conceptual interface to clients, and better aligns with device tree
clock bindings.
* Clocks are now identified with a single "struct clk", rather than
requiring clients to store the clock provider device and clock identity
values separately. For simple clock consumers, this isolates clients
from internal details of the clock API.
* clk.h is split so it only contains the client/consumer API, whereas
clk-uclass.h contains the provider API. This aligns with the recently
added reset and mailbox APIs.
* clk_ops .of_xlate(), .request(), and .free() are added so providers
can customize these operations if needed. This also aligns with the
recently added reset and mailbox APIs.
* clk_disable() is added.
* All users of the current clock APIs are updated.
* Sandbox clock tests are updated to exercise clock lookup via DT, and
clock enable/disable.
* rkclk_get_clk() is removed and replaced with standard APIs.

Buildman shows no clock-related errors for any board for which buildman
can download a toolchain.

test/py passes for sandbox (which invokes the dm clk test amongst
others).

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>

show more ...

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

usb: ehci: Use map_physmem in ehci-generic

Some architectures, like MIPS, require remapping of the registers.
Add the map_physmem() call to handle it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc:

usb: ehci: Use map_physmem in ehci-generic

Some architectures, like MIPS, require remapping of the registers.
Add the map_physmem() call to handle it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
Cc: Hans de Goede <hdegoede@redhat.com>

show more ...

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

usb: add clock support for generic EHCI

This driver is designed in a generic manner, so clocks should be
handled genericly as well.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

Merge git://git.denx.de/u-boot-usb