Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NAND FSL elbc: Use virt_to_phys to determine which bank is in use

Browse source 
The current code that determines which bank/chipselect is used for a
given NAND instance only worked for 32-bit addresses and assumed
a 1:1 mapping.  This breaks in 36-bit physical configs.

The proper way to handle this is to use the virt_to_phys() and
BR_PHYS_ADDR() routinues to match the 34-bit lbc bus address
with the the virtual address the NAND code uses.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Kumar Gala 2008-12-16 14:59:22 -06:00 committed by Andrew Fleming-AFLEMING
parent 77c8115b1f
commit 9d94aff699
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/mtd/nand/fsl_elbc_nand.c
View file

@ -718,7 +718,7 @@ static void fsl_elbc_ctrl_init(void)
int board_nand_init(struct nand_chip *nand) int board_nand_init(struct nand_chip *nand)
{ {
struct fsl_elbc_mtd *priv; struct fsl_elbc_mtd *priv;
uint32_t br, or; uint32_t br = 0, or = 0;
if (!elbc_ctrl) { if (!elbc_ctrl) {
fsl_elbc_ctrl_init(); fsl_elbc_ctrl_init();
@ -737,11 +737,13 @@ int board_nand_init(struct nand_chip *nand)
* if we could pass more than one datum to the NAND driver... * if we could pass more than one datum to the NAND driver...
*/ */
for (priv->bank = 0; priv->bank < MAX_BANKS; priv->bank++) { for (priv->bank = 0; priv->bank < MAX_BANKS; priv->bank++) {
phys_addr_t base_addr = virt_to_phys(nand->IO_ADDR_R);
br = in_be32(&elbc_ctrl->regs->bank[priv->bank].br); br = in_be32(&elbc_ctrl->regs->bank[priv->bank].br);
or = in_be32(&elbc_ctrl->regs->bank[priv->bank].or); or = in_be32(&elbc_ctrl->regs->bank[priv->bank].or);
if ((br & BR_V) && (br & BR_MSEL) == BR_MS_FCM && if ((br & BR_V) && (br & BR_MSEL) == BR_MS_FCM &&
(br & or & BR_BA) == (phys_addr_t)nand->IO_ADDR_R) (br & or & BR_BA) == BR_PHYS_ADDR(base_addr))
break; break;
} }