Merge branch 'testing/bcmring' into next/cleanups

Browse source

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>

...

This commit is contained in:

Arnd Bergmann 2012-08-13 17:01:31 +02:00

parent 19ec6caca2 878040ef83

commit a4c75ba85c

45 changed files with 1364 additions and 1669 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/arm/mach-bcmring/arch.c

View file

3

arch/arm/mach-bcmring/core.c

View file

137

arch/arm/mach-bcmring/csp/chipc/chipcHw.c

View file

90

arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c

View file

19

arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c

View file

27

arch/arm/mach-bcmring/csp/dmac/dmacHw.c

View file

6

arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c

View file

6

arch/arm/mach-bcmring/csp/tmr/tmrHw.c

View file

13

arch/arm/mach-bcmring/include/cfg_global.h

View file

35

arch/arm/mach-bcmring/include/csp/cache.h

View file

36

arch/arm/mach-bcmring/include/csp/delay.h

View file

32

arch/arm/mach-bcmring/include/csp/errno.h

View file

40

arch/arm/mach-bcmring/include/csp/intcHw.h

View file

32

arch/arm/mach-bcmring/include/csp/module.h

View file

65

arch/arm/mach-bcmring/include/csp/secHw.h

View file

30

arch/arm/mach-bcmring/include/csp/stdint.h

View file

34

arch/arm/mach-bcmring/include/csp/string.h

View file

11

arch/arm/mach-bcmring/include/cfg_global_defines.h → arch/arm/mach-bcmring/include/mach/cfg_global.h

View file

2

arch/arm/mach-bcmring/include/mach/csp/cap_inline.h

View file

6

arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h

View file

119

arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h

View file

6

arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h

View file

6

arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h

View file

4

arch/arm/mach-bcmring/include/csp/dmacHw.h → arch/arm/mach-bcmring/include/mach/csp/dmacHw.h

View file

2

arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h

View file

106

arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h

View file

2

arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h

View file

18

arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h

View file

2

arch/arm/mach-bcmring/include/mach/csp/mm_addr.h

View file

8

arch/arm/mach-bcmring/include/mach/csp/mm_io.h

View file

25

arch/arm/mach-bcmring/include/csp/reg.h → arch/arm/mach-bcmring/include/mach/csp/reg.h

View file

10

arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h

View file

2

arch/arm/mach-bcmring/include/csp/tmrHw.h → arch/arm/mach-bcmring/include/mach/csp/tmrHw.h

View file

2

arch/arm/mach-bcmring/include/mach/dma.h

View file

2

arch/arm/mach-bcmring/include/mach/hardware.h

View file

2

arch/arm/mach-bcmring/include/mach/reg_nand.h

View file

4

arch/arm/mach-bcmring/include/mach/reg_umi.h

View file

4

arch/arm/mach-bcmring/mm.c

View file

2

arch/arm/mach-bcmring/timer.c

View file

12

drivers/mtd/nand/bcm_umi_nand.c

View file

73

drivers/mtd/nand/nand_bcm_umi.h

View file