Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1423924

[PATCH v2 2/3] arm64: dts: hi6220: Add media subsystem reset dts

From Xinliang Liu <xinliang.liu@linaro.org>
Newsgroups linux.kernel
Subject [PATCH v2 2/3] arm64: dts: hi6220: Add media subsystem reset dts
Date 2016-06-16 12:40 +0200
Message-ID <rKCSn-7c3-43@gated-at.bofh.it> (permalink)
References <rKCSm-7c3-5@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Add media subsystem reset support.

Signed-off-by: Chen Feng <puck.chen@hisilicon.com>
Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi      | 2 ++
 include/dt-bindings/reset/hisi,hi6220-resets.h | 8 ++++++++
 2 files changed, 10 insertions(+)

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 @@
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/reset/hisi,hi6220-resets.h>
 #include <dt-bindings/clock/hi6220-clock.h>
 #include <dt-bindings/pinctrl/hisi.h>
 #include <dt-bindings/thermal/thermal.h>
@@ -252,6 +253,7 @@
 			compatible = "hisilicon,hi6220-mediactrl", "syscon";
 			reg = <0x0 0xf4410000 0x0 0x1000>;
 			#clock-cells = <1>;
+			#reset-cells = <1>;
 		};
 
 		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 @@
 #define PERIPH_RSDIST9_CARM_SOCDBG      0x507
 #define PERIPH_RSDIST9_CARM_ETM         0x508
 
+#define MEDIA_G3D                       0
+#define MEDIA_CODEC_VPU                 2
+#define MEDIA_CODEC_JPEG                3
+#define MEDIA_ISP                       4
+#define MEDIA_ADE                       5
+#define MEDIA_MMU                       6
+#define MEDIA_XG2RAM1                   7
+
 #endif /*_DT_BINDINGS_RESET_CONTROLLER_HI6220*/
-- 
2.8.3

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v2 0/3] Add hi6220 media subsystem reset controller driver Xinliang Liu <xinliang.liu@linaro.org> - 2016-06-16 12:40 +0200
  [PATCH v2 2/3] arm64: dts: hi6220: Add media subsystem reset dts Xinliang Liu <xinliang.liu@linaro.org> - 2016-06-16 12:40 +0200
  [PATCH v2 3/3] reset: hisilicon: Add hi6220 media subsystem reset support Xinliang Liu <xinliang.liu@linaro.org> - 2016-06-16 12:40 +0200
    Re: [PATCH v2 3/3] reset: hisilicon: Add hi6220 media subsystem  reset support Philipp Zabel <p.zabel@pengutronix.de> - 2016-06-16 13:00 +0200
      Re: [PATCH v2 3/3] reset: hisilicon: Add hi6220 media subsystem reset support Xinliang Liu <xinliang.liu@linaro.org> - 2016-06-17 03:50 +0200

csiph-web