Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bcma: use NS prefix for names of Northstar specific cores

It's cleaner and we don't have quite identical names like
BCMA_CORE_PCIEG2 and BCMA_CORE_PCIE2.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

authored by

Rafał Miłecki and committed by
John W. Linville
dc6be9f5 11d14c79

+22 -22
+11 -11
drivers/bcma/scan.c
··· 32 32 { BCMA_CORE_4706_CHIPCOMMON, "BCM4706 ChipCommon" }, 33 33 { BCMA_CORE_4706_SOC_RAM, "BCM4706 SOC RAM" }, 34 34 { BCMA_CORE_4706_MAC_GBIT, "BCM4706 GBit MAC" }, 35 - { BCMA_CORE_PCIEG2, "PCIe Gen 2" }, 36 - { BCMA_CORE_DMA, "DMA" }, 37 - { BCMA_CORE_SDIO3, "SDIO3" }, 38 - { BCMA_CORE_USB20, "USB 2.0" }, 39 - { BCMA_CORE_USB30, "USB 3.0" }, 40 - { BCMA_CORE_A9JTAG, "ARM Cortex A9 JTAG" }, 41 - { BCMA_CORE_DDR23, "Denali DDR2/DDR3 memory controller" }, 42 - { BCMA_CORE_ROM, "ROM" }, 43 - { BCMA_CORE_NAND, "NAND flash controller" }, 44 - { BCMA_CORE_QSPI, "SPI flash controller" }, 45 - { BCMA_CORE_CHIPCOMMON_B, "Chipcommon B" }, 35 + { BCMA_CORE_NS_PCIEG2, "PCIe Gen 2" }, 36 + { BCMA_CORE_NS_DMA, "DMA" }, 37 + { BCMA_CORE_NS_SDIO3, "SDIO3" }, 38 + { BCMA_CORE_NS_USB20, "USB 2.0" }, 39 + { BCMA_CORE_NS_USB30, "USB 3.0" }, 40 + { BCMA_CORE_NS_A9JTAG, "ARM Cortex A9 JTAG" }, 41 + { BCMA_CORE_NS_DDR23, "Denali DDR2/DDR3 memory controller" }, 42 + { BCMA_CORE_NS_ROM, "ROM" }, 43 + { BCMA_CORE_NS_NAND, "NAND flash controller" }, 44 + { BCMA_CORE_NS_QSPI, "SPI flash controller" }, 45 + { BCMA_CORE_NS_CHIPCOMMON_B, "Chipcommon B" }, 46 46 { BCMA_CORE_ARMCA9, "ARM Cortex A9 core (ihost)" }, 47 47 { BCMA_CORE_AMEMC, "AMEMC (DDR)" }, 48 48 { BCMA_CORE_ALTA, "ALTA (I2S)" },
+11 -11
include/linux/bcma/bcma.h
··· 73 73 /* Core-ID values. */ 74 74 #define BCMA_CORE_OOB_ROUTER 0x367 /* Out of band */ 75 75 #define BCMA_CORE_4706_CHIPCOMMON 0x500 76 - #define BCMA_CORE_PCIEG2 0x501 77 - #define BCMA_CORE_DMA 0x502 78 - #define BCMA_CORE_SDIO3 0x503 79 - #define BCMA_CORE_USB20 0x504 80 - #define BCMA_CORE_USB30 0x505 81 - #define BCMA_CORE_A9JTAG 0x506 82 - #define BCMA_CORE_DDR23 0x507 83 - #define BCMA_CORE_ROM 0x508 84 - #define BCMA_CORE_NAND 0x509 85 - #define BCMA_CORE_QSPI 0x50A 86 - #define BCMA_CORE_CHIPCOMMON_B 0x50B 76 + #define BCMA_CORE_NS_PCIEG2 0x501 77 + #define BCMA_CORE_NS_DMA 0x502 78 + #define BCMA_CORE_NS_SDIO3 0x503 79 + #define BCMA_CORE_NS_USB20 0x504 80 + #define BCMA_CORE_NS_USB30 0x505 81 + #define BCMA_CORE_NS_A9JTAG 0x506 82 + #define BCMA_CORE_NS_DDR23 0x507 83 + #define BCMA_CORE_NS_ROM 0x508 84 + #define BCMA_CORE_NS_NAND 0x509 85 + #define BCMA_CORE_NS_QSPI 0x50A 86 + #define BCMA_CORE_NS_CHIPCOMMON_B 0x50B 87 87 #define BCMA_CORE_4706_SOC_RAM 0x50E 88 88 #define BCMA_CORE_ARMCA9 0x510 89 89 #define BCMA_CORE_4706_MAC_GBIT 0x52D