diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-08-13 13:48:57 +0000 | 
|---|---|---|
| committer | Andy Fleming <afleming@freescale.com> | 2012-08-23 10:24:18 -0500 | 
| commit | a2af6a7a84c32ee3c1500000d2a0238052a4f5e1 (patch) | |
| tree | 09b865541631d9c81786dc3f2b0cad53bcd28af9 | |
| parent | ae6beb24d7589f1b8b7aa3519afb3c7cdf8e66e5 (diff) | |
| download | olio-uboot-2014.01-a2af6a7a84c32ee3c1500000d2a0238052a4f5e1.tar.xz olio-uboot-2014.01-a2af6a7a84c32ee3c1500000d2a0238052a4f5e1.zip | |
mpc85xx: use LCRR_DBYP define instead of raw constant
Using the raw value of 0x80000000 directly in the code can
lead to "count the zeros" bugs like that fixed in commit
718e9d13b98 ("MPC85xxCDS: Fix missing LCRR_DBYP bits for
66-133MHz LBC")
Change all existing raw values to use the symbolic value of
LCRR_DBYP instead.
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
| -rw-r--r-- | board/freescale/mpc8540ads/mpc8540ads.c | 6 | ||||
| -rw-r--r-- | board/freescale/mpc8541cds/mpc8541cds.c | 6 | ||||
| -rw-r--r-- | board/freescale/mpc8555cds/mpc8555cds.c | 6 | ||||
| -rw-r--r-- | board/freescale/mpc8560ads/mpc8560ads.c | 6 | 
4 files changed, 12 insertions, 12 deletions
| diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c index c75585e28..a275d3a07 100644 --- a/board/freescale/mpc8540ads/mpc8540ads.c +++ b/board/freescale/mpc8540ads/mpc8540ads.c @@ -87,10 +87,10 @@ local_bus_init(void)  	lbc_hz = sysinfo.freqSystemBus / 1000000 / clkdiv;  	if (lbc_hz < 66) { -		lbc->lcrr = CONFIG_SYS_LBC_LCRR | 0x80000000;	/* DLL Bypass */ +		lbc->lcrr = CONFIG_SYS_LBC_LCRR | LCRR_DBYP;	/* DLL Bypass */  	} else if (lbc_hz >= 133) { -		lbc->lcrr = CONFIG_SYS_LBC_LCRR & (~0x80000000); /* DLL Enabled */ +		lbc->lcrr = CONFIG_SYS_LBC_LCRR & (~LCRR_DBYP); /* DLL Enabled */  	} else {  		/* @@ -105,7 +105,7 @@ local_bus_init(void)  			lbc->lcrr = 0x10000004;  		} -		lbc->lcrr = CONFIG_SYS_LBC_LCRR & (~0x80000000); /* DLL Enabled */ +		lbc->lcrr = CONFIG_SYS_LBC_LCRR & (~LCRR_DBYP); /* DLL Enabled */  		udelay(200);  		/* diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c index 532d32ac7..13ca84b65 100644 --- a/board/freescale/mpc8541cds/mpc8541cds.c +++ b/board/freescale/mpc8541cds/mpc8541cds.c @@ -269,13 +269,13 @@ local_bus_init(void)  	lbc_hz = sysinfo.freqSystemBus / 1000000 / clkdiv;  	if (lbc_hz < 66) { -		lbc->lcrr |= 0x80000000;	/* DLL Bypass */ +		lbc->lcrr |= LCRR_DBYP;	/* DLL Bypass */  	} else if (lbc_hz >= 133) { -		lbc->lcrr &= (~0x80000000);		/* DLL Enabled */ +		lbc->lcrr &= (~LCRR_DBYP);		/* DLL Enabled */  	} else { -		lbc->lcrr &= (~0x80000000);	/* DLL Enabled */ +		lbc->lcrr &= (~LCRR_DBYP);	/* DLL Enabled */  		udelay(200);  		/* diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c index 3361614de..4cfd61cdd 100644 --- a/board/freescale/mpc8555cds/mpc8555cds.c +++ b/board/freescale/mpc8555cds/mpc8555cds.c @@ -267,13 +267,13 @@ local_bus_init(void)  	lbc_hz = sysinfo.freqSystemBus / 1000000 / clkdiv;  	if (lbc_hz < 66) { -		lbc->lcrr |= 0x80000000;	/* DLL Bypass */ +		lbc->lcrr |= LCRR_DBYP;	/* DLL Bypass */  	} else if (lbc_hz >= 133) { -		lbc->lcrr &= (~0x80000000);		/* DLL Enabled */ +		lbc->lcrr &= (~LCRR_DBYP);		/* DLL Enabled */  	} else { -		lbc->lcrr &= (~0x80000000);	/* DLL Enabled */ +		lbc->lcrr &= (~LCRR_DBYP);	/* DLL Enabled */  		udelay(200);  		/* diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c index 1a165bff8..285edbce6 100644 --- a/board/freescale/mpc8560ads/mpc8560ads.c +++ b/board/freescale/mpc8560ads/mpc8560ads.c @@ -292,10 +292,10 @@ local_bus_init(void)  	lbc_hz = sysinfo.freqSystemBus / 1000000 / clkdiv;  	if (lbc_hz < 66) { -		lbc->lcrr = CONFIG_SYS_LBC_LCRR | 0x80000000;	/* DLL Bypass */ +		lbc->lcrr = CONFIG_SYS_LBC_LCRR | LCRR_DBYP;	/* DLL Bypass */  	} else if (lbc_hz >= 133) { -		lbc->lcrr = CONFIG_SYS_LBC_LCRR & (~0x80000000); /* DLL Enabled */ +		lbc->lcrr = CONFIG_SYS_LBC_LCRR & (~LCRR_DBYP); /* DLL Enabled */  	} else {  		/* @@ -310,7 +310,7 @@ local_bus_init(void)  			lbc->lcrr = 0x10000004;  		} -		lbc->lcrr = CONFIG_SYS_LBC_LCRR & (~0x80000000);/* DLL Enabled */ +		lbc->lcrr = CONFIG_SYS_LBC_LCRR & (~LCRR_DBYP);/* DLL Enabled */  		udelay(200);  		/* |