* [PATCH 2/4] arm64: dts: Add HDMI node for hi6220-hikey
2016-08-22 22:48 [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey John Stultz
@ 2016-08-22 22:48 ` John Stultz
2016-08-22 22:48 ` [PATCH 3/4] arm64: dts: hikey: Add hikey support for syscon-reboot-mode John Stultz
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: John Stultz @ 2016-08-22 22:48 UTC (permalink / raw)
To: lkml
Cc: Xinliang Liu, Guodong Xu, Wei Xu, Rob Herring, Mark Rutland,
Catalin Marinas, Will Deacon, linux-arm-kernel, devicetree,
John Stultz
From: Xinliang Liu <xinliang.liu@linaro.org>
Add adv7533 HDMI DT node for HiKey board.
Cc: Guodong Xu <guodong.xu@linaro.org>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 32 ++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index c2f014e..8597e9b 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -379,4 +379,36 @@
&dsi {
status = "ok";
+
+ ports {
+ /* 1 for output port */
+ port@1 {
+ reg = <1>;
+
+ dsi_out0: endpoint@0 {
+ remote-endpoint = <&adv7533_in>;
+ };
+ };
+ };
+};
+
+&i2c2 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "ok";
+
+ adv7533: adv7533@39 {
+ compatible = "adi,adv7533";
+ reg = <0x39>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <1 2>;
+ pd-gpio = <&gpio0 4 0>;
+ adi,dsi-lanes = <4>;
+
+ port {
+ adv7533_in: endpoint {
+ remote-endpoint = <&dsi_out0>;
+ };
+ };
+ };
};
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/4] arm64: dts: hikey: Add hikey support for syscon-reboot-mode
2016-08-22 22:48 [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey John Stultz
2016-08-22 22:48 ` [PATCH 2/4] arm64: dts: Add HDMI node " John Stultz
@ 2016-08-22 22:48 ` John Stultz
2016-08-22 22:48 ` [PATCH 4/4] arm64: dts: hikey: Add pstore support for HiKey John Stultz
2016-08-24 15:14 ` [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey Wei Xu
3 siblings, 0 replies; 8+ messages in thread
From: John Stultz @ 2016-08-22 22:48 UTC (permalink / raw)
To: lkml
Cc: John Stultz, Andy Yan, Bjorn Andersson, Haojian Zhuang,
Guodong Xu, Wei Xu, Rob Herring, Mark Rutland, Catalin Marinas,
Will Deacon, linux-arm-kernel, devicetree
Add support to hikey dts for the syscon-reboot-mode driver.
After trying an approach using a sram driver and node, a number
of issues cropped up which would make it so we would be
duplicating a lot of extra syscon infrastructure in order to
support mfds on sram. After talking with Bjorn, using the
syscon driver for this seems like an better choice.
Cc: Andy Yan <andy.yan@rock-chips.com>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Guodong Xu <guodong.xu@linaro.org>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 8597e9b..4492a15 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -29,6 +29,7 @@
* Reserve below regions from memory node:
*
* 0x05e0,0000 - 0x05ef,ffff: MCU firmware runtime using
+ * 0x05f0,1000 - 0x05f0,1fff: Reboot reason
* 0x06df,f000 - 0x06df,ffff: Mailbox message data
* 0x0740,f000 - 0x0740,ffff: MCU firmware section
* 0x3e00,0000 - 0x3fff,ffff: OP-TEE
@@ -36,11 +37,26 @@
memory@0 {
device_type = "memory";
reg = <0x00000000 0x00000000 0x00000000 0x05e00000>,
- <0x00000000 0x05f00000 0x00000000 0x00eff000>,
+ <0x00000000 0x05f00000 0x00000000 0x00001000>,
+ <0x00000000 0x05f02000 0x00000000 0x00efd000>,
<0x00000000 0x06e00000 0x00000000 0x0060f000>,
<0x00000000 0x07410000 0x00000000 0x36bf0000>;
};
+ reboot-mode-syscon@5f01000 {
+ compatible = "syscon", "simple-mfd";
+ reg = <0x0 0x05f01000 0x0 0x00001000>;
+
+ reboot-mode {
+ compatible = "syscon-reboot-mode";
+ offset = <0x0>;
+
+ mode-normal = <0x77665501>;
+ mode-bootloader = <0x77665500>;
+ mode-recovery = <0x77665502>;
+ };
+ };
+
soc {
spi0: spi@f7106000 {
status = "ok";
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/4] arm64: dts: hikey: Add pstore support for HiKey
2016-08-22 22:48 [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey John Stultz
2016-08-22 22:48 ` [PATCH 2/4] arm64: dts: Add HDMI node " John Stultz
2016-08-22 22:48 ` [PATCH 3/4] arm64: dts: hikey: Add hikey support for syscon-reboot-mode John Stultz
@ 2016-08-22 22:48 ` John Stultz
2016-09-09 0:12 ` Kees Cook
2016-08-24 15:14 ` [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey Wei Xu
3 siblings, 1 reply; 8+ messages in thread
From: John Stultz @ 2016-08-22 22:48 UTC (permalink / raw)
To: lkml
Cc: John Stultz, Kees Cook, Guodong Xu, Haojian Zhuang, Wei Xu,
Rob Herring, Mark Rutland, Catalin Marinas, Will Deacon,
linux-arm-kernel, devicetree
This patch reserves some memory in the DTS and sets up a
pstore device tree node to enable pstore support on HiKey.
Cc: Kees Cook <keescook@chromium.org>
Cc: Guodong Xu <guodong.xu@linaro.org>
Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Cc: Wei Xu <xuwei5@hisilicon.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: devicetree@vger.kernel.org
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 4492a15..9508f28 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -32,6 +32,7 @@
* 0x05f0,1000 - 0x05f0,1fff: Reboot reason
* 0x06df,f000 - 0x06df,ffff: Mailbox message data
* 0x0740,f000 - 0x0740,ffff: MCU firmware section
+ * 0x21f0,0000 - 0x21ff,ffff: pstore/ramoops buffer
* 0x3e00,0000 - 0x3fff,ffff: OP-TEE
*/
memory@0 {
@@ -40,9 +41,25 @@
<0x00000000 0x05f00000 0x00000000 0x00001000>,
<0x00000000 0x05f02000 0x00000000 0x00efd000>,
<0x00000000 0x06e00000 0x00000000 0x0060f000>,
- <0x00000000 0x07410000 0x00000000 0x36bf0000>;
+ <0x00000000 0x07410000 0x00000000 0x1aaf0000>,
+ <0x00000000 0x22000000 0x00000000 0x1c000000>;
};
+ reserved-memory {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ ramoops@0x21f00000 {
+ compatible = "ramoops";
+ reg = <0x0 0x21f00000 0x0 0x00100000>;
+ record-size = <0x00020000>;
+ console-size = <0x00020000>;
+ ftrace-size = <0x00020000>;
+ };
+ };
+
+
reboot-mode-syscon@5f01000 {
compatible = "syscon", "simple-mfd";
reg = <0x0 0x05f01000 0x0 0x00001000>;
--
1.9.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 4/4] arm64: dts: hikey: Add pstore support for HiKey
2016-08-22 22:48 ` [PATCH 4/4] arm64: dts: hikey: Add pstore support for HiKey John Stultz
@ 2016-09-09 0:12 ` Kees Cook
2016-09-09 0:17 ` John Stultz
0 siblings, 1 reply; 8+ messages in thread
From: Kees Cook @ 2016-09-09 0:12 UTC (permalink / raw)
To: John Stultz
Cc: lkml, Guodong Xu, Haojian Zhuang, Wei Xu, Rob Herring,
Mark Rutland, Catalin Marinas, Will Deacon, linux-arm-kernel,
devicetree
On Mon, Aug 22, 2016 at 3:48 PM, John Stultz <john.stultz@linaro.org> wrote:
> This patch reserves some memory in the DTS and sets up a
> pstore device tree node to enable pstore support on HiKey.
>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Guodong Xu <guodong.xu@linaro.org>
> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
> Cc: Wei Xu <xuwei5@hisilicon.com>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: devicetree@vger.kernel.org
> Reviewed-by: Kees Cook <keescook@chromium.org>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
I'm going through old emails -- did this get picked up by anyone? I
don't see an "applied" reply or similar, though I could have easily
missed it. :)
-Kees
> ---
> arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 19 ++++++++++++++++++-
> 1 file changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> index 4492a15..9508f28 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> @@ -32,6 +32,7 @@
> * 0x05f0,1000 - 0x05f0,1fff: Reboot reason
> * 0x06df,f000 - 0x06df,ffff: Mailbox message data
> * 0x0740,f000 - 0x0740,ffff: MCU firmware section
> + * 0x21f0,0000 - 0x21ff,ffff: pstore/ramoops buffer
> * 0x3e00,0000 - 0x3fff,ffff: OP-TEE
> */
> memory@0 {
> @@ -40,9 +41,25 @@
> <0x00000000 0x05f00000 0x00000000 0x00001000>,
> <0x00000000 0x05f02000 0x00000000 0x00efd000>,
> <0x00000000 0x06e00000 0x00000000 0x0060f000>,
> - <0x00000000 0x07410000 0x00000000 0x36bf0000>;
> + <0x00000000 0x07410000 0x00000000 0x1aaf0000>,
> + <0x00000000 0x22000000 0x00000000 0x1c000000>;
> };
>
> + reserved-memory {
> + #address-cells = <2>;
> + #size-cells = <2>;
> + ranges;
> +
> + ramoops@0x21f00000 {
> + compatible = "ramoops";
> + reg = <0x0 0x21f00000 0x0 0x00100000>;
> + record-size = <0x00020000>;
> + console-size = <0x00020000>;
> + ftrace-size = <0x00020000>;
> + };
> + };
> +
> +
> reboot-mode-syscon@5f01000 {
> compatible = "syscon", "simple-mfd";
> reg = <0x0 0x05f01000 0x0 0x00001000>;
> --
> 1.9.1
>
--
Kees Cook
Nexus Security
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 4/4] arm64: dts: hikey: Add pstore support for HiKey
2016-09-09 0:12 ` Kees Cook
@ 2016-09-09 0:17 ` John Stultz
2016-09-09 8:31 ` Wei Xu
0 siblings, 1 reply; 8+ messages in thread
From: John Stultz @ 2016-09-09 0:17 UTC (permalink / raw)
To: Kees Cook
Cc: lkml, Guodong Xu, Haojian Zhuang, Wei Xu, Rob Herring,
Mark Rutland, Catalin Marinas, Will Deacon, linux-arm-kernel,
devicetree
On Thu, Sep 8, 2016 at 5:12 PM, Kees Cook <keescook@chromium.org> wrote:
> On Mon, Aug 22, 2016 at 3:48 PM, John Stultz <john.stultz@linaro.org> wrote:
>> This patch reserves some memory in the DTS and sets up a
>> pstore device tree node to enable pstore support on HiKey.
>>
>> Cc: Kees Cook <keescook@chromium.org>
>> Cc: Guodong Xu <guodong.xu@linaro.org>
>> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
>> Cc: Wei Xu <xuwei5@hisilicon.com>
>> Cc: Rob Herring <robh+dt@kernel.org>
>> Cc: Mark Rutland <mark.rutland@arm.com>
>> Cc: Catalin Marinas <catalin.marinas@arm.com>
>> Cc: Will Deacon <will.deacon@arm.com>
>> Cc: linux-arm-kernel@lists.infradead.org
>> Cc: devicetree@vger.kernel.org
>> Reviewed-by: Kees Cook <keescook@chromium.org>
>> Signed-off-by: John Stultz <john.stultz@linaro.org>
>
> I'm going through old emails -- did this get picked up by anyone? I
> don't see an "applied" reply or similar, though I could have easily
> missed it. :)
Wei said he picked up the set, but it hasn't shown up in -next yet, as
his tree isn't automatically pulled in apparently.
thanks
-john
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4/4] arm64: dts: hikey: Add pstore support for HiKey
2016-09-09 0:17 ` John Stultz
@ 2016-09-09 8:31 ` Wei Xu
0 siblings, 0 replies; 8+ messages in thread
From: Wei Xu @ 2016-09-09 8:31 UTC (permalink / raw)
To: John Stultz, Kees Cook
Cc: lkml, Guodong Xu, Haojian Zhuang, Rob Herring, Mark Rutland,
Catalin Marinas, Will Deacon, linux-arm-kernel, devicetree
Hi Kess and John,
On 09/09/2016 01:17, John Stultz wrote:
> On Thu, Sep 8, 2016 at 5:12 PM, Kees Cook <keescook@chromium.org> wrote:
>> On Mon, Aug 22, 2016 at 3:48 PM, John Stultz <john.stultz@linaro.org> wrote:
>>> This patch reserves some memory in the DTS and sets up a
>>> pstore device tree node to enable pstore support on HiKey.
>>>
>>> Cc: Kees Cook <keescook@chromium.org>
>>> Cc: Guodong Xu <guodong.xu@linaro.org>
>>> Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
>>> Cc: Wei Xu <xuwei5@hisilicon.com>
>>> Cc: Rob Herring <robh+dt@kernel.org>
>>> Cc: Mark Rutland <mark.rutland@arm.com>
>>> Cc: Catalin Marinas <catalin.marinas@arm.com>
>>> Cc: Will Deacon <will.deacon@arm.com>
>>> Cc: linux-arm-kernel@lists.infradead.org
>>> Cc: devicetree@vger.kernel.org
>>> Reviewed-by: Kees Cook <keescook@chromium.org>
>>> Signed-off-by: John Stultz <john.stultz@linaro.org>
>>
>> I'm going through old emails -- did this get picked up by anyone? I
>> don't see an "applied" reply or similar, though I could have easily
>> missed it. :)
>
> Wei said he picked up the set, but it hasn't shown up in -next yet, as
> his tree isn't automatically pulled in apparently.
I have picked up this series and sent the pull request as [1].
Thanks for your interesting!
[1] http://www.spinics.net/lists/arm-kernel/msg528380.html
Best Regards,
Wei
>
> thanks
> -john
>
> .
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey
2016-08-22 22:48 [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey John Stultz
` (2 preceding siblings ...)
2016-08-22 22:48 ` [PATCH 4/4] arm64: dts: hikey: Add pstore support for HiKey John Stultz
@ 2016-08-24 15:14 ` Wei Xu
3 siblings, 0 replies; 8+ messages in thread
From: Wei Xu @ 2016-08-24 15:14 UTC (permalink / raw)
To: John Stultz, lkml
Cc: Xinliang Liu, Guodong Xu, Rob Herring, Mark Rutland,
Catalin Marinas, Will Deacon, linux-arm-kernel, devicetree
Hi John,
On 22/08/2016 23:48, John Stultz wrote:
> From: Xinliang Liu <xinliang.liu@linaro.org>
>
> Add ade and dsi DT nodes for hikey board.
>
> Cc: Guodong Xu <guodong.xu@linaro.org>
> Cc: Wei Xu <xuwei5@hisilicon.com>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
Series applied to the hisilicon soc tree.
Thanks!
Best Regards,
Wei
> arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 8 ++++
> arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 55 ++++++++++++++++++++++++++
> 2 files changed, 63 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> index 593c7e4..c2f014e 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> @@ -372,3 +372,11 @@
> &uart3 {
> label = "LS-UART1";
> };
> +
> +&ade {
> + status = "ok";
> +};
> +
> +&dsi {
> + status = "ok";
> +};
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
> index 4f27041..d0b887a 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
> @@ -262,6 +262,11 @@
> #clock-cells = <1>;
> };
>
> + medianoc_ade: medianoc_ade@f4520000 {
> + compatible = "syscon";
> + reg = <0x0 0xf4520000 0x0 0x4000>;
> + };
> +
> stub_clock: stub_clock {
> compatible = "hisilicon,hi6220-stub-clk";
> hisilicon,hi6220-clk-sram = <&sram>;
> @@ -850,5 +855,55 @@
> };
> };
> };
> +
> + ade: ade@f4100000 {
> + compatible = "hisilicon,hi6220-ade";
> + reg = <0x0 0xf4100000 0x0 0x7800>;
> + reg-names = "ade_base";
> + hisilicon,noc-syscon = <&medianoc_ade>;
> + resets = <&media_ctrl MEDIA_ADE>;
> + interrupts = <0 115 4>; /* ldi interrupt */
> +
> + clocks = <&media_ctrl HI6220_ADE_CORE>,
> + <&media_ctrl HI6220_CODEC_JPEG>,
> + <&media_ctrl HI6220_ADE_PIX_SRC>;
> + /*clock name*/
> + clock-names = "clk_ade_core",
> + "clk_codec_jpeg",
> + "clk_ade_pix";
> +
> + assigned-clocks = <&media_ctrl HI6220_ADE_CORE>,
> + <&media_ctrl HI6220_CODEC_JPEG>;
> + assigned-clock-rates = <360000000>, <288000000>;
> + dma-coherent;
> + status = "disabled";
> +
> + port {
> + ade_out: endpoint {
> + remote-endpoint = <&dsi_in>;
> + };
> + };
> + };
> +
> + dsi: dsi@f4107800 {
> + compatible = "hisilicon,hi6220-dsi";
> + reg = <0x0 0xf4107800 0x0 0x100>;
> + clocks = <&media_ctrl HI6220_DSI_PCLK>;
> + clock-names = "pclk";
> + status = "disabled";
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + /* 0 for input port */
> + port@0 {
> + reg = <0>;
> + dsi_in: endpoint {
> + remote-endpoint = <&ade_out>;
> + };
> + };
> + };
> + };
> };
> };
>
^ permalink raw reply [flat|nested] 8+ messages in thread