minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 20:18:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

ppc4xx: Coding style cleanup

Browse Source 
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2007-10-02 11:44:46 +02:00
parent 87c1833a39
commit 738815c0cc
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/amcc/luan/luan.c
View File

@ -81,7 +81,7 @@ int misc_init_r(void)
EPLD2_ETH_MODE_1000 | EPLD2_ETH_DUPLEX_MODE; EPLD2_ETH_MODE_1000 | EPLD2_ETH_DUPLEX_MODE;
/* clear ETHERNET_AUTO_NEGO bit to turn on autonegotiation */ /* clear ETHERNET_AUTO_NEGO bit to turn on autonegotiation */
x->ethuart &= ~EPLD2_ETH_AUTO_NEGO; x->ethuart &= ~EPLD2_ETH_AUTO_NEGO;
/* put Ethernet+PHY in reset */ /* put Ethernet+PHY in reset */
x->ethuart &= ~EPLD2_RESET_ETH_N; x->ethuart &= ~EPLD2_RESET_ETH_N;
udelay(10000); udelay(10000);

10
cpu/ppc4xx/440spe_pcie.c
View File

@ -104,7 +104,7 @@ static int pcie_read_config(struct pci_controller *hose, unsigned int devfn,
if ((!((PCI_FUNC(devfn) == 0) && (PCI_DEV(devfn) == 0))) && if ((!((PCI_FUNC(devfn) == 0) && (PCI_DEV(devfn) == 0))) &&
((PCI_BUS(devfn) == 0) || (PCI_BUS(devfn) == 1))) ((PCI_BUS(devfn) == 0) || (PCI_BUS(devfn) == 1)))
return 0; return 0;
address = pcie_get_base(hose, devfn); address = pcie_get_base(hose, devfn);
offset += devfn << 4; offset += devfn << 4;
@ -136,12 +136,12 @@ static int pcie_write_config(struct pci_controller *hose, unsigned int devfn,
int offset, int len, u32 val) { int offset, int len, u32 val) {
u8 *address; u8 *address;
/* /*
* Bus numbers are relative to hose->first_busno * Bus numbers are relative to hose->first_busno
*/ */
devfn -= PCI_BDF(hose->first_busno, 0, 0); devfn -= PCI_BDF(hose->first_busno, 0, 0);
/* /*
* Same constraints as in pcie_read_config(). * Same constraints as in pcie_read_config().
*/ */
@ -151,7 +151,7 @@ static int pcie_write_config(struct pci_controller *hose, unsigned int devfn,
if ((!((PCI_FUNC(devfn) == 0) && (PCI_DEV(devfn) == 0))) && if ((!((PCI_FUNC(devfn) == 0) && (PCI_DEV(devfn) == 0))) &&
((PCI_BUS(devfn) == 0) || (PCI_BUS(devfn) == 1))) ((PCI_BUS(devfn) == 0) || (PCI_BUS(devfn) == 1)))
return 0; return 0;
address = pcie_get_base(hose, devfn); address = pcie_get_base(hose, devfn);
offset += devfn << 4; offset += devfn << 4;
@ -926,7 +926,7 @@ void ppc440spe_setup_pcie_rootpoint(struct pci_controller *hose, int port)
in_le16((u16 *)(mbase + PCI_COMMAND)) | in_le16((u16 *)(mbase + PCI_COMMAND)) |
PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER);
printf("PCIE:%d successfully set as rootpoint\n",port); printf("PCIE:%d successfully set as rootpoint\n",port);
/* Set Device and Vendor Id */ /* Set Device and Vendor Id */
switch (port) { switch (port) {
case 0: case 0:

14
cpu/ppc4xx/4xx_enet.c
View File

@ -410,7 +410,7 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
#endif #endif
#endif #endif
#if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SPE) || defined(CONFIG_440SP) defined(CONFIG_440SP) || defined(CONFIG_440SPE)
unsigned long mfr; unsigned long mfr;
#endif #endif
@ -502,8 +502,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
__asm__ volatile ("eieio"); __asm__ volatile ("eieio");
/* reset emac so we have access to the phy */ /* reset emac so we have access to the phy */
#if defined(CONFIG_440SPE) || defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SP) defined(CONFIG_440SP) || defined(CONFIG_440SPE)
/* provide clocks for EMAC internal loopback */ /* provide clocks for EMAC internal loopback */
mfsdr (sdr_mfr, mfr); mfsdr (sdr_mfr, mfr);
mfr |= SDR0_MFR_ETH_CLK_SEL_V(devnum); mfr |= SDR0_MFR_ETH_CLK_SEL_V(devnum);
@ -521,8 +521,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
if (failsafe <= 0) if (failsafe <= 0)
printf("\nProblem resetting EMAC!\n"); printf("\nProblem resetting EMAC!\n");
#if defined(CONFIG_440SPE) || defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440SP) defined(CONFIG_440SP) || defined(CONFIG_440SPE)
/* remove clocks for EMAC internal loopback */ /* remove clocks for EMAC internal loopback */
mfsdr (sdr_mfr, mfr); mfsdr (sdr_mfr, mfr);
mfr &= ~SDR0_MFR_ETH_CLK_SEL_V(devnum); mfr &= ~SDR0_MFR_ETH_CLK_SEL_V(devnum);
@ -924,8 +924,8 @@ static int ppc_4xx_eth_init (struct eth_device *dev, bd_t * bis)
/* set speed */ /* set speed */
if (speed == _1000BASET) { if (speed == _1000BASET) {
#if defined(CONFIG_440SP) || defined(CONFIG_440SPE) || \ #if defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
defined(CONFIG_440EPX) || defined(CONFIG_440GRX) defined(CONFIG_440SP) || defined(CONFIG_440SPE)
unsigned long pfc1; unsigned long pfc1;
mfsdr (sdr_pfc1, pfc1); mfsdr (sdr_pfc1, pfc1);