diff mbox

[19/20] ARM: dts: sun9i: Change node names to remove underscores

Message ID 708449b45b1ef546a4c27d99bc68d6cc151e8ad3.1507198895.git-series.maxime.ripard@free-electrons.com (mailing list archive)
State New, archived
Headers show

Commit Message

Maxime Ripard Oct. 5, 2017, 10:49 a.m. UTC
Some node names in the A80 DTSI still have underscores in them. Remove them
in favour of hyphens to remove DTC warnings.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/boot/dts/sun9i-a80.dtsi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Chen-Yu Tsai Oct. 5, 2017, 3:56 p.m. UTC | #1
On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Some node names in the A80 DTSI still have underscores in them. Remove them
> in favour of hyphens to remove DTC warnings.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  arch/arm/boot/dts/sun9i-a80.dtsi | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
> index f9cb701f29b0..70d79ef711b3 100644
> --- a/arch/arm/boot/dts/sun9i-a80.dtsi
> +++ b/arch/arm/boot/dts/sun9i-a80.dtsi
> @@ -139,7 +139,7 @@
>                  * would also throw all the PLL clock rates off, or just the
>                  * downstream clocks in the PRCM.
>                  */
> -               osc24M: osc24M_clk {
> +               osc24M: clk-24M {

Can we stick with the same style for all clks? Like "X-clk"?

>                         #clock-cells = <0>;
>                         compatible = "fixed-clock";
>                         clock-frequency = <24000000>;
> @@ -151,7 +151,7 @@
>                  * AC100 codec/RTC chip. This serves as a placeholder for
>                  * board dts files to specify the source.
>                  */
> -               osc32k: osc32k_clk {
> +               osc32k: clk-32k {

And here.

>                         #clock-cells = <0>;
>                         compatible = "fixed-factor-clock";
>                         clock-div = <1>;
> @@ -169,7 +169,7 @@
>                         clock-output-names = "cpus";
>                 };
>
> -               ahbs: ahbs_clk {
> +               ahbs: ahbs-clk {
>                         compatible = "fixed-factor-clock";
>                         #clock-cells = <0>;
>                         clock-div = <1>;
> @@ -708,12 +708,12 @@
>                         #interrupt-cells = <3>;
>                         #gpio-cells = <3>;
>
> -                       r_ir_pins: r_ir {
> +                       r_ir_pins: r-ir {

"r-ir-pins".

>                                 pins = "PL6";
>                                 function = "s_cir_rx";
>                         };
>
> -                       r_rsb_pins: r_rsb {
> +                       r_rsb_pins: r-rsb {

"r-rsb-pins".

ChenYu

>                                 pins = "PN0", "PN1";
>                                 function = "s_rsb";
>                                 drive-strength = <20>;
> --
> git-series 0.9.1
Maxime Ripard Oct. 6, 2017, 9:34 a.m. UTC | #2
On Thu, Oct 05, 2017 at 03:56:29PM +0000, Chen-Yu Tsai wrote:
> On Thu, Oct 5, 2017 at 6:49 PM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > Some node names in the A80 DTSI still have underscores in them. Remove them
> > in favour of hyphens to remove DTC warnings.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > ---
> >  arch/arm/boot/dts/sun9i-a80.dtsi | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
> > index f9cb701f29b0..70d79ef711b3 100644
> > --- a/arch/arm/boot/dts/sun9i-a80.dtsi
> > +++ b/arch/arm/boot/dts/sun9i-a80.dtsi
> > @@ -139,7 +139,7 @@
> >                  * would also throw all the PLL clock rates off, or just the
> >                  * downstream clocks in the PRCM.
> >                  */
> > -               osc24M: osc24M_clk {
> > +               osc24M: clk-24M {
> 
> Can we stick with the same style for all clks? Like "X-clk"?
> 
> >                         #clock-cells = <0>;
> >                         compatible = "fixed-clock";
> >                         clock-frequency = <24000000>;
> > @@ -151,7 +151,7 @@
> >                  * AC100 codec/RTC chip. This serves as a placeholder for
> >                  * board dts files to specify the source.
> >                  */
> > -               osc32k: osc32k_clk {
> > +               osc32k: clk-32k {
> 
> And here.

I guess that's the same argument for buttons. Most of the other nodes
are starting with the device class, and have a suffix to make them
generic.

> >                         #clock-cells = <0>;
> >                         compatible = "fixed-factor-clock";
> >                         clock-div = <1>;
> > @@ -169,7 +169,7 @@
> >                         clock-output-names = "cpus";
> >                 };
> >
> > -               ahbs: ahbs_clk {
> > +               ahbs: ahbs-clk {
> >                         compatible = "fixed-factor-clock";
> >                         #clock-cells = <0>;
> >                         clock-div = <1>;
> > @@ -708,12 +708,12 @@
> >                         #interrupt-cells = <3>;
> >                         #gpio-cells = <3>;
> >
> > -                       r_ir_pins: r_ir {
> > +                       r_ir_pins: r-ir {
> 
> "r-ir-pins".
> 
> >                                 pins = "PL6";
> >                                 function = "s_cir_rx";
> >                         };
> >
> > -                       r_rsb_pins: r_rsb {
> > +                       r_rsb_pins: r-rsb {
> 
> "r-rsb-pins".

I'll address those comments, thanks!
Maxime
diff mbox

Patch

diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
index f9cb701f29b0..70d79ef711b3 100644
--- a/arch/arm/boot/dts/sun9i-a80.dtsi
+++ b/arch/arm/boot/dts/sun9i-a80.dtsi
@@ -139,7 +139,7 @@ 
 		 * would also throw all the PLL clock rates off, or just the
 		 * downstream clocks in the PRCM.
 		 */
-		osc24M: osc24M_clk {
+		osc24M: clk-24M {
 			#clock-cells = <0>;
 			compatible = "fixed-clock";
 			clock-frequency = <24000000>;
@@ -151,7 +151,7 @@ 
 		 * AC100 codec/RTC chip. This serves as a placeholder for
 		 * board dts files to specify the source.
 		 */
-		osc32k: osc32k_clk {
+		osc32k: clk-32k {
 			#clock-cells = <0>;
 			compatible = "fixed-factor-clock";
 			clock-div = <1>;
@@ -169,7 +169,7 @@ 
 			clock-output-names = "cpus";
 		};
 
-		ahbs: ahbs_clk {
+		ahbs: ahbs-clk {
 			compatible = "fixed-factor-clock";
 			#clock-cells = <0>;
 			clock-div = <1>;
@@ -708,12 +708,12 @@ 
 			#interrupt-cells = <3>;
 			#gpio-cells = <3>;
 
-			r_ir_pins: r_ir {
+			r_ir_pins: r-ir {
 				pins = "PL6";
 				function = "s_cir_rx";
 			};
 
-			r_rsb_pins: r_rsb {
+			r_rsb_pins: r-rsb {
 				pins = "PN0", "PN1";
 				function = "s_rsb";
 				drive-strength = <20>;