| Message ID | 1546966907.5406.17.camel@pengutronix.de (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Commit | d0c2d2101b4c1a41e6ebeca6a28c70df43d2a6a3 |
| Headers | show |
| Series | [RFC,GIT,PULL] Late reset controller changes for v5.0 | expand |
On Tue, Jan 08, 2019 at 06:01:47PM +0100, Philipp Zabel wrote: > Dear arm-soc maintainers, > > due to a combination of a late merge conflict, early holidays, and the > common cold, I have failed to send the last reset controller pull > request in time for the v5.0-rc1 merge window. As usual there are not > many changes, and they have been carried in linux-next for quite a > while. > > One of the changes, commit b3ca9888f35f ("reset: socfpga: add an early > reset driver for SoCFPGA") is necessary for the Stratix10 platform to > boot, since the already merged change 8bb4f3f55961 ("arm64: dts: > stratix10: use "altr,stratix10-rst-mgr" binding") depends on it. > > Can you take the whole lot for v5.0-rc2? Should I split out the SoCFPGA > early reset patch + the NULL pointer dereference fix into a separate > "fixes" pull request for v5.0-rc2, postponing the other patches to for- > v5.1? Or do we have to revert 8bb4f3f55961 for now? Please advise. Hi, Unfortunate, but looking at the set of patches, it's also not a whole lot of code. Based on the list, nothing looks particularly high risk. I've merged the lot into our fixes branch. -Olof
Dear arm-soc maintainers, due to a combination of a late merge conflict, early holidays, and the common cold, I have failed to send the last reset controller pull request in time for the v5.0-rc1 merge window. As usual there are not many changes, and they have been carried in linux-next for quite a while. One of the changes, commit b3ca9888f35f ("reset: socfpga: add an early reset driver for SoCFPGA") is necessary for the Stratix10 platform to boot, since the already merged change 8bb4f3f55961 ("arm64: dts: stratix10: use "altr,stratix10-rst-mgr" binding") depends on it. Can you take the whole lot for v5.0-rc2? Should I split out the SoCFPGA early reset patch + the NULL pointer dereference fix into a separate "fixes" pull request for v5.0-rc2, postponing the other patches to for- v5.1? Or do we have to revert 8bb4f3f55961 for now? Please advise. regards Philipp The following changes since commit bfeffd155283772bbe78c6a05dec7c0128ee500c: Linux 5.0-rc1 (2019-01-06 17:08:20 -0800) are available in the Git repository at: git://git.pengutronix.de/git/pza/linux.git tags/reset-for-5.0-rc2 for you to fetch changes up to d0c2d2101b4c1a41e6ebeca6a28c70df43d2a6a3: reset: uniphier-glue: Add AHCI reset control support in glue layer (2019-01-07 16:38:51 +0100) ---------------------------------------------------------------- Late reset controller changes for v5.0 This adds missing deassert functionality to the ARC HSDK reset driver, fixes some indentation and grammar issues in the kernel docs, adds a helper to count the number of resets on a device for the non-DT case as well, adds an early reset driver for SoCFPGA and simple reset driver support for Stratix10, and generalizes the uniphier USB3 glue layer reset to also cover AHCI. ---------------------------------------------------------------- Colin Ian King (1): reset: fix null pointer dereference on dev by dev_name Dinh Nguyen (2): reset: socfpga: add an early reset driver for SoCFPGA ARM: socfpga: dts: document "altr,stratix10-rst-mgr" binding Eugeniy Paltsev (1): ARC: HSDK: improve reset driver Geert Uytterhoeven (2): reset: Improve reset controller kernel docs reset: Add reset_control_get_count() Kunihiko Hayashi (4): dt-bindings: reset: uniphier: Replace the expression of USB3 with generic peripherals reset: uniphier-usb3: Rename to reset-uniphier-glue dt-bindings: reset: uniphier: Add AHCI core reset description reset: uniphier-glue: Add AHCI reset control support in glue layer .../devicetree/bindings/reset/socfpga-reset.txt | 3 +- .../devicetree/bindings/reset/uniphier-reset.txt | 25 +++--- arch/arm/mach-socfpga/socfpga.c | 4 + drivers/reset/Kconfig | 20 +++-- drivers/reset/Makefile | 3 +- drivers/reset/core.c | 42 +++++++++++ drivers/reset/reset-hsdk.c | 1 + drivers/reset/reset-simple.c | 13 +--- drivers/reset/reset-socfpga.c | 88 ++++++++++++++++++++++ ...reset-uniphier-usb3.c => reset-uniphier-glue.c} | 50 +++++++----- include/linux/reset.h | 15 +++- 11 files changed, 212 insertions(+), 52 deletions(-) create mode 100644 drivers/reset/reset-socfpga.c rename drivers/reset/{reset-uniphier-usb3.c => reset-uniphier-glue.c} (73%)