History

Merge tag 'reset-for-5.1' of git://git.pengutronix.de/git/pza/linux into arm/drivers

Reset controller changes for v5.1 This adds the include/linux/reset directory to MAINTAINERS for reset specific headers and adds headers for sunxi and socfpga in there to get rid of a few extern function declarations. There is a new reset driver for the Broadcom STB reset controller and the i.MX7 system reset controller driver is extended to support i.MX8MQ as well. Finally, there is a new header with reset id constants for the Meson G12A SoC, which has a reset controller identical to Meson AXG and thus can reuse its driver and DT bindings. * tag 'reset-for-5.1' of git://git.pengutronix.de/git/pza/linux: dt-bindings: reset: meson: add g12a bindings reset: imx7: Add support for i.MX8MQ IP block variant reset: imx7: Add plubming to support multiple IP variants reset: Add Broadcom STB SW_INIT reset controller driver dt-bindings: reset: Add document for Broadcom STB reset controller reset: socfpga: declare socfpga_reset_init in a header file reset: sunxi: declare sun6i_reset_init in a header file MAINTAINERS: use include/linux/reset for reset controller related headers dt-bindings: reset: imx7: Document usage on i.MX8MQ SoCs

Arnd Bergmann committed 7 years ago

Commit 6f2185f2 parents 1d03f18 dbfc54515 files · +550 −22Browse files

Showing the changes to include/linux (2 of 15 files). Show all

Unified · Split

2 files
  1. include/linux/reset/socfpga.h +7 −0
  2. include/linux/reset/sunxi.h +7 −0
include/linux/reset/socfpga.h+7−0
@@ -0,0 +1,7 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
2+#ifndef __LINUX_RESET_SOCFPGA_H__
3+#define __LINUX_RESET_SOCFPGA_H__
4+
5+void __init socfpga_reset_init(void);
6+
7+#endif /* __LINUX_RESET_SOCFPGA_H__ */
include/linux/reset/sunxi.h+7−0
@@ -0,0 +1,7 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
2+#ifndef __LINUX_RESET_SUNXI_H__
3+#define __LINUX_RESET_SUNXI_H__
4+
5+void __init sun6i_reset_init(void);
6+
7+#endif /* __LINUX_RESET_SUNXI_H__ */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t