From patchwork Thu Jul 23 07:37:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680211 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C4147618 for ; Thu, 23 Jul 2020 07:38:02 +0000 (UTC) Received: by mail.kernel.org (Postfix) id BEAA2206F5; Thu, 23 Jul 2020 07:38:02 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C4AB0208E4; Thu, 23 Jul 2020 07:37:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489882; bh=YIxz/o253j44qkEYIrfeQA61qF/hiWPJNnP0C/MPLu4=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=LIBNePcfYyblAVEJonBePvIsCQV+OlxBUmLHx2LcCC9pa6sBZfMxsnKh8+jWL6cDs F5PKlmVwcThX6fGVXXJ8A1o32kAHafz0/aKEj+7osGz+zFMc6SmmUZ6OwKDWoX+lv4 ZDtyTgRrDdhHaMtn+4RTrLXd6DRRyGks+ufgtZhM= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [RFT 01/23] memory: omap-gpmc: Remove unneeded asm/mach-types.h inclusion Date: Thu, 23 Jul 2020 09:37:22 +0200 Message-Id: <20200723073744.13400-2-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> The driver does not use macros from asm/mach-types.h (neither MACH_TYPE nor machine_is_xxx()). Removal of this include allows compile testing on non-ARM architectures. Signed-off-by: Krzysztof Kozlowski --- Please kindly test. --- drivers/memory/omap-gpmc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index eff26c1b1394..fc08b5292932 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -32,8 +32,6 @@ #include -#include - #define DEVICE_NAME "omap-gpmc" /* GPMC register offsets */ From patchwork Thu Jul 23 07:37:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680215 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E49DC618 for ; Thu, 23 Jul 2020 07:38:07 +0000 (UTC) Received: by mail.kernel.org (Postfix) id DD857206C1; Thu, 23 Jul 2020 07:38:07 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2347420888; Thu, 23 Jul 2020 07:38:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489887; bh=UBowTDjnfwR++x51iBC0S5T4aqD4Cl4to0TPv3vFF2c=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=TUZ+NOKhf8ob/sYKroRE2hy9NICzWcjqAFmHEJdeJeu5NUPtbVjud7CKDzQeXgQow 4InH0wx20/G4/M3O/P+B7Jf7UMEcy7l0PuvReYZPHuM/TF6k8PEjdwMIQQhAwTdmG8 e9kp2iG6hUcHQ7cLIVF1WPVPcMuLQDpQzgPMLQPU= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [RFT 02/23] memory: omap-gpmc: Remove unused file-scope phys_base and mem_size Date: Thu, 23 Jul 2020 09:37:23 +0200 Message-Id: <20200723073744.13400-3-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> The file-scope variables phys_base and mem_size are assigned in gpmc_probe() but never read. Signed-off-by: Krzysztof Kozlowski --- Please kindly test. --- drivers/memory/omap-gpmc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index fc08b5292932..8ec2ef2aebdd 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -242,7 +242,6 @@ static DEFINE_SPINLOCK(gpmc_mem_lock); /* Define chip-selects as reserved by default until probe completes */ static unsigned int gpmc_cs_num = GPMC_CS_NUM; static unsigned int gpmc_nr_waitpins; -static resource_size_t phys_base, mem_size; static unsigned gpmc_capability; static void __iomem *gpmc_base; @@ -2357,9 +2356,6 @@ static int gpmc_probe(struct platform_device *pdev) if (res == NULL) return -ENOENT; - phys_base = res->start; - mem_size = resource_size(res); - gpmc_base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(gpmc_base)) return PTR_ERR(gpmc_base); From patchwork Thu Jul 23 07:37:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680219 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 466AA618 for ; Thu, 23 Jul 2020 07:38:13 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 406E5206C1; Thu, 23 Jul 2020 07:38:13 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 495132086A; Thu, 23 Jul 2020 07:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489893; bh=8hhBjsDf+duqgm8C+20j5iK2FtslF0khDERCHSKr6Y4=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=GH9YfAAjKDGYL+O4GZjCWEP1gWOKwpknLAvqoBlT8EWT302FYAK1tJakMBUqMN56H lcVP7NkfTSA91MsVMPLgWAvn2LRcNGyKl+Bp++Km1G04Crn2ynGpG03TPR45cGYu+G 6G3fSExzuJ0fnw/+o8pPkkjByBffNf5lnzEYlWC0= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 03/23] memory: omap-gpmc: Include for SZ_16M Date: Thu, 23 Jul 2020 09:37:24 +0200 Message-Id: <20200723073744.13400-4-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> The driver uses SZ_16M which is defined in include/linux/sizes.h. On ARM it was pulled by other headers but its inclusion is necessary for compile testing on other architectures. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/omap-gpmc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index 8ec2ef2aebdd..c158b6cae9a9 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -29,6 +29,7 @@ #include #include #include +#include #include From patchwork Thu Jul 23 07:37:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680221 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7C0E1138C for ; Thu, 23 Jul 2020 07:38:18 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 75B212086A; Thu, 23 Jul 2020 07:38:18 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A21AD208E4; Thu, 23 Jul 2020 07:38:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489898; bh=N1yekIn82T7n6H3QNG7K3PqdR3cbgdb+nsZzNs4rQHU=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qs87/SwYYmVXvmL0U/vio+GKIk7G65nNCpBFiX98WQpmvFNGaI4Sq7BGB1sYxNTYR r2QjYMe5oQD9hZVziA4/fLwbwiwSNfkxps6LcMiC9V/Odi1javgitos+Iw/y40P3Qn lytdqSM0Ep5v80YMS8tVDXOeL164bW20/B+uZorM= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [RFT 04/23] memory: ti-aemif: Rename SS to SSTROBE to avoid name conflicts Date: Thu, 23 Jul 2020 09:37:25 +0200 Message-Id: <20200723073744.13400-5-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> SS conflicts with compile test build on i386: ../drivers/memory/ti-aemif.c:40:0: warning: "SS" redefined In file included from ../arch/x86/include/uapi/asm/ptrace.h:6:0, from ../arch/x86/include/asm/ptrace.h:7, from ../arch/x86/include/asm/math_emu.h:5, from ../arch/x86/include/asm/processor.h:13, from ../include/linux/mutex.h:19, from ../include/linux/notifier.h:14, from ../include/linux/clk.h:14, from ../drivers/memory/ti-aemif.c:12: ../arch/x86/include/uapi/asm/ptrace-abi.h:23:0: note: this is the location of the previous definition #define SS 16 Use more descriptive name (SSTROBE) to avoid the conflict. Signed-off-by: Krzysztof Kozlowski --- Please kindly test. --- drivers/memory/ti-aemif.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/memory/ti-aemif.c b/drivers/memory/ti-aemif.c index db526dbf71ee..159a16f5e7d6 100644 --- a/drivers/memory/ti-aemif.c +++ b/drivers/memory/ti-aemif.c @@ -27,7 +27,7 @@ #define WSTROBE_SHIFT 20 #define WSETUP_SHIFT 26 #define EW_SHIFT 30 -#define SS_SHIFT 31 +#define SSTROBE_SHIFT 31 #define TA(x) ((x) << TA_SHIFT) #define RHOLD(x) ((x) << RHOLD_SHIFT) @@ -37,7 +37,7 @@ #define WSTROBE(x) ((x) << WSTROBE_SHIFT) #define WSETUP(x) ((x) << WSETUP_SHIFT) #define EW(x) ((x) << EW_SHIFT) -#define SS(x) ((x) << SS_SHIFT) +#define SSTROBE(x) ((x) << SSTROBE_SHIFT) #define ASIZE_MAX 0x1 #define TA_MAX 0x3 @@ -48,7 +48,7 @@ #define WSTROBE_MAX 0x3f #define WSETUP_MAX 0xf #define EW_MAX 0x1 -#define SS_MAX 0x1 +#define SSTROBE_MAX 0x1 #define NUM_CS 4 #define TA_VAL(x) (((x) & TA(TA_MAX)) >> TA_SHIFT) @@ -59,7 +59,7 @@ #define WSTROBE_VAL(x) (((x) & WSTROBE(WSTROBE_MAX)) >> WSTROBE_SHIFT) #define WSETUP_VAL(x) (((x) & WSETUP(WSETUP_MAX)) >> WSETUP_SHIFT) #define EW_VAL(x) (((x) & EW(EW_MAX)) >> EW_SHIFT) -#define SS_VAL(x) (((x) & SS(SS_MAX)) >> SS_SHIFT) +#define SSTROBE_VAL(x) (((x) & SSTROBE(SSTROBE_MAX)) >> SSTROBE_SHIFT) #define NRCSR_OFFSET 0x00 #define AWCCR_OFFSET 0x04 @@ -67,7 +67,7 @@ #define ACR_ASIZE_MASK 0x3 #define ACR_EW_MASK BIT(30) -#define ACR_SS_MASK BIT(31) +#define ACR_SSTROBE_MASK BIT(31) #define ASIZE_16BIT 1 #define CONFIG_MASK (TA(TA_MAX) | \ @@ -77,7 +77,7 @@ WHOLD(WHOLD_MAX) | \ WSTROBE(WSTROBE_MAX) | \ WSETUP(WSETUP_MAX) | \ - EW(EW_MAX) | SS(SS_MAX) | \ + EW(EW_MAX) | SSTROBE(SSTROBE_MAX) | \ ASIZE_MAX) /** @@ -204,7 +204,7 @@ static int aemif_config_abus(struct platform_device *pdev, int csnum) if (data->enable_ew) set |= ACR_EW_MASK; if (data->enable_ss) - set |= ACR_SS_MASK; + set |= ACR_SSTROBE_MASK; val = readl(aemif->base + offset); val &= ~CONFIG_MASK; @@ -246,7 +246,7 @@ static void aemif_get_hw_params(struct platform_device *pdev, int csnum) data->wstrobe = aemif_cycles_to_nsec(WSTROBE_VAL(val), clk_rate); data->wsetup = aemif_cycles_to_nsec(WSETUP_VAL(val), clk_rate); data->enable_ew = EW_VAL(val); - data->enable_ss = SS_VAL(val); + data->enable_ss = SSTROBE_VAL(val); data->asize = val & ASIZE_MAX; } From patchwork Thu Jul 23 07:37:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680225 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BADF2618 for ; Thu, 23 Jul 2020 07:38:23 +0000 (UTC) Received: by mail.kernel.org (Postfix) id B6560208E4; Thu, 23 Jul 2020 07:38:23 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D30B8206C1; Thu, 23 Jul 2020 07:38:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489903; bh=0PlnX2dyoEdPY2VCFqgAqjrHcIQdbtj0eBfEmrlOaoE=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nt/j0SsCR2UawV+yqbto/KCMDEmbNz7H3Td9fI+GDJx4PZ7yU1wsZKj16RvcHzXZN X/yNOgcRlbEGCcnc0YEI1BLviFxETBMcHwBavEDPeu8Z3BZO9DBRRZCnQ1k6foX6o8 6Kn9fPkia0gxOkCkkCjpkloz1n6D1blb0ULqJ4x0= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 05/23] memory: Enable compile testing for most of the drivers Date: Thu, 23 Jul 2020 09:37:26 +0200 Message-Id: <20200723073744.13400-6-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Most of the memory controller drivers do not depend on architecture specific code so can be compile tested to increase build coverage. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/Kconfig | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig index efcb4dfaccc2..2c0fe2d75b57 100644 --- a/drivers/memory/Kconfig +++ b/drivers/memory/Kconfig @@ -27,7 +27,8 @@ config ARM_PL172_MPMC config ATMEL_SDRAMC bool "Atmel (Multi-port DDR-)SDRAM Controller" default y - depends on ARCH_AT91 && OF + depends on ARCH_AT91 || COMPILE_TEST + depends on OF help This driver is for Atmel SDRAM Controller or Atmel Multi-port DDR-SDRAM Controller available on Atmel AT91SAM9 and SAMA5 SoCs. @@ -37,7 +38,8 @@ config ATMEL_SDRAMC config ATMEL_EBI bool "Atmel EBI driver" default y - depends on ARCH_AT91 && OF + depends on ARCH_AT91 || COMPILE_TEST + depends on OF select MFD_SYSCON select MFD_ATMEL_SMC help @@ -59,7 +61,8 @@ config BT1_L2_CTL config TI_AEMIF tristate "Texas Instruments AEMIF driver" - depends on (ARCH_DAVINCI || ARCH_KEYSTONE) && OF + depends on ARCH_DAVINCI || ARCH_KEYSTONE || COMPILE_TEST + depends on OF help This driver is for the AEMIF module available in Texas Instruments SoCs. AEMIF stands for Asynchronous External Memory Interface and @@ -70,7 +73,7 @@ config TI_AEMIF config TI_EMIF tristate "Texas Instruments EMIF driver" - depends on ARCH_OMAP2PLUS + depends on ARCH_OMAP2PLUS || COMPILE_TEST select DDR help This driver is for the EMIF module available in Texas Instruments @@ -82,7 +85,7 @@ config TI_EMIF temperature changes config OMAP_GPMC - bool + bool "Texas Instruments OMAP SoC GPMC driver" if COMPILE_TEST select GPIOLIB help This driver is for the General Purpose Memory Controller (GPMC) @@ -106,7 +109,8 @@ config OMAP_GPMC_DEBUG config TI_EMIF_SRAM tristate "Texas Instruments EMIF SRAM driver" - depends on (SOC_AM33XX || SOC_AM43XX) && SRAM + depends on SOC_AM33XX || SOC_AM43XX || (ARM && COMPILE_TEST) + depends on SRAM help This driver is for the EMIF module available on Texas Instruments AM33XX and AM43XX SoCs and is required for PM. Certain parts of @@ -117,7 +121,8 @@ config TI_EMIF_SRAM config MVEBU_DEVBUS bool "Marvell EBU Device Bus Controller" default y - depends on PLAT_ORION && OF + depends on PLAT_ORION || COMPILE_TEST + depends on OF help This driver is for the Device Bus controller available in some Marvell EBU SoCs such as Discovery (mv78xx0), Orion (88f5xxx) and @@ -126,7 +131,7 @@ config MVEBU_DEVBUS config FSL_CORENET_CF tristate "Freescale CoreNet Error Reporting" - depends on FSL_SOC_BOOKE + depends on FSL_SOC_BOOKE || COMPILE_TEST help Say Y for reporting of errors from the Freescale CoreNet Coherency Fabric. Errors reported include accesses to @@ -135,7 +140,7 @@ config FSL_CORENET_CF represents a coherency violation. config FSL_IFC - bool + bool "Freescale IFC driver" if COMPILE_TEST depends on FSL_SOC || ARCH_LAYERSCAPE || SOC_LS1021A || COMPILE_TEST depends on HAS_IOMEM @@ -150,7 +155,7 @@ config JZ4780_NEMC memory devices such as NAND and SRAM. config MTK_SMI - bool + bool "Mediatek SoC Memory Controller driver" if COMPILE_TEST depends on ARCH_MEDIATEK || COMPILE_TEST help This driver is for the Memory Controller module in MediaTek SoCs, @@ -159,7 +164,7 @@ config MTK_SMI config DA8XX_DDRCTL bool "Texas Instruments da8xx DDR2/mDDR driver" - depends on ARCH_DAVINCI_DA8XX + depends on ARCH_DAVINCI_DA8XX || COMPILE_TEST help This driver is for the DDR2/mDDR Memory Controller present on Texas Instruments da8xx SoCs. It's used to tweak various memory @@ -169,14 +174,14 @@ config PL353_SMC tristate "ARM PL35X Static Memory Controller(SMC) driver" default y depends on ARM - depends on ARM_AMBA + depends on ARM_AMBA || COMPILE_TEST help This driver is for the ARM PL351/PL353 Static Memory Controller(SMC) module. config RENESAS_RPCIF tristate "Renesas RPC-IF driver" - depends on ARCH_RENESAS + depends on ARCH_RENESAS || COMPILE_TEST select REGMAP_MMIO help This supports Renesas R-Car Gen3 RPC-IF which provides either SPI From patchwork Thu Jul 23 07:37:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680227 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 55B06618 for ; Thu, 23 Jul 2020 07:38:29 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 5189D2086A; Thu, 23 Jul 2020 07:38:29 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 36AE720714; Thu, 23 Jul 2020 07:38:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489909; bh=CxLPvsXneuHKMA+oKmRHQgODnfZL3rxyv+X2/YTG+sI=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=pa1jPZxhOZ1nA1iOGE4txbNgZpcvAIFUPQy1Qs0BlMxuoyaWa8UFoY+rEXt46/OoF 63PlpUEKobrVzkgGorbknhXSFo92kd/k7q39Drh9uKCphytXeq3HPff0nYGLQ4Cxu7 FUrp749Jz0eh+ydhNYe0wNwuTT2Rwxc+mct3XVmw= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 06/23] memory: of: Remove unused headers Date: Thu, 23 Jul 2020 09:37:27 +0200 Message-Id: <20200723073744.13400-7-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> The of_memory.c does not use platform_device nor linked list. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/of_memory.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c index 71f26eac7350..cfcb91eeccfb 100644 --- a/drivers/memory/of_memory.c +++ b/drivers/memory/of_memory.c @@ -7,8 +7,6 @@ */ #include -#include -#include #include #include #include From patchwork Thu Jul 23 07:37:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680231 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70EB3618 for ; Thu, 23 Jul 2020 07:38:34 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 6B474206F5; Thu, 23 Jul 2020 07:38:34 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AC68F208E4; Thu, 23 Jul 2020 07:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489914; bh=fStTa63/zlpMTDTDyAH0TKomthctGMET63ewzq4d76A=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=bXf/SFlMnTz2Ly+2aeAn/h2BpT10kVT7CKpRBmjY65PweCs8de/cxEHGgd5vjqhjb 8dqSKD5NQkXxA5nIxClG+hmQDD6vddbuK9EpX7OD9O16pXtmw7uNTQTHCnKpRIArIB XbBGQAKxrbaELJzCz/ZYgEvwFOicfChZVD8Vc07Y= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 07/23] memory: of: Remove __func__ in device related messages Date: Thu, 23 Jul 2020 09:37:28 +0200 Message-Id: <20200723073744.13400-8-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Messages printed by generic of_memory code will still be using device context so their location/meaning will be known. Printing __func__ is not needed. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/of_memory.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c index cfcb91eeccfb..8a5b654eca6b 100644 --- a/drivers/memory/of_memory.c +++ b/drivers/memory/of_memory.c @@ -4,6 +4,7 @@ * * Copyright (C) 2012 Texas Instruments, Inc. * Copyright (C) 2019 Samsung Electronics Co., Ltd. + * Copyright (C) 2020 Krzysztof Kozlowski */ #include @@ -54,7 +55,7 @@ const struct lpddr2_min_tck *of_get_min_tck(struct device_node *np, return min; default_min_tck: - dev_warn(dev, "%s: using default min-tck values\n", __func__); + dev_warn(dev, "Using default min-tck values\n"); return &lpddr2_jedec_min_tck; } EXPORT_SYMBOL(of_get_min_tck); @@ -114,7 +115,7 @@ const struct lpddr2_timings *of_get_ddr_timings(struct device_node *np_ddr, tim_compat = "jedec,lpddr2-timings"; break; default: - dev_warn(dev, "%s: un-supported memory type\n", __func__); + dev_warn(dev, "Unsupported memory type\n"); } for_each_child_of_node(np_ddr, np_tim) @@ -143,7 +144,7 @@ const struct lpddr2_timings *of_get_ddr_timings(struct device_node *np_ddr, return timings; default_timings: - dev_warn(dev, "%s: using default timings\n", __func__); + dev_warn(dev, "Using default memory timings\n"); *nr_frequencies = ARRAY_SIZE(lpddr2_jedec_timings); return lpddr2_jedec_timings; } @@ -191,8 +192,7 @@ const struct lpddr3_min_tck *of_lpddr3_get_min_tck(struct device_node *np, ret |= of_property_read_u32(np, "tMRD-min-tck", &min->tMRD); if (ret) { - dev_warn(dev, "%s: errors while parsing min-tck values\n", - __func__); + dev_warn(dev, "Errors while parsing min-tck values\n"); devm_kfree(dev, min); goto default_min_tck; } @@ -200,7 +200,7 @@ const struct lpddr3_min_tck *of_lpddr3_get_min_tck(struct device_node *np, return min; default_min_tck: - dev_warn(dev, "%s: using default min-tck values\n", __func__); + dev_warn(dev, "Using default min-tck values\n"); return NULL; } EXPORT_SYMBOL(of_lpddr3_get_min_tck); @@ -262,7 +262,7 @@ const struct lpddr3_timings tim_compat = "jedec,lpddr3-timings"; break; default: - dev_warn(dev, "%s: un-supported memory type\n", __func__); + dev_warn(dev, "Unsupported memory type\n"); } for_each_child_of_node(np_ddr, np_tim) @@ -291,7 +291,7 @@ const struct lpddr3_timings return timings; default_timings: - dev_warn(dev, "%s: failed to get timings\n", __func__); + dev_warn(dev, "Failed to get timings\n"); *nr_frequencies = 0; return NULL; } From patchwork Thu Jul 23 07:37:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680233 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C64C1138C for ; Thu, 23 Jul 2020 07:38:39 +0000 (UTC) Received: by mail.kernel.org (Postfix) id C145220714; Thu, 23 Jul 2020 07:38:39 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C954422B43; Thu, 23 Jul 2020 07:38:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489919; bh=n3jS1R8cGlbzQZ2E7MTkJN+e77K8jIddQTQt1KGSL/c=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=I001MfGiQyDWDrYgVgOD+HLDpfKQf+mvmvQu4e50/Sn4DaAK+M8wySNttzqIQCtg3 P8S5jbkP/ikJ8BFNIp6GCsCOtYj2nD44+TF+f9gb4OQTzrMUi3VzepIysBZox4jb3D bzc4KjTa6LRxQen0MyV34X5DchZDDfXT5tJCJa2k= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 08/23] memory: of: Correct indentation Date: Thu, 23 Jul 2020 09:37:29 +0200 Message-Id: <20200723073744.13400-9-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Correct indentation to match open parenthesis. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/of_memory.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c index 8a5b654eca6b..67b811cb2cb9 100644 --- a/drivers/memory/of_memory.c +++ b/drivers/memory/of_memory.c @@ -26,7 +26,7 @@ * default min timings provided by JEDEC. */ const struct lpddr2_min_tck *of_get_min_tck(struct device_node *np, - struct device *dev) + struct device *dev) { int ret = 0; struct lpddr2_min_tck *min; @@ -61,7 +61,7 @@ const struct lpddr2_min_tck *of_get_min_tck(struct device_node *np, EXPORT_SYMBOL(of_get_min_tck); static int of_do_get_timings(struct device_node *np, - struct lpddr2_timings *tim) + struct lpddr2_timings *tim) { int ret; @@ -83,7 +83,7 @@ static int of_do_get_timings(struct device_node *np, ret |= of_property_read_u32(np, "tZQinit", &tim->tZQinit); ret |= of_property_read_u32(np, "tRAS-max-ns", &tim->tRAS_max_ns); ret |= of_property_read_u32(np, "tDQSCK-max-derated", - &tim->tDQSCK_max_derated); + &tim->tDQSCK_max_derated); return ret; } @@ -102,7 +102,9 @@ static int of_do_get_timings(struct device_node *np, * while populating, returns default timings provided by JEDEC. */ const struct lpddr2_timings *of_get_ddr_timings(struct device_node *np_ddr, - struct device *dev, u32 device_type, u32 *nr_frequencies) + struct device *dev, + u32 device_type, + u32 *nr_frequencies) { struct lpddr2_timings *timings = NULL; u32 arr_sz = 0, i = 0; From patchwork Thu Jul 23 07:37:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680235 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2989C618 for ; Thu, 23 Jul 2020 07:38:45 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 2308E20714; Thu, 23 Jul 2020 07:38:45 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2541620888; Thu, 23 Jul 2020 07:38:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489925; bh=Z8MuOz+oKCf2eX1Gix1+yisOoYg6lXsXqmuJC5dVEe4=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=jbKQwJnAtJ8kzg+QIqHrvrZep8m9TPS+c5fv1JPjZ1djhud+PmhM3cIqYlBeVc9Qu bYGdC+D8iEAG0v7ZZIHd9ezVDaaf9N4cvNAiEYbYrd8U2XRX7nydCTuZnqu+srGgvh t5m+kRWzORydByvRkFVokRJLO15cbQGUkO4pFU/E= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 09/23] memory: of: Remove unneeded extern from function declarations Date: Thu, 23 Jul 2020 09:37:30 +0200 Message-Id: <20200723073744.13400-10-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Function declarations in headers do not need to come with extern keyword. Remove them to make the declaration slightly shorter. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/of_memory.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/memory/of_memory.h b/drivers/memory/of_memory.h index e39ecc4c733d..4a99b232ab0a 100644 --- a/drivers/memory/of_memory.h +++ b/drivers/memory/of_memory.h @@ -3,22 +3,23 @@ * OpenFirmware helpers for memory drivers * * Copyright (C) 2012 Texas Instruments, Inc. + * Copyright (C) 2020 Krzysztof Kozlowski */ #ifndef __LINUX_MEMORY_OF_REG_H #define __LINUX_MEMORY_OF_REG_H #if defined(CONFIG_OF) && defined(CONFIG_DDR) -extern const struct lpddr2_min_tck *of_get_min_tck(struct device_node *np, - struct device *dev); -extern const struct lpddr2_timings - *of_get_ddr_timings(struct device_node *np_ddr, struct device *dev, - u32 device_type, u32 *nr_frequencies); -extern const struct lpddr3_min_tck - *of_lpddr3_get_min_tck(struct device_node *np, struct device *dev); -extern const struct lpddr3_timings - *of_lpddr3_get_ddr_timings(struct device_node *np_ddr, - struct device *dev, u32 device_type, u32 *nr_frequencies); +const struct lpddr2_min_tck *of_get_min_tck(struct device_node *np, + struct device *dev); +const struct lpddr2_timings *of_get_ddr_timings(struct device_node *np_ddr, + struct device *dev, + u32 device_type, u32 *nr_frequencies); +const struct lpddr3_min_tck *of_lpddr3_get_min_tck(struct device_node *np, + struct device *dev); +const struct lpddr3_timings * +of_lpddr3_get_ddr_timings(struct device_node *np_ddr, + struct device *dev, u32 device_type, u32 *nr_frequencies); #else static inline const struct lpddr2_min_tck *of_get_min_tck(struct device_node *np, struct device *dev) From patchwork Thu Jul 23 07:37:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680239 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 55BAA618 for ; Thu, 23 Jul 2020 07:38:50 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 50AC820714; Thu, 23 Jul 2020 07:38:50 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7B16A208E4; Thu, 23 Jul 2020 07:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489930; bh=8uq3UUJKpZZ+hvQ3u4hd18U64ZU4lFW2L8pLN0025Nw=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=OutNqlMmtfrEHvODWwhggmTw9MQdVd9IAvGIW0yp9RFrV0UoQne/x9+W2GGPJqcqC Upmqp52mpSRucWHGSKxwT0AWfsKcq5Ykwa/3eBc2QIQSf47IXZKD3hmBcJh1V5Aqqv FuOko/SXVyCahrxVngncksDy02V/5RKvCFowEYmw= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 10/23] memory: emif-asm-offsets: Add GPLv2 SPDX license header Date: Thu, 23 Jul 2020 09:37:31 +0200 Message-Id: <20200723073744.13400-11-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Add GPLv2 license header and remove GPL boiler plate text. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/emif-asm-offsets.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/memory/emif-asm-offsets.c b/drivers/memory/emif-asm-offsets.c index db8043019ec6..2ebf94c07ba3 100644 --- a/drivers/memory/emif-asm-offsets.c +++ b/drivers/memory/emif-asm-offsets.c @@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * TI AM33XX EMIF PM Assembly Offsets * * Copyright (C) 2016-2017 Texas Instruments Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation version 2. - * - * This program is distributed "as is" WITHOUT ANY WARRANTY of any - * kind, whether express or implied; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. */ #include From patchwork Thu Jul 23 07:37:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680241 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C99C138C for ; Thu, 23 Jul 2020 07:38:55 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 97C17206C1; Thu, 23 Jul 2020 07:38:55 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A707820888; Thu, 23 Jul 2020 07:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489935; bh=kEeIY8BXwH4Tiy+sCCMu4cX9Ql2lsKEB0G7hN7yh/jc=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=kmEPwFNCb1Yfu9DJFECM5JICjVoHu4ZltjX+8aufxdF4Nkz3ZO/ck17GOsVsAYs5l cLDE/rYkhe+GYY+uF3xPJ2EXkmApuBpl+W/x5bMHStqwhSuqtJlu4ntlUQfHmoIG1B rxvrGJiiz9AlvAfCVx9Y9zQ6am83qIh9OaGZ1DO8= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 11/23] memory: emif: Put constant in comparison on the right side Date: Thu, 23 Jul 2020 09:37:32 +0200 Message-Id: <20200723073744.13400-12-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Fixes checkpatch warning: WARNING: Comparisons should place the constant on the right side of the test Signed-off-by: Krzysztof Kozlowski --- drivers/memory/emif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index 58a82eea5850..97bad1588bba 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -282,7 +282,7 @@ static void set_lpmode(struct emif_data *emif, u8 lpmode) * the EMIF_PWR_MGMT_CTRL[10:8] REG_LP_MODE bit field to 0x4. */ if ((emif->plat_data->ip_rev == EMIF_4D) && - (EMIF_LP_MODE_PWR_DN == lpmode)) { + (lpmode == EMIF_LP_MODE_PWR_DN)) { WARN_ONCE(1, "REG_LP_MODE = LP_MODE_PWR_DN(4) is prohibited by" "erratum i743 switch to LP_MODE_SELF_REFRESH(2)\n"); From patchwork Thu Jul 23 07:37:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680243 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BBEFD138C for ; Thu, 23 Jul 2020 07:39:00 +0000 (UTC) Received: by mail.kernel.org (Postfix) id B6AB120714; Thu, 23 Jul 2020 07:39:00 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 04EEB208E4; Thu, 23 Jul 2020 07:38:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489940; bh=ggEflJqSV8AjFjySy+bubvW5KGNlQOK8sPbHABZ405A=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=AgMPqrgQ1dDhLHgcTaIdkVaPaAXoQyEpJ5DOnUAxDs6SJeymBlwu7UcANi+1OjH7L dh+88+SxOyMFMasgXSg/0MLerxOjCmbkqdiLZx9QACtdMqhNkiRAHgi62jmh4kZwPM bbNJ0bsh9B3RjfvLa3TJK9n2j1bKGTXb/sYmghJg= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 12/23] memory: emif: Fix whitespace coding style violations Date: Thu, 23 Jul 2020 09:37:33 +0200 Message-Id: <20200723073744.13400-13-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Make the code and printed messages slightly more readable. Fixes checkpatch warnings: WARNING: quoted string split across lines ERROR: space prohibited before that ',' (ctx:WxW) Signed-off-by: Krzysztof Kozlowski --- drivers/memory/emif.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index 97bad1588bba..1241a87081f8 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -284,8 +284,7 @@ static void set_lpmode(struct emif_data *emif, u8 lpmode) if ((emif->plat_data->ip_rev == EMIF_4D) && (lpmode == EMIF_LP_MODE_PWR_DN)) { WARN_ONCE(1, - "REG_LP_MODE = LP_MODE_PWR_DN(4) is prohibited by" - "erratum i743 switch to LP_MODE_SELF_REFRESH(2)\n"); + "REG_LP_MODE = LP_MODE_PWR_DN(4) is prohibited by erratum i743 switch to LP_MODE_SELF_REFRESH(2)\n"); /* rollback LP_MODE to Self-refresh mode */ lpmode = EMIF_LP_MODE_SELF_REFRESH; } @@ -714,7 +713,7 @@ static u32 get_ext_phy_ctrl_2_intelliphy_4d5(void) u32 fifo_we_slave_ratio; fifo_we_slave_ratio = DIV_ROUND_CLOSEST( - EMIF_INTELLI_PHY_DQS_GATE_OPENING_DELAY_PS * 256 , t_ck); + EMIF_INTELLI_PHY_DQS_GATE_OPENING_DELAY_PS * 256, t_ck); return fifo_we_slave_ratio | fifo_we_slave_ratio << 11 | fifo_we_slave_ratio << 22; @@ -725,7 +724,7 @@ static u32 get_ext_phy_ctrl_3_intelliphy_4d5(void) u32 fifo_we_slave_ratio; fifo_we_slave_ratio = DIV_ROUND_CLOSEST( - EMIF_INTELLI_PHY_DQS_GATE_OPENING_DELAY_PS * 256 , t_ck); + EMIF_INTELLI_PHY_DQS_GATE_OPENING_DELAY_PS * 256, t_ck); return fifo_we_slave_ratio >> 10 | fifo_we_slave_ratio << 1 | fifo_we_slave_ratio << 12 | fifo_we_slave_ratio << 23; @@ -736,7 +735,7 @@ static u32 get_ext_phy_ctrl_4_intelliphy_4d5(void) u32 fifo_we_slave_ratio; fifo_we_slave_ratio = DIV_ROUND_CLOSEST( - EMIF_INTELLI_PHY_DQS_GATE_OPENING_DELAY_PS * 256 , t_ck); + EMIF_INTELLI_PHY_DQS_GATE_OPENING_DELAY_PS * 256, t_ck); return fifo_we_slave_ratio >> 9 | fifo_we_slave_ratio << 2 | fifo_we_slave_ratio << 13; @@ -975,8 +974,7 @@ static irqreturn_t handle_temp_alert(void __iomem *base, struct emif_data *emif) EMIF_CUSTOM_CONFIG_EXTENDED_TEMP_PART)) { if (emif->temperature_level >= SDRAM_TEMP_HIGH_DERATE_REFRESH) { dev_err(emif->dev, - "%s:NOT Extended temperature capable memory." - "Converting MR4=0x%02x as shutdown event\n", + "%s:NOT Extended temperature capable memory. Converting MR4=0x%02x as shutdown event\n", __func__, emif->temperature_level); /* * Temperature far too high - do kernel_power_off() @@ -1318,9 +1316,9 @@ static void __init_or_module of_get_ddr_info(struct device_node *np_emif, if (of_find_property(np_emif, "cal-resistor-per-cs", &len)) dev_info->cal_resistors_per_cs = true; - if (of_device_is_compatible(np_ddr , "jedec,lpddr2-s4")) + if (of_device_is_compatible(np_ddr, "jedec,lpddr2-s4")) dev_info->type = DDR_TYPE_LPDDR2_S4; - else if (of_device_is_compatible(np_ddr , "jedec,lpddr2-s2")) + else if (of_device_is_compatible(np_ddr, "jedec,lpddr2-s2")) dev_info->type = DDR_TYPE_LPDDR2_S2; of_property_read_u32(np_ddr, "density", &density); From patchwork Thu Jul 23 07:37:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680247 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1800B618 for ; Thu, 23 Jul 2020 07:39:06 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 13FAB2086A; Thu, 23 Jul 2020 07:39:06 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4A54F20888; Thu, 23 Jul 2020 07:39:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489946; bh=ee2yfevvxPNZT07hkWmEVih9tVXRSdr7zWFQlfrcYn8=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=beeuAmTdud655oreI8BCaEUt5hXcWkZs5WDZL9wh07wF9SA9720CJDVJsxQOS5U2r yyMRR8hRm/HqJl/UdwABRMqhmT0Q5WN/5HAs/0wEOzGxh1AjZRxT4sqFost4h/ccNc VIiqUdkYM+t5BZX/VWQBo0HNk/zDqrP9TVYtq9Oo= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 13/23] memory: emif: Silence platform_get_irq() error in driver Date: Thu, 23 Jul 2020 09:37:34 +0200 Message-Id: <20200723073744.13400-14-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> The platform_get_irq() already prints error message so there is no need to do it again in the driver. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/emif.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/memory/emif.c b/drivers/memory/emif.c index 1241a87081f8..1bf0656d5e9a 100644 --- a/drivers/memory/emif.c +++ b/drivers/memory/emif.c @@ -1561,11 +1561,8 @@ static int __init_or_module emif_probe(struct platform_device *pdev) goto error; irq = platform_get_irq(pdev, 0); - if (irq < 0) { - dev_err(emif->dev, "%s: error getting IRQ resource - %d\n", - __func__, irq); + if (irq < 0) goto error; - } emif_onetime_settings(emif); emif_debugfs_init(emif); From patchwork Thu Jul 23 07:37:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680249 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 33AA5138C for ; Thu, 23 Jul 2020 07:39:11 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 2E3A020714; Thu, 23 Jul 2020 07:39:11 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6887B206F5; Thu, 23 Jul 2020 07:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489951; bh=F8/rcj75C8QDyRhC1fqjTttvRAlPLacLZsrsJfSBM8k=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=EN3DXaBMHmRIXUjHTlT1fiFpBvJMDCp8b7erVoTMQr1jhGbfWnMwrmwR07ZW2XYVU QJepgRUMv6EfZgrU2VROmGXBGSZCTyDV2j/smEWrSdUKIACB/G1PF904rqkTGXPUbt 8LYVaJJ3HWb1S2mxruX75Y38pSoYbYjHBtaoSbhQ= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 14/23] memory: ti-emif-pm: Fix cast to iomem pointer Date: Thu, 23 Jul 2020 09:37:35 +0200 Message-Id: <20200723073744.13400-15-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Cast pointer to iomem memory properly to fix sparse warning: drivers/memory/ti-emif-pm.c:251:38: warning: incorrect type in argument 1 (different address spaces) drivers/memory/ti-emif-pm.c:251:38: expected void const volatile [noderef] __iomem *addr drivers/memory/ti-emif-pm.c:251:38: got void * Signed-off-by: Krzysztof Kozlowski --- drivers/memory/ti-emif-pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/memory/ti-emif-pm.c b/drivers/memory/ti-emif-pm.c index 9c90f815ad3a..6c747c1e98cb 100644 --- a/drivers/memory/ti-emif-pm.c +++ b/drivers/memory/ti-emif-pm.c @@ -248,7 +248,7 @@ MODULE_DEVICE_TABLE(of, ti_emif_of_match); static int ti_emif_resume(struct device *dev) { unsigned long tmp = - __raw_readl((void *)emif_instance->ti_emif_sram_virt); + __raw_readl((void __iomem *)emif_instance->ti_emif_sram_virt); /* * Check to see if what we are copying is already present in the From patchwork Thu Jul 23 07:37:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680251 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 567D6618 for ; Thu, 23 Jul 2020 07:39:16 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 50305206C1; Thu, 23 Jul 2020 07:39:16 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 84DC1208E4; Thu, 23 Jul 2020 07:39:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489956; bh=HjMCchZVhPwTwkexmP6RnIdWez/ZPatrwHEB1rb8se0=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=LFqSf6PJxOqeiMM4RV4IMrBCGe48LXhfUC8Zj7FEAVeSq0eQlSI9jdgOrYDKgaNpY B/5ak1NAri7aMtrNmjmv85TAk/jW0NGVj71PvS26s9ya67XTe87OK67hwOgXuzQCTX NxV/1mWlp7BNURuzQf2wCtKMLFadsKg9PUpQJauM= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 15/23] memory: renesas-rpc-if: Simplify with PTR_ERR_OR_ZERO Date: Thu, 23 Jul 2020 09:37:36 +0200 Message-Id: <20200723073744.13400-16-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Use PTR_ERR_OR_ZERO to make the code a little bit simpler. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/renesas-rpc-if.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c index 88f51ec8f1d1..f2a33a1af836 100644 --- a/drivers/memory/renesas-rpc-if.c +++ b/drivers/memory/renesas-rpc-if.c @@ -199,10 +199,8 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev) rpc->dirmap = NULL; rpc->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); - if (IS_ERR(rpc->rstc)) - return PTR_ERR(rpc->rstc); - return 0; + return PTR_ERR_OR_ZERO(rpc->rstc); } EXPORT_SYMBOL(rpcif_sw_init); From patchwork Thu Jul 23 07:37:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680253 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 707A9138C for ; Thu, 23 Jul 2020 07:39:21 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 6B98A2086A; Thu, 23 Jul 2020 07:39:21 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A7219206F5; Thu, 23 Jul 2020 07:39:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489961; bh=nqu5Y498742MQxF2QuKaSfgniJyraieyrSnwhfyLEWs=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=GVQTvp8XY+0ZIqL3fZuDQw6HOXBTu9EQvv9NqcYOo97wGP1i56x2dunsmhbbgxnO8 hd2ONvqJqqpbnJ0wZvhDxVi+zQCpu5kL7mQ/0aqH3RlUJydtQ+HhluMaQ1dqGp6t3U VECcwGDhIbA0XAq6wAcaz+JLJYrCxpuA9AAyFzVA= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 16/23] memory: brcmstb_dpfe: Constify the contents of string Date: Thu, 23 Jul 2020 09:37:37 +0200 Message-Id: <20200723073744.13400-17-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> The string itself can be made const for safety. Signed-off-by: Krzysztof Kozlowski Acked-by: Florian Fainelli Acked-by: Markus Mayer --- drivers/memory/brcmstb_dpfe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/memory/brcmstb_dpfe.c b/drivers/memory/brcmstb_dpfe.c index 82b415be18d1..5942380f343b 100644 --- a/drivers/memory/brcmstb_dpfe.c +++ b/drivers/memory/brcmstb_dpfe.c @@ -188,7 +188,7 @@ struct brcmstb_dpfe_priv { struct mutex lock; }; -static const char *error_text[] = { +static const char * const error_text[] = { "Success", "Header code incorrect", "Unknown command or argument", "Incorrect checksum", "Malformed command", "Timed out", }; From patchwork Thu Jul 23 07:37:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680257 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AAED2618 for ; Thu, 23 Jul 2020 07:39:26 +0000 (UTC) Received: by mail.kernel.org (Postfix) id A6023206F5; Thu, 23 Jul 2020 07:39:26 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D7E82206C1; Thu, 23 Jul 2020 07:39:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489966; bh=e4V2Qo20TwT4HxLyr4pTxaZfaaoAjPuiGdmfYt7qXvc=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=vE6s8L61G8Pzi4VzQq8GsvVBmCEsoIW53mxWTNYFW9ubxg3xdyW32SFWX1AD8DqPZ SeN2LzObiFmWy9xhErZgl1aI9SDLHmrhsPlLYIm6fC5uOgYY+eUxdjS9cUkR4vSccX lKh4YdBiage+sFX8iJKmPiyT7c7bYzAHh5F5jIo4= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 17/23] memory: brcmstb_dpfe: Remove unneeded braces Date: Thu, 23 Jul 2020 09:37:38 +0200 Message-Id: <20200723073744.13400-18-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Single statement blocks don't need braces. Fixes checkpatch warning: WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Krzysztof Kozlowski Acked-by: Florian Fainelli Acked-by: Markus Mayer --- drivers/memory/brcmstb_dpfe.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/memory/brcmstb_dpfe.c b/drivers/memory/brcmstb_dpfe.c index 5942380f343b..604f0e3fb112 100644 --- a/drivers/memory/brcmstb_dpfe.c +++ b/drivers/memory/brcmstb_dpfe.c @@ -379,9 +379,8 @@ static void __iomem *get_msg_ptr(struct brcmstb_dpfe_priv *priv, u32 response, void __iomem *ptr = NULL; /* There is no need to use this function for API v3 or later. */ - if (unlikely(priv->dpfe_api->version >= 3)) { + if (unlikely(priv->dpfe_api->version >= 3)) return NULL; - } msg_type = (response >> DRAM_MSG_TYPE_OFFSET) & DRAM_MSG_TYPE_MASK; offset = (response >> DRAM_MSG_ADDR_OFFSET) & DRAM_MSG_ADDR_MASK; From patchwork Thu Jul 23 07:37:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680259 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C3C07138C for ; Thu, 23 Jul 2020 07:39:31 +0000 (UTC) Received: by mail.kernel.org (Postfix) id BF09A206F5; Thu, 23 Jul 2020 07:39:31 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0ADE022B40; Thu, 23 Jul 2020 07:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489971; bh=q3j/pctKuGz1PK+SF65LyM0Wzy/rnfsCYc63Wa9bVUY=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sv2PJ5m1Waf1mhrbtp5gl6gOI4kR2oz/+93hWyqEhGpe9dl+NwJzLKRPyPUfypmqJ pl4FqV6mRWEMKSXJr0SABSx4dNXdPSS4Jtmt+s3EYhj4z/lC0GAZrkOgLfLK/+iW17 4cGqvtr3ubklMhhirb3U2qKHJECs5j4dB1Sqg2zA= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 18/23] memory: mtk-smi: Add argument to function definition Date: Thu, 23 Jul 2020 09:37:39 +0200 Message-Id: <20200723073744.13400-19-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Fix checkpatch warning: WARNING: function definition argument 'struct device *' should also have an identifier name Signed-off-by: Krzysztof Kozlowski --- drivers/memory/mtk-smi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/memory/mtk-smi.c b/drivers/memory/mtk-smi.c index 109c7e51d551..c21262502581 100644 --- a/drivers/memory/mtk-smi.c +++ b/drivers/memory/mtk-smi.c @@ -60,7 +60,7 @@ struct mtk_smi_common_plat { struct mtk_smi_larb_gen { int port_in_larb[MTK_LARB_NR_MAX + 1]; - void (*config_port)(struct device *); + void (*config_port)(struct device *dev); unsigned int larb_direct_to_common_mask; bool has_gals; }; From patchwork Thu Jul 23 07:37:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680261 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 00982618 for ; Thu, 23 Jul 2020 07:39:36 +0000 (UTC) Received: by mail.kernel.org (Postfix) id EC50B20714; Thu, 23 Jul 2020 07:39:36 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2333E20888; Thu, 23 Jul 2020 07:39:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489976; bh=Q+VpYpLjWIwZ0g8o4mw+vEngonlHZ5dsYcy1gteiV5w=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=fEBDmx/81iUUTlDt+yRSihyz14ccJ3hurkzqj3rShk1Az4IuFlr6Vqze8o8ZbMzdH hJA7yHBIVT11ow5yNFwciEqwZTI/V8BFtIhYs5bpm08zQEyqhiJ+I3yV34H7CktEpI YYOepVrrOkkt1+dVza4c2U+8d/FQxJZOkqpV8NfE= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 19/23] memory: omap-gpmc: Enclose macro statements in do-while Date: Thu, 23 Jul 2020 09:37:40 +0200 Message-Id: <20200723073744.13400-20-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> do-while is a preferred way for complex macros because of safety reasons. This fixes checkpatch error: ERROR: Macros starting with if should be enclosed by a do - while loop to avoid possible if/else logic defects Signed-off-by: Krzysztof Kozlowski --- drivers/memory/omap-gpmc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index c158b6cae9a9..bb85aa56d247 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -635,10 +635,12 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, int max return 0; } -#define GPMC_SET_ONE_CD_MAX(reg, st, end, max, field, cd) \ - if (set_gpmc_timing_reg(cs, (reg), (st), (end), (max), \ - t->field, (cd), #field) < 0) \ - return -1 +#define GPMC_SET_ONE_CD_MAX(reg, st, end, max, field, cd) \ + do { \ + if (set_gpmc_timing_reg(cs, (reg), (st), (end), (max), \ + t->field, (cd), #field) < 0) \ + return -1; \ + } while (0) #define GPMC_SET_ONE(reg, st, end, field) \ GPMC_SET_ONE_CD_MAX(reg, st, end, 0, field, GPMC_CD_FCLK) From patchwork Thu Jul 23 07:37:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680263 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 33C6E618 for ; Thu, 23 Jul 2020 07:39:42 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 2DCCF20714; Thu, 23 Jul 2020 07:39:42 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C698208E4; Thu, 23 Jul 2020 07:39:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489982; bh=NdbmLicn3oVWIbypF/s2z0DFqecAMJ/cDEIwA0qY1Xw=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZkoGw1tiEsETe7FUzfEjLbKpYB7akIamNrOTCY16ovj+rqIlDVbvHGLRggnEyt1Ca +Lv6jbMHiV76g7WWqdXnbneyGlBbXIt6/YB2XR90DJpDsoy+gBN1dRsyANWcnLli/X TeFzPyLm1maxaU4XxNO/XV/2FlblSdxEf1ifaTO8= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 20/23] memory: omap-gpmc: Fix whitespace issue Date: Thu, 23 Jul 2020 09:37:41 +0200 Message-Id: <20200723073744.13400-21-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Fix minor whitespace issues. No functional changes. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/omap-gpmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index bb85aa56d247..dc10f55a3162 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -958,7 +958,7 @@ static int gpmc_cs_remap(int cs, u32 base) * Make sure we ignore any device offsets from the GPMC partition * allocated for the chip select and that the new base confirms * to the GPMC 16MB minimum granularity. - */ + */ base &= ~(SZ_16M - 1); gpmc_cs_get_memconf(cs, &old_base, &size); @@ -1756,7 +1756,7 @@ static int gpmc_calc_common_timings(struct gpmc_timings *gpmc_t, /* TODO: remove this function once all peripherals are confirmed to * work with generic timing. Simultaneously gpmc_cs_set_timings() * has to be modified to handle timings in ps instead of ns -*/ + */ static void gpmc_convert_ps_to_ns(struct gpmc_timings *t) { t->cs_on /= 1000; From patchwork Thu Jul 23 07:37:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680267 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9EEF1618 for ; Thu, 23 Jul 2020 07:39:47 +0000 (UTC) Received: by mail.kernel.org (Postfix) id 99C34206C1; Thu, 23 Jul 2020 07:39:47 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 84D0E206F5; Thu, 23 Jul 2020 07:39:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489987; bh=+gFjDJ7e8jqodH9leHcZ6qQN7ZQWC5AX9izX5256A2o=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=CGZDJru6XZ48EUhU5RmNl5E/jhoRB6YA/A7IrFAgGxDUy+/a0VEV4B3vpsRpZSLhL 60jcFyrCWX5wmfWJB9K4p3Nfvkcyu4EIzraehjM1DQ/p/mgZfMI0f+QmgjmnU+al1z rq0erCoFDgVgyd9dhFd9cdar7pivpHcQrPGOL47s= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 21/23] memory: pl172: Add GPLv2 SPDX license header Date: Thu, 23 Jul 2020 09:37:42 +0200 Message-Id: <20200723073744.13400-22-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Add GPLv2 license header and remove GPL boiler plate text. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/pl172.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/memory/pl172.c b/drivers/memory/pl172.c index ff57195b4e37..084891eb29cc 100644 --- a/drivers/memory/pl172.c +++ b/drivers/memory/pl172.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Memory controller driver for ARM PrimeCell PL172 * PrimeCell MultiPort Memory Controller (PL172) @@ -6,10 +7,6 @@ * * Based on: * TI AEMIF driver, Copyright (C) 2010 - 2013 Texas Instruments Inc. - * - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. */ #include From patchwork Thu Jul 23 07:37:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680269 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D51D9138C for ; Thu, 23 Jul 2020 07:39:52 +0000 (UTC) Received: by mail.kernel.org (Postfix) id CF24920714; Thu, 23 Jul 2020 07:39:52 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 19666208E4; Thu, 23 Jul 2020 07:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489992; bh=CFjeTLf3VxTPc69usAlF1x6NQjpN6H7DE6BSfcr/r54=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=aSt7bqaMoWp6nXKbr/zPcZiQShKbFDNwzgSJ8xKs4q9Nr6F/b/P4YdAVzhWRp7Obh ABl0P/B6Q7w2Y2vL2IFnUMaI7bJoHhhf1c8AqpERFX2A3K87JCsH+sQqMncHKCQQln YaA7Rb89cUn6RSB/s4IrroQGpmKrHzM44HK0QEKU= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 22/23] memory: tegra: tegra210-emc: Fix indentation Date: Thu, 23 Jul 2020 09:37:43 +0200 Message-Id: <20200723073744.13400-23-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> Use tabs instead of spaces for indentation. Signed-off-by: Krzysztof Kozlowski --- drivers/memory/tegra/tegra210-emc-cc-r21021.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/memory/tegra/tegra210-emc-cc-r21021.c b/drivers/memory/tegra/tegra210-emc-cc-r21021.c index ff55a17896fa..d60bdea3af3f 100644 --- a/drivers/memory/tegra/tegra210-emc-cc-r21021.c +++ b/drivers/memory/tegra/tegra210-emc-cc-r21021.c @@ -1044,7 +1044,7 @@ static void tegra210_emc_r21021_set_clock(struct tegra210_emc *emc, u32 clksrc) !opt_cc_short_zcal && opt_short_zcal) { value = (value & ~(EMC_ZCAL_WAIT_CNT_ZCAL_WAIT_CNT_MASK << EMC_ZCAL_WAIT_CNT_ZCAL_WAIT_CNT_SHIFT)) | - ((zq_wait_long & EMC_ZCAL_WAIT_CNT_ZCAL_WAIT_CNT_MASK) << + ((zq_wait_long & EMC_ZCAL_WAIT_CNT_ZCAL_WAIT_CNT_MASK) << EMC_MRS_WAIT_CNT_SHORT_WAIT_SHIFT); } else if (offset == EMC_ZCAL_INTERVAL && opt_zcal_en_cc) { value = 0; /* EMC_ZCAL_INTERVAL reset value. */ From patchwork Thu Jul 23 07:37:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 11680271 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0244B138C for ; Thu, 23 Jul 2020 07:39:58 +0000 (UTC) Received: by mail.kernel.org (Postfix) id F1ADD2086A; Thu, 23 Jul 2020 07:39:57 +0000 (UTC) Delivered-To: soc@kernel.org Received: from kozik-lap.mshome.net (unknown [194.230.155.213]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 31D2D22B3F; Thu, 23 Jul 2020 07:39:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595489997; bh=PGt6CmA4xQ2D8+h4rie2l8c/Z5g61AsC2PRj1+rQAAg=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hd9TwwR1akNGFEprl++W034ikBEerDEaLfUfgktacXKLlB0yX++QAGmjfK/ZvTXML oQqIVcHwcb6mig616efY5YKKRxEuMDZtyY6f/YplP5NU+ySUbbKRTS2+zdBbI4pWnX LlQfqCDVpvdPfP1DwIi/Nqw2moc9J0AZ4ZPGXxx8= From: Krzysztof Kozlowski List-Id: To: Arnd Bergmann , Olof Johansson , arm@kernel.org, soc@kernel.org, Krzysztof Kozlowski , Markus Mayer , bcm-kernel-feedback-list@broadcom.com, Florian Fainelli , Santosh Shilimkar , Matthias Brugger , Roger Quadros , Tony Lindgren , Vladimir Zapolskiy , Thierry Reding , Jonathan Hunter , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org Cc: Andrew Morton , Linus Torvalds , Greg Kroah-Hartman Subject: [PATCH 23/23] MAINTAINERS: Add Krzysztof Kozlowski as maintainer of memory controllers Date: Thu, 23 Jul 2020 09:37:44 +0200 Message-Id: <20200723073744.13400-24-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200723073744.13400-1-krzk@kernel.org> References: <20200723073744.13400-1-krzk@kernel.org> The specific drivers in drivers/memory usually go via architecture (e.g. ARM SoC) maintainers but the generic parts (of_memory.[ch]) lacked any care. Signed-off-by: Krzysztof Kozlowski Acked-by: Florian Fainelli --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f4557bc43bd5..cba0ed77775b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11158,6 +11158,13 @@ F: Documentation/core-api/boot-time-mm.rst F: include/linux/memblock.h F: mm/memblock.c +MEMORY CONTROLLER DRIVERS +M: Krzysztof Kozlowski +L: linux-kernel@vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/memory-controllers/ +F: drivers/memory/ + MEMORY FREQUENCY SCALING DRIVERS FOR NVIDIA TEGRA M: Dmitry Osipenko L: linux-pm@vger.kernel.org