From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
To: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Marek Szyprowski <m.szyprowski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
Markus Reichl <m.reichl@fivetechno.de>,
Andrzej Hajda <a.hajda@samsung.com>,
Chanwoo Choi <cw00.choi@samsung.com>,
Javier Martinez Canillas <javierm@redhat.com>,
Pankaj Dubey <pankaj.dubey@samsung.com>,
linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com
Subject: [PATCH 6/9] ARM: EXYNOS: remove soc_is_exynos*() macros
Date: Thu, 15 Nov 2018 16:11:35 +0100 [thread overview]
Message-ID: <1542294698-17470-7-git-send-email-b.zolnierkie@samsung.com> (raw)
In-Reply-To: <1542294698-17470-1-git-send-email-b.zolnierkie@samsung.com>
Remove no longer needed soc_is_exynos*() macros & co.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
---
arch/arm/mach-exynos/common.h | 71 -------------------------------------------
1 file changed, 71 deletions(-)
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 20d205e..1dfd434 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -17,81 +17,10 @@
extern bool soc_dev_is_exynos4412(void);
extern bool soc_dev_is_exynos542x(void);
-#define EXYNOS3250_SOC_ID 0xE3472000
-#define EXYNOS3_SOC_MASK 0xFFFFF000
-
-#define EXYNOS4210_CPU_ID 0x43210000
-#define EXYNOS4412_CPU_ID 0xE4412200
-#define EXYNOS4_CPU_MASK 0xFFFE0000
-
-#define EXYNOS5250_SOC_ID 0x43520000
-#define EXYNOS5410_SOC_ID 0xE5410000
-#define EXYNOS5420_SOC_ID 0xE5420000
-#define EXYNOS5800_SOC_ID 0xE5422000
-#define EXYNOS5_SOC_MASK 0xFFFFF000
-
-extern unsigned long samsung_cpu_id;
-
-#define IS_SAMSUNG_CPU(name, id, mask) \
-static inline int is_samsung_##name(void) \
-{ \
- return ((samsung_cpu_id & mask) == (id & mask)); \
-}
-
-IS_SAMSUNG_CPU(exynos3250, EXYNOS3250_SOC_ID, EXYNOS3_SOC_MASK)
-IS_SAMSUNG_CPU(exynos4210, EXYNOS4210_CPU_ID, EXYNOS4_CPU_MASK)
-IS_SAMSUNG_CPU(exynos4412, EXYNOS4412_CPU_ID, EXYNOS4_CPU_MASK)
-IS_SAMSUNG_CPU(exynos5250, EXYNOS5250_SOC_ID, EXYNOS5_SOC_MASK)
-IS_SAMSUNG_CPU(exynos5410, EXYNOS5410_SOC_ID, EXYNOS5_SOC_MASK)
-IS_SAMSUNG_CPU(exynos5420, EXYNOS5420_SOC_ID, EXYNOS5_SOC_MASK)
-IS_SAMSUNG_CPU(exynos5800, EXYNOS5800_SOC_ID, EXYNOS5_SOC_MASK)
-
-#if defined(CONFIG_SOC_EXYNOS3250)
-# define soc_is_exynos3250() is_samsung_exynos3250()
-#else
-# define soc_is_exynos3250() 0
-#endif
-
-#if defined(CONFIG_CPU_EXYNOS4210)
-# define soc_is_exynos4210() is_samsung_exynos4210()
-#else
-# define soc_is_exynos4210() 0
-#endif
-
-#if defined(CONFIG_SOC_EXYNOS4412)
-# define soc_is_exynos4412() is_samsung_exynos4412()
-#else
-# define soc_is_exynos4412() 0
-#endif
-
#define EXYNOS4210_REV_0 (0x0)
#define EXYNOS4210_REV_1_0 (0x10)
#define EXYNOS4210_REV_1_1 (0x11)
-#if defined(CONFIG_SOC_EXYNOS5250)
-# define soc_is_exynos5250() is_samsung_exynos5250()
-#else
-# define soc_is_exynos5250() 0
-#endif
-
-#if defined(CONFIG_SOC_EXYNOS5410)
-# define soc_is_exynos5410() is_samsung_exynos5410()
-#else
-# define soc_is_exynos5410() 0
-#endif
-
-#if defined(CONFIG_SOC_EXYNOS5420)
-# define soc_is_exynos5420() is_samsung_exynos5420()
-#else
-# define soc_is_exynos5420() 0
-#endif
-
-#if defined(CONFIG_SOC_EXYNOS5800)
-# define soc_is_exynos5800() is_samsung_exynos5800()
-#else
-# define soc_is_exynos5800() 0
-#endif
-
extern u32 cp15_save_diag;
extern u32 cp15_save_power;
--
1.9.1
next prev parent reply other threads:[~2018-11-15 15:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20181115151207epcas1p45adfa96d5b52e10fbb5ace76ebae5e3e@epcas1p4.samsung.com>
2018-11-15 15:11 ` [PATCH 0/9] ARM: SAMSUNG: add Exynos chipid driver Bartlomiej Zolnierkiewicz
[not found] ` <CGME20181115151211epcas2p4fdc719d354f2a732f70667ccbd8f1bae@epcas2p4.samsung.com>
2018-11-15 15:11 ` [PATCH 1/9] ARM: EXYNOS: remove secondary startup initialization from smp_prepare_cpus Bartlomiej Zolnierkiewicz
2018-11-18 14:13 ` Krzysztof Kozlowski
[not found] ` <CGME20181115151216epcas1p3413d9586bf941aa086bfc5cd620d45d9@epcas1p3.samsung.com>
2018-11-15 15:11 ` [PATCH 2/9] soc: samsung: add exynos chipid driver support Bartlomiej Zolnierkiewicz
2018-11-16 12:40 ` Krzysztof Kozlowski
[not found] ` <CGME20181115151221epcas2p17b8bbb240f70fdd7c5ecf1c0c27de35f@epcas2p1.samsung.com>
2018-11-15 15:11 ` [PATCH 3/9] ARM: EXYNOS: enable exynos_chipid for ARCH_EXYNOS Bartlomiej Zolnierkiewicz
[not found] ` <CGME20181115151225epcas2p4244fba019e0509d480f7953a05097105@epcas2p4.samsung.com>
2018-11-15 15:11 ` [PATCH 4/9] ARM64: " Bartlomiej Zolnierkiewicz
[not found] ` <CGME20181115151230epcas1p35afa7ac09774a6e6256523b3a77453c3@epcas1p3.samsung.com>
2018-11-15 15:11 ` [PATCH 5/9] ARM: EXYNOS: use chipid driver Bartlomiej Zolnierkiewicz
2018-11-16 12:24 ` Krzysztof Kozlowski
[not found] ` <CGME20181115151234epcas1p2006b64ae88567526c855869758ff8b9c@epcas1p2.samsung.com>
2018-11-15 15:11 ` Bartlomiej Zolnierkiewicz [this message]
[not found] ` <CGME20181115151238epcas2p1dd0da525c3cd2a7a4d153ced264b5b8f@epcas2p1.samsung.com>
2018-11-15 15:11 ` [PATCH 7/9] ARM: SAMSUNG: remove samsung_rev() Bartlomiej Zolnierkiewicz
[not found] ` <CGME20181115151243epcas1p382a3d1704a8ee0d1b0e0b7d214d11ec4@epcas1p3.samsung.com>
2018-11-15 15:11 ` [PATCH 8/9] ARM: SAMSUNG: remove s5p_init_cpu() Bartlomiej Zolnierkiewicz
[not found] ` <CGME20181115151247epcas2p4053da2cb28b2414156d2fd0530059c0d@epcas2p4.samsung.com>
2018-11-15 15:11 ` [PATCH 9/9] ARM: EXYNOS: remove <mach/map.h> include Bartlomiej Zolnierkiewicz
2018-11-16 12:49 ` Krzysztof Kozlowski
2018-11-16 8:58 ` [PATCH 0/9] ARM: SAMSUNG: add Exynos chipid driver Markus Reichl
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=1542294698-17470-7-git-send-email-b.zolnierkie@samsung.com \
--to=b.zolnierkie@samsung.com \
--cc=a.hajda@samsung.com \
--cc=arnd@arndb.de \
--cc=cw00.choi@samsung.com \
--cc=javierm@redhat.com \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.reichl@fivetechno.de \
--cc=m.szyprowski@samsung.com \
--cc=pankaj.dubey@samsung.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).