arm64: dts: rockchip: misc. cleanups

From: Chen-Yu Tsai <[email protected]>

With SDIO now enabled, the numbering of the existing MMC host controllers gets incremented by 1, as the SDIO host is the first one.

Increment the numbering of the MMC LED triggers to match.

Fixes cf3c5397835f ("arm64: dts: rockchip: Enable sdio0 and uart0 on rk3399-roc-pc-mezzanine")

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 8 ++++++++
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi          | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts +8 -0

index 2acb3d500fb9..f0686fc276be 100644
@@ -38,6 +38,10 @@ vcc3v3_pcie: vcc3v3-pcie {
 	};
 };
 
+&diy_led {
+	linux,default-trigger = "mmc2";
+};
+
 &pcie_phy {
 	status = "okay";
 };

@@ -91,3 +95,7 @@ &uart0 {
 	pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
 	status = "okay";
 };
+
+&yellow_led {
+	linux,default-trigger = "mmc1";
+};

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +2 -2

index 9f225e9c3d54..bc060ac7972d 100644
@@ -70,14 +70,14 @@ work-led {
 			linux,default-trigger = "heartbeat";
 		};
 
-		diy-led {
+		diy_led: diy-led {
 			label = "red:diy";
 			gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
 			default-state = "off";
 			linux,default-trigger = "mmc1";
 		};
 
-		yellow-led {
+		yellow_led: yellow-led {
 			label = "yellow:yellow-led";
 			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
 			default-state = "off";

Signature · 1 line

2.25.1

Hi Chen-Yu Tsai,

The led node names need some changes.
'linux,default-trigger' value does not fit.

From leds-gpio.yaml:

patternProperties:
# The first form is preferred, but fall back to just 'led' anywhere in the

  # node name to at least catch some child nodes.
  "(^led-[0-9a-f]$|led)":
    type: object

Rename led nodenames to 'led-0' form

Also include all mail lists found with:
./scripts/get_maintainer.pl --nogit-fallback --nogit

[email protected]

If you like change the rest of dts with leds as well...

DTC arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml
CHECK arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml: leds:
yellow-led:linux,default-trigger:0: 'mmc0' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern'] arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml: leds:
diy-led:linux,default-trigger:0: 'mmc1' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern']
DTC arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml
CHECK arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml
arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
diy-led:linux,default-trigger:0: 'mmc2' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern'] arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
yellow-led:linux,default-trigger:0: 'mmc1' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern']

make -k ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/leds/leds-gpio.yaml

Quoted 60 lines

From: Chen-Yu Tsai <[email protected]>

With SDIO now enabled, the numbering of the existing MMC host controllers gets incremented by 1, as the SDIO host is the first one.

Increment the numbering of the MMC LED triggers to match.

Fixes cf3c5397835f ("arm64: dts: rockchip: Enable sdio0 and uart0 on rk3399-roc-pc-mezzanine")

Signed-off-by Chen-Yu Tsai <[email protected]>

---
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 8 ++++++++
 arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi          | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts +8 -0

index 2acb3d500fb9..f0686fc276be 100644
@@ -38,6 +38,10 @@ vcc3v3_pcie: vcc3v3-pcie {
      };
 };
 
+&diy_led {
+     linux,default-trigger = "mmc2";
+};
+
 &pcie_phy {
      status = "okay";
 };

@@ -91,3 +95,7 @@ &uart0 {
      pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
      status = "okay";
 };
+
+&yellow_led {
+     linux,default-trigger = "mmc1";
+};

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +2 -3

index 9f225e9c3d54..bc060ac7972d 100644
@@ -70,14 +70,14 @@ work-led {
                      linux,default-trigger = "heartbeat";
              };
 
-             diy-led {
+             diy_led: diy-led {
                      label = "red:diy";
                      gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
                      default-state = "off";
                      linux,default-trigger = "mmc1";
              };
 
-             yellow-led {
+             yellow_led: yellow-led {
                      label = "yellow:yellow-led";
                      gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
                      default-state = "off";
--

2.25.1

Quoted 14 lines · Johan Jonker

Hi Chen-Yu Tsai,

The led node names need some changes.
'linux,default-trigger' value does not fit.

From leds-gpio.yaml:

patternProperties:
# The first form is preferred, but fall back to just 'led' anywhere in the

   # node name to at least catch some child nodes.
   "(^led-[0-9a-f]$|led)":
     type: object

Quoted 6 lines

Rename led nodenames to 'led-0' form

Also include all mail lists found with:
./scripts/get_maintainer.pl --nogit-fallback --nogit

[email protected]

Oops...

Quoted 4 lines

If you like change the rest of dts with leds as well...

   DTC     arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml
   CHECK   arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml

Quoted 14 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml: leds:
yellow-led:linux,default-trigger:0: 'mmc0' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern'] arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml: leds:
diy-led:linux,default-trigger:0: 'mmc1' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern']
DTC arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml
CHECK arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml
arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
diy-led:linux,default-trigger:0: 'mmc2' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern'] arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
yellow-led:linux,default-trigger:0: 'mmc1' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern']

Maybe we should just get rid of linux,default-trigger then?

Heiko?

ChenYu

Quoted 56 lines

make -k ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/leds/leds-gpio.yaml

Quoted 53 lines

From: Chen-Yu Tsai <[email protected]>

With SDIO now enabled, the numbering of the existing MMC host controllers gets incremented by 1, as the SDIO host is the first one.

Increment the numbering of the MMC LED triggers to match.

Fixes cf3c5397835f ("arm64: dts: rockchip: Enable sdio0 and uart0 on rk3399-roc-pc-mezzanine")

Signed-off-by Chen-Yu Tsai <[email protected]>

---
  arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 8 ++++++++
  arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi          | 4 ++--
  2 files changed, 10 insertions(+), 2 deletions(-)

arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts +8 -0

index 2acb3d500fb9..f0686fc276be 100644
@@ -38,6 +38,10 @@ vcc3v3_pcie: vcc3v3-pcie {
       };
  };
 
+&diy_led {
+     linux,default-trigger = "mmc2";
+};
+
  &pcie_phy {
       status = "okay";
  };

@@ -91,3 +95,7 @@ &uart0 {
       pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
       status = "okay";
  };
+
+&yellow_led {
+     linux,default-trigger = "mmc1";
+};

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +1 -1

index 9f225e9c3d54..bc060ac7972d 100644
@@ -70,14 +70,14 @@ work-led {
                       linux,default-trigger = "heartbeat";
               };
 
-             diy-led {
+             diy_led: diy-led {
                       label = "red:diy";
                       gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
                       default-state = "off";
                       linux,default-trigger = "mmc1";
               };
 

Quoted 8 lines

Quoted 7 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +1 -2

-             yellow-led {
+             yellow_led: yellow-led {
                       label = "yellow:yellow-led";
                       gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
                       default-state = "off";
--

2.25.1

_______________________________________________
Linux-rockchip mailing list [email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

[ +cc LED binding maintainers]

Quoted 48 lines · Chen-Yu Tsai

Quoted 15 lines · Johan Jonker

Hi Chen-Yu Tsai,

The led node names need some changes.
'linux,default-trigger' value does not fit.

 From leds-gpio.yaml:

patternProperties:
   # The first form is preferred, but fall back to just 'led' anywhere in the

   # node name to at least catch some child nodes.
   "(^led-[0-9a-f]$|led)":
     type: object

Quoted 6 lines

Rename led nodenames to 'led-0' form

Also include all mail lists found with:
./scripts/get_maintainer.pl --nogit-fallback --nogit

[email protected]

Oops...

Quoted 14 lines

If you like change the rest of dts with leds as well...

   DTC     arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml CHECK   arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml: leds:
yellow-led:linux,default-trigger:0: 'mmc0' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern'] arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dt.yaml: leds:
diy-led:linux,default-trigger:0: 'mmc1' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern']
   DTC     arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml CHECK   arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml

Quoted 8 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
diy-led:linux,default-trigger:0: 'mmc2' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern'] arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
yellow-led:linux,default-trigger:0: 'mmc1' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern']

Quoted 1 line

Maybe we should just get rid of linux,default-trigger then?

In this particular case, I'd say it's probably time to reevaluate the rather out-of-date binding. The apparent intent of the "linux,default-trigger" property seems to be to describe any trigger supported by Linux, so either the binding wants to be kept in sync with all the triggers Linux actually supports, or perhaps it should just be redefined as a free-form string. FWIW I'd be slightly inclined towards the latter, since the schema validator can't know whether the given trigger actually corresponds to the correct thing for whatever the LED

is physically labelled on the board/case, nor whether the version(s) of Linux that people intend to use actually support that trigger (since it doesn't have to be the version contemporary with the schema definition), so strict validation of this particular property seems to be of limited value.

Robin.

Quoted 80 lines

Heiko?

ChenYu

Quoted 61 lines

make -k ARCH=arm64 dtbs_check DT_SCHEMA_FILES=Documentation/devicetree/bindings/leds/leds-gpio.yaml

Quoted 58 lines

From: Chen-Yu Tsai <[email protected]>

With SDIO now enabled, the numbering of the existing MMC host controllers
gets incremented by 1, as the SDIO host is the first one.

Increment the numbering of the MMC LED triggers to match.

Fixes cf3c5397835f ("arm64: dts: rockchip: Enable sdio0 and uart0

on rk3399-roc-pc-mezzanine")

Signed-off-by Chen-Yu Tsai <[email protected]>

---
  arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts | 8 ++++++++ arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi          | 4 ++--

  2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts index 2acb3d500fb9..f0686fc276be 100644

arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts +8 -0

@@ -38,6 +38,10 @@ vcc3v3_pcie: vcc3v3-pcie {
        };
   };
 
+&diy_led {
+     linux,default-trigger = "mmc2";
+};
+
   &pcie_phy {
        status = "okay";
   };

@@ -91,3 +95,7 @@ &uart0 {
        pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
        status = "okay";
   };
+
+&yellow_led {
+     linux,default-trigger = "mmc1";
+};

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +1 -1

index 9f225e9c3d54..bc060ac7972d 100644
@@ -70,14 +70,14 @@ work-led {
                        linux,default-trigger = "heartbeat";
                };
 
-             diy-led {
+             diy_led: diy-led {
                        label = "red:diy";
                        gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                        linux,default-trigger = "mmc1";
                };
 

Quoted 8 lines

Quoted 7 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +1 -1

-             yellow-led {
+             yellow_led: yellow-led {
                        label = "yellow:yellow-led";
                        gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
                        default-state = "off";

Signature · 1 line

2.25.1

_______________________________________________
Linux-rockchip mailing list [email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

Quoted 7 lines

Quoted 6 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
diy-led:linux,default-trigger:0: 'mmc2' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern'] arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
yellow-led:linux,default-trigger:0: 'mmc1' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern']

Quoted 1 line

Maybe we should just get rid of linux,default-trigger then?

In this particular case, I'd say it's probably time to reevaluate the rather out-of-date binding. The apparent intent of the "linux,default-trigger" property seems to be to describe any trigger supported by Linux, so either the binding wants to be kept in sync with all the triggers Linux actually supports, or perhaps it should just be redefined as a free-form

I'd be slightly inclined towards the latter, since the schema validator can't know whether the given trigger actually corresponds to the correct thing for whatever the LED is physically labelled on the board/case, nor whether the version(s) of Linux that people intend to use actually support that trigger (since it doesn't have to be the version contemporary with the schema definition), so strict validation of this particular property seems to be of limited value.

Quoted 7 lines

Quoted 7 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi work-led { · line 78

Quoted 7 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +1 -1

-             diy-led {
+             diy_led: diy-led {
                       label = "red:diy";
                       gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
                       default-state = "off";
                       linux,default-trigger = "mmc1";
               };

Quoted 5 lines

Quoted 5 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi work-led { · line 83

Quoted 5 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +1 -1

-             yellow-led {
+             yellow_led: yellow-led {
                       label = "yellow:yellow-led";
                       gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
                       default-state = "off";

Hi!

Quoted 7 lines

Quoted 7 lines

Quoted 6 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
diy-led:linux,default-trigger:0: 'mmc2' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern'] arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dt.yaml: leds:
yellow-led:linux,default-trigger:0: 'mmc1' is not one of ['backlight', 'default-on', 'heartbeat', 'disk-activity', 'ide-disk', 'timer', 'pattern']

Quoted 7 lines

Quoted 1 line

Maybe we should just get rid of linux,default-trigger then?

In this particular case, I'd say it's probably time to reevaluate the rather out-of-date binding. The apparent intent of the "linux,default-trigger" property seems to be to describe any trigger supported by Linux, so either the binding wants to be kept in sync with all the triggers Linux actually supports, or perhaps it should just be redefined as a free-form

It is enough to keep it in sync with all the triggers we actually use :-).

Quoted 7 lines

I'd be slightly inclined towards the latter, since the schema validator can't know whether the given trigger actually corresponds to the correct thing for whatever the LED is physically labelled on the board/case, nor whether the version(s) of Linux that people intend to use actually support that trigger (since it doesn't have to be the version contemporary with the schema definition), so strict validation of this particular property seems to be of limited value.

But freeform seems acceptable, too.

Quoted 7 lines

Quoted 7 lines

Quoted 7 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi work-led { · line 78

Quoted 7 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +1 -1

-             diy-led {
+             diy_led: diy-led {
                       label = "red:diy";
                       gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
                       default-state = "off";
                       linux,default-trigger = "mmc1";
               };

This label probably should be "mmc1:red:activity" or something like that.

Quoted 5 lines

Quoted 5 lines

Quoted 5 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi work-led { · line 83

Quoted 5 lines

arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +1 -1

-             yellow-led {
+             yellow_led: yellow-led {
                       label = "yellow:yellow-led";
                       gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
                       default-state = "off";

And this label should be changed, too.

Best regards,
Pavel
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Example:
--------

rk805: rk805@18 {
	compatible = "rockchip,rk805";

Hi Chen-Yu Tsai,

The Documentation/ portion of the patch should come in the series before the code implementing the binding.

If you like, could you convert the binding as well and fix the example?

Documentation/devicetree/bindings/pinctrl/pinctrl-rk805.txt

Quoted 4 lines

Example:
--------

rk805: rk805@18 {
      compatible = "rockchip,rk805";

Chen-Yu Tsai (6):
arm64: dts: rockchip: rk3399-roc-pc: Fix MMC numbering for LED
triggers
arm64: dts: rockchip: rk3328: Replace RK805 PMIC node name with "pmic"

arm64: dts: rockchip: rk3328: drop non-existent gmac2phy pinmux
options
arm64: dts: rockchip: rk3328: drop #address-cells, #size-cells from
grf node
arm64: dts: rockchip: rk3399: drop #address-cells, #size-cells from
pmugrf node
arm64: dts: rockchip: rk3399: Rename dwc3 device nodes to make dtc
happy