From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: Pull request: u-boot-spi/master
Date: Sat, 9 May 2020 16:58:50 -0400 [thread overview]
Message-ID: <20200509205850.GD12564@bill-the-cat> (raw)
In-Reply-To: <20200509162609.18857-1-jagan@amarulasolutions.com>
On Sat, May 09, 2020 at 09:56:09PM +0530, Jagan Teki wrote:
> Hi Tom,
>
> Please pull this PR.
>
> Summary:
> - zap lpc32xx_ssp driver (Jagan)
> - rename of phy nodev call (Jagan)
> - iopoll with sleep_us (Jagan)
> - MX25R6435F flash (Ye Li)
>
> Travis-CI:
> https://travis-ci.org/github/openedev/u-boot-amarula/builds/684188097
>
> The following changes since commit 67887903afc3615070dd878f6e0420d34b30274c:
>
> Merge branch '2020-05-07-atheros-phy-improvements' (2020-05-07 14:51:44 -0400)
>
> are available in the Git repository at:
>
> https://gitlab.denx.de/u-boot/custodians/u-boot-spi spi
>
> for you to fetch changes up to 9e880f36dfab0fb8d856cffd4b8b9e34c4c2c7a6:
>
> sf: Add Macronix MX25R6435F SPI NOR flash to flash parameters array (2020-05-08 00:52:50 +0530)
>
> ----------------------------------------------------------------
> Dario Binacchi (1):
> spi: fix dev parameter in dev_* calls
>
> Jagan Teki (7):
> spi: Zap lpc32xx_ssp driver-related code
> phy: Fix node description of phy_get_by_node
> phy: Use _nodev naming convention if non-device clients
> clk: Fix clk func names in comments
> iopoll: Add read_poll_timeout common API
> iopoll: Add dealy to read poll
> iopoll: Add readl_poll_sleep_timeout
>
> Kuldeep Singh (1):
> spi: nxp-fspi: Use new readl_poll_sleep_timeout API
>
> Ye Li (1):
> sf: Add Macronix MX25R6435F SPI NOR flash to flash parameters array
>
> arch/arm/mach-meson/board-gx.c | 3 +-
> drivers/mtd/spi/spi-nor-core.c | 19 +++---
> drivers/mtd/spi/spi-nor-ids.c | 1 +
> drivers/phy/phy-uclass.c | 4 +-
> drivers/spi/Kconfig | 6 --
> drivers/spi/Makefile | 1 -
> drivers/spi/lpc32xx_ssp.c | 134 -----------------------------------------
> drivers/spi/nxp_fspi.c | 10 +--
> include/clk.h | 12 ++--
> include/configs/devkit3250.h | 5 --
> include/configs/work_92105.h | 5 --
> include/generic-phy.h | 9 ++-
> include/linux/iopoll.h | 16 ++++-
> scripts/config_whitelist.txt | 1 -
> 14 files changed, 47 insertions(+), 179 deletions(-)
> delete mode 100644 drivers/spi/lpc32xx_ssp.c
For a small PR it has a ton of conflicts, can you please rebase it?
Thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200509/44f8f65d/attachment.sig>
next prev parent reply other threads:[~2020-05-09 20:58 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 16:26 Pull request: u-boot-spi/master Jagan Teki
2020-05-09 20:58 ` Tom Rini [this message]
2020-05-10 14:19 ` Jagan Teki
2020-05-10 19:36 ` Tom Rini
-- strict thread matches above, loose matches on Subject: below --
2024-10-24 14:33 Jagan Teki
2024-10-24 20:42 ` Tom Rini
2024-01-29 17:53 Jagan Teki
2024-01-29 18:50 ` Tom Rini
2023-07-13 16:36 Jagan Teki
2023-07-14 16:05 ` Tom Rini
2023-05-01 17:12 Jagan Teki
2023-05-01 22:46 ` Tom Rini
2023-01-26 17:52 Jagan Teki
2023-01-26 20:09 ` Tom Rini
2022-11-02 6:08 Jagan Teki
2022-11-02 15:34 ` Tom Rini
2022-10-25 12:26 Jagan Teki
2022-10-25 16:27 ` Tom Rini
2022-07-18 19:35 Jagan Teki
2022-07-19 14:51 ` Tom Rini
2022-05-04 6:11 Jagan Teki
2022-05-04 15:41 ` Tom Rini
2022-03-12 8:44 Jagan Teki
2022-03-13 12:17 ` Tom Rini
2021-12-26 18:57 Jagan Teki
2021-12-27 13:25 ` Tom Rini
2021-10-23 13:35 Jagan Teki
2021-10-23 20:10 ` Tom Rini
2021-08-03 16:24 Jagan Teki
2021-08-04 1:14 ` Tom Rini
2021-02-26 17:22 Jagan Teki
2021-02-26 20:10 ` Tom Rini
2020-12-18 17:54 Jagan Teki
2020-12-20 23:06 ` Tom Rini
2020-07-20 17:14 Jagan Teki
2020-07-22 3:04 ` Tom Rini
2020-07-11 17:02 Jagan Teki
2020-07-13 15:28 ` Tom Rini
2020-06-11 17:53 Jagan Teki
2020-06-14 16:00 ` Tom Rini
2020-06-02 18:54 Jagan Teki
2020-06-03 18:09 ` Tom Rini
2020-04-21 8:24 Jagan Teki
2020-04-21 19:19 ` Tom Rini
2020-04-03 14:30 Jagan Teki
2020-04-05 23:04 ` Tom Rini
2020-01-27 17:48 Jagan Teki
2020-01-28 16:04 ` Tom Rini
2019-12-27 12:20 Jagan Teki
2019-12-28 4:30 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200509205850.GD12564@bill-the-cat \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox