diff options
author | Xinliang Liu <xinliang.liu@linaro.org> | 2016-06-19 23:50:05 -0400 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2016-06-29 17:39:08 -0400 |
commit | 339d00cb173a5eb283d3b8d617fa97a3a46ada2f (patch) | |
tree | cbca7fd748f58c2edbf2a298f614d9be6d0dad43 | |
parent | 50f44e894ad06eb8b401308c3cfe5bceaaa26df2 (diff) |
arm64: dts: hi6220: Add media subsystem reset dts
Add media subsystem reset dts support.
Signed-off-by: Chen Feng <puck.chen@hisilicon.com>
Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 2 | ||||
-rw-r--r-- | include/dt-bindings/reset/hisi,hi6220-resets.h | 8 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi index 189d21541f9c..c19b82799a34 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi | |||
@@ -5,6 +5,7 @@ | |||
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include <dt-bindings/interrupt-controller/arm-gic.h> | 7 | #include <dt-bindings/interrupt-controller/arm-gic.h> |
8 | #include <dt-bindings/reset/hisi,hi6220-resets.h> | ||
8 | #include <dt-bindings/clock/hi6220-clock.h> | 9 | #include <dt-bindings/clock/hi6220-clock.h> |
9 | #include <dt-bindings/pinctrl/hisi.h> | 10 | #include <dt-bindings/pinctrl/hisi.h> |
10 | #include <dt-bindings/thermal/thermal.h> | 11 | #include <dt-bindings/thermal/thermal.h> |
@@ -252,6 +253,7 @@ | |||
252 | compatible = "hisilicon,hi6220-mediactrl", "syscon"; | 253 | compatible = "hisilicon,hi6220-mediactrl", "syscon"; |
253 | reg = <0x0 0xf4410000 0x0 0x1000>; | 254 | reg = <0x0 0xf4410000 0x0 0x1000>; |
254 | #clock-cells = <1>; | 255 | #clock-cells = <1>; |
256 | #reset-cells = <1>; | ||
255 | }; | 257 | }; |
256 | 258 | ||
257 | pm_ctrl: pm_ctrl@f7032000 { | 259 | pm_ctrl: pm_ctrl@f7032000 { |
diff --git a/include/dt-bindings/reset/hisi,hi6220-resets.h b/include/dt-bindings/reset/hisi,hi6220-resets.h index ca08a7e5248e..322ec5335b65 100644 --- a/include/dt-bindings/reset/hisi,hi6220-resets.h +++ b/include/dt-bindings/reset/hisi,hi6220-resets.h | |||
@@ -64,4 +64,12 @@ | |||
64 | #define PERIPH_RSDIST9_CARM_SOCDBG 0x507 | 64 | #define PERIPH_RSDIST9_CARM_SOCDBG 0x507 |
65 | #define PERIPH_RSDIST9_CARM_ETM 0x508 | 65 | #define PERIPH_RSDIST9_CARM_ETM 0x508 |
66 | 66 | ||
67 | #define MEDIA_G3D 0 | ||
68 | #define MEDIA_CODEC_VPU 2 | ||
69 | #define MEDIA_CODEC_JPEG 3 | ||
70 | #define MEDIA_ISP 4 | ||
71 | #define MEDIA_ADE 5 | ||
72 | #define MEDIA_MMU 6 | ||
73 | #define MEDIA_XG2RAM1 7 | ||
74 | |||
67 | #endif /*_DT_BINDINGS_RESET_CONTROLLER_HI6220*/ | 75 | #endif /*_DT_BINDINGS_RESET_CONTROLLER_HI6220*/ |