From: Krzysztof Kozlowski <krzk@kernel.org>
To: Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>,
arm@kernel.org, soc@kernel.org,
Krzysztof Kozlowski <krzk@kernel.org>,
Markus Mayer <mmayer@broadcom.com>,
bcm-kernel-feedback-list@broadcom.com,
Florian Fainelli <f.fainelli@gmail.com>,
Santosh Shilimkar <ssantosh@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Roger Quadros <rogerq@ti.com>, Tony Lindgren <tony@atomide.com>,
Vladimir Zapolskiy <vz@mleia.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [RFT 04/23] memory: ti-aemif: Rename SS to SSTROBE to avoid name conflicts
Date: Thu, 23 Jul 2020 09:37:25 +0200 [thread overview]
Message-ID: <20200723073744.13400-5-krzk@kernel.org> (raw)
In-Reply-To: <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 <krzk@kernel.org>
---
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;
}
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-23 7:40 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 7:37 [RFC PATCH 00/23] memory: Cleanup, improve and compile test memory drivers Krzysztof Kozlowski
2020-07-23 7:37 ` [RFT 01/23] memory: omap-gpmc: Remove unneeded asm/mach-types.h inclusion Krzysztof Kozlowski
2020-07-23 7:37 ` [RFT 02/23] memory: omap-gpmc: Remove unused file-scope phys_base and mem_size Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 03/23] memory: omap-gpmc: Include <linux/sizes.h> for SZ_16M Krzysztof Kozlowski
2020-07-23 7:37 ` Krzysztof Kozlowski [this message]
2020-07-23 7:37 ` [PATCH 05/23] memory: Enable compile testing for most of the drivers Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 06/23] memory: of: Remove unused headers Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 07/23] memory: of: Remove __func__ in device related messages Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 08/23] memory: of: Correct indentation Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 09/23] memory: of: Remove unneeded extern from function declarations Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 10/23] memory: emif-asm-offsets: Add GPLv2 SPDX license header Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 11/23] memory: emif: Put constant in comparison on the right side Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 12/23] memory: emif: Fix whitespace coding style violations Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 13/23] memory: emif: Silence platform_get_irq() error in driver Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 14/23] memory: ti-emif-pm: Fix cast to iomem pointer Krzysztof Kozlowski
2020-07-23 8:48 ` Arnd Bergmann
2020-07-23 9:02 ` Krzysztof Kozlowski
2020-07-23 9:14 ` Arnd Bergmann
2020-07-23 10:01 ` Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 15/23] memory: renesas-rpc-if: Simplify with PTR_ERR_OR_ZERO Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 16/23] memory: brcmstb_dpfe: Constify the contents of string Krzysztof Kozlowski
2020-07-23 17:11 ` Florian Fainelli
2020-07-23 17:15 ` Markus Mayer
2020-07-23 7:37 ` [PATCH 17/23] memory: brcmstb_dpfe: Remove unneeded braces Krzysztof Kozlowski
2020-07-23 17:11 ` Florian Fainelli
2020-07-23 17:15 ` Markus Mayer
2020-07-23 7:37 ` [PATCH 18/23] memory: mtk-smi: Add argument to function definition Krzysztof Kozlowski
2020-07-23 8:50 ` Arnd Bergmann
2020-07-23 8:55 ` Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 19/23] memory: omap-gpmc: Enclose macro statements in do-while Krzysztof Kozlowski
2020-07-23 9:09 ` Arnd Bergmann
2020-07-23 10:16 ` Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 20/23] memory: omap-gpmc: Fix whitespace issue Krzysztof Kozlowski
2020-07-23 9:11 ` Arnd Bergmann
2020-07-23 10:08 ` Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 21/23] memory: pl172: Add GPLv2 SPDX license header Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 22/23] memory: tegra: tegra210-emc: Fix indentation Krzysztof Kozlowski
2020-07-23 7:37 ` [PATCH 23/23] MAINTAINERS: Add Krzysztof Kozlowski as maintainer of memory controllers Krzysztof Kozlowski
2020-07-23 17:12 ` Florian Fainelli
2020-07-24 7:15 ` Krzysztof Kozlowski
2020-07-23 7:46 ` [RFC PATCH 00/23] memory: Cleanup, improve and compile test memory drivers Greg Kroah-Hartman
2020-07-23 9:31 ` Arnd Bergmann
2020-07-23 9:52 ` Krzysztof Kozlowski
2020-07-23 10:14 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200723073744.13400-5-krzk@kernel.org \
--to=krzk@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jonathanh@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=mmayer@broadcom.com \
--cc=olof@lixom.net \
--cc=rogerq@ti.com \
--cc=soc@kernel.org \
--cc=ssantosh@kernel.org \
--cc=thierry.reding@gmail.com \
--cc=tony@atomide.com \
--cc=torvalds@linux-foundation.org \
--cc=vz@mleia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).