Skip to contentSkip to conversation

ARM: Removal of bcmring

PATCH New Christian Daudt 5 participants 7 messages Sep 21, 2012 – Sep 28, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures Memory technology devices (MTD) NAND flash
lore
Share & tools
lore

Christian Daudt

author
#0 lore raw

v3 cover ARM: Removal of bcmring

Remove mach-bcmring as this is no longer maintained or used.

Updated the removal with:
- drop the edit to mach-types requested by Russell King
- eliminate defconfig mod from patch 1 requested Olof Johansson

Also switched to using git send-email to avoid word-wrapping problems

Christian Daudt (2):
ARM: Remove bcmring NAND driver
ARM: Remove mach-bcmring

 MAINTAINERS                                        |   16 -
 arch/arm/Kconfig                                   |   14 -
 arch/arm/Makefile                                  |    1 -
 arch/arm/configs/bcmring_defconfig                 |   79 -
 arch/arm/mach-bcmring/Kconfig                      |   19 -
 arch/arm/mach-bcmring/Makefile                     |    8 -
 arch/arm/mach-bcmring/Makefile.boot                |    6 -
 arch/arm/mach-bcmring/arch.c                       |  199 ---
 arch/arm/mach-bcmring/clock.c                      |  223 ---
 arch/arm/mach-bcmring/clock.h                      |   33 -
 arch/arm/mach-bcmring/core.c                       |  228 ---
 arch/arm/mach-bcmring/core.h                       |   31 -
 arch/arm/mach-bcmring/csp/Makefile                 |    3 -
 arch/arm/mach-bcmring/csp/chipc/Makefile           |    1 -
 arch/arm/mach-bcmring/csp/chipc/chipcHw.c          |  776 ---------
 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c     |  293 ----
 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c    |  124 --
 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c      |   64 -
 arch/arm/mach-bcmring/csp/dmac/Makefile            |    1 -
 arch/arm/mach-bcmring/csp/dmac/dmacHw.c            |  917 -----------
 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c      | 1017 ------------
 arch/arm/mach-bcmring/csp/tmr/Makefile             |    1 -
 arch/arm/mach-bcmring/csp/tmr/tmrHw.c              |  576 -------
 arch/arm/mach-bcmring/dma.c                        | 1518 ------------------
 arch/arm/mach-bcmring/dma_device.c                 |  593 -------
 arch/arm/mach-bcmring/include/cfg_global.h         |   13 -
 arch/arm/mach-bcmring/include/cfg_global_defines.h |   40 -
 arch/arm/mach-bcmring/include/csp/cache.h          |   35 -
 arch/arm/mach-bcmring/include/csp/delay.h          |   36 -
 arch/arm/mach-bcmring/include/csp/dmacHw.h         |  596 -------
 arch/arm/mach-bcmring/include/csp/errno.h          |   32 -
 arch/arm/mach-bcmring/include/csp/intcHw.h         |   40 -
 arch/arm/mach-bcmring/include/csp/module.h         |   32 -
 arch/arm/mach-bcmring/include/csp/reg.h            |  114 --
 arch/arm/mach-bcmring/include/csp/secHw.h          |   65 -
 arch/arm/mach-bcmring/include/csp/stdint.h         |   30 -
 arch/arm/mach-bcmring/include/csp/string.h         |   34 -
 arch/arm/mach-bcmring/include/csp/tmrHw.h          |  263 ---
 arch/arm/mach-bcmring/include/mach/csp/cap.h       |   63 -
 .../arm/mach-bcmring/include/mach/csp/cap_inline.h |  409 -----
 .../mach-bcmring/include/mach/csp/chipcHw_def.h    | 1123 -------------
 .../mach-bcmring/include/mach/csp/chipcHw_inline.h | 1673 --------------------
 .../mach-bcmring/include/mach/csp/chipcHw_reg.h    |  530 -------
 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h   |  872 ----------
 .../mach-bcmring/include/mach/csp/dmacHw_priv.h    |  145 --
 .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h |  406 -----
 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h    |   73 -
 .../arm/mach-bcmring/include/mach/csp/intcHw_reg.h |  246 ---
 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h   |  101 --
 arch/arm/mach-bcmring/include/mach/csp/mm_io.h     |  147 --
 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h |  100 --
 .../mach-bcmring/include/mach/csp/secHw_inline.h   |   79 -
 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h |   82 -
 arch/arm/mach-bcmring/include/mach/dma.h           |  630 --------
 arch/arm/mach-bcmring/include/mach/entry-macro.S   |   76 -
 arch/arm/mach-bcmring/include/mach/hardware.h      |   57 -
 arch/arm/mach-bcmring/include/mach/irqs.h          |  132 --
 .../mach-bcmring/include/mach/memory_settings.h    |   67 -
 arch/arm/mach-bcmring/include/mach/reg_nand.h      |   66 -
 arch/arm/mach-bcmring/include/mach/reg_umi.h       |  237 ---
 arch/arm/mach-bcmring/include/mach/timer.h         |   77 -
 arch/arm/mach-bcmring/include/mach/timex.h         |   25 -
 arch/arm/mach-bcmring/include/mach/uncompress.h    |   43 -
 arch/arm/mach-bcmring/irq.c                        |  126 --
 arch/arm/mach-bcmring/mm.c                         |   60 -
 arch/arm/mach-bcmring/timer.c                      |   61 -
 drivers/mtd/nand/Kconfig                           |   16 -
 drivers/mtd/nand/Makefile                          |    1 -
 drivers/mtd/nand/bcm_umi_bch.c                     |  217 ---
 drivers/mtd/nand/bcm_umi_nand.c                    |  555 -------
 drivers/mtd/nand/nand_bcm_umi.c                    |  149 --
 drivers/mtd/nand/nand_bcm_umi.h                    |  337 ----
 72 files changed, 17052 deletions(-)
 delete mode 100644 arch/arm/configs/bcmring_defconfig
 delete mode 100644 arch/arm/mach-bcmring/Kconfig
 delete mode 100644 arch/arm/mach-bcmring/Makefile
 delete mode 100644 arch/arm/mach-bcmring/Makefile.boot
 delete mode 100644 arch/arm/mach-bcmring/arch.c
 delete mode 100644 arch/arm/mach-bcmring/clock.c
 delete mode 100644 arch/arm/mach-bcmring/clock.h
 delete mode 100644 arch/arm/mach-bcmring/core.c
 delete mode 100644 arch/arm/mach-bcmring/core.h
 delete mode 100644 arch/arm/mach-bcmring/csp/Makefile
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/Makefile
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw.c
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c
 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/Makefile
 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw.c
 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
 delete mode 100644 arch/arm/mach-bcmring/csp/tmr/Makefile
 delete mode 100644 arch/arm/mach-bcmring/csp/tmr/tmrHw.c
 delete mode 100644 arch/arm/mach-bcmring/dma.c
 delete mode 100644 arch/arm/mach-bcmring/dma_device.c
 delete mode 100644 arch/arm/mach-bcmring/include/cfg_global.h
 delete mode 100644 arch/arm/mach-bcmring/include/cfg_global_defines.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/cache.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/delay.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/dmacHw.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/errno.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/intcHw.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/module.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/secHw.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/stdint.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/string.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/tmrHw.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap_inline.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_io.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/dma.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-bcmring/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/memory_settings.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_nand.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_umi.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/timer.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/timex.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-bcmring/irq.c
 delete mode 100644 arch/arm/mach-bcmring/mm.c
 delete mode 100644 arch/arm/mach-bcmring/timer.c
 delete mode 100644 drivers/mtd/nand/bcm_umi_bch.c
 delete mode 100644 drivers/mtd/nand/bcm_umi_nand.c
 delete mode 100644 drivers/mtd/nand/nand_bcm_umi.c
 delete mode 100644 drivers/mtd/nand/nand_bcm_umi.h
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH v3 1/2 ARM: Remove bcmring NAND driver

This driver is being removed as part of the cleanup of the bcmring SoC from mainline as it is no longer maintained.

Signed-off-by Christian Daudt <[email protected]>
Reviewed-by Jiandong Zheng <[email protected]>
Acked-by Will Deacon <[email protected]>
---
 MAINTAINERS                     |    9 -
 drivers/mtd/nand/Kconfig        |   16 --
 drivers/mtd/nand/Makefile       |    1 -
 drivers/mtd/nand/bcm_umi_bch.c  |  217 ---------------
 drivers/mtd/nand/bcm_umi_nand.c |  555 ---------------------------------------
 drivers/mtd/nand/nand_bcm_umi.c |  149 -----------
 drivers/mtd/nand/nand_bcm_umi.h |  337 ------------------------
 7 files changed, 1284 deletions(-)
 delete mode 100644 drivers/mtd/nand/bcm_umi_bch.c
 delete mode 100644 drivers/mtd/nand/bcm_umi_nand.c
 delete mode 100644 drivers/mtd/nand/nand_bcm_umi.c
 delete mode 100644 drivers/mtd/nand/nand_bcm_umi.h
MAINTAINERS +0 -9
index fdc0119..36da5f9 100644
@@ -665,15 +665,6 @@ L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
 S:	Maintained
 F:	arch/arm/mach-bcmring
 
-ARM/BCMRING MTD NAND DRIVER
-M:	Jiandong Zheng <[email protected]>
-M:	Scott Branden <[email protected]>
-L:	linux-mtd at lists.infradead.org
-S:	Maintained
-F:	drivers/mtd/nand/bcm_umi_nand.c
-F:	drivers/mtd/nand/bcm_umi_bch.c
-F:	drivers/mtd/nand/nand_bcm_umi.h
-
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:	Rob Herring <[email protected]>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
drivers/mtd/nand/Kconfig +0 -16
index 8ca4176..5c60a44 100644
@@ -267,22 +267,6 @@ config MTD_NAND_S3C2410_CLKSTOP
 	  when the is NAND chip selected or released, but will save
 	  approximately 5mA of power when there is nothing happening.
 
-config MTD_NAND_BCM_UMI
-	tristate "NAND Flash support for BCM Reference Boards"
-	depends on ARCH_BCMRING
-	help
-	  This enables the NAND flash controller on the BCM UMI block.
-
-	  No board specific support is done by this driver, each board
-	  must advertise a platform_device for the driver to attach.
-
-config MTD_NAND_BCM_UMI_HWCS
-	bool "BCM UMI NAND Hardware CS"
-	depends on MTD_NAND_BCM_UMI
-	help
-	  Enable the use of the BCM UMI block's internal CS using NAND.
-	  This should only be used if you know the external NAND CS can toggle.
-
 config MTD_NAND_DISKONCHIP
 	tristate "DiskOnChip 2000, Millennium and Millennium Plus (NAND reimplementation) (EXPERIMENTAL)"
 	depends on EXPERIMENTAL
drivers/mtd/nand/Makefile +0 -1
index d4b4d87..8b2825a 100644
@@ -46,7 +46,6 @@ obj-$(CONFIG_MTD_NAND_SOCRATES)		+= socrates_nand.o
 obj-$(CONFIG_MTD_NAND_TXX9NDFMC)	+= txx9ndfmc.o
 obj-$(CONFIG_MTD_NAND_NUC900)		+= nuc900_nand.o
 obj-$(CONFIG_MTD_NAND_NOMADIK)		+= nomadik_nand.o
-obj-$(CONFIG_MTD_NAND_BCM_UMI)		+= bcm_umi_nand.o nand_bcm_umi.o
 obj-$(CONFIG_MTD_NAND_MPC5121_NFC)	+= mpc5121_nfc.o
 obj-$(CONFIG_MTD_NAND_RICOH)		+= r852.o
 obj-$(CONFIG_MTD_NAND_JZ4740)		+= jz4740_nand.o
drivers/mtd/nand/bcm_umi_bch.c deleted +0 -217

217 lines not on this page · raw message

drivers/mtd/nand/bcm_umi_nand.c deleted +0 -555

555 lines not on this page · raw message

drivers/mtd/nand/nand_bcm_umi.c deleted +0 -149

149 lines not on this page · raw message

drivers/mtd/nand/nand_bcm_umi.h deleted +0 -337

337 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#2 lore raw

PATCH v3 1/2 ARM: Remove bcmring NAND driver

Quoted 6 lines · Christian Daudt

This driver is being removed as part of the cleanup of the bcmring SoC from mainline as it is no longer maintained.

Signed-off-by Christian Daudt <[email protected]>
Reviewed-by Jiandong Zheng <[email protected]>
Acked-by Will Deacon <[email protected]>

Pushed this patch to l2-mtd.git. But if you decide to merge it via Arnd's tree (probably better idea) - let me know, I'll drop it.

Signature · 9 lines
Best Regards,
Artem Bityutskiy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120924/8db93cc8/attachment-0001.sig>
#3 lore raw

PATCH v3 1/2 ARM: Remove bcmring NAND driver

Quoted 10 lines · Artem Bityutskiy
Quoted 6 lines · Christian Daudt

This driver is being removed as part of the cleanup of the bcmring SoC from mainline as it is no longer maintained.

Signed-off-by Christian Daudt <[email protected]>
Reviewed-by Jiandong Zheng <[email protected]>
Acked-by Will Deacon <[email protected]>

Pushed this patch to l2-mtd.git. But if you decide to merge it via Arnd's tree (probably better idea) - let me know, I'll drop it.

Keeping it in mtd is fine.

-Olof

author
#4 lore raw

PATCH v3 2/2 ARM: Remove mach-bcmring

In reply to Christian Daudt

Remove mach-bcmring as this is no longer maintained or used.

Signed-off-by Christian Daudt <[email protected]>
Reviewed-by Jiandong Zheng <[email protected]>
---
 MAINTAINERS                                        |    7 -
 arch/arm/Kconfig                                   |   14 -
 arch/arm/Makefile                                  |    1 -
 arch/arm/configs/bcmring_defconfig                 |   79 -
 arch/arm/mach-bcmring/Kconfig                      |   19 -
 arch/arm/mach-bcmring/Makefile                     |    8 -
 arch/arm/mach-bcmring/Makefile.boot                |    6 -
 arch/arm/mach-bcmring/arch.c                       |  199 ---
 arch/arm/mach-bcmring/clock.c                      |  223 ---
 arch/arm/mach-bcmring/clock.h                      |   33 -
 arch/arm/mach-bcmring/core.c                       |  228 ---
 arch/arm/mach-bcmring/core.h                       |   31 -
 arch/arm/mach-bcmring/csp/Makefile                 |    3 -
 arch/arm/mach-bcmring/csp/chipc/Makefile           |    1 -
 arch/arm/mach-bcmring/csp/chipc/chipcHw.c          |  776 ---------
 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c     |  293 ----
 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c    |  124 --
 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c      |   64 -
 arch/arm/mach-bcmring/csp/dmac/Makefile            |    1 -
 arch/arm/mach-bcmring/csp/dmac/dmacHw.c            |  917 -----------
 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c      | 1017 ------------
 arch/arm/mach-bcmring/csp/tmr/Makefile             |    1 -
 arch/arm/mach-bcmring/csp/tmr/tmrHw.c              |  576 -------
 arch/arm/mach-bcmring/dma.c                        | 1518 ------------------
 arch/arm/mach-bcmring/dma_device.c                 |  593 -------
 arch/arm/mach-bcmring/include/cfg_global.h         |   13 -
 arch/arm/mach-bcmring/include/cfg_global_defines.h |   40 -
 arch/arm/mach-bcmring/include/csp/cache.h          |   35 -
 arch/arm/mach-bcmring/include/csp/delay.h          |   36 -
 arch/arm/mach-bcmring/include/csp/dmacHw.h         |  596 -------
 arch/arm/mach-bcmring/include/csp/errno.h          |   32 -
 arch/arm/mach-bcmring/include/csp/intcHw.h         |   40 -
 arch/arm/mach-bcmring/include/csp/module.h         |   32 -
 arch/arm/mach-bcmring/include/csp/reg.h            |  114 --
 arch/arm/mach-bcmring/include/csp/secHw.h          |   65 -
 arch/arm/mach-bcmring/include/csp/stdint.h         |   30 -
 arch/arm/mach-bcmring/include/csp/string.h         |   34 -
 arch/arm/mach-bcmring/include/csp/tmrHw.h          |  263 ---
 arch/arm/mach-bcmring/include/mach/csp/cap.h       |   63 -
 .../arm/mach-bcmring/include/mach/csp/cap_inline.h |  409 -----
 .../mach-bcmring/include/mach/csp/chipcHw_def.h    | 1123 -------------
 .../mach-bcmring/include/mach/csp/chipcHw_inline.h | 1673 --------------------
 .../mach-bcmring/include/mach/csp/chipcHw_reg.h    |  530 -------
 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h   |  872 ----------
 .../mach-bcmring/include/mach/csp/dmacHw_priv.h    |  145 --
 .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h |  406 -----
 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h    |   73 -
 .../arm/mach-bcmring/include/mach/csp/intcHw_reg.h |  246 ---
 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h   |  101 --
 arch/arm/mach-bcmring/include/mach/csp/mm_io.h     |  147 --
 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h |  100 --
 .../mach-bcmring/include/mach/csp/secHw_inline.h   |   79 -
 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h |   82 -
 arch/arm/mach-bcmring/include/mach/dma.h           |  630 --------
 arch/arm/mach-bcmring/include/mach/entry-macro.S   |   76 -
 arch/arm/mach-bcmring/include/mach/hardware.h      |   57 -
 arch/arm/mach-bcmring/include/mach/irqs.h          |  132 --
 .../mach-bcmring/include/mach/memory_settings.h    |   67 -
 arch/arm/mach-bcmring/include/mach/reg_nand.h      |   66 -
 arch/arm/mach-bcmring/include/mach/reg_umi.h       |  237 ---
 arch/arm/mach-bcmring/include/mach/timer.h         |   77 -
 arch/arm/mach-bcmring/include/mach/timex.h         |   25 -
 arch/arm/mach-bcmring/include/mach/uncompress.h    |   43 -
 arch/arm/mach-bcmring/irq.c                        |  126 --
 arch/arm/mach-bcmring/mm.c                         |   60 -
 arch/arm/mach-bcmring/timer.c                      |   61 -
 66 files changed, 15768 deletions(-)
 delete mode 100644 arch/arm/configs/bcmring_defconfig
 delete mode 100644 arch/arm/mach-bcmring/Kconfig
 delete mode 100644 arch/arm/mach-bcmring/Makefile
 delete mode 100644 arch/arm/mach-bcmring/Makefile.boot
 delete mode 100644 arch/arm/mach-bcmring/arch.c
 delete mode 100644 arch/arm/mach-bcmring/clock.c
 delete mode 100644 arch/arm/mach-bcmring/clock.h
 delete mode 100644 arch/arm/mach-bcmring/core.c
 delete mode 100644 arch/arm/mach-bcmring/core.h
 delete mode 100644 arch/arm/mach-bcmring/csp/Makefile
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/Makefile
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw.c
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c
 delete mode 100644 arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c
 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/Makefile
 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw.c
 delete mode 100644 arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c
 delete mode 100644 arch/arm/mach-bcmring/csp/tmr/Makefile
 delete mode 100644 arch/arm/mach-bcmring/csp/tmr/tmrHw.c
 delete mode 100644 arch/arm/mach-bcmring/dma.c
 delete mode 100644 arch/arm/mach-bcmring/dma_device.c
 delete mode 100644 arch/arm/mach-bcmring/include/cfg_global.h
 delete mode 100644 arch/arm/mach-bcmring/include/cfg_global_defines.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/cache.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/delay.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/dmacHw.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/errno.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/intcHw.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/module.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/secHw.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/stdint.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/string.h
 delete mode 100644 arch/arm/mach-bcmring/include/csp/tmrHw.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/cap_inline.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_addr.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/mm_io.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_def.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/dma.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-bcmring/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/memory_settings.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_nand.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/reg_umi.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/timer.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/timex.h
 delete mode 100644 arch/arm/mach-bcmring/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-bcmring/irq.c
 delete mode 100644 arch/arm/mach-bcmring/mm.c
 delete mode 100644 arch/arm/mach-bcmring/timer.c
MAINTAINERS +0 -7
index 36da5f9..a4b166c 100644
@@ -658,13 +658,6 @@ W:	http://www.linux4sam.org
 S:	Supported
 F:	arch/arm/mach-at91/
 
-ARM/BCMRING ARM ARCHITECTURE
-M:	Jiandong Zheng <[email protected]>
-M:	Scott Branden <[email protected]>
-L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
-S:	Maintained
-F:	arch/arm/mach-bcmring
-
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:	Rob Herring <[email protected]>
 L:	linux-arm-kernel at lists.infradead.org (moderated for non-subscribers)
arch/arm/Kconfig +0 -14
index c5f9ae5..e99177a 100644
@@ -350,18 +350,6 @@ config ARCH_AT91
 	  This enables support for systems based on Atmel
 	  AT91RM9200 and AT91SAM9* processors.
 
-config ARCH_BCMRING
-	bool "Broadcom BCMRING"
-	depends on MMU
-	select CPU_V6
-	select ARM_AMBA
-	select ARM_TIMER_SP804
-	select CLKDEV_LOOKUP
-	select GENERIC_CLOCKEVENTS
-	select ARCH_WANT_OPTIONAL_GPIOLIB
-	help
-	  Support for Broadcom's BCMRing platform.
-
 config ARCH_HIGHBANK
 	bool "Calxeda Highbank-based"
 	select ARCH_WANT_OPTIONAL_GPIOLIB

@@ -1031,8 +1019,6 @@ source "arch/arm/mach-mvebu/Kconfig"
 
 source "arch/arm/mach-at91/Kconfig"
 
-source "arch/arm/mach-bcmring/Kconfig"
-
 source "arch/arm/mach-clps711x/Kconfig"
 
 source "arch/arm/mach-cns3xxx/Kconfig"
arch/arm/Makefile +0 -1
index 30eae87..8383e2e 100644
@@ -136,7 +136,6 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
 # Machine directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.
 machine-$(CONFIG_ARCH_AT91)		:= at91
-machine-$(CONFIG_ARCH_BCMRING)		:= bcmring
 machine-$(CONFIG_ARCH_CLPS711X)		:= clps711x
 machine-$(CONFIG_ARCH_CNS3XXX)		:= cns3xxx
 machine-$(CONFIG_ARCH_DAVINCI)		:= davinci
arch/arm/configs/bcmring_defconfig deleted +0 -79

79 lines not on this page · raw message

arch/arm/mach-bcmring/Kconfig deleted +0 -19
deleted file mode 100644
index 9170d16..0000000
@@ -1,19 +0,0 @@
-choice
-	prompt "Processor selection in BCMRING family of devices"
-	depends on ARCH_BCMRING
-	default ARCH_BCM11107
-
-config ARCH_FPGA11107
-	bool "FPGA11107"
-
-config ARCH_BCM11107
-	bool "BCM11107"
-endchoice
-
-menu "BCMRING Options"
-	depends on ARCH_BCMRING
-
-config BCM_ZRELADDR
-	hex "Compressed ZREL ADDR"
-
-endmenu
arch/arm/mach-bcmring/Makefile deleted +0 -8
deleted file mode 100644
index f8d9fce..0000000
@@ -1,8 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
-obj-y := arch.o mm.o irq.o clock.o core.o timer.o dma.o
-obj-y += csp/
arch/arm/mach-bcmring/Makefile.boot deleted +0 -6
deleted file mode 100644
index aef2467..0000000
@@ -1,6 +0,0 @@
-# Address where decompressor will be written and eventually executed.
-#
-# default to SDRAM
-zreladdr-y      += $(CONFIG_BCM_ZRELADDR)
-params_phys-y   := 0x00000800
-
arch/arm/mach-bcmring/arch.c deleted +0 -199

199 lines not on this page · raw message

arch/arm/mach-bcmring/clock.c deleted +0 -223

223 lines not on this page · raw message

arch/arm/mach-bcmring/clock.h deleted +0 -33
deleted file mode 100644
index 5e0b981..0000000
@@ -1,33 +0,0 @@
-/*****************************************************************************
-* Copyright 2001 - 2009 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.
-*****************************************************************************/
-#include <mach/csp/chipcHw_def.h>
-
-#define CLK_TYPE_PRIMARY         1	/* primary clock must NOT have a parent */
-#define CLK_TYPE_PLL1            2	/* PPL1 */
-#define CLK_TYPE_PLL2            4	/* PPL2 */
-#define CLK_TYPE_PROGRAMMABLE    8	/* programmable clock rate */
-#define CLK_TYPE_BYPASSABLE      16	/* parent can be changed */
-
-#define CLK_MODE_XTAL            1	/* clock source is from crystal */
-
-struct clk {
-	const char *name;	/* clock name */
-	unsigned int type;	/* clock type */
-	unsigned int mode;	/* current mode */
-	volatile int use_bypass;	/* indicate if it's in bypass mode */
-	chipcHw_CLOCK_e csp_id;	/* clock ID for CSP CHIPC */
-	unsigned long rate_hz;	/* clock rate in Hz */
-	unsigned int use_cnt;	/* usage count */
-	struct clk *parent;	/* parent clock */
-};
arch/arm/mach-bcmring/core.c deleted +0 -228

228 lines not on this page · raw message

arch/arm/mach-bcmring/core.h deleted +0 -31
deleted file mode 100644
index e0e02c4..0000000
@@ -1,31 +0,0 @@
-/*
- *  linux/arch/arm/mach-versatile/core.h
- *
- *  Copyright (C) 2004 ARM Limited
- *  Copyright (C) 2000 Deep Blue Solutions Ltd
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-/* Portions copyright Broadcom 2008 */
-#ifndef __ASM_ARCH_BCMRING_H
-#define __ASM_ARCH_BCMRING_H
-
-void __init bcmring_amba_init(void);
-void __init bcmring_map_io(void);
-void __init bcmring_init_irq(void);
-void __init bcmring_init_early(void);
-
-extern struct sys_timer bcmring_timer;
-#endif
arch/arm/mach-bcmring/csp/Makefile deleted +0 -3
deleted file mode 100644
index 648c037..0000000
@@ -1,3 +0,0 @@
-obj-y += dmac/
-obj-y += tmr/
-obj-y += chipc/
arch/arm/mach-bcmring/csp/chipc/Makefile deleted +0 -1
deleted file mode 100644
index 6739527..0000000
@@ -1 +0,0 @@
-obj-y += chipcHw.o chipcHw_str.o chipcHw_reset.o chipcHw_init.o
arch/arm/mach-bcmring/csp/chipc/chipcHw.c deleted +0 -776

776 lines not on this page · raw message

arch/arm/mach-bcmring/csp/chipc/chipcHw_init.c deleted +0 -293

293 lines not on this page · raw message

arch/arm/mach-bcmring/csp/chipc/chipcHw_reset.c deleted +0 -124

124 lines not on this page · raw message

arch/arm/mach-bcmring/csp/chipc/chipcHw_str.c deleted +0 -64

64 lines not on this page · raw message

arch/arm/mach-bcmring/csp/dmac/Makefile deleted +0 -1
deleted file mode 100644
index fb1104f..0000000
@@ -1 +0,0 @@
-obj-y += dmacHw.o dmacHw_extra.o
\ No newline at end of file
arch/arm/mach-bcmring/csp/dmac/dmacHw.c deleted +0 -917

865 lines not on this page · raw message

arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c deleted +0 -1017

1,017 lines not on this page · raw message

arch/arm/mach-bcmring/csp/tmr/Makefile deleted +0 -1
deleted file mode 100644
index 244a61a..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/csp/tmr/tmrHw.c deleted +0 -576

576 lines not on this page · raw message

arch/arm/mach-bcmring/dma.c deleted +0 -1518

1,518 lines not on this page · raw message

arch/arm/mach-bcmring/dma_device.c deleted +0 -593

593 lines not on this page · raw message

arch/arm/mach-bcmring/include/cfg_global.h deleted +0 -13
deleted file mode 100644
index f01da87..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/cfg_global_defines.h deleted +0 -40
deleted file mode 100644
index b5beb0b..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/csp/cache.h deleted +0 -35
deleted file mode 100644
index caa20e5..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/csp/delay.h deleted +0 -36
deleted file mode 100644
index 8b3d803..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/csp/dmacHw.h deleted +0 -596

596 lines not on this page · raw message

arch/arm/mach-bcmring/include/csp/errno.h deleted +0 -32
deleted file mode 100644
index 51357dd..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/csp/intcHw.h deleted +0 -40
deleted file mode 100644
index 1c639c8..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/csp/module.h deleted +0 -32
deleted file mode 100644
index c30d2a5..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/csp/reg.h deleted +0 -114

114 lines not on this page · raw message

arch/arm/mach-bcmring/include/csp/secHw.h deleted +0 -65

65 lines not on this page · raw message

arch/arm/mach-bcmring/include/csp/stdint.h deleted +0 -30
deleted file mode 100644
index 3a8718b..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/csp/string.h deleted +0 -34
deleted file mode 100644
index ad9e400..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/csp/tmrHw.h deleted +0 -263

263 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/cap.h deleted +0 -63

63 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/cap_inline.h deleted +0 -409

409 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/chipcHw_def.h deleted +0 -1123

1,123 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/chipcHw_inline.h deleted +0 -1673

1,673 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/chipcHw_reg.h deleted +0 -530

530 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/ddrcReg.h deleted +0 -872

872 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/dmacHw_priv.h deleted +0 -145

145 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/dmacHw_reg.h deleted +0 -406

406 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/hw_cfg.h deleted +0 -73

73 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/intcHw_reg.h deleted +0 -246

246 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/mm_addr.h deleted +0 -101

101 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/mm_io.h deleted +0 -147

147 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/secHw_def.h deleted +0 -100

100 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/secHw_inline.h deleted +0 -79

79 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/csp/tmrHw_reg.h deleted +0 -82

82 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/dma.h deleted +0 -630

630 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/entry-macro.S deleted +0 -76

76 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/hardware.h deleted +0 -57

57 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/irqs.h deleted +0 -132

132 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/memory_settings.h deleted +0 -67

67 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/reg_nand.h deleted +0 -66

66 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/reg_umi.h deleted +0 -237

237 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/timer.h deleted +0 -77

77 lines not on this page · raw message

arch/arm/mach-bcmring/include/mach/timex.h deleted +0 -25
deleted file mode 100644
index 40d033e..0000000

Lines of this file are not shown. View the raw message.

arch/arm/mach-bcmring/include/mach/uncompress.h deleted +0 -43

43 lines not on this page · raw message

arch/arm/mach-bcmring/irq.c deleted +0 -126

126 lines not on this page · raw message

arch/arm/mach-bcmring/mm.c deleted +0 -60

60 lines not on this page · raw message

arch/arm/mach-bcmring/timer.c deleted +0 -61

61 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
1.7.9.5

Part of the diff is not shown here. View the raw message.