From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Chou Date: Tue, 13 Oct 2015 21:13:09 +0800 Subject: [U-Boot] [PATCH] nios2: convert ioremap to use dm cpu data In-Reply-To: <1444012688-5142-1-git-send-email-thomas@wytron.com.tw> References: <1444012688-5142-1-git-send-email-thomas@wytron.com.tw> Message-ID: <561D0365.3000701@wytron.com.tw> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 > --- > 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)) >