From: Arnd Bergmann Date: Fri, 18 Aug 2017 22:04:27 +0000 (+0200) Subject: Merge tag 'reset-for-4.14' of git://git.pengutronix.de/git/pza/linux into next/drivers X-Git-Tag: v4.14-rc1~67^2~5 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e517030e2689c3f04a5516c1b4c007c8a64c597b;p=linux.git Merge tag 'reset-for-4.14' of git://git.pengutronix.de/git/pza/linux into next/drivers Pull "Reset controller changes for v4.14" from Philipp Zabel: - constify zx2967 reset_ops - add a convenience API to manage an array of resets - let deassert report success and let assert report success for shared resets if the reset controller driver does not implement (de)assert. - add HSDKv1 reset driver - remove Gemini reset controller, the driver is made obsolete by a combined clock/reset driver in drivers/clk - fix the total number of reset lines in the sunxi driver - various uniphier updates and fixes: - remove sLD3 SoC support - simplify system reset register and bit definitions - add audio systems, video input subsystem, and analog amplifiers reset controls * tag 'reset-for-4.14' of git://git.pengutronix.de/git/pza/linux: reset: uniphier: add analog amplifiers reset control reset: uniphier: add video input subsystem reset control reset: uniphier: add audio systems reset control reset: sunxi: fix number of reset lines reset: uniphier: do not use per-SoC macro for system reset block reset: uniphier: remove sLD3 SoC support Revert "reset: Add a Gemini reset controller" ARC: reset: introduce HSDKv1 reset driver reset: make (de)assert report success for self-deasserting reset drivers reset: Add APIs to manage array of resets reset: zx2967: constify zx2967_reset_ops. --- e517030e2689c3f04a5516c1b4c007c8a64c597b diff --cc MAINTAINERS index 44cb004c765d,57853844969b..3a21e206ada9 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -12614,35 -12752,6 +12614,42 @@@ F: arch/arc/plat-axs10 F: arch/arc/boot/dts/ax* F: Documentation/devicetree/bindings/arc/axs10* +SYNOPSYS DESIGNWARE DMAC DRIVER +M: Viresh Kumar +M: Andy Shevchenko +S: Maintained +F: include/linux/dma/dw.h +F: include/linux/platform_data/dma-dw.h +F: drivers/dma/dw/ + +SYNOPSYS DESIGNWARE ENTERPRISE ETHERNET DRIVER +M: Jie Deng +L: netdev@vger.kernel.org +S: Supported +F: drivers/net/ethernet/synopsys/ + +SYNOPSYS DESIGNWARE I2C DRIVER +M: Jarkko Nikula +R: Andy Shevchenko +R: Mika Westerberg +L: linux-i2c@vger.kernel.org +S: Maintained +F: drivers/i2c/busses/i2c-designware-* +F: include/linux/platform_data/i2c-designware.h + +SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER +M: Jaehoon Chung +L: linux-mmc@vger.kernel.org +S: Maintained +F: drivers/mmc/host/dw_mmc* + ++SYNOPSYS HSDK RESET CONTROLLER DRIVER ++M: Eugeniy Paltsev ++S: Supported ++F: drivers/reset/reset-hsdk-v1.c ++F: include/dt-bindings/reset/snps,hsdk-v1-reset.h ++F: Documentation/devicetree/bindings/reset/snps,hsdk-v1-reset.txt ++ SYSTEM CONFIGURATION (SYSCON) M: Lee Jones M: Arnd Bergmann