Merge branch 'bcmring/cleanup' into bcmring/removal
Doing a large-scale cleaning and removing the platform in another branch don't mix well, so do the trivial merge here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
25e4b485fb
|
@ -1,13 +0,0 @@
|
|||
#ifndef _CFG_GLOBAL_H_
|
||||
#define _CFG_GLOBAL_H_
|
||||
|
||||
#include <cfg_global_defines.h>
|
||||
|
||||
#define CFG_GLOBAL_CHIP BCM11107
|
||||
#define CFG_GLOBAL_CHIP_FAMILY CFG_GLOBAL_CHIP_FAMILY_BCMRING
|
||||
#define CFG_GLOBAL_CHIP_REV 0xB0
|
||||
#define CFG_GLOBAL_RAM_SIZE 0x10000000
|
||||
#define CFG_GLOBAL_RAM_BASE 0x00000000
|
||||
#define CFG_GLOBAL_RAM_RESERVED_SIZE 0x000000
|
||||
|
||||
#endif /* _CFG_GLOBAL_H_ */
|
|
@ -1,35 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef CSP_CACHE_H
|
||||
#define CSP_CACHE_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#include <csp/stdint.h>
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
|
||||
#if defined(__KERNEL__) && !defined(STANDALONE)
|
||||
#include <asm/cacheflush.h>
|
||||
|
||||
#define CSP_CACHE_FLUSH_ALL flush_cache_all()
|
||||
|
||||
#else
|
||||
|
||||
#define CSP_CACHE_FLUSH_ALL
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* CSP_CACHE_H */
|
|
@ -1,36 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
#ifndef CSP_DELAY_H
|
||||
#define CSP_DELAY_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
/* Some CSP routines require use of the following delay routines. Use the OS */
|
||||
/* version if available, otherwise use a CSP specific definition. */
|
||||
/* void udelay(unsigned long usecs); */
|
||||
/* void mdelay(unsigned long msecs); */
|
||||
|
||||
#if defined(__KERNEL__) && !defined(STANDALONE)
|
||||
#include <linux/delay.h>
|
||||
#else
|
||||
#include <mach/csp/delay.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
#endif /* CSP_DELAY_H */
|
|
@ -1,32 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef CSP_ERRNO_H
|
||||
#define CSP_ERRNO_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#if defined(__KERNEL__)
|
||||
#include <linux/errno.h>
|
||||
#elif defined(CSP_SIMULATION)
|
||||
#include <asm-generic/errno.h>
|
||||
#else
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
#endif /* CSP_ERRNO_H */
|
|
@ -1,40 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @file intcHw.h
|
||||
*
|
||||
* @brief generic interrupt controller API
|
||||
*
|
||||
* @note
|
||||
* None
|
||||
*/
|
||||
/****************************************************************************/
|
||||
|
||||
#ifndef _INTCHW_H
|
||||
#define _INTCHW_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <mach/csp/intcHw_reg.h>
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
static inline void intcHw_irq_disable(void *basep, uint32_t mask);
|
||||
static inline void intcHw_irq_enable(void *basep, uint32_t mask);
|
||||
|
||||
#endif /* _INTCHW_H */
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
#ifndef CSP_MODULE_H
|
||||
#define CSP_MODULE_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/module.h>
|
||||
#else
|
||||
#define EXPORT_SYMBOL(symbol)
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
|
||||
#endif /* CSP_MODULE_H */
|
|
@ -1,65 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2004 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @file secHw.h
|
||||
*
|
||||
* @brief Definitions for accessing low level security features
|
||||
*
|
||||
*/
|
||||
/****************************************************************************/
|
||||
#ifndef SECHW_H
|
||||
#define SECHW_H
|
||||
|
||||
typedef void (*secHw_FUNC_t) (void);
|
||||
|
||||
typedef enum {
|
||||
secHw_MODE_SECURE = 0x0, /* Switches processor into secure mode */
|
||||
secHw_MODE_NONSECURE = 0x1 /* Switches processor into non-secure mode */
|
||||
} secHw_MODE;
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @brief Requesting to execute the function in secure mode
|
||||
*
|
||||
* This function requests the given function to run in secure mode
|
||||
*
|
||||
*/
|
||||
/****************************************************************************/
|
||||
void secHw_RunSecure(secHw_FUNC_t /* Function to run in secure mode */
|
||||
);
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @brief Sets the mode
|
||||
*
|
||||
* his function sets the processor mode (secure/non-secure)
|
||||
*
|
||||
*/
|
||||
/****************************************************************************/
|
||||
void secHw_SetMode(secHw_MODE /* Processor mode */
|
||||
);
|
||||
|
||||
/****************************************************************************/
|
||||
/**
|
||||
* @brief Get the current mode
|
||||
*
|
||||
* This function retieves the processor mode (secure/non-secure)
|
||||
*
|
||||
*/
|
||||
/****************************************************************************/
|
||||
void secHw_GetMode(secHw_MODE *);
|
||||
|
||||
#endif /* SECHW_H */
|
|
@ -1,30 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef CSP_STDINT_H
|
||||
#define CSP_STDINT_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/types.h>
|
||||
#else
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
#endif /* CSP_STDINT_H */
|
|
@ -1,34 +0,0 @@
|
|||
/*****************************************************************************
|
||||
* Copyright 2003 - 2008 Broadcom Corporation. All rights reserved.
|
||||
*
|
||||
* Unless you and Broadcom execute a separate written software license
|
||||
* agreement governing use of this software, this software is licensed to you
|
||||
* under the terms of the GNU General Public License version 2, available at
|
||||
* http://www.broadcom.com/licenses/GPLv2.php (the "GPL").
|
||||
*
|
||||
* Notwithstanding the above, under no circumstances may you combine this
|
||||
* software in any way with any other Broadcom software provided under a
|
||||
* license other than the GPL, without Broadcom's express prior written
|
||||
* consent.
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
|
||||
#ifndef CSP_STRING_H
|
||||
#define CSP_STRING_H
|
||||
|
||||
/* ---- Include Files ---------------------------------------------------- */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/string.h>
|
||||
#else
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
/* ---- Public Constants and Types --------------------------------------- */
|
||||
/* ---- Public Variable Externs ------------------------------------------ */
|
||||
/* ---- Public Function Prototypes --------------------------------------- */
|
||||
|
||||
|
||||
#endif /* CSP_STRING_H */
|
||||
|
|
@ -249,20 +249,20 @@ static int nand_dev_ready(struct mtd_info *mtd)
|
|||
int bcm_umi_nand_inithw(void)
|
||||
{
|
||||
/* Configure nand timing parameters */
|
||||
REG_UMI_NAND_TCR &= ~0x7ffff;
|
||||
REG_UMI_NAND_TCR |= HW_CFG_NAND_TCR;
|
||||
writel(readl(®_UMI_NAND_TCR) & ~0x7ffff, ®_UMI_NAND_TCR);
|
||||
writel(readl(®_UMI_NAND_TCR) | HW_CFG_NAND_TCR, ®_UMI_NAND_TCR);
|
||||
|
||||
#if !defined(CONFIG_MTD_NAND_BCM_UMI_HWCS)
|
||||
/* enable software control of CS */
|
||||
REG_UMI_NAND_TCR |= REG_UMI_NAND_TCR_CS_SWCTRL;
|
||||
writel(readl(®_UMI_NAND_TCR) | REG_UMI_NAND_TCR_CS_SWCTRL, ®_UMI_NAND_TCR);
|
||||
#endif
|
||||
|
||||
/* keep NAND chip select asserted */
|
||||
REG_UMI_NAND_RCSR |= REG_UMI_NAND_RCSR_CS_ASSERTED;
|
||||
writel(readl(®_UMI_NAND_RCSR) | REG_UMI_NAND_RCSR_CS_ASSERTED, ®_UMI_NAND_RCSR);
|
||||
|
||||
REG_UMI_NAND_TCR &= ~REG_UMI_NAND_TCR_WORD16;
|
||||
writel(readl(®_UMI_NAND_TCR) & ~REG_UMI_NAND_TCR_WORD16, ®_UMI_NAND_TCR);
|
||||
/* enable writes to flash */
|
||||
REG_UMI_MMD_ICR |= REG_UMI_MMD_ICR_FLASH_WP;
|
||||
writel(readl(®_UMI_MMD_ICR) | REG_UMI_MMD_ICR_FLASH_WP, ®_UMI_MMD_ICR);
|
||||
|
||||
writel(NAND_CMD_RESET, bcm_umi_io_base + REG_NAND_CMD_OFFSET);
|
||||
nand_bcm_umi_wait_till_ready();
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
/* ---- Include Files ---------------------------------------------------- */
|
||||
#include <mach/reg_umi.h>
|
||||
#include <mach/reg_nand.h>
|
||||
#include <cfg_global.h>
|
||||
#include <mach/cfg_global.h>
|
||||
|
||||
/* ---- Constants and Types ---------------------------------------------- */
|
||||
#if (CFG_GLOBAL_CHIP_FAMILY == CFG_GLOBAL_CHIP_FAMILY_BCMRING)
|
||||
|
@ -48,7 +48,7 @@ int nand_bcm_umi_bch_correct_page(uint8_t *datap, uint8_t *readEccData,
|
|||
/* Check in device is ready */
|
||||
static inline int nand_bcm_umi_dev_ready(void)
|
||||
{
|
||||
return REG_UMI_NAND_RCSR & REG_UMI_NAND_RCSR_RDY;
|
||||
return readl(®_UMI_NAND_RCSR) & REG_UMI_NAND_RCSR_RDY;
|
||||
}
|
||||
|
||||
/* Wait until device is ready */
|
||||
|
@ -62,10 +62,11 @@ static inline void nand_bcm_umi_wait_till_ready(void)
|
|||
static inline void nand_bcm_umi_hamming_enable_hwecc(void)
|
||||
{
|
||||
/* disable and reset ECC, 512 byte page */
|
||||
REG_UMI_NAND_ECC_CSR &= ~(REG_UMI_NAND_ECC_CSR_ECC_ENABLE |
|
||||
REG_UMI_NAND_ECC_CSR_256BYTE);
|
||||
writel(readl(®_UMI_NAND_ECC_CSR) & ~(REG_UMI_NAND_ECC_CSR_ECC_ENABLE |
|
||||
REG_UMI_NAND_ECC_CSR_256BYTE), ®_UMI_NAND_ECC_CSR);
|
||||
/* enable ECC */
|
||||
REG_UMI_NAND_ECC_CSR |= REG_UMI_NAND_ECC_CSR_ECC_ENABLE;
|
||||
writel(readl(®_UMI_NAND_ECC_CSR) | REG_UMI_NAND_ECC_CSR_ECC_ENABLE,
|
||||
®_UMI_NAND_ECC_CSR);
|
||||
}
|
||||
|
||||
#if NAND_ECC_BCH
|
||||
|
@ -76,18 +77,18 @@ static inline void nand_bcm_umi_hamming_enable_hwecc(void)
|
|||
static inline void nand_bcm_umi_bch_enable_read_hwecc(void)
|
||||
{
|
||||
/* disable and reset ECC */
|
||||
REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_RD_ECC_VALID;
|
||||
writel(REG_UMI_BCH_CTRL_STATUS_RD_ECC_VALID, ®_UMI_BCH_CTRL_STATUS);
|
||||
/* Turn on ECC */
|
||||
REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN;
|
||||
writel(REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN, ®_UMI_BCH_CTRL_STATUS);
|
||||
}
|
||||
|
||||
/* Enable BCH Write ECC */
|
||||
static inline void nand_bcm_umi_bch_enable_write_hwecc(void)
|
||||
{
|
||||
/* disable and reset ECC */
|
||||
REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID;
|
||||
writel(REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID, ®_UMI_BCH_CTRL_STATUS);
|
||||
/* Turn on ECC */
|
||||
REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_ECC_WR_EN;
|
||||
writel(REG_UMI_BCH_CTRL_STATUS_ECC_WR_EN, ®_UMI_BCH_CTRL_STATUS);
|
||||
}
|
||||
|
||||
/* Config number of BCH ECC bytes */
|
||||
|
@ -99,9 +100,9 @@ static inline void nand_bcm_umi_bch_config_ecc(uint8_t numEccBytes)
|
|||
uint32_t numBits = numEccBytes * 8;
|
||||
|
||||
/* disable and reset ECC */
|
||||
REG_UMI_BCH_CTRL_STATUS =
|
||||
REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID |
|
||||
REG_UMI_BCH_CTRL_STATUS_RD_ECC_VALID;
|
||||
writel(REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID |
|
||||
REG_UMI_BCH_CTRL_STATUS_RD_ECC_VALID,
|
||||
®_UMI_BCH_CTRL_STATUS);
|
||||
|
||||
/* Every correctible bit requires 13 ECC bits */
|
||||
tValue = (uint32_t) (numBits / ECC_BITS_PER_CORRECTABLE_BIT);
|
||||
|
@ -113,23 +114,21 @@ static inline void nand_bcm_umi_bch_config_ecc(uint8_t numEccBytes)
|
|||
kValue = nValue - (tValue * ECC_BITS_PER_CORRECTABLE_BIT);
|
||||
|
||||
/* Write the settings */
|
||||
REG_UMI_BCH_N = nValue;
|
||||
REG_UMI_BCH_T = tValue;
|
||||
REG_UMI_BCH_K = kValue;
|
||||
writel(nValue, ®_UMI_BCH_N);
|
||||
writel(tValue, ®_UMI_BCH_T);
|
||||
writel(kValue, ®_UMI_BCH_K);
|
||||
}
|
||||
|
||||
/* Pause during ECC read calculation to skip bytes in OOB */
|
||||
static inline void nand_bcm_umi_bch_pause_read_ecc_calc(void)
|
||||
{
|
||||
REG_UMI_BCH_CTRL_STATUS =
|
||||
REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN |
|
||||
REG_UMI_BCH_CTRL_STATUS_PAUSE_ECC_DEC;
|
||||
writel(REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN | REG_UMI_BCH_CTRL_STATUS_PAUSE_ECC_DEC, ®_UMI_BCH_CTRL_STATUS);
|
||||
}
|
||||
|
||||
/* Resume during ECC read calculation after skipping bytes in OOB */
|
||||
static inline void nand_bcm_umi_bch_resume_read_ecc_calc(void)
|
||||
{
|
||||
REG_UMI_BCH_CTRL_STATUS = REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN;
|
||||
writel(REG_UMI_BCH_CTRL_STATUS_ECC_RD_EN, ®_UMI_BCH_CTRL_STATUS);
|
||||
}
|
||||
|
||||
/* Poll read ECC calc to check when hardware completes */
|
||||
|
@ -139,7 +138,7 @@ static inline uint32_t nand_bcm_umi_bch_poll_read_ecc_calc(void)
|
|||
|
||||
do {
|
||||
/* wait for ECC to be valid */
|
||||
regVal = REG_UMI_BCH_CTRL_STATUS;
|
||||
regVal = readl(®_UMI_BCH_CTRL_STATUS);
|
||||
} while ((regVal & REG_UMI_BCH_CTRL_STATUS_RD_ECC_VALID) == 0);
|
||||
|
||||
return regVal;
|
||||
|
@ -149,7 +148,7 @@ static inline uint32_t nand_bcm_umi_bch_poll_read_ecc_calc(void)
|
|||
static inline void nand_bcm_umi_bch_poll_write_ecc_calc(void)
|
||||
{
|
||||
/* wait for ECC to be valid */
|
||||
while ((REG_UMI_BCH_CTRL_STATUS & REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID)
|
||||
while ((readl(®_UMI_BCH_CTRL_STATUS) & REG_UMI_BCH_CTRL_STATUS_WR_ECC_VALID)
|
||||
== 0)
|
||||
;
|
||||
}
|
||||
|
@ -170,9 +169,9 @@ static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
|
|||
if (pageSize != NAND_DATA_ACCESS_SIZE) {
|
||||
/* skip BI */
|
||||
#if defined(__KERNEL__) && !defined(STANDALONE)
|
||||
*oobp++ = REG_NAND_DATA8;
|
||||
*oobp++ = readb(®_NAND_DATA8);
|
||||
#else
|
||||
REG_NAND_DATA8;
|
||||
readb(®_NAND_DATA8);
|
||||
#endif
|
||||
numToRead--;
|
||||
}
|
||||
|
@ -180,9 +179,9 @@ static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
|
|||
while (numToRead > numEccBytes) {
|
||||
/* skip free oob region */
|
||||
#if defined(__KERNEL__) && !defined(STANDALONE)
|
||||
*oobp++ = REG_NAND_DATA8;
|
||||
*oobp++ = readb(®_NAND_DATA8);
|
||||
#else
|
||||
REG_NAND_DATA8;
|
||||
readb(®_NAND_DATA8);
|
||||
#endif
|
||||
numToRead--;
|
||||
}
|
||||
|
@ -193,11 +192,11 @@ static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
|
|||
|
||||
while (numToRead > 11) {
|
||||
#if defined(__KERNEL__) && !defined(STANDALONE)
|
||||
*oobp = REG_NAND_DATA8;
|
||||
*oobp = readb(®_NAND_DATA8);
|
||||
eccCalc[eccPos++] = *oobp;
|
||||
oobp++;
|
||||
#else
|
||||
eccCalc[eccPos++] = REG_NAND_DATA8;
|
||||
eccCalc[eccPos++] = readb(®_NAND_DATA8);
|
||||
#endif
|
||||
numToRead--;
|
||||
}
|
||||
|
@ -207,9 +206,9 @@ static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
|
|||
if (numToRead == 11) {
|
||||
/* read BI */
|
||||
#if defined(__KERNEL__) && !defined(STANDALONE)
|
||||
*oobp++ = REG_NAND_DATA8;
|
||||
*oobp++ = readb(®_NAND_DATA8);
|
||||
#else
|
||||
REG_NAND_DATA8;
|
||||
readb(®_NAND_DATA8);
|
||||
#endif
|
||||
numToRead--;
|
||||
}
|
||||
|
@ -219,11 +218,11 @@ static inline void nand_bcm_umi_bch_read_oobEcc(uint32_t pageSize,
|
|||
nand_bcm_umi_bch_resume_read_ecc_calc();
|
||||
while (numToRead) {
|
||||
#if defined(__KERNEL__) && !defined(STANDALONE)
|
||||
*oobp = REG_NAND_DATA8;
|
||||
*oobp = readb(®_NAND_DATA8);
|
||||
eccCalc[eccPos++] = *oobp;
|
||||
oobp++;
|
||||
#else
|
||||
eccCalc[eccPos++] = REG_NAND_DATA8;
|
||||
eccCalc[eccPos++] = readb(®_NAND_DATA8);
|
||||
#endif
|
||||
numToRead--;
|
||||
}
|
||||
|
@ -255,7 +254,7 @@ static inline void nand_bcm_umi_bch_write_oobEcc(uint32_t pageSize,
|
|||
if (pageSize == NAND_DATA_ACCESS_SIZE) {
|
||||
/* Now fill in the ECC bytes */
|
||||
if (numEccBytes >= 13)
|
||||
eccVal = REG_UMI_BCH_WR_ECC_3;
|
||||
eccVal = readl(®_UMI_BCH_WR_ECC_3);
|
||||
|
||||
/* Usually we skip CM in oob[0,1] */
|
||||
NAND_BCM_UMI_ECC_WRITE(numEccBytes, 15, &oobp[0],
|
||||
|
@ -268,7 +267,7 @@ static inline void nand_bcm_umi_bch_write_oobEcc(uint32_t pageSize,
|
|||
eccVal & 0xff); /* ECC 12 */
|
||||
|
||||
if (numEccBytes >= 9)
|
||||
eccVal = REG_UMI_BCH_WR_ECC_2;
|
||||
eccVal = readl(®_UMI_BCH_WR_ECC_2);
|
||||
|
||||
NAND_BCM_UMI_ECC_WRITE(numEccBytes, 12, &oobp[3],
|
||||
(eccVal >> 24) & 0xff); /* ECC11 */
|
||||
|
@ -281,7 +280,7 @@ static inline void nand_bcm_umi_bch_write_oobEcc(uint32_t pageSize,
|
|||
|
||||
/* Now fill in the ECC bytes */
|
||||
if (numEccBytes >= 13)
|
||||
eccVal = REG_UMI_BCH_WR_ECC_3;
|
||||
eccVal = readl(®_UMI_BCH_WR_ECC_3);
|
||||
|
||||
/* Usually skip CM in oob[1,2] */
|
||||
NAND_BCM_UMI_ECC_WRITE(numEccBytes, 15, &oobp[1],
|
||||
|
@ -294,7 +293,7 @@ static inline void nand_bcm_umi_bch_write_oobEcc(uint32_t pageSize,
|
|||
eccVal & 0xff); /* ECC12 */
|
||||
|
||||
if (numEccBytes >= 9)
|
||||
eccVal = REG_UMI_BCH_WR_ECC_2;
|
||||
eccVal = readl(®_UMI_BCH_WR_ECC_2);
|
||||
|
||||
NAND_BCM_UMI_ECC_WRITE(numEccBytes, 12, &oobp[4],
|
||||
(eccVal >> 24) & 0xff); /* ECC11 */
|
||||
|
@ -309,7 +308,7 @@ static inline void nand_bcm_umi_bch_write_oobEcc(uint32_t pageSize,
|
|||
eccVal & 0xff); /* ECC8 */
|
||||
|
||||
if (numEccBytes >= 5)
|
||||
eccVal = REG_UMI_BCH_WR_ECC_1;
|
||||
eccVal = readl(®_UMI_BCH_WR_ECC_1);
|
||||
|
||||
NAND_BCM_UMI_ECC_WRITE(numEccBytes, 8, &oobp[8],
|
||||
(eccVal >> 24) & 0xff); /* ECC7 */
|
||||
|
@ -321,7 +320,7 @@ static inline void nand_bcm_umi_bch_write_oobEcc(uint32_t pageSize,
|
|||
eccVal & 0xff); /* ECC4 */
|
||||
|
||||
if (numEccBytes >= 1)
|
||||
eccVal = REG_UMI_BCH_WR_ECC_0;
|
||||
eccVal = readl(®_UMI_BCH_WR_ECC_0);
|
||||
|
||||
NAND_BCM_UMI_ECC_WRITE(numEccBytes, 4, &oobp[12],
|
||||
(eccVal >> 24) & 0xff); /* ECC3 */
|
||||
|
|
Loading…
Reference in a new issue