Merge branch 'master' of git://git.denx.de/u-boot-arm

[kernel/u-boot.git] / include / miiphy.h

diff --git a/include/miiphy.h b/include/miiphy.h
index 7ce6d14..088797e 100644 (file)
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -1,27 +1,8 @@
-/*----------------------------------------------------------------------------+
-|   This source code is dual-licensed.  You may use it under the terms of the
-|   GNU General Public License version 2, or under the license below.
-|
-|      This source code has been made available to you by IBM on an AS-IS
-|      basis.  Anyone receiving this source is licensed under IBM
-|      copyrights to use it in any way he or she deems fit, including
-|      copying it, modifying it, compiling it, and redistributing it either
-|      with or without modifications.  No license under IBM patents or
-|      patent applications is to be implied by the copyright license.
-|
-|      Any user of this software should understand that IBM cannot provide
-|      technical support for this software and will not be responsible for
-|      any consequences resulting from the use of this software.
-|
-|      Any person who transfers this source code or any derivative work
-|      must include the IBM copyright notice, this paragraph, and the
-|      preceding two paragraphs in the transferred software.
-|
-|      COPYRIGHT   I B M   CORPORATION 1999
-|      LICENSED MATERIAL  -  PROGRAM PROPERTY OF I B M
-|
-|   Additions (C) Copyright 2009 Industrie Dial Face S.p.A.
-+----------------------------------------------------------------------------*/
+/*
+ * SPDX-License-Identifier:    GPL-2.0 IBM-pibs
+ *
+ * Additions (C) Copyright 2009 Industrie Dial Face S.p.A.
+ */
 /*----------------------------------------------------------------------------+
 |
 |  File Name:  miiphy.h
@@ -42,14 +23,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 +46,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);
@@ -86,7 +67,7 @@ void mdio_list_devices(void);
 #define BB_MII_DEVNAME "bb_miiphy"
 
 struct bb_miiphy_bus {
-       char name[NAMESIZE];
+       char name[16];
        int (*init)(struct bb_miiphy_bus *bus);
        int (*mdio_active)(struct bb_miiphy_bus *bus);
        int (*mdio_tristate)(struct bb_miiphy_bus *bus);