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=-18.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,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 D63C8C4338F for ; Tue, 24 Aug 2021 19:07:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9BBC61374 for ; Tue, 24 Aug 2021 19:07:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234322AbhHXTIJ (ORCPT ); Tue, 24 Aug 2021 15:08:09 -0400 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]:58360 "EHLO smtp-relay-internal-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231745AbhHXTIC (ORCPT ); Tue, 24 Aug 2021 15:08:02 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 40B5A4075F for ; Tue, 24 Aug 2021 19:07:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629832037; bh=JpRp0VKOepmJFb28VmqG/rgWxsh/ZZpFinNf4XIR7QM=; h=Subject:To:Cc:References:From:Message-ID:Date:MIME-Version: In-Reply-To:Content-Type; b=PlqLQpyZ7073uQZpTapVqkLdCFa65K863R/NL52Wom0vvsNNfJXYjiPQVmCnxDw8e SQbL3bdh4RAX5zvzaXTCsWRjbeMVAECleeNV3B966Ju+HbphX/JJM68o3Fx/ToYnlj fpLi8J7VMS+UuU47mgqZp1QrjYKbmEJsX1niivL+3oiBq2c4BGAaPRNIOTF/Xmo4PI n5xQJf7VEnnM/u29D0Epv6aTvbuLw3e3mx9Xtu1jE3LvSMxUivuo5bEBdIe/CjI/VU RW4PEnQvuIzVDk3ksvcJJYW7FJtG2wJSiuvbL9Z4GRdvVJUTB/t2NJLZJFvB6fxBJE S4M4yMu6jAMOg== Received: by mail-wm1-f71.google.com with SMTP id r4-20020a1c4404000000b002e728beb9fbso1628549wma.9 for ; Tue, 24 Aug 2021 12:07:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=JpRp0VKOepmJFb28VmqG/rgWxsh/ZZpFinNf4XIR7QM=; b=Gm9Gm0lDTeiZlWHNX61ThM5VWqX4S7PhJC+DTxq7kR8Nz5hdl+C0QGbOEqO5GVPPVX G1Q4piYNjD5sQ85M286xPVpRvCrmZmw72KEZoWlIga9ywykoNq7DD5CsgWrR0ywfBPxq b9AtYemCR2Oa61tduuRYMgouADyAlfX+Un/1RI1h1SC5rLPPZ15LasQ66jdSj/UY/GWX lrdCFusEm1GkjS/BH6WzfJBEE5/NPwJzQDSy3jMUQ39oc5rGlDHKAUEP2Zn8kgDMg+r2 tX7skcF+vs1F1oi3BF/bt4DBElo32vwisbONwhkdP0QO1LHWqdcFZt9rAwEop0BG12EA wjvg== X-Gm-Message-State: AOAM533GcEqXIzCh1mIRBzPXeQzsgc8B/z7Q1PbyICIA7zP0QFXryEs2 kFS70LaXIQiSmvupskA61icyLdf5f9QYYWhP5TKAeMpHngLlC0oFkBXK1kp7Q9zcwAHxXeK8DDb pn7IEXhRD0tuZuw7HP0JfTKCRyXH8yOrJwy74svt6FQ== X-Received: by 2002:a5d:4fc7:: with SMTP id h7mr19839330wrw.333.1629832037020; Tue, 24 Aug 2021 12:07:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyeoMUDqGDEYSbaq1nM+F0db0NK2Q1pZrBBRtGCTmNXFAADL4Ln6NrT8uwtmhR4uFIDABktKQ== X-Received: by 2002:a5d:4fc7:: with SMTP id h7mr19839314wrw.333.1629832036855; Tue, 24 Aug 2021 12:07:16 -0700 (PDT) Received: from [192.168.0.103] ([79.98.113.249]) by smtp.gmail.com with ESMTPSA id t8sm22065855wrx.27.2021.08.24.12.07.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 24 Aug 2021 12:07:16 -0700 (PDT) Subject: Re: [PATCH 5/6] riscv: microchip: mpfs: drop duplicated MMC/SDHC node To: Geert Uytterhoeven Cc: Ulf Hansson , Rob Herring , Paul Walmsley , Palmer Dabbelt , Albert Ou , Geert Uytterhoeven , Atish Patra , Yash Shah , Masahiro Yamada , Piotr Sroka , Linux MMC List , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Linux Kernel Mailing List , linux-riscv References: <20210819154436.117798-1-krzysztof.kozlowski@canonical.com> <20210819154436.117798-5-krzysztof.kozlowski@canonical.com> From: Krzysztof Kozlowski Message-ID: Date: Tue, 24 Aug 2021 21:07:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 24/08/2021 17:37, Geert Uytterhoeven wrote: > Hi Krzysztof, > > On Thu, Aug 19, 2021 at 5:45 PM Krzysztof Kozlowski > wrote: >> Devicetree source is a description of hardware and hardware has only one >> block @20008000 which can be configured either as eMMC or SDHC. Having >> two node for different modes is an obscure, unusual and confusing way to >> configure it. Instead the board file is supposed to customize the block >> to its needs, e.g. to SDHC mode. >> >> This fixes dtbs_check warning: >> arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dt.yaml: sdhc@20008000: $nodename:0: 'sdhc@20008000' does not match '^mmc(@.*)?$' >> >> Signed-off-by: Krzysztof Kozlowski > > Thanks for your patch! > >> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts >> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts >> @@ -43,8 +43,16 @@ &serial3 { >> status = "okay"; >> }; >> >> -&sdcard { >> +&mmc { >> status = "okay"; >> + >> + disable-wp; >> + cap-sd-highspeed; >> + card-detect-delay = <200>; >> + sd-uhs-sdr12; >> + sd-uhs-sdr25; >> + sd-uhs-sdr50; >> + sd-uhs-sdr104; >> }; >> >> &emac0 { >> diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi >> index cb54da0cc3c4..c4ccd7e4d3eb 100644 >> --- a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi >> +++ b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi >> @@ -262,25 +262,7 @@ serial3: serial@20104000 { >> status = "disabled"; >> }; >> >> - emmc: mmc@20008000 { >> - compatible = "cdns,sd4hc"; >> - reg = <0x0 0x20008000 0x0 0x1000>; >> - interrupt-parent = <&plic>; >> - interrupts = <88 89>; > > Note that the other node has only a single interrupt. > Which one is correct? I assume the one put there initially, since it was tested (sdcard wsas enabled, emmc was disabled). > >> - pinctrl-names = "default"; >> - clocks = <&clkcfg 6>; >> - bus-width = <4>; >> - cap-mmc-highspeed; >> - mmc-ddr-3_3v; >> - max-frequency = <200000000>; >> - non-removable; >> - no-sd; >> - no-sdio; >> - voltage-ranges = <3300 3300>; >> - status = "disabled"; >> - }; >> - >> - sdcard: sdhc@20008000 { >> + mmc: mmc@20008000 { >> compatible = "cdns,sd4hc"; >> reg = <0x0 0x20008000 0x0 0x1000>; >> interrupt-parent = <&plic>; >> @@ -288,13 +270,6 @@ sdcard: sdhc@20008000 { >> pinctrl-names = "default"; >> clocks = <&clkcfg 6>; >> bus-width = <4>; > > I think bus-width should be moved to the board .dts, too. Makes sense. Thanks for review! Best regards, Krzysztof