* [U-Boot] [PATCH] nios2: convert ioremap to use dm cpu data
@ 2015-10-05 2:38 Thomas Chou
2015-10-13 13:13 ` Thomas Chou
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Chou @ 2015-10-05 2:38 UTC (permalink / raw)
To: u-boot
Convert ioremap() to use io_region_base in dm cpu global data.
Also remove three unused io functions, which have style issue
and are replaced by macros already.
Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
arch/nios2/include/asm/io.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
index 2200dab..d0adf08 100644
--- a/arch/nios2/include/asm/io.h
+++ b/arch/nios2/include/asm/io.h
@@ -44,13 +44,10 @@ static inline phys_addr_t virt_to_phys(void * vaddr)
static inline void *ioremap(unsigned long physaddr, unsigned long size)
{
- return (void *)(IO_REGION_BASE | physaddr);
+ DECLARE_GLOBAL_DATA_PTR;
+ return (void *)(gd->arch.io_region_base | physaddr);
}
-extern unsigned char inb (unsigned char *port);
-extern unsigned short inw (unsigned short *port);
-extern unsigned inl (unsigned port);
-
#define __raw_writeb(v,a) (*(volatile unsigned char *)(a) = (v))
#define __raw_writew(v,a) (*(volatile unsigned short *)(a) = (v))
#define __raw_writel(v,a) (*(volatile unsigned int *)(a) = (v))
--
2.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [PATCH] nios2: convert ioremap to use dm cpu data
2015-10-05 2:38 [U-Boot] [PATCH] nios2: convert ioremap to use dm cpu data Thomas Chou
@ 2015-10-13 13:13 ` Thomas Chou
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Chou @ 2015-10-13 13:13 UTC (permalink / raw)
To: u-boot
On 10/05/2015 10:38 AM, Thomas Chou wrote:
> Convert ioremap() to use io_region_base in dm cpu global data.
>
> Also remove three unused io functions, which have style issue
> and are replaced by macros already.
>
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
> arch/nios2/include/asm/io.h | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
Applied to u-boot-nios.
> diff --git a/arch/nios2/include/asm/io.h b/arch/nios2/include/asm/io.h
> index 2200dab..d0adf08 100644
> --- a/arch/nios2/include/asm/io.h
> +++ b/arch/nios2/include/asm/io.h
> @@ -44,13 +44,10 @@ static inline phys_addr_t virt_to_phys(void * vaddr)
>
> static inline void *ioremap(unsigned long physaddr, unsigned long size)
> {
> - return (void *)(IO_REGION_BASE | physaddr);
> + DECLARE_GLOBAL_DATA_PTR;
> + return (void *)(gd->arch.io_region_base | physaddr);
> }
>
> -extern unsigned char inb (unsigned char *port);
> -extern unsigned short inw (unsigned short *port);
> -extern unsigned inl (unsigned port);
> -
> #define __raw_writeb(v,a) (*(volatile unsigned char *)(a) = (v))
> #define __raw_writew(v,a) (*(volatile unsigned short *)(a) = (v))
> #define __raw_writel(v,a) (*(volatile unsigned int *)(a) = (v))
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-13 13:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-05 2:38 [U-Boot] [PATCH] nios2: convert ioremap to use dm cpu data Thomas Chou
2015-10-13 13:13 ` Thomas Chou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox