Revert "mii: miiphy register address width change"

This reverts commit 5c45a22b9203351a32aec4600514341b91175542.

It causes a lot of "incompatible pointer type" warnings for a large
number of Ethernet drivers, which are not really worth fixing
especially as this patch was only supposed to help the old,
deprecated miiphy API.  Instead of adding more efforts to a lost case
we rather revert it.

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index 88747b874e1fa1729e76df282e39d137a5e5d2d6..2cc23b410a22bf38ed1d55eecf4f4915fa8e2082 100644 (file)
--- 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 short reg, unsigned short *value),
+                                  unsigned char reg, unsigned short *value),
                      int (*write)(const char *devname, unsigned char addr,
-                                   unsigned short reg, unsigned short value))
+                                   unsigned char 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 short reg,
+int miiphy_read(const char *devname, unsigned char addr, unsigned char reg,
                 unsigned short *value)
 {
        struct mii_dev *bus;
@@ -315,7 +315,7 @@ int miiphy_read(const char *devname, unsigned char addr, unsigned short reg,
  * Returns:
  *   0 on success
  */
-int miiphy_write(const char *devname, unsigned char addr, unsigned short reg,
+int miiphy_write(const char *devname, unsigned char addr, unsigned char reg,
                  unsigned short value)
 {
        struct mii_dev *bus;

diff --git a/include/miiphy.h b/include/miiphy.h
index 7ce6d1486456659c3081eae0795e2f897331bbf1..7e70cf81e4d3d49e7a171c8af50ed39cb93e0da6 100644 (file)
--- 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 short reg, unsigned short *value);
+                    unsigned char reg, unsigned short *value);
        int (*write)(const char *devname, unsigned char addr,
-                     unsigned short reg, unsigned short value);
+                     unsigned char reg, unsigned short value);
 };
 
-int miiphy_read(const char *devname, unsigned char addr, unsigned short reg,
+int miiphy_read(const char *devname, unsigned char addr, unsigned char reg,
                 unsigned short *value);
-int miiphy_write(const char *devname, unsigned char addr, unsigned short reg,
+int miiphy_write(const char *devname, unsigned char addr, unsigned char 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 short reg, unsigned short *value),
+                                  unsigned char reg, unsigned short *value),
                      int (*write)(const char *devname, unsigned char addr,
-                                   unsigned short reg, unsigned short value));
+                                   unsigned char reg, unsigned short value));
 
 int miiphy_set_current_dev(const char *devname);
 const char *miiphy_get_current_dev(void);