From: Xinliang Liu <xinliang.liu@linaro.org>
To: p.zabel@pengutronix.de
Cc: linux-kernel@vger.kernel.org, robh+dt@kernel.org,
xuwei5@hisilicon.com, puck.chen@hisilicon.com,
saberlily.xia@hisilicon.com, kong.kongxinwei@hisilicon.com,
guodong.xu@linaro.org, Xinliang Liu <xinliang.liu@linaro.org>
Subject: [PATCH v3 2/4] arm64: dts: hi6220: Add media subsystem reset dts
Date: Mon, 20 Jun 2016 11:50:05 +0800 [thread overview]
Message-ID: <20160620035007.229629-3-xinliang.liu@linaro.org> (raw)
In-Reply-To: <20160620035007.229629-1-xinliang.liu@linaro.org>
Add media subsystem reset dts 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
next prev parent reply other threads:[~2016-06-20 3:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 3:50 [PATCH v3 0/4] Add hi6220 media subsystem reset controller driver Xinliang Liu
2016-06-20 3:50 ` [PATCH v3 1/4] reset: hisilicon: Add media reset controller binding Xinliang Liu
2016-06-20 12:07 ` Philipp Zabel
2016-06-20 13:55 ` Xinliang Liu
2016-06-20 3:50 ` Xinliang Liu [this message]
2016-06-20 3:50 ` [PATCH v3 3/4] reset: hisilicon: Change to syscon register access Xinliang Liu
2016-06-20 3:50 ` [PATCH v3 4/4] reset: hisilicon: Add hi6220 media subsystem reset support Xinliang Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160620035007.229629-3-xinliang.liu@linaro.org \
--to=xinliang.liu@linaro.org \
--cc=guodong.xu@linaro.org \
--cc=kong.kongxinwei@hisilicon.com \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=puck.chen@hisilicon.com \
--cc=robh+dt@kernel.org \
--cc=saberlily.xia@hisilicon.com \
--cc=xuwei5@hisilicon.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).