From: Chandan Nath <chandan.nath@ti.com>
Date: Wed, 21 Sep 2011 01:10:32 +0000 (+0000)
Subject: mii: miiphy register address width change
X-Git-Tag: v2011.12-rc1~77
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5c45a22b9203351a32aec4600514341b91175542;p=u-boot

mii: miiphy register address width change

This patch is added for PHY whose register offset value exceeds 0xFF and
cannot be used with "unsigned char" datatype in miiphy_read, miiphy_write
and miiphy_register functions. Datatype of register offset is changed to
unsigned short instead of unsigned char so that offset value greater then
0xFF can be used.

Signed-off-by: Chandan Nath <chandan.nath@ti.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index 2cc23b410a..88747b874e 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -106,9 +106,9 @@ static int legacy_miiphy_write(struct mii_dev *bus, int addr, int devad,
  */
 void miiphy_register(const char *name,
 		      int (*read)(const char *devname, unsigned char addr,
-				   unsigned char reg, unsigned short *value),
+				   unsigned short reg, unsigned short *value),
 		      int (*write)(const char *devname, unsigned char addr,
-				    unsigned char reg, unsigned short value))
+				    unsigned short reg, unsigned short value))
 {
 	struct mii_dev *new_dev;
 	struct legacy_mii_dev *ldev;
@@ -287,7 +287,7 @@ static struct mii_dev *miiphy_get_active_dev(const char *devname)
  * Returns:
  *   0 on success
  */
-int miiphy_read(const char *devname, unsigned char addr, unsigned char reg,
+int miiphy_read(const char *devname, unsigned char addr, unsigned short reg,
 		 unsigned short *value)
 {
 	struct mii_dev *bus;
@@ -315,7 +315,7 @@ int miiphy_read(const char *devname, unsigned char addr, unsigned char reg,
  * Returns:
  *   0 on success
  */
-int miiphy_write(const char *devname, unsigned char addr, unsigned char reg,
+int miiphy_write(const char *devname, unsigned char addr, unsigned short reg,
 		  unsigned short value)
 {
 	struct mii_dev *bus;
diff --git a/include/miiphy.h b/include/miiphy.h
index 7e70cf81e4..7ce6d14864 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -42,14 +42,14 @@
 
 struct legacy_mii_dev {
 	int (*read)(const char *devname, unsigned char addr,
-		     unsigned char reg, unsigned short *value);
+		     unsigned short reg, unsigned short *value);
 	int (*write)(const char *devname, unsigned char addr,
-		      unsigned char reg, unsigned short value);
+		      unsigned short reg, unsigned short value);
 };
 
-int miiphy_read(const char *devname, unsigned char addr, unsigned char reg,
+int miiphy_read(const char *devname, unsigned char addr, unsigned short reg,
 		 unsigned short *value);
-int miiphy_write(const char *devname, unsigned char addr, unsigned char reg,
+int miiphy_write(const char *devname, unsigned char addr, unsigned short reg,
 		  unsigned short value);
 int miiphy_info(const char *devname, unsigned char addr, unsigned int *oui,
 		 unsigned char *model, unsigned char *rev);
@@ -65,9 +65,9 @@ void miiphy_init(void);
 
 void miiphy_register(const char *devname,
 		      int (*read)(const char *devname, unsigned char addr,
-				   unsigned char reg, unsigned short *value),
+				   unsigned short reg, unsigned short *value),
 		      int (*write)(const char *devname, unsigned char addr,
-				    unsigned char reg, unsigned short value));
+				    unsigned short reg, unsigned short value));
 
 int miiphy_set_current_dev(const char *devname);
 const char *miiphy_get_current_dev(void);