From: Chen Feng <puck.chen@hisilicon.com>
To: <p.zabel@pengutronix.de>, <puck.chen@hisilicon.com>,
<arnd@arndb.de>, <xinliang.liu@linaro.org>,
<linux-kernel@vger.kernel.org>
Cc: <puck.chen@foxmail.com>, <w.f@huawei.com>
Subject: [PATCH 2/2] dts: arm64: Add hi6220 media reset dts
Date: Mon, 22 Feb 2016 10:45:14 +0800 [thread overview]
Message-ID: <1456109114-93675-2-git-send-email-puck.chen@hisilicon.com> (raw)
In-Reply-To: <1456109114-93675-1-git-send-email-puck.chen@hisilicon.com>
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 ad1f1eb..c034ca0 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>
/ {
@@ -154,6 +155,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 ca08a7e..322ec53 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*/
--
1.9.1
next prev parent reply other threads:[~2016-02-22 2:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 2:45 [PATCH 1/2] reset: hisilicon: Add hi6220 media part of reset Chen Feng
2016-02-22 2:45 ` Chen Feng [this message]
2016-02-22 10:23 ` Philipp Zabel
2016-02-23 1:45 ` Chen Feng
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=1456109114-93675-2-git-send-email-puck.chen@hisilicon.com \
--to=puck.chen@hisilicon.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=puck.chen@foxmail.com \
--cc=w.f@huawei.com \
--cc=xinliang.liu@linaro.org \
/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
Powered by JetHome