Merge branch 'testing/bcmring' into next/cleanups

This attempts to get the bcmring platform better in line with the
other platforms. Moving the header files below mach/ helps with
the future reorganization for multiplatform kernels, and using
MMIO accessors is generally the right thing.

* testing/bcmring:
  ARM: bcmring: use proper MMIO accessors
  ARM: bcmring: remove include/csp/ subdir
  ARM: bcmring: move cfg_global header to mach/

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined drivers/mtd/nand/bcm_umi_nand.c
index c855e7cd337b2f7a278a164c2e7a7b7f17a723f8,55e7799f4bf37176ca4ad045066088c870b10b24..d0d1bd4d0e7d13b4d065077632dac5773264e7f2
--- 1/drivers/mtd/nand/bcm_umi_nand.c
--- 2/drivers/mtd/nand/bcm_umi_nand.c
+++ b/drivers/mtd/nand/bcm_umi_nand.c
@@@ -249,20 -249,20 +249,20 @@@ static int nand_dev_ready(struct mtd_in
  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(&REG_UMI_NAND_TCR) & ~0x7ffff, &REG_UMI_NAND_TCR);
+       writel(readl(&REG_UMI_NAND_TCR) | HW_CFG_NAND_TCR, &REG_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(&REG_UMI_NAND_TCR) | REG_UMI_NAND_TCR_CS_SWCTRL, &REG_UMI_NAND_TCR);
  #endif
  
        /* keep NAND chip select asserted */
-       REG_UMI_NAND_RCSR |= REG_UMI_NAND_RCSR_CS_ASSERTED;
+       writel(readl(&REG_UMI_NAND_RCSR) | REG_UMI_NAND_RCSR_CS_ASSERTED, &REG_UMI_NAND_RCSR);
  
-       REG_UMI_NAND_TCR &= ~REG_UMI_NAND_TCR_WORD16;
+       writel(readl(&REG_UMI_NAND_TCR) & ~REG_UMI_NAND_TCR_WORD16, &REG_UMI_NAND_TCR);
        /* enable writes to flash */
-       REG_UMI_MMD_ICR |= REG_UMI_MMD_ICR_FLASH_WP;
+       writel(readl(&REG_UMI_MMD_ICR) | REG_UMI_MMD_ICR_FLASH_WP, &REG_UMI_MMD_ICR);
  
        writel(NAND_CMD_RESET, bcm_umi_io_base + REG_NAND_CMD_OFFSET);
        nand_bcm_umi_wait_till_ready();
@@@ -341,7 -341,7 +341,7 @@@ static int bcm_umi_nand_verify_buf(stru
         * for MLC parts which may have permanently stuck bits.
         */
        struct nand_chip *chip = mtd->priv;
 -      int ret = chip->ecc.read_page(mtd, chip, readbackbuf, 0);
 +      int ret = chip->ecc.read_page(mtd, chip, readbackbuf, 0, 0);
        if (ret < 0)
                return -EFAULT;
        else {
@@@ -476,7 -476,12 +476,7 @@@ static int __devinit bcm_umi_nand_probe
                this->badblock_pattern = &largepage_bbt;
        }
  
 -      /*
 -       * FIXME: ecc strength value of 6 bits per 512 bytes of data is a
 -       * conservative guess, given 13 ecc bytes and using bch alg.
 -       * (Assume Galois field order m=15 to allow a margin of error.)
 -       */
 -      this->ecc.strength = 6;
 +      this->ecc.strength = 8;
  
  #endif