Skip to content

Commit 521d04e

Browse files
committed
Merge tag 'regmap-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull regmap updates from Mark Brown: "This has been a busy release for regmap with one thing and other, there's been an especially large interest in MMIO regmaps for some reason. The bulk of the changes are cleanups but there are several user visible changes too: - Support for I/O ports in regmap-mmio - Support for accelerated noinc operations in regmap-mmio - Support for tracing the register values in bulk operations" * tag 'regmap-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: mmio: replace return 0 with break in switch statement regmap: spi-avmm: Use swabXX_array() helpers regmap: mmio: Use swabXX_array() helpers swab: Add array operations regmap: trace: Remove unneeded blank lines regmap: trace: Remove explicit castings regmap: trace: Remove useless check for NULL for bulk ops regmap: mmio: Fix rebase error regmap: check right noinc bounds in debug print regmap: introduce value tracing for regmap bulk operations regmap/hexagon: Properly fix the generic IO helpers regmap: mmio: Support accelerared noinc operations regmap: Support accelerated noinc operations regmap: Make use of get_unaligned_be24(), put_unaligned_be24() regmap: mmio: Fix MMIO accessors to avoid talking to IO port regmap: mmio: Introduce IO accessors that can talk to IO port regmap: mmio: Get rid of broken 64-bit IO regmap: mmio: Remove mmio_relaxed member from context
2 parents 0baf6dc + 01ed230 commit 521d04e

File tree

7 files changed

+489
-103
lines changed

7 files changed

+489
-103
lines changed

arch/hexagon/include/asm/io.h

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,31 @@ static inline void outsl(unsigned long port, const void *buffer, int count)
308308
}
309309
}
310310

311+
/*
312+
* These defines are necessary to use the generic io.h for filling in
313+
* the missing parts of the API contract. This is because the platform
314+
* uses (inline) functions rather than defines and the generic helper
315+
* fills in the undefined.
316+
*/
317+
#define virt_to_phys virt_to_phys
318+
#define phys_to_virt phys_to_virt
319+
#define memset_io memset_io
320+
#define memcpy_fromio memcpy_fromio
321+
#define memcpy_toio memcpy_toio
322+
#define readb readb
323+
#define readw readw
324+
#define readl readl
325+
#define writeb writeb
326+
#define writew writew
327+
#define writel writel
328+
#define insb insb
329+
#define insw insw
330+
#define insl insl
331+
#define outsb outsb
332+
#define outsw outsw
333+
#define outsl outsl
334+
#include <asm-generic/io.h>
335+
311336
#endif /* __KERNEL__ */
312337

313338
#endif

0 commit comments

Comments
 (0)