diff mbox

[v2,04/11] ARM: dts: zynq: Update deprecated xuartps clock names

Message ID 1406242820-20140-5-git-send-email-afaerber@suse.de
State New
Headers show

Commit Message

Andreas Färber July 24, 2014, 11 p.m. UTC
Avoids deprecation warning messages.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 v2: New
 
 arch/arm/boot/dts/zynq-7000.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Soren Brinkmann July 24, 2014, 11:09 p.m. UTC | #1
On Fri, 2014-07-25 at 01:00AM +0200, Andreas Färber wrote:
> Avoids deprecation warning messages.

A patch that updates those names is already in armsoc.

	Sören
Andreas Färber July 24, 2014, 11:13 p.m. UTC | #2
Am 25.07.2014 01:09, schrieb Sören Brinkmann:
> On Fri, 2014-07-25 at 01:00AM +0200, Andreas Färber wrote:
>> Avoids deprecation warning messages.
> 
> A patch that updates those names is already in armsoc.

Which tree/branch should I base this series on then? It seemed the
Xilinx branches were all heavily outdated some days ago, so this is
against vanilla v3.16-rc6.

Thanks,
Andreas
Soren Brinkmann July 24, 2014, 11:24 p.m. UTC | #3
On Fri, 2014-07-25 at 01:13AM +0200, Andreas Färber wrote:
> Am 25.07.2014 01:09, schrieb Sören Brinkmann:
> > On Fri, 2014-07-25 at 01:00AM +0200, Andreas Färber wrote:
> >> Avoids deprecation warning messages.
> > 
> > A patch that updates those names is already in armsoc.
> 
> Which tree/branch should I base this series on then? It seemed the
> Xilinx branches were all heavily outdated some days ago, so this is
> against vanilla v3.16-rc6.

That is something for the maintainers to answer. But in general, you're
adding a lot of stuff that is not yet upstream, AFAIK. Some is still
under review I think (like QSPI), others are just staged for the next
merge window and parts are still in flight. Michal hopefully has a
better overview.
This particular patch can simply be omitted I think.

	Sören
Michal Simek July 25, 2014, 7:38 a.m. UTC | #4
On 07/25/2014 01:24 AM, Sören Brinkmann wrote:
> On Fri, 2014-07-25 at 01:13AM +0200, Andreas Färber wrote:
>> Am 25.07.2014 01:09, schrieb Sören Brinkmann:
>>> On Fri, 2014-07-25 at 01:00AM +0200, Andreas Färber wrote:
>>>> Avoids deprecation warning messages.
>>>
>>> A patch that updates those names is already in armsoc.
>>
>> Which tree/branch should I base this series on then? It seemed the
>> Xilinx branches were all heavily outdated some days ago, so this is
>> against vanilla v3.16-rc6.

I have updated that branches. From my experience none is looking
at these branches and I mainly use them for communication
with arm-soc where sign tags are used which you can see them there.

> 
> That is something for the maintainers to answer. But in general, you're
> adding a lot of stuff that is not yet upstream, AFAIK. Some is still
> under review I think (like QSPI), others are just staged for the next
> merge window and parts are still in flight. Michal hopefully has a
> better overview.
> This particular patch can simply be omitted I think.

There are several options and I think the best is arm-soc tree
where you can see what have been accepted.
And also I believe all arm-soc trees are added to linux-next.

That's why I would use linux-next or arm-soc.

Thanks,
Michal
diff mbox

Patch

diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 760bbc4..8fd826a 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -108,7 +108,7 @@ 
 			compatible = "xlnx,xuartps";
 			status = "disabled";
 			clocks = <&clkc 23>, <&clkc 40>;
-			clock-names = "ref_clk", "aper_clk";
+			clock-names = "uart_clk", "pclk";
 			reg = <0xE0000000 0x1000>;
 			interrupts = <0 27 4>;
 		};
@@ -117,7 +117,7 @@ 
 			compatible = "xlnx,xuartps";
 			status = "disabled";
 			clocks = <&clkc 24>, <&clkc 41>;
-			clock-names = "ref_clk", "aper_clk";
+			clock-names = "uart_clk", "pclk";
 			reg = <0xE0001000 0x1000>;
 			interrupts = <0 50 4>;
 		};