diff mbox

arm: dts: pxa3xx: provide correct clk-names property for nand controller node

Message ID 20180624174205.20648-1-daniel@zonque.org (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Mack June 24, 2018, 5:42 p.m. UTC
The NAND driver looks for a clock named "core" and falls back to a pdev
clock that has a wrong rate if not set.

Signed-off-by: Daniel Mack <daniel@zonque.org>
---
 arch/arm/boot/dts/pxa3xx.dtsi | 1 +
 1 file changed, 1 insertion(+)

Comments

Robert Jarzmik June 25, 2018, 8:18 p.m. UTC | #1
Daniel Mack <daniel@zonque.org> writes:

> The NAND driver looks for a clock named "core" and falls back to a pdev
> clock that has a wrong rate if not set.
>
> Signed-off-by: Daniel Mack <daniel@zonque.org>
Applied to pxa/dt with a small "line swap", ie. clock-names is one line below
"clocks" line.

Cheers.
Daniel Mack Sept. 19, 2018, 4:20 p.m. UTC | #2
Hi Robert,

On 25/6/2018 10:18 PM, Robert Jarzmik wrote:
> Daniel Mack <daniel@zonque.org> writes:
> 
>> The NAND driver looks for a clock named "core" and falls back to a pdev
>> clock that has a wrong rate if not set.
>>
>> Signed-off-by: Daniel Mack <daniel@zonque.org>
> Applied to pxa/dt with a small "line swap", ie. clock-names is one line below
> "clocks" line.

This patch got applied twice in mainline, as ce4313f318de and as 
267a113cec97. Not sure what went wrong here, but the same property npow 
occurs twice in the node, which leads to an error during dtb complication.

Could you queue a revert for ce4313f318de?


Thanks,
Daniel
Daniel Mack Sept. 20, 2018, 5:03 a.m. UTC | #3
On 19/9/2018 6:20 PM, Daniel Mack wrote:
> On 25/6/2018 10:18 PM, Robert Jarzmik wrote:
>> Daniel Mack <daniel@zonque.org> writes:
>>
>>> The NAND driver looks for a clock named "core" and falls back to a pdev
>>> clock that has a wrong rate if not set.
>>>
>>> Signed-off-by: Daniel Mack <daniel@zonque.org>
>> Applied to pxa/dt with a small "line swap", ie. clock-names is one line below
>> "clocks" line.
> 
> This patch got applied twice in mainline, as ce4313f318de and as
> 267a113cec97. Not sure what went wrong here, but the same property npow
> occurs twice in the node, which leads to an error during dtb complication.

Ooops, sorry. Forget it, all is good. I've messed up a local branch.

Sorry for the noise. :(


Daniel
diff mbox

Patch

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 3851057bc77d..7f65791c0559 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -134,6 +134,7 @@ 
 			compatible = "marvell,pxa3xx-nand-controller";
 			reg = <0x43100000 90>;
 			interrupts = <45>;
+			clock-names = "core";
 			clocks = <&clks CLK_NAND>;
 			dmas = <&pdma 97 3>;
 			dma-names = "data";