From patchwork Mon Oct 24 11:29:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8422 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp400455wru; Mon, 24 Oct 2022 04:47:11 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6SQfAo+w4r072T+1jYsU0RvRnMpKQO13a69qv/J8x7cUsEiJASdgFUVkecjsRy85T7k3e6 X-Received: by 2002:a05:6402:518f:b0:461:c252:c3b3 with SMTP id q15-20020a056402518f00b00461c252c3b3mr4832933edd.29.1666612031033; Mon, 24 Oct 2022 04:47:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666612031; cv=none; d=google.com; s=arc-20160816; b=HQ22sy8xF5pN82o70kYCsFbOGylmpDv5R2FDN7p3aHexUo1bkIDDuoUnIhu/voRb+q 3hAJZOLKfVjIxKDlI7l3HCBqI4JMXCGctMOOznvOD0gZIn/O30POfQtCEF4lemEBD+/S ejyY4pQeFaZOyUSd3DWcPN3SWDC2p54V8dt0h7f4mSS/l+82RmoyN1EpYU4+sww7QJRN JB3D6WTP8KGZd1gbLTcPB1chlSQV54zufFCuxUmeVn6dAdEJu1fwgKUdr6VFTuM/Zygn HA1W4UrA7LQ7rUCx/e+mydgsV6c+HM5W2uEu7npKf5bK0+xP2jSXubSDa7r5jNuPiknU gLLg== 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=3p7icUJZ2SE8vLPo2eITL1hcqZM3ZKnx2SxaqHuLLoc=; b=dJ6hV6CK2bn1PrD7c90knavToXMYo41UT5fvUa95kVXkpDZLXPah9gNIArABI15+X0 qBQ9jcoPlcvhITHsO+Yc2xojl8Lfhir5MEAUAmW28L7kgsZ9VTSvigkJYGSKkswR8cBG t6V+kCTIB3deZfeiBqhpYmNY7+Vbv171xWabLplf1VUEwqqBwGwAZGgRXVt/hPYHb8lM 2+BWBQXCtsjvms0T3djzIPmRAUu95vM7rtR8m8aW4pY6BVNRtmJEQYw3oaVVg/e1lR7t Hem9CiCpjloLZDxSQmMRmGPIzOtxNmUDbNVWlxlQcs3V5GK1WJLocQU24cNtn9WYNcg8 /Gzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LR1EzXO8; 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 w3-20020a05640234c300b004595a90c510si34198589edc.3.2022.10.24.04.46.47; Mon, 24 Oct 2022 04:47:11 -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=LR1EzXO8; 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 S231590AbiJXLqS (ORCPT + 99 others); Mon, 24 Oct 2022 07:46:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231747AbiJXLoX (ORCPT ); Mon, 24 Oct 2022 07:44:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B94E06B67F; Mon, 24 Oct 2022 04:41:52 -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 dfw.source.kernel.org (Postfix) with ESMTPS id C470761257; Mon, 24 Oct 2022 11:40:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D97D3C433C1; Mon, 24 Oct 2022 11:40:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611631; bh=Itjhk4tlvqpq7yCkr6oJEtqaCekNQTzch1Vk7YlqBnw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LR1EzXO8XOd02Vw0P9zjPsE64e9HaDMCI0WwUbyVfceFfnoiTD181vXtU7r6n3Swh 5BJwvJ2XI/ASS/gfdAYMC3u0bdRFuIQPJgRvREcY6CPgeWpCWLPFkZBLRx+2onoivQ IvWNHNe1Ph5FpuqEXRABgeSIrtq+E017MiUUddfI= 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 4.9 021/159] ARM: dts: fix Moxa SDIO compatible, remove sdhci misnomer Date: Mon, 24 Oct 2022 13:29:35 +0200 Message-Id: <20221024112950.172126970@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112949.358278806@linuxfoundation.org> References: <20221024112949.358278806@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747569377036750355?= X-GMAIL-MSGID: =?utf-8?q?1747569377036750355?= 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 4a962a26482d..59d8775a3a93 100644 --- a/arch/arm/boot/dts/moxart-uc7112lx.dts +++ b/arch/arm/boot/dts/moxart-uc7112lx.dts @@ -80,7 +80,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 64f2f44235d0..167278f8d117 100644 --- a/arch/arm/boot/dts/moxart.dtsi +++ b/arch/arm/boot/dts/moxart.dtsi @@ -91,8 +91,8 @@ watchdog: watchdog@98500000 { clocks = <&clk_apb>; }; - 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>;