diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 17:36:09 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-09-23 17:36:09 +0200 |
| commit | 891518b717538a255fc08277cfc0277dd3f8f6bb (patch) | |
| tree | 24235a0eb4cc7cdd6dccbd75adc243806183743e /include/linux/soc | |
| parent | b97e1e2faa3c611a61da7a26cc2e5ee83434ded0 (diff) | |
| parent | 1f698cb11dd48ec5c430886f794953878e1ff016 (diff) | |
Merge tag 'sunxi-drivers-for-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/drivers
sunxi SRAM driver changes:
- minor code refactor
- support for Allwinner D1
* tag 'sunxi-drivers-for-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
soc: sunxi: sram: Add support for the D1 system control
soc: sunxi: sram: Export the LDO control register
soc: sunxi: sram: Save a pointer to the OF match data
soc: sunxi: sram: Return void from the release function
soc: sunxi: sram: Fix debugfs info for A64 SRAM C
soc: sunxi: sram: Fix probe function ordering issues
soc: sunxi: sram: Prevent the driver from being unbound
soc: sunxi: sram: Actually claim SRAM regions
Link: https://lore.kernel.org/r/YyeOthH4y8wy8A8R@kista.localdomain
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/soc')
| -rw-r--r-- | include/linux/soc/sunxi/sunxi_sram.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/soc/sunxi/sunxi_sram.h b/include/linux/soc/sunxi/sunxi_sram.h index c5f663bba9c2..60e274d1b821 100644 --- a/include/linux/soc/sunxi/sunxi_sram.h +++ b/include/linux/soc/sunxi/sunxi_sram.h @@ -14,6 +14,6 @@ #define _SUNXI_SRAM_H_ int sunxi_sram_claim(struct device *dev); -int sunxi_sram_release(struct device *dev); +void sunxi_sram_release(struct device *dev); #endif /* _SUNXI_SRAM_H_ */ |