Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 42537master
Rafał Miłecki
10 years ago
parent
f032f66318
commit
7cd532623e
@ -1,71 +0,0 @@ |
||||
From f8c6045ee00b82c1bb3f8b3446d723c4d50e6b08 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Mon, 12 May 2014 21:57:53 +0200
|
||||
Subject: [PATCH 09/17] bcma: store more alternative addresses
|
||||
|
||||
Each core could have more than one alternative address. There are cores
|
||||
with 8 alternative addresses for different functions. The PHY control
|
||||
in the Chip common B core is done through the 2. alternative address
|
||||
and not the first one.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
drivers/bcma/scan.c | 9 +++++----
|
||||
drivers/usb/host/bcma-hcd.c | 2 +-
|
||||
include/linux/bcma/bcma.h | 2 +-
|
||||
3 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
--- a/drivers/bcma/scan.c
|
||||
+++ b/drivers/bcma/scan.c
|
||||
@@ -276,7 +276,7 @@ static int bcma_get_next_core(struct bcm
|
||||
struct bcma_device *core)
|
||||
{
|
||||
u32 tmp;
|
||||
- u8 i, j;
|
||||
+ u8 i, j, k;
|
||||
s32 cia, cib;
|
||||
u8 ports[2], wrappers[2];
|
||||
|
||||
@@ -367,6 +367,7 @@ static int bcma_get_next_core(struct bcm
|
||||
core->addr = tmp;
|
||||
|
||||
/* get & parse slave ports */
|
||||
+ k = 0;
|
||||
for (i = 0; i < ports[1]; i++) {
|
||||
for (j = 0; ; j++) {
|
||||
tmp = bcma_erom_get_addr_desc(bus, eromptr,
|
||||
@@ -376,9 +377,9 @@ static int bcma_get_next_core(struct bcm
|
||||
/* pr_debug("erom: slave port %d "
|
||||
* "has %d descriptors\n", i, j); */
|
||||
break;
|
||||
- } else {
|
||||
- if (i == 0 && j == 0)
|
||||
- core->addr1 = tmp;
|
||||
+ } else if (k < 8) {
|
||||
+ core->addr_s[k] = tmp;
|
||||
+ k++;
|
||||
}
|
||||
}
|
||||
}
|
||||
--- a/drivers/usb/host/bcma-hcd.c
|
||||
+++ b/drivers/usb/host/bcma-hcd.c
|
||||
@@ -237,7 +237,7 @@ static int bcma_hcd_probe(struct bcma_de
|
||||
bcma_hcd_init_chip(dev);
|
||||
|
||||
/* In AI chips EHCI is addrspace 0, OHCI is 1 */
|
||||
- ohci_addr = dev->addr1;
|
||||
+ ohci_addr = dev->addr_s[0];
|
||||
if ((chipinfo->id == 0x5357 || chipinfo->id == 0x4749)
|
||||
&& chipinfo->rev == 0)
|
||||
ohci_addr = 0x18009000;
|
||||
--- a/include/linux/bcma/bcma.h
|
||||
+++ b/include/linux/bcma/bcma.h
|
||||
@@ -267,7 +267,7 @@ struct bcma_device {
|
||||
u8 core_unit;
|
||||
|
||||
u32 addr;
|
||||
- u32 addr1;
|
||||
+ u32 addr_s[8];
|
||||
u32 wrap;
|
||||
|
||||
void __iomem *io_addr;
|
||||
@ -1,180 +0,0 @@ |
||||
From 30e85c691b905f15ef55ab9e1aea98ac35f5e31a Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Mon, 12 May 2014 20:33:15 +0200
|
||||
Subject: [PATCH 10/17] bcma: add support for chipcommon B core
|
||||
|
||||
This core is used on BCM4708 to configure the PCIe and USB3 PHYs and it
|
||||
contains the addresses to the Device Management unit. This will be used
|
||||
by the PCIe driver first.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
drivers/bcma/Makefile | 1 +
|
||||
drivers/bcma/bcma_private.h | 4 ++
|
||||
drivers/bcma/driver_chipcommon_b.c | 59 +++++++++++++++++++++++++++++
|
||||
drivers/bcma/main.c | 10 +++++
|
||||
drivers/bcma/scan.c | 1 +
|
||||
include/linux/bcma/bcma.h | 1 +
|
||||
include/linux/bcma/bcma_driver_chipcommon.h | 8 ++++
|
||||
7 files changed, 84 insertions(+)
|
||||
create mode 100644 drivers/bcma/driver_chipcommon_b.c
|
||||
|
||||
--- a/drivers/bcma/Makefile
|
||||
+++ b/drivers/bcma/Makefile
|
||||
@@ -1,5 +1,6 @@
|
||||
bcma-y += main.o scan.o core.o sprom.o
|
||||
bcma-y += driver_chipcommon.o driver_chipcommon_pmu.o
|
||||
+bcma-y += driver_chipcommon_b.o
|
||||
bcma-$(CONFIG_BCMA_SFLASH) += driver_chipcommon_sflash.o
|
||||
bcma-$(CONFIG_BCMA_NFLASH) += driver_chipcommon_nflash.o
|
||||
bcma-y += driver_pci.o
|
||||
--- a/drivers/bcma/bcma_private.h
|
||||
+++ b/drivers/bcma/bcma_private.h
|
||||
@@ -50,6 +50,10 @@ void bcma_chipco_serial_init(struct bcma
|
||||
extern struct platform_device bcma_pflash_dev;
|
||||
#endif /* CONFIG_BCMA_DRIVER_MIPS */
|
||||
|
||||
+/* driver_chipcommon_b.c */
|
||||
+int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);
|
||||
+void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb);
|
||||
+
|
||||
/* driver_chipcommon_pmu.c */
|
||||
u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);
|
||||
u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);
|
||||
--- /dev/null
|
||||
+++ b/drivers/bcma/driver_chipcommon_b.c
|
||||
@@ -0,0 +1,59 @@
|
||||
+/*
|
||||
+ * Broadcom specific AMBA
|
||||
+ * ChipCommon B Unit driver
|
||||
+ *
|
||||
+ * Copyright 2011, 2014, Hauke Mehrtens <hauke@hauke-m.de>
|
||||
+ *
|
||||
+ * Licensed under the GNU/GPL. See COPYING for details.
|
||||
+ */
|
||||
+
|
||||
+#include "bcma_private.h"
|
||||
+#include <linux/export.h>
|
||||
+#include <linux/bcma/bcma.h>
|
||||
+
|
||||
+static bool bcma_wait_reg(void __iomem *addr, u32 mask, u32 value,
|
||||
+ int timeout)
|
||||
+{
|
||||
+ unsigned long deadline = jiffies + timeout;
|
||||
+ u32 val;
|
||||
+
|
||||
+ do {
|
||||
+ val = readl(addr);
|
||||
+ if ((val & mask) == value)
|
||||
+ return true;
|
||||
+ cpu_relax();
|
||||
+ udelay(10);
|
||||
+ } while (!time_after_eq(jiffies, deadline));
|
||||
+
|
||||
+ pr_warn("Timeout waiting for register %p!\n", addr);
|
||||
+
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value)
|
||||
+{
|
||||
+ writel(offset, ccb->mii + 0x00);
|
||||
+ bcma_wait_reg(ccb->mii + 0x00, 0x0100, 0x0000, 100);
|
||||
+ writel(value, ccb->mii + 0x04);
|
||||
+ bcma_wait_reg(ccb->mii + 0x00, 0x0100, 0x0000, 100);
|
||||
+}
|
||||
+EXPORT_SYMBOL_GPL(bcma_chipco_b_mii_write);
|
||||
+
|
||||
+int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb)
|
||||
+{
|
||||
+ if (ccb->setup_done)
|
||||
+ return 0;
|
||||
+
|
||||
+ ccb->setup_done = 1;
|
||||
+ ccb->mii = ioremap_nocache(ccb->core->addr_s[1], BCMA_CORE_SIZE);
|
||||
+ if (!ccb->mii)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+void bcma_core_chipcommon_b_free(struct bcma_drv_cc_b *ccb)
|
||||
+{
|
||||
+ if (ccb->mii)
|
||||
+ iounmap(ccb->mii);
|
||||
+}
|
||||
--- a/drivers/bcma/main.c
|
||||
+++ b/drivers/bcma/main.c
|
||||
@@ -213,6 +213,7 @@ static int bcma_register_devices(struct
|
||||
switch (core->id.id) {
|
||||
case BCMA_CORE_4706_CHIPCOMMON:
|
||||
case BCMA_CORE_CHIPCOMMON:
|
||||
+ case BCMA_CORE_NS_CHIPCOMMON_B:
|
||||
case BCMA_CORE_PCI:
|
||||
case BCMA_CORE_PCIE:
|
||||
case BCMA_CORE_PCIE2:
|
||||
@@ -327,6 +328,13 @@ int bcma_bus_register(struct bcma_bus *b
|
||||
bcma_core_chipcommon_init(&bus->drv_cc);
|
||||
}
|
||||
|
||||
+ /* Init CC core */
|
||||
+ core = bcma_find_core(bus, BCMA_CORE_NS_CHIPCOMMON_B);
|
||||
+ if (core) {
|
||||
+ bus->drv_cc_b.core = core;
|
||||
+ bcma_core_chipcommon_b_init(&bus->drv_cc_b);
|
||||
+ }
|
||||
+
|
||||
/* Init MIPS core */
|
||||
core = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
|
||||
if (core) {
|
||||
@@ -381,6 +389,8 @@ void bcma_bus_unregister(struct bcma_bus
|
||||
else if (err)
|
||||
bcma_err(bus, "Can not unregister GPIO driver: %i\n", err);
|
||||
|
||||
+ bcma_core_chipcommon_b_free(&bus->drv_cc_b);
|
||||
+
|
||||
cores[0] = bcma_find_core(bus, BCMA_CORE_MIPS_74K);
|
||||
cores[1] = bcma_find_core(bus, BCMA_CORE_PCIE);
|
||||
cores[2] = bcma_find_core(bus, BCMA_CORE_4706_MAC_GBIT_COMMON);
|
||||
--- a/drivers/bcma/scan.c
|
||||
+++ b/drivers/bcma/scan.c
|
||||
@@ -314,6 +314,7 @@ static int bcma_get_next_core(struct bcm
|
||||
/* Some specific cores don't need wrappers */
|
||||
switch (core->id.id) {
|
||||
case BCMA_CORE_4706_MAC_GBIT_COMMON:
|
||||
+ case BCMA_CORE_NS_CHIPCOMMON_B:
|
||||
/* Not used yet: case BCMA_CORE_OOB_ROUTER: */
|
||||
break;
|
||||
default:
|
||||
--- a/include/linux/bcma/bcma.h
|
||||
+++ b/include/linux/bcma/bcma.h
|
||||
@@ -337,6 +337,7 @@ struct bcma_bus {
|
||||
u8 num;
|
||||
|
||||
struct bcma_drv_cc drv_cc;
|
||||
+ struct bcma_drv_cc_b drv_cc_b;
|
||||
struct bcma_drv_pci drv_pci[2];
|
||||
struct bcma_drv_pcie2 drv_pcie2;
|
||||
struct bcma_drv_mips drv_mips;
|
||||
--- a/include/linux/bcma/bcma_driver_chipcommon.h
|
||||
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
|
||||
@@ -644,6 +644,12 @@ struct bcma_drv_cc {
|
||||
#endif
|
||||
};
|
||||
|
||||
+struct bcma_drv_cc_b {
|
||||
+ struct bcma_device *core;
|
||||
+ u8 setup_done:1;
|
||||
+ void __iomem *mii;
|
||||
+};
|
||||
+
|
||||
/* Register access */
|
||||
#define bcma_cc_read32(cc, offset) \
|
||||
bcma_read32((cc)->core, offset)
|
||||
@@ -699,4 +705,6 @@ extern void bcma_pmu_spuravoid_pllupdate
|
||||
|
||||
extern u32 bcma_pmu_get_bus_clock(struct bcma_drv_cc *cc);
|
||||
|
||||
+void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value);
|
||||
+
|
||||
#endif /* LINUX_BCMA_DRIVER_CC_H_ */
|
||||
Loading…
Reference in new issue