From patchwork Mon Oct 24 11:29:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10172 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp640817wru; Mon, 24 Oct 2022 13:33:38 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5NBw6Nl+DYcHvcW9URe7ak0poAQlFrPx3p+olTJ2KKJq1+NA0mSGu/XxZng3w5HEtzNJj0 X-Received: by 2002:a05:6402:3509:b0:45d:c25b:b80e with SMTP id b9-20020a056402350900b0045dc25bb80emr32435686edd.250.1666643618499; Mon, 24 Oct 2022 13:33:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666643618; cv=none; d=google.com; s=arc-20160816; b=x75px/Xj3YDHDe2L4BOhfTu/tKH0mNkE5YK0iT9wxaE/KG5b8E/zAWN2XiFfaan8WS THdMf3TjGtiaeXit2727MVxxsvZ9xhWa0JpxdZ0/nG+74VbMUZLAcH8ftmgJOvsrGdGP t7EzXyo5P8RlwHLySObRpj5tEVGKr9H7WaNqcjtx8S6hV6ufijcXIm5NN7SlCKUh81QR GoFCVNTYM4vaJkAEqc5pOoi2WiV7YqjPSbhSPuxNaqsBuQN6cg9nZsXN8i8VRTQCxelh iiCjYc76wus+5ZDeCE8YfQDrIPDmlhkOWFKRgvA0TmjcAkNkgvaDlKmausxcpDB+hg/v 3rVw== 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=RAYN8+oZmpVhDqq+MDPqGhdHYQGe7GpH1LSpCKg/oGg=; b=ddMWLZqwSCv2V8q1vAfMce/6kZdNNMbHMr5xdZw2U62b2qU7kaxybMFmfcm8sa63sk KxVS5pBeoBdNEbV7kmbeXhU+kLSVOPiqUPiFU6qaCpU26/1FSjjmqPO3U9Ai1w6YQGTU cg1TCAQJnKC07c7yvJoX4dNgmUu/3nTu9saJAt7zOhJeCiWmIVX0EFaKJH5f+M7Y5FzT ln4cLe3kaJmQS6pxa1ZSrHulk1lZfaJg8GHbZ4hSemUOQDZiXduWJbnlaoSufAUKeLgu vtagyJqWNmoO7T574WAEoiBy+FgWNx7LRlcO5jXOnquEkD+9/xMDsrY6twJFbcWxN/JN lhcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=HaqDwC6o; 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 dm4-20020a170907948400b00787b0b0a96esi798833ejc.131.2022.10.24.13.33.13; Mon, 24 Oct 2022 13:33:38 -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=HaqDwC6o; 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 S231132AbiJXUXM (ORCPT + 99 others); Mon, 24 Oct 2022 16:23:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232785AbiJXUWX (ORCPT ); Mon, 24 Oct 2022 16:22:23 -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 24F2B9AC33; Mon, 24 Oct 2022 11:38:15 -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 02887B8119D; Mon, 24 Oct 2022 11:46:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E922C433D7; Mon, 24 Oct 2022 11:46:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666611985; bh=baATQorB7E7tji15g54jQol3I3flzO4pwiVl9pgM6Bk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HaqDwC6oHoj+3OgLNBxQVoPu6+0siuuvX6f7XfFvzb/wnR4W6XQQhReB1q1/nAbuh QVBABXegQBKC7WYtLSiCTSHvN9GE9JDs5+QJ6nqBWV/K/MrxDoShA1JEgBAQi411fL 76phOvzDXn3fnItbLi+dDCwf3QvtPBYB4VCJBTBk= 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.14 026/210] ARM: dts: fix Moxa SDIO compatible, remove sdhci misnomer Date: Mon, 24 Oct 2022 13:29:03 +0200 Message-Id: <20221024112957.815210976@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747602499161339456?= X-GMAIL-MSGID: =?utf-8?q?1747602499161339456?= 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 da7b3237bfe9..804a2bc6ec82 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>;