diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 01:22:28 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 01:22:28 +0100 |
| commit | bd8f27ba828efa2538bc86010f299a635e79249b (patch) | |
| tree | d644f8854beee1daad492d49e2876dde6659e80f /arch/arm64 | |
| parent | 7eccfebf65f0ba2d41dbd053e29a9b6287f406da (diff) | |
| parent | ba64e27e9d3c558549f765869c6a471114c0f328 (diff) | |
| download | op-kernel-dev-bd8f27ba828efa2538bc86010f299a635e79249b.zip op-kernel-dev-bd8f27ba828efa2538bc86010f299a635e79249b.tar.gz | |
Merge tag 'reset-for-4.5-2' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge "Reset controller changes for v4.5 v2" from Philipp Zabel:
- oftree support for getting reset devices by index
- fixed return value consistency of of_reset_control_get
- added support for STi co-processor resets
- added STi status callback
- added HiSilicon Hi6220 reset driver
- added ath79 system restart support
- various fixes
* tag 'reset-for-4.5-2' of git://git.pengutronix.de/git/pza/linux:
reset: ath79: Add system restart support
arm64: dts: Add reset dts config for Hisilicon Hi6220 SoC
reset: hi6220: Reset driver for hisilicon hi6220 SoC
reset: hisilicon: document hisi-hi6220 reset controllers bindings
reset: remove unused device pointer from struct reset_control
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 82d2488..ad1f1eb 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi @@ -147,6 +147,7 @@ compatible = "hisilicon,hi6220-sysctrl", "syscon"; reg = <0x0 0xf7030000 0x0 0x2000>; #clock-cells = <1>; + #reset-cells = <1>; }; media_ctrl: media_ctrl@f4410000 { |
