diff options
Diffstat (limited to 'arch/ppc/platforms/85xx/sbc8560.c')
| -rw-r--r-- | arch/ppc/platforms/85xx/sbc8560.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c index 3dbdd73618eb..165df94d4aa6 100644 --- a/arch/ppc/platforms/85xx/sbc8560.c +++ b/arch/ppc/platforms/85xx/sbc8560.c | |||
| @@ -129,20 +129,24 @@ sbc8560_setup_arch(void) | |||
| 129 | 129 | ||
| 130 | /* setup the board related information for the enet controllers */ | 130 | /* setup the board related information for the enet controllers */ |
| 131 | pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1); | 131 | pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1); |
| 132 | pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; | 132 | if (pdata) { |
| 133 | pdata->interruptPHY = MPC85xx_IRQ_EXT6; | 133 | pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; |
| 134 | pdata->phyid = 25; | 134 | pdata->interruptPHY = MPC85xx_IRQ_EXT6; |
| 135 | /* fixup phy address */ | 135 | pdata->phyid = 25; |
| 136 | pdata->phy_reg_addr += binfo->bi_immr_base; | 136 | /* fixup phy address */ |
| 137 | memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6); | 137 | pdata->phy_reg_addr += binfo->bi_immr_base; |
| 138 | memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6); | ||
| 139 | } | ||
| 138 | 140 | ||
| 139 | pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2); | 141 | pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2); |
| 140 | pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; | 142 | if (pdata) { |
| 141 | pdata->interruptPHY = MPC85xx_IRQ_EXT7; | 143 | pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; |
| 142 | pdata->phyid = 26; | 144 | pdata->interruptPHY = MPC85xx_IRQ_EXT7; |
| 143 | /* fixup phy address */ | 145 | pdata->phyid = 26; |
| 144 | pdata->phy_reg_addr += binfo->bi_immr_base; | 146 | /* fixup phy address */ |
| 145 | memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6); | 147 | pdata->phy_reg_addr += binfo->bi_immr_base; |
| 148 | memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6); | ||
| 149 | } | ||
| 146 | 150 | ||
| 147 | #ifdef CONFIG_BLK_DEV_INITRD | 151 | #ifdef CONFIG_BLK_DEV_INITRD |
| 148 | if (initrd_start) | 152 | if (initrd_start) |