mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-02 11:11:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: smc911x: Convert IO accessors to {read,write}{w,l}()

Browse Source 
Convert the IO accessors to standard ones instead of using volatile
void pointers, as those do not cover all the bus access details.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Joe Hershberger <joe.hershberger@ni.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Marek Vasut 2020-03-15 14:42:23 +01:00 committed by marex
parent f0d73f5cd0
commit ba267c781d
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/smc911x.c
View File

@ -10,6 +10,7 @@
#include <malloc.h> #include <malloc.h>
#include <net.h> #include <net.h>
#include <miiphy.h> #include <miiphy.h>
#include <linux/io.h>
#include <linux/types.h> #include <linux/types.h>
#include "smc911x.h" #include "smc911x.h"
@ -46,23 +47,23 @@ static const struct chip_id chip_ids[] = {
#if defined (CONFIG_SMC911X_32_BIT) #if defined (CONFIG_SMC911X_32_BIT)
static u32 smc911x_reg_read(struct eth_device *dev, u32 offset) static u32 smc911x_reg_read(struct eth_device *dev, u32 offset)
{ {
return *(volatile u32*)(dev->iobase + offset); return readl(dev->iobase + offset);
} }
static void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val) static void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val)
{ {
*(volatile u32*)(dev->iobase + offset) = val; writel(val, dev->iobase + offset);
} }
#elif defined (CONFIG_SMC911X_16_BIT) #elif defined (CONFIG_SMC911X_16_BIT)
static u32 smc911x_reg_read(struct eth_device *dev, u32 offset) static u32 smc911x_reg_read(struct eth_device *dev, u32 offset)
{ {
volatile u16 *addr_16 = (u16 *)(dev->iobase + offset); return (readw(dev->iobase + offset) & 0xffff) |
return ((*addr_16 & 0x0000ffff) | (*(addr_16 + 1) << 16)); (readw(dev->iobase + offset + 2) << 16);
} }
static void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val) static void smc911x_reg_write(struct eth_device *dev, u32 offset, u32 val)
{ {
*(volatile u16 *)(dev->iobase + offset) = (u16)val; writew(val & 0xffff, dev->iobase + offset);
*(volatile u16 *)(dev->iobase + offset + 2) = (u16)(val >> 16); writew(val >> 16, dev->iobase + offset + 2);
} }
#else #else
#error "SMC911X: undefined bus width" #error "SMC911X: undefined bus width"