Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f915c9316cf1dd16a5ec4da02447656f200660f0

Authored by Wolfgang Denk
1 parent ea45cb0adc
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 2 changed files with 10 additions and 10 deletions Side-by-side Diff

... ... @@ -106,9 +106,9 @@
106 106 */
107 107 void miiphy_register(const char *name,
108 108 int (*read)(const char *devname, unsigned char addr,
109   - unsigned short reg, unsigned short *value),
  109 + unsigned char reg, unsigned short *value),
110 110 int (*write)(const char *devname, unsigned char addr,
111   - unsigned short reg, unsigned short value))
  111 + unsigned char reg, unsigned short value))
112 112 {
113 113 struct mii_dev *new_dev;
114 114 struct legacy_mii_dev *ldev;
... ... @@ -287,7 +287,7 @@
287 287 * Returns:
288 288 * 0 on success
289 289 */
290   -int miiphy_read(const char *devname, unsigned char addr, unsigned short reg,
  290 +int miiphy_read(const char *devname, unsigned char addr, unsigned char reg,
291 291 unsigned short *value)
292 292 {
293 293 struct mii_dev *bus;
... ... @@ -315,7 +315,7 @@
315 315 * Returns:
316 316 * 0 on success
317 317 */
318   -int miiphy_write(const char *devname, unsigned char addr, unsigned short reg,
  318 +int miiphy_write(const char *devname, unsigned char addr, unsigned char reg,
319 319 unsigned short value)
320 320 {
321 321 struct mii_dev *bus;
... ... @@ -42,14 +42,14 @@
42 42  
43 43 struct legacy_mii_dev {
44 44 int (*read)(const char *devname, unsigned char addr,
45   - unsigned short reg, unsigned short *value);
  45 + unsigned char reg, unsigned short *value);
46 46 int (*write)(const char *devname, unsigned char addr,
47   - unsigned short reg, unsigned short value);
  47 + unsigned char reg, unsigned short value);
48 48 };
49 49  
50   -int miiphy_read(const char *devname, unsigned char addr, unsigned short reg,
  50 +int miiphy_read(const char *devname, unsigned char addr, unsigned char reg,
51 51 unsigned short *value);
52   -int miiphy_write(const char *devname, unsigned char addr, unsigned short reg,
  52 +int miiphy_write(const char *devname, unsigned char addr, unsigned char reg,
53 53 unsigned short value);
54 54 int miiphy_info(const char *devname, unsigned char addr, unsigned int *oui,
55 55 unsigned char *model, unsigned char *rev);
56 56  
... ... @@ -65,9 +65,9 @@
65 65  
66 66 void miiphy_register(const char *devname,
67 67 int (*read)(const char *devname, unsigned char addr,
68   - unsigned short reg, unsigned short *value),
  68 + unsigned char reg, unsigned short *value),
69 69 int (*write)(const char *devname, unsigned char addr,
70   - unsigned short reg, unsigned short value));
  70 + unsigned char reg, unsigned short value));
71 71  
72 72 int miiphy_set_current_dev(const char *devname);
73 73 const char *miiphy_get_current_dev(void);