diff options
author | Tom Rini <trini@ti.com> | 2014-11-11 15:49:10 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-11-11 15:49:10 -0500 |
commit | 63f7af9a4cfb4a3b9136674c6612c6d13957c2cd (patch) | |
tree | b8046bd85f78115819982cb7a587bec6e8e60250 /arch/arm/include/asm/arch-uniphier/sg-regs.h | |
parent | f888cf5d942e63f29322cd21c00f11663fbf303a (diff) | |
parent | b67932e3e72b6214cde75c7e2f796d0c70ff3ffb (diff) | |
download | blackbird-obmc-uboot-63f7af9a4cfb4a3b9136674c6612c6d13957c2cd.tar.gz blackbird-obmc-uboot-63f7af9a4cfb4a3b9136674c6612c6d13957c2cd.zip |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/include/asm/arch-uniphier/sg-regs.h')
-rw-r--r-- | arch/arm/include/asm/arch-uniphier/sg-regs.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-uniphier/sg-regs.h b/arch/arm/include/asm/arch-uniphier/sg-regs.h index 79d7ec7148..fa5e6ae0f2 100644 --- a/arch/arm/include/asm/arch-uniphier/sg-regs.h +++ b/arch/arm/include/asm/arch-uniphier/sg-regs.h @@ -88,7 +88,18 @@ #define SG_PINMON0_CLK_MODE_AXOSEL_20480KHZ (0x2 << 16) #define SG_PINMON0_CLK_MODE_AXOSEL_25000KHZ_A (0x3 << 16) -#ifndef __ASSEMBLY__ +#ifdef __ASSEMBLY__ + + .macro set_pinsel, n, value, ra, rd + ldr \ra, =SG_PINSEL_ADDR(\n) + ldr \rd, [\ra] + and \rd, \rd, #SG_PINSEL_MASK(\n) + orr \rd, \rd, #SG_PINSEL_MODE(\n, \value) + str \rd, [\ra] + .endm + +#else + #include <linux/types.h> #include <asm/io.h> |