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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F0EDC3527D for ; Wed, 15 Dec 2021 16:01:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244314AbhLOP6M (ORCPT ); Wed, 15 Dec 2021 10:58:12 -0500 Received: from marcansoft.com ([212.63.210.85]:53462 "EHLO mail.marcansoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232587AbhLOP6L (ORCPT ); Wed, 15 Dec 2021 10:58:11 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: marcan@marcan.st) by mail.marcansoft.com (Postfix) with ESMTPSA id BE539424D9; Wed, 15 Dec 2021 15:58:07 +0000 (UTC) Subject: Re: [PATCH v2 1/2] mmc: sdhci-pci-gli: GL9755: Support for CD/WP inversion on OF platforms To: Robin Murphy , Ben Chuang , Adrian Hunter , Ulf Hansson Cc: Sven Peter , Marc Zyngier , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org References: <20211212070210.141664-1-marcan@marcan.st> <20211212070210.141664-2-marcan@marcan.st> From: Hector Martin Message-ID: Date: Thu, 16 Dec 2021 00:58:05 +0900 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: es-ES Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 13/12/2021 20.45, Robin Murphy wrote: > On 2021-12-12 07:02, Hector Martin wrote: >> This is required on some Apple ARM64 laptops using this controller. >> As is typical on DT platforms, pull these quirks from the device tree >> using the standard mmc bindings. >> >> See Documentation/devicetree/bindings/mmc/mmc-controller.yaml >> >> Signed-off-by: Hector Martin >> --- >> drivers/mmc/host/sdhci-pci-gli.c | 19 +++++++++++++++++-- >> 1 file changed, 17 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/mmc/host/sdhci-pci-gli.c b/drivers/mmc/host/sdhci-pci-gli.c >> index 4fd99c1e82ba..ad742743a494 100644 >> --- a/drivers/mmc/host/sdhci-pci-gli.c >> +++ b/drivers/mmc/host/sdhci-pci-gli.c >> @@ -12,6 +12,7 @@ >> #include >> #include >> #include >> +#include >> #include "sdhci.h" >> #include "sdhci-pci.h" >> #include "cqhci.h" >> @@ -114,8 +115,10 @@ >> #define GLI_9755_WT_EN_OFF 0x0 >> >> #define PCI_GLI_9755_PECONF 0x44 >> -#define PCI_GLI_9755_LFCLK GENMASK(14, 12) >> -#define PCI_GLI_9755_DMACLK BIT(29) >> +#define PCI_GLI_9755_LFCLK GENMASK(14, 12) >> +#define PCI_GLI_9755_DMACLK BIT(29) >> +#define PCI_GLI_9755_INVERT_CD BIT(30) >> +#define PCI_GLI_9755_INVERT_WP BIT(31) >> >> #define PCI_GLI_9755_CFG2 0x48 >> #define PCI_GLI_9755_CFG2_L1DLY GENMASK(28, 24) >> @@ -570,6 +573,18 @@ static void gl9755_hw_setting(struct sdhci_pci_slot *slot) >> gl9755_wt_on(pdev); >> >> pci_read_config_dword(pdev, PCI_GLI_9755_PECONF, &value); >> +#ifdef CONFIG_OF >> + if (pdev->dev.of_node) { > > FWIW, of_property_read_bool() should handle a NULL node correctly, and > its stub be optimised away for !OF, so you don't really need the > explicit check or the #ifdef. Thanks, removed it for v3! -- Hector Martin (marcan@marcan.st) Public Key: https://mrcn.st/pub