From patchwork Thu Oct 13 17:52:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 2264 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp414739wrs; Thu, 13 Oct 2022 11:16:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6IKXfOZ2It5HGUyG+1taHtcjaHgTkJrqFii4NQwHKlxYoH40KEsoDOTB5E9or+aX0D8lb2 X-Received: by 2002:a17:902:e741:b0:184:53b8:fb09 with SMTP id p1-20020a170902e74100b0018453b8fb09mr951685plf.88.1665684969911; Thu, 13 Oct 2022 11:16:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665684969; cv=none; d=google.com; s=arc-20160816; b=lGUoyza4WvLBufDmkaXkao5m6EB8jUzOAtc7RyLcMHt60js2r8rSJqR/2J3V2MN+hQ A4Kb2CTAx2awD5VNDALAv+RXppwtDGK388KJS5fn3ogKHps45yy4JoVKsj6kO+fh6Hnf muEnSsTySEOlHlAcAkGW6z/E3hZSOykqbWP74onbAopEwiffJlvaEGGdDLItxwd0a1Wh ghvi9TYfdcUsS7DFSNck4oAOSbuprOUF9j4FV5X+LZDrxPgMNsAXSrfYClUrRIfl+1fO 8/ASowRhHwT5CgccWiIFm9l197jnizHnkHc/BK0QUGyUK3Y8zAKQz/C//Z276nz/++gg d8OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DfSO5BMB5CiShziienbmZdlJhZChHtU4/pkF6xTr2sw=; b=UxJC2pztn7iLUeo+D8QOD7+L45PByz1uuEflcN2tcju+7/cpWXhEjXNmcemWJ7k7s5 fVBSGQo5HU+S9nbNQLv/q8nYFEnI7LBDBkjLUyDpPjupKLScKg8Kev9cZ3UGZcKJQrCv dtK0e2HqaGUi+6XI/t2upjkSo+06vcE96fwdZOz7hpTGlhdErjXcTgruKMQqvJ0m8gZA bSyw9l+9l13jmQp9XaGDzVzwovNDGJR01OeYWYoDlYxmUcyq1PbV4XOELsDJaKNGH3P6 KuA/MoiQtmoiWlgH7cmd7Xoc2wzYCdy/pNijRIEtiliFpBYkwigCjoWxpV7exN5eMB+j R6cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="j/czCUXm"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x15-20020a170902ec8f00b00184eec6cd65si529462plg.259.2022.10.13.11.15.57; Thu, 13 Oct 2022 11:16:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="j/czCUXm"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231698AbiJMSPZ (ORCPT + 99 others); Thu, 13 Oct 2022 14:15:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231732AbiJMSMq (ORCPT ); Thu, 13 Oct 2022 14:12:46 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE134170DFD; Thu, 13 Oct 2022 11:09:29 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 58564B82041; Thu, 13 Oct 2022 17:56:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2DFDC433D6; Thu, 13 Oct 2022 17:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1665683775; bh=snTKj5uUCniAAmOx2ttL6/s1ceXhHSHr5CwfTfYUtug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j/czCUXmbxeA/Aur/NTo0szELgRz/FTsVa5XMME6orgLHxx490ybzFQg7Ky6O9O+p qz8tMWMKI9NCJ3jZuz9cHufVrsnv9vsnP82isd1EdX4FL2p2BZcjjI4DVU9zSsrTPs gBlb6k9Llqoee74fwHwV7jkXB/GrdQf2V7sAP0CU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Sergei Antonov , Jonas Jensen , Sasha Levin Subject: [PATCH 5.10 19/54] ARM: dts: fix Moxa SDIO compatible, remove sdhci misnomer Date: Thu, 13 Oct 2022 19:52:13 +0200 Message-Id: <20221013175147.829828899@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221013175147.337501757@linuxfoundation.org> References: <20221013175147.337501757@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1746597282997277163?= X-GMAIL-MSGID: =?utf-8?q?1746597282997277163?= From: Sergei Antonov [ Upstream commit 02181e68275d28cab3c3f755852770367f1bc229 ] Driver moxart-mmc.c has .compatible = "moxa,moxart-mmc". But moxart .dts/.dtsi and the documentation file moxa,moxart-dma.txt contain compatible = "moxa,moxart-sdhci". Change moxart .dts/.dtsi files and moxa,moxart-dma.txt to match the driver. Replace 'sdhci' with 'mmc' in names too, since SDHCI is a different controller from FTSDC010. Suggested-by: Arnd Bergmann Signed-off-by: Sergei Antonov Cc: Jonas Jensen Link: https://lore.kernel.org/r/20220907175341.1477383-1-saproj@gmail.com' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt | 4 ++-- arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +- arch/arm/boot/dts/moxart.dtsi | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt b/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt index 8a9f3559335b..7e14e26676ec 100644 --- a/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt +++ b/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt @@ -34,8 +34,8 @@ Example: Use specific request line passing from dma For example, MMC request line is 5 - sdhci: sdhci@98e00000 { - compatible = "moxa,moxart-sdhci"; + mmc: mmc@98e00000 { + compatible = "moxa,moxart-mmc"; reg = <0x98e00000 0x5C>; interrupts = <5 0>; clocks = <&clk_apb>; diff --git a/arch/arm/boot/dts/moxart-uc7112lx.dts b/arch/arm/boot/dts/moxart-uc7112lx.dts index eb5291b0ee3a..e07b807b4cec 100644 --- a/arch/arm/boot/dts/moxart-uc7112lx.dts +++ b/arch/arm/boot/dts/moxart-uc7112lx.dts @@ -79,7 +79,7 @@ &clk_pll { clocks = <&ref12>; }; -&sdhci { +&mmc { status = "okay"; }; diff --git a/arch/arm/boot/dts/moxart.dtsi b/arch/arm/boot/dts/moxart.dtsi index f5f070a87482..764832ddfa78 100644 --- a/arch/arm/boot/dts/moxart.dtsi +++ b/arch/arm/boot/dts/moxart.dtsi @@ -93,8 +93,8 @@ watchdog: watchdog@98500000 { clock-names = "PCLK"; }; - sdhci: sdhci@98e00000 { - compatible = "moxa,moxart-sdhci"; + mmc: mmc@98e00000 { + compatible = "moxa,moxart-mmc"; reg = <0x98e00000 0x5C>; interrupts = <5 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk_apb>;