After patch [1] SD-card becomes mmc1 and eMMC becomes mmc2.
Correct trigger of LEDs accordingly.
[1]
https://patchwork.kernel.org/patch/11881427
Signed-off-by: Markus Reichl <[email protected]>
---
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
index e7a459fa4322..20309076dbac 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
@@ -74,14 +74,14 @@ diy_led: led-1 {
label = "red:diy";
gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
default-state = "off";
- linux,default-trigger = "mmc1";
+ linux,default-trigger = "mmc2";
};
yellow_led: led-2 {
label = "yellow:yellow-led";
gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
default-state = "off";
- linux,default-trigger = "mmc0";
+ linux,default-trigger = "mmc1";
};
};
--
2.28.0
Hi Markus,
On 11/4/20 8:29 PM, Markus Reichl wrote:
> After patch [1] SD-card becomes mmc1 and eMMC becomes mmc2.
> Correct trigger of LEDs accordingly.
>
> [1]
> https://patchwork.kernel.org/patch/11881427
>
> Signed-off-by: Markus Reichl <[email protected]>
> ---
> arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
> index e7a459fa4322..20309076dbac 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
> @@ -74,14 +74,14 @@ diy_led: led-1 {
> label = "red:diy";
> gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
> default-state = "off";
> - linux,default-trigger = "mmc1";
> + linux,default-trigger = "mmc2";
remove
> };
>
> yellow_led: led-2 {
> label = "yellow:yellow-led";
> gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
> default-state = "off";
> - linux,default-trigger = "mmc0";
> + linux,default-trigger = "mmc1";
remove
> };
> };
>
>
The "mmc1" and "mmc2" options are custom values and invalid to the
automated dt check in the mainline kernel.
make ARCH=arm64 dtbs_check
DT_SCHEMA_FILES=Documentation/devicetree/bindings/leds/leds-gpio.yaml
linux,default-trigger:
description:
This parameter, if present, is a string defining the trigger
assigned to
the LED.
$ref: /schemas/types.yaml#definitions/string
enum:
# LED will act as a back-light, controlled by the framebuffer system
- backlight
# LED will turn on (but for leds-gpio see "default-state"
property in
# Documentation/devicetree/bindings/leds/leds-gpio.yaml)
- default-on
# LED "double" flashes at a load average based rate
- heartbeat
# LED indicates disk activity
- disk-activity
# LED indicates IDE disk activity (deprecated), in new
implementations
# use "disk-activity"
- ide-disk
# LED flashes at a fixed, configurable rate
- timer
# LED alters the brightness for the specified duration with one
software
# timer (requires "led-pattern" property)
- pattern
On 2020-11-06 10:29, Johan Jonker wrote:
> Hi Markus,
>
> On 11/4/20 8:29 PM, Markus Reichl wrote:
>> After patch [1] SD-card becomes mmc1 and eMMC becomes mmc2.
>> Correct trigger of LEDs accordingly.
>>
>> [1]
>> https://patchwork.kernel.org/patch/11881427
>>
>> Signed-off-by: Markus Reichl <[email protected]>
>> ---
>> arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
>> index e7a459fa4322..20309076dbac 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
>> @@ -74,14 +74,14 @@ diy_led: led-1 {
>> label = "red:diy";
>> gpios = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>;
>> default-state = "off";
>> - linux,default-trigger = "mmc1";
>
>> + linux,default-trigger = "mmc2";
>
> remove
>> };
>>
>> yellow_led: led-2 {
>> label = "yellow:yellow-led";
>> gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
>> default-state = "off";
>> - linux,default-trigger = "mmc0";
>
>> + linux,default-trigger = "mmc1";
>
> remove
>
>> };
>> };
>>
>>
>
> The "mmc1" and "mmc2" options are custom values and invalid to the
> automated dt check in the mainline kernel.
It's already been established that the binding is at fault here. Effort
should be spent on fixing *that*, not sacrificing useful and intended DT
functionality in blind deference to the schema gods.
Robin.
>
> make ARCH=arm64 dtbs_check
> DT_SCHEMA_FILES=Documentation/devicetree/bindings/leds/leds-gpio.yaml
>
>
> linux,default-trigger:
> description:
> This parameter, if present, is a string defining the trigger
> assigned to
> the LED.
> $ref: /schemas/types.yaml#definitions/string
>
> enum:
> # LED will act as a back-light, controlled by the framebuffer system
> - backlight
> # LED will turn on (but for leds-gpio see "default-state"
> property in
> # Documentation/devicetree/bindings/leds/leds-gpio.yaml)
> - default-on
> # LED "double" flashes at a load average based rate
> - heartbeat
> # LED indicates disk activity
> - disk-activity
> # LED indicates IDE disk activity (deprecated), in new
> implementations
> # use "disk-activity"
> - ide-disk
> # LED flashes at a fixed, configurable rate
> - timer
> # LED alters the brightness for the specified duration with one
> software
> # timer (requires "led-pattern" property)
> - pattern
>
On Wed, 4 Nov 2020 20:29:31 +0100, Markus Reichl wrote:
> After patch [1] SD-card becomes mmc1 and eMMC becomes mmc2.
> Correct trigger of LEDs accordingly.
>
> [1]
> https://patchwork.kernel.org/patch/11881427
Applied, thanks!
[1/1] arm64: dts: rockchip: Reorder LED triggers from mmc devices on rk3399-roc-pc.
commit: 7327c8b98e2e14c47021eea14d1ab268086a6408
Best regards,
--
Heiko Stuebner <[email protected]>