diff options
| author | Olof Johansson <olof@lixom.net> | 2016-02-25 04:20:40 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-02-25 04:20:40 +0300 |
| commit | 3f2242ec4068fba76f353b384a79bcae81dd1e2d (patch) | |
| tree | 36f310934be0fc084aba018c542ab5a89f5332b2 /drivers/reset/reset-socfpga.c | |
| parent | f628c64fc0ffdcd08f39d74ec23ed7706cb8653b (diff) | |
| parent | f673ed4d5fdc123b1552525de30741cd8dfde53f (diff) | |
| download | linux-3f2242ec4068fba76f353b384a79bcae81dd1e2d.tar.xz | |
Merge tag 'reset-for-4.6' of git://git.pengutronix.de/git/pza/linux into next/drivers
Reset controller changes for v4.6
- add support for the imgtec Pistachio SoC reset controller
- make struct reset_control_ops const
- move DT cell size check into the core to avoid code duplication
in the drivers
* tag 'reset-for-4.6' of git://git.pengutronix.de/git/pza/linux:
reset: sti: Make reset_control_ops const
reset: zynq: Make reset_control_ops const
reset: socfpga: Make reset_control_ops const
reset: hi6220: Make reset_control_ops const
reset: ath79: Make reset_control_ops const
reset: lpc18xx: Make reset_control_ops const
reset: sunxi: Make reset_control_ops const
reset: img: Make reset_control_ops const
reset: berlin: Make reset_control_ops const
reset: berlin: drop DT cell size check
reset: img: Add Pistachio reset controller driver
reset: img: Add pistachio reset controller binding document
reset: hisilicon: check return value of reset_controller_register()
reset: Move DT cell size check to the core
reset: Make reset_control_ops const
reset: remove unnecessary local variable initialization from of_reset_control_get_by_index
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/reset/reset-socfpga.c')
| -rw-r--r-- | drivers/reset/reset-socfpga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/reset/reset-socfpga.c b/drivers/reset/reset-socfpga.c index b7d773d9248c..cd05a7032b17 100644 --- a/drivers/reset/reset-socfpga.c +++ b/drivers/reset/reset-socfpga.c @@ -90,7 +90,7 @@ static int socfpga_reset_status(struct reset_controller_dev *rcdev, return !(reg & BIT(offset)); } -static struct reset_control_ops socfpga_reset_ops = { +static const struct reset_control_ops socfpga_reset_ops = { .assert = socfpga_reset_assert, .deassert = socfpga_reset_deassert, .status = socfpga_reset_status, |