diff mbox

[U-Boot,26/27] ARM64: zynqmp: Add clocks for LPDDMA

Message ID 172a51e893b69a372d23b09d8abdf6193bf37799.1478871698.git.michal.simek@xilinx.com
State Accepted
Commit d33046aa2a6816bb8437a30215b8c03948f7ed4e
Delegated to: Michal Simek
Headers show

Commit Message

Michal Simek Nov. 11, 2016, 1:41 p.m. UTC
From: Kedareswara rao Appana <appana.durga.rao@xilinx.com>

Zynqmp DMA driver expects two clocks (main clock and apb clock)
For LPDDMA channels the two clocks are missing in the
Dma node resulting probe failure.

xilinx-zynqmp-dma ffa80000.dma: main clock not found.
xilinx-zynqmp-dma ffa80000.dma: Probing channel failed
xilinx-zynqmp-dma: probe of ffa80000.dma failed with error -2

This patch fixes this issue.

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 arch/arm/dts/zynqmp.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Soren Brinkmann Nov. 11, 2016, 5:49 p.m. UTC | #1
> -----Original Message-----
> From: Michal Simek [mailto:monstr@monstr.eu] On Behalf Of Michal Simek
> Sent: November 11, 2016 05:42
> To: u-boot@lists.denx.de
> Cc: Appana Durga Kedareswara Rao <appanad@xilinx.com>; Naga Sureshkumar
> Relli <nagasure@xilinx.com>; Bharat Kumar Gogada <bharatku@xilinx.com>;
> Hyun Kwon <hyunk@xilinx.com>; Albert Aribaud
> <albert.u.boot@aribaud.net>; Soren Brinkmann <sorenb@xilinx.com>; Filip
> Drazic <filip.drazic@aggios.com>
> Subject: [PATCH 26/27] ARM64: zynqmp: Add clocks for LPDDMA
>
> From: Kedareswara rao Appana <appana.durga.rao@xilinx.com>
>
> Zynqmp DMA driver expects two clocks (main clock and apb clock)
> For LPDDMA channels the two clocks are missing in the
> Dma node resulting probe failure.
>
> xilinx-zynqmp-dma ffa80000.dma: main clock not found.
> xilinx-zynqmp-dma ffa80000.dma: Probing channel failed
> xilinx-zynqmp-dma: probe of ffa80000.dma failed with error -2
>
> This patch fixes this issue.
>
> Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  arch/arm/dts/zynqmp.dtsi | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
> index aeeccbf9e9d0..5b4fe0962e05 100644
> --- a/arch/arm/dts/zynqmp.dtsi
> +++ b/arch/arm/dts/zynqmp.dtsi
> @@ -428,6 +428,7 @@
>               lpd_dma_chan1: dma@ffa80000 {
>                       status = "disabled";
>                       compatible = "xlnx,zynqmp-dma-1.0";
> +                     clock-names = "clk_main", "clk_apb";
>                       reg = <0x0 0xffa80000 0x0 0x1000>;
>                       interrupt-parent = <&gic>;
>                       interrupts = <0 77 4>;

Am I missing something? Adding 'clock-names' without 'clocks' doesn't seem right.

        Sören


This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.
Michal Simek Nov. 14, 2016, 7:12 a.m. UTC | #2
On 11.11.2016 18:49, Soren Brinkmann wrote:
> 
> 
>> -----Original Message-----
>> From: Michal Simek [mailto:monstr@monstr.eu] On Behalf Of Michal Simek
>> Sent: November 11, 2016 05:42
>> To: u-boot@lists.denx.de
>> Cc: Appana Durga Kedareswara Rao <appanad@xilinx.com>; Naga Sureshkumar
>> Relli <nagasure@xilinx.com>; Bharat Kumar Gogada <bharatku@xilinx.com>;
>> Hyun Kwon <hyunk@xilinx.com>; Albert Aribaud
>> <albert.u.boot@aribaud.net>; Soren Brinkmann <sorenb@xilinx.com>; Filip
>> Drazic <filip.drazic@aggios.com>
>> Subject: [PATCH 26/27] ARM64: zynqmp: Add clocks for LPDDMA
>>
>> From: Kedareswara rao Appana <appana.durga.rao@xilinx.com>
>>
>> Zynqmp DMA driver expects two clocks (main clock and apb clock)
>> For LPDDMA channels the two clocks are missing in the
>> Dma node resulting probe failure.
>>
>> xilinx-zynqmp-dma ffa80000.dma: main clock not found.
>> xilinx-zynqmp-dma ffa80000.dma: Probing channel failed
>> xilinx-zynqmp-dma: probe of ffa80000.dma failed with error -2
>>
>> This patch fixes this issue.
>>
>> Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> ---
>>
>>  arch/arm/dts/zynqmp.dtsi | 8 ++++++++
>>  1 file changed, 8 insertions(+)
>>
>> diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
>> index aeeccbf9e9d0..5b4fe0962e05 100644
>> --- a/arch/arm/dts/zynqmp.dtsi
>> +++ b/arch/arm/dts/zynqmp.dtsi
>> @@ -428,6 +428,7 @@
>>  		lpd_dma_chan1: dma@ffa80000 {
>>  			status = "disabled";
>>  			compatible = "xlnx,zynqmp-dma-1.0";
>> +			clock-names = "clk_main", "clk_apb";
>>  			reg = <0x0 0xffa80000 0x0 0x1000>;
>>  			interrupt-parent = <&gic>;
>>  			interrupts = <0 77 4>;
> 
> Am I missing something? Adding 'clock-names' without 'clocks' doesn't seem right.

Clocks were added in 1/27
http://lists.denx.de/pipermail/u-boot/2016-November/272338.html

The reason for this split is that this is cherry-pick of patches we did
in Xilinx tree.

Thanks,
Michal
diff mbox

Patch

diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi
index aeeccbf9e9d0..5b4fe0962e05 100644
--- a/arch/arm/dts/zynqmp.dtsi
+++ b/arch/arm/dts/zynqmp.dtsi
@@ -428,6 +428,7 @@ 
 		lpd_dma_chan1: dma@ffa80000 {
 			status = "disabled";
 			compatible = "xlnx,zynqmp-dma-1.0";
+			clock-names = "clk_main", "clk_apb";
 			reg = <0x0 0xffa80000 0x0 0x1000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 77 4>;
@@ -440,6 +441,7 @@ 
 		lpd_dma_chan2: dma@ffa90000 {
 			status = "disabled";
 			compatible = "xlnx,zynqmp-dma-1.0";
+			clock-names = "clk_main", "clk_apb";
 			reg = <0x0 0xffa90000 0x0 0x1000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 78 4>;
@@ -452,6 +454,7 @@ 
 		lpd_dma_chan3: dma@ffaa0000 {
 			status = "disabled";
 			compatible = "xlnx,zynqmp-dma-1.0";
+			clock-names = "clk_main", "clk_apb";
 			reg = <0x0 0xffaa0000 0x0 0x1000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 79 4>;
@@ -464,6 +467,7 @@ 
 		lpd_dma_chan4: dma@ffab0000 {
 			status = "disabled";
 			compatible = "xlnx,zynqmp-dma-1.0";
+			clock-names = "clk_main", "clk_apb";
 			reg = <0x0 0xffab0000 0x0 0x1000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 80 4>;
@@ -476,6 +480,7 @@ 
 		lpd_dma_chan5: dma@ffac0000 {
 			status = "disabled";
 			compatible = "xlnx,zynqmp-dma-1.0";
+			clock-names = "clk_main", "clk_apb";
 			reg = <0x0 0xffac0000 0x0 0x1000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 81 4>;
@@ -488,6 +493,7 @@ 
 		lpd_dma_chan6: dma@ffad0000 {
 			status = "disabled";
 			compatible = "xlnx,zynqmp-dma-1.0";
+			clock-names = "clk_main", "clk_apb";
 			reg = <0x0 0xffad0000 0x0 0x1000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 82 4>;
@@ -500,6 +506,7 @@ 
 		lpd_dma_chan7: dma@ffae0000 {
 			status = "disabled";
 			compatible = "xlnx,zynqmp-dma-1.0";
+			clock-names = "clk_main", "clk_apb";
 			reg = <0x0 0xffae0000 0x0 0x1000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 83 4>;
@@ -512,6 +519,7 @@ 
 		lpd_dma_chan8: dma@ffaf0000 {
 			status = "disabled";
 			compatible = "xlnx,zynqmp-dma-1.0";
+			clock-names = "clk_main", "clk_apb";
 			reg = <0x0 0xffaf0000 0x0 0x1000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 84 4>;