From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39EA9C2D0EE for ; Tue, 31 Mar 2020 11:07:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 167DE20838 for ; Tue, 31 Mar 2020 11:07:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730573AbgCaLHL (ORCPT ); Tue, 31 Mar 2020 07:07:11 -0400 Received: from foss.arm.com ([217.140.110.172]:51162 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730377AbgCaLHK (ORCPT ); Tue, 31 Mar 2020 07:07:10 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0AFBF1FB; Tue, 31 Mar 2020 04:07:10 -0700 (PDT) Received: from [10.57.60.204] (unknown [10.57.60.204]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 77EEE3F52E; Tue, 31 Mar 2020 04:07:08 -0700 (PDT) Subject: Re: [PATCH 1/6] arm64: dts: rockchip: rk3399-roc-pc: Fix MMC numbering for LED triggers To: Chen-Yu Tsai , Johan Jonker , =?UTF-8?Q?Heiko_St=c3=bcbner?= Cc: Rob Herring , "open list:ARM/Rockchip SoC..." , linux-kernel , linux-arm-kernel , jacek.anaszewski@gmail.com, pavel@ucw.cz, devicetree@vger.kernel.org References: <20200327030414.5903-2-wens@kernel.org> <684a08e6-7dfe-4cb1-2ae5-c1fb4128976b@gmail.com> From: Robin Murphy Message-ID: Date: Tue, 31 Mar 2020 12:07:07 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ +cc LED binding maintainers] On 2020-03-29 5:36 pm, Chen-Yu Tsai wrote: > On Fri, Mar 27, 2020 at 5:58 PM Johan Jonker wrote: >> >> 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 >> >> devicetree@vger.kernel.org > > Oops... > >> 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'] > > 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. > > Heiko? > > ChenYu > >> make -k ARCH=arm64 dtbs_check >> DT_SCHEMA_FILES=Documentation/devicetree/bindings/leds/leds-gpio.yaml >> >>> From: Chen-Yu Tsai >>> >>> 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 >>> --- >>> 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 >>> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts >>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc-mezzanine.dts >>> @@ -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"; >>> +}; >>> diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi >>> index 9f225e9c3d54..bc060ac7972d 100644 >>> --- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi >>> +++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi >>> @@ -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 >> > > _______________________________________________ > Linux-rockchip mailing list > Linux-rockchip@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-rockchip >