On Tue, 8 Dec 2009 09:21:41 +0100 Stefan Roese sr@denx.de wrote:
From: Reinhard Arlt reinhard.arlt@esd.eu
Remove PCI reset, if there is a monarch PMC module.
Signed-off-by: Reinhard Arlt reinhard.arlt@esd.eu Signed-off-by: Stefan Roese sr@denx.de
applied, with the below fixes merged into the same commit.
Thanks,
Kim
From 798912251cced1b5e22580351c868409a22ce991 Mon Sep 17 00:00:00 2001
From: Kim Phillips kim.phillips@freescale.com Date: Wed, 6 Jan 2010 17:43:56 -0600 Subject: [PATCH] fixes for vme pci reset patch
convert clrbits_be32 + setbits_be32 to clrsetbits_be32, use out_be32 to set gcr.
Signed-off-by: Kim Phillips kim.phillips@freescale.com --- board/esd/vme8349/pci.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/board/esd/vme8349/pci.c b/board/esd/vme8349/pci.c index 380f4fb..94fd32a 100644 --- a/board/esd/vme8349/pci.c +++ b/board/esd/vme8349/pci.c @@ -99,11 +99,9 @@ pci_init_board(void) /* * Assert/deassert VME reset */ - clrbits_be32(&immr->gpio[1].dat, GPIO2_TSI_POWERUP_RESET_N | - GPIO2_TSI_PLL_RESET_N); - setbits_be32(&immr->gpio[1].dat, GPIO2_VME_RESET_N | - GPIO2_L_RESET_EN_N); - + clrsetbits_be32(&immr->gpio[1].dat, + GPIO2_TSI_POWERUP_RESET_N | GPIO2_TSI_PLL_RESET_N, + GPIO2_VME_RESET_N | GPIO2_L_RESET_EN_N); setbits_be32(&immr->gpio[1].dir, GPIO2_TSI_PLL_RESET_N | GPIO2_TSI_POWERUP_RESET_N | GPIO2_VME_RESET_N | @@ -131,8 +129,8 @@ pci_init_board(void) /* * Release PCI RST Output signal */ - immr->pci_ctrl[0].gcr = 0; + out_be32(&immr->pci_ctrl[0].gcr, 0); udelay(2000); - immr->pci_ctrl[0].gcr = 1; + out_be32(&immr->pci_ctrl[0].gcr, 1); } }