mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 06/25] ARM: asm/io.h: fall back to <asm-generic/bitio.h> out_be32 and friends
Date: Tue,  2 Jun 2020 10:53:53 +0200	[thread overview]
Message-ID: <20200602085412.16554-7-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20200602085412.16554-1-a.fatoum@pengutronix.de>

With the generic implementations in place in <asm-generic/bitio.h>, we can
drop the now-duplicate ARM definitions.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/arm/include/asm/io.h | 58 +--------------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 56db5463410e..072b47317c03 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -4,6 +4,7 @@
 #define	IO_SPACE_LIMIT	0
 
 #include <asm-generic/io.h>
+#include <asm-generic/bitio.h>
 
 /*
  * String version of IO memory access ops:
@@ -12,63 +13,6 @@ extern void memcpy_fromio(void *, const volatile void __iomem *, size_t);
 extern void memcpy_toio(volatile void __iomem *, const void *, size_t);
 extern void memset_io(volatile void __iomem *, int, size_t);
 
-/*
- * Clear and set bits in one shot. These macros can be used to clear and
- * set multiple bits in a register using a single call. These macros can
- * also be used to set a multiple-bit bit pattern using a mask, by
- * specifying the mask in the 'clear' parameter and the new bit pattern
- * in the 'set' parameter.
- */
-
-#define out_arch(type,endian,a,v)	__raw_write##type(cpu_to_##endian(v),a)
-#define in_arch(type,endian,a)		endian##_to_cpu(__raw_read##type(a))
-
-#define out_le64(a,v)	out_arch(q,le64,a,v)
-#define out_le32(a,v)	out_arch(l,le32,a,v)
-#define out_le16(a,v)	out_arch(w,le16,a,v)
-
-#define in_le64(a)	in_arch(q,le64,a)
-#define in_le32(a)	in_arch(l,le32,a)
-#define in_le16(a)	in_arch(w,le16,a)
-
-#define out_be32(a,v)	out_arch(l,be32,a,v)
-#define out_be16(a,v)	out_arch(w,be16,a,v)
-
-#define in_be32(a)	in_arch(l,be32,a)
-#define in_be16(a)	in_arch(w,be16,a)
-
-#define out_8(a,v)	__raw_writeb(v,a)
-#define in_8(a)		__raw_readb(a)
-
-#define clrbits(type, addr, clear) \
-	out_##type((addr), in_##type(addr) & ~(clear))
-
-#define setbits(type, addr, set) \
-	out_##type((addr), in_##type(addr) | (set))
-
-#define clrsetbits(type, addr, clear, set) \
-	out_##type((addr), (in_##type(addr) & ~(clear)) | (set))
-
-#define clrbits_be32(addr, clear) clrbits(be32, addr, clear)
-#define setbits_be32(addr, set) setbits(be32, addr, set)
-#define clrsetbits_be32(addr, clear, set) clrsetbits(be32, addr, clear, set)
-
-#define clrbits_le32(addr, clear) clrbits(le32, addr, clear)
-#define setbits_le32(addr, set) setbits(le32, addr, set)
-#define clrsetbits_le32(addr, clear, set) clrsetbits(le32, addr, clear, set)
-
-#define clrbits_be16(addr, clear) clrbits(be16, addr, clear)
-#define setbits_be16(addr, set) setbits(be16, addr, set)
-#define clrsetbits_be16(addr, clear, set) clrsetbits(be16, addr, clear, set)
-
-#define clrbits_le16(addr, clear) clrbits(le16, addr, clear)
-#define setbits_le16(addr, set) setbits(le16, addr, set)
-#define clrsetbits_le16(addr, clear, set) clrsetbits(le16, addr, clear, set)
-
-#define clrbits_8(addr, clear) clrbits(8, addr, clear)
-#define setbits_8(addr, set) setbits(8, addr, set)
-#define clrsetbits_8(addr, clear, set) clrsetbits(8, addr, clear, set)
-
 static inline void *phys_to_virt(unsigned long phys)
 {
 	return (void *)phys;
-- 
2.27.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2020-06-02  8:54 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-02  8:53 [PATCH v2 00/25] sandbox: support COMPILE_TESTing drivers Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 01/25] scripts: import Linux Kconfig.include Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 02/25] sandbox: define CONFIG_64BIT as appropriate Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 03/25] sandbox: asm: bitsperlong.h: detect bitness according to 64BIT symbol Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 04/25] sandbox: support forcing 32-bit x86 Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 05/25] include: asm-generic: provide (in|out)_(le|be)(16|32) helpers for all archs Ahmad Fatoum
2020-06-02  8:53 ` Ahmad Fatoum [this message]
2020-06-02  8:53 ` [PATCH v2 07/25] sandbox: <asm/io.h>: include bitio accessors Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 08/25] clocksource: arm_global_timer.c: remove unused asm/ header Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 09/25] mtd: nand: orion: depend on ARM Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 10/25] ddr: fsl: " Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 11/25] net: fec_imx: depend on HAS_DMA Ahmad Fatoum
2020-06-02  8:53 ` [PATCH v2 12/25] net: macb: " Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 13/25] sandbox: implement stub physical virtual translation Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 14/25] sandbox: asm: implement stub DMA functions Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 15/25] sandbox: select HAS_DMA Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 16/25] ARM: atomic.h: move generic implementation to asm-generic Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 17/25] include: <asm-generic/atomic.h>: remove stub IRQ save/restore Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 18/25] sandbox: asm: implement <asm/atomic.h> Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 19/25] usb: xhci-hcd: remove unused #include <asm/cache.h> Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 20/25] usb: xhci-hcd: replace opencoded non-atomic 64-bit MMIO with lo_hi helper Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 21/25] include: bitops: fix dead increment in fls() and ffs() Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 22/25] commands: tftp: drop unused variable Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 23/25] commands: test: drop dead assignment Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 24/25] sandbox: os: add_image: fix memory leak Ahmad Fatoum
2020-06-02  8:54 ` [PATCH v2 25/25] mtd: nand: base: fix use of uninitialized struct member Ahmad Fatoum
2020-06-03  8:04 ` [PATCH v2 00/25] sandbox: support COMPILE_TESTing drivers Sascha Hauer

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=20200602085412.16554-7-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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