bcma: add constants for chip ids

The chip IDs are used all over bcma and no constants where defined.
This patch adds the constants and makes bcma use them.

Acked-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/bcma/driver_pci_host.c b/drivers/bcma/driver_pci_host.c
index b9a86edfec39..d6e8a37e3e5f 100644
--- a/drivers/bcma/driver_pci_host.c
+++ b/drivers/bcma/driver_pci_host.c
@@ -215,7 +215,8 @@ static int bcma_extpci_write_config(struct bcma_drv_pci *pc, unsigned int dev,
         } else {
                 writel(val, mmio);
 
-                if (chipid == 0x4716 || chipid == 0x4748)
+                if (chipid == BCMA_CHIP_ID_BCM4716 ||
+                    chipid == BCMA_CHIP_ID_BCM4748)
                         readl(mmio);
         }
 
@@ -434,13 +435,14 @@ void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc)
          * as mips can't generate 64-bit address on the
          * backplane.
          */
-        if (bus->chipinfo.id == 0x4716 || bus->chipinfo.id == 0x4748) {
+        if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4716 ||
+            bus->chipinfo.id == BCMA_CHIP_ID_BCM4748) {
                 pc_host->mem_resource.start = BCMA_SOC_PCI_MEM;
                 pc_host->mem_resource.end = BCMA_SOC_PCI_MEM +
                                             BCMA_SOC_PCI_MEM_SZ - 1;
                 pcicore_write32(pc, BCMA_CORE_PCI_SBTOPCI0,
                                 BCMA_CORE_PCI_SBTOPCI_MEM | BCMA_SOC_PCI_MEM);
-        } else if (bus->chipinfo.id == 0x5300) {
+        } else if (bus->chipinfo.id == BCMA_CHIP_ID_BCM4706) {
                 tmp = BCMA_CORE_PCI_SBTOPCI_MEM;
                 tmp |= BCMA_CORE_PCI_SBTOPCI_PREF;
                 tmp |= BCMA_CORE_PCI_SBTOPCI_BURST;