Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm/km: redefine piggy 4 reg names to avoid conflicts

Browse Source 
Some very similar #defines for reg addresses are used in a later patch
(managed_switch support for km_arm).

Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Holger Brunck <holger.brunck@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>
master
Valentin Longchamp 13 years ago committed by Albert ARIBAUD
parent 48ced62cfb
commit c1b8514a7a
1 changed files with 11 additions and 11 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 22
      board/keymile/km_arm/km_arm.c

22
board/keymile/km_arm/km_arm.c
Unescape View File

@ -328,13 +328,13 @@ void dram_init_banksize(void)
#if (defined(CONFIG_KM_PIGGY4_88E6061)) #if (defined(CONFIG_KM_PIGGY4_88E6061))
#define PHY_LED_SEL 0x18 #define PHY_LED_SEL_REG 0x18
#define PHY_LED0_LINK (0x5) #define PHY_LED0_LINK (0x5)
#define PHY_LED1_ACT (0x8<<4) #define PHY_LED1_ACT (0x8<<4)
#define PHY_LED2_INT (0xe<<8) #define PHY_LED2_INT (0xe<<8)
#define PHY_SPEC_CTRL 0x1c #define PHY_SPEC_CTRL_REG 0x1c
#define PHY_RGMII_CLK_STABLE (0x1<<10) #define PHY_RGMII_CLK_STABLE (0x1<<10)
#define PHY_CLSA (0x1<<1) #define PHY_CLSA (0x1<<1)
/* Configure and enable MV88E3018 PHY */ /* Configure and enable MV88E3018 PHY */
void reset_phy(void) void reset_phy(void)
@ -346,15 +346,15 @@ void reset_phy(void)
return; return;
/* RGMII clk transition on data stable */ /* RGMII clk transition on data stable */
if (miiphy_read(name, CONFIG_PHY_BASE_ADR, PHY_SPEC_CTRL, &reg) != 0) if (!miiphy_read(name, CONFIG_PHY_BASE_ADR, PHY_SPEC_CTRL_REG, &reg))
printf("Error reading PHY spec ctrl reg\n"); printf("Error reading PHY spec ctrl reg\n");
if (miiphy_write(name, CONFIG_PHY_BASE_ADR, PHY_SPEC_CTRL, if (!miiphy_write(name, CONFIG_PHY_BASE_ADR, PHY_SPEC_CTRL_REG,
reg | PHY_RGMII_CLK_STABLE | PHY_CLSA) != 0) reg | PHY_RGMII_CLK_STABLE | PHY_CLSA))
printf("Error writing PHY spec ctrl reg\n"); printf("Error writing PHY spec ctrl reg\n");
/* leds setup */ /* leds setup */
if (miiphy_write(name, CONFIG_PHY_BASE_ADR, PHY_LED_SEL, if (!miiphy_write(name, CONFIG_PHY_BASE_ADR, PHY_LED_SEL_REG,
PHY_LED0_LINK | PHY_LED1_ACT | PHY_LED2_INT) != 0) PHY_LED0_LINK | PHY_LED1_ACT | PHY_LED2_INT))
printf("Error writing PHY LED reg\n"); printf("Error writing PHY LED reg\n");
/* reset the phy */ /* reset the phy */

Write Preview
Loading…
Cancel
Save