mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-10 15:47:11 +02:00
1b56ff8998
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30481 3c298f89-4303-0410-b956-a3cf2f4a3e73
135 lines
3.8 KiB
Diff
135 lines
3.8 KiB
Diff
From 6d174f732e198aae8583cc5414b11b988bfd37a9 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Mon, 30 Jan 2012 22:44:15 +0100
|
|
Subject: [PATCH 4/4] ssb: add support for bcm5354
|
|
|
|
This patch adds support the the BCM5354 SoC.
|
|
It has a PMU and a constant not configurable clock.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
drivers/ssb/driver_chipcommon_pmu.c | 48 +++++++++++++++++++++++++++++++---
|
|
drivers/ssb/driver_mipscore.c | 3 ++
|
|
drivers/ssb/main.c | 3 ++
|
|
drivers/ssb/ssb_private.h | 4 +++
|
|
4 files changed, 53 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/ssb/driver_chipcommon_pmu.c
|
|
+++ b/drivers/ssb/driver_chipcommon_pmu.c
|
|
@@ -13,6 +13,9 @@
|
|
#include <linux/ssb/ssb_driver_chipcommon.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/export.h>
|
|
+#ifdef CONFIG_BCM47XX
|
|
+#include <asm/mach-bcm47xx/nvram.h>
|
|
+#endif
|
|
|
|
#include "ssb_private.h"
|
|
|
|
@@ -92,10 +95,6 @@ static void ssb_pmu0_pllinit_r0(struct s
|
|
u32 pmuctl, tmp, pllctl;
|
|
unsigned int i;
|
|
|
|
- if ((bus->chip_id == 0x5354) && !crystalfreq) {
|
|
- /* The 5354 crystal freq is 25MHz */
|
|
- crystalfreq = 25000;
|
|
- }
|
|
if (crystalfreq)
|
|
e = pmu0_plltab_find_entry(crystalfreq);
|
|
if (!e)
|
|
@@ -321,7 +320,11 @@ static void ssb_pmu_pll_init(struct ssb_
|
|
u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
|
|
|
|
if (bus->bustype == SSB_BUSTYPE_SSB) {
|
|
- /* TODO: The user may override the crystal frequency. */
|
|
+#ifdef CONFIG_BCM47XX
|
|
+ char buf[20];
|
|
+ if (nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
|
|
+ crystalfreq = simple_strtoul(buf, NULL, 0);
|
|
+#endif
|
|
}
|
|
|
|
switch (bus->chip_id) {
|
|
@@ -330,7 +333,11 @@ static void ssb_pmu_pll_init(struct ssb_
|
|
ssb_pmu1_pllinit_r0(cc, crystalfreq);
|
|
break;
|
|
case 0x4328:
|
|
+ ssb_pmu0_pllinit_r0(cc, crystalfreq);
|
|
+ break;
|
|
case 0x5354:
|
|
+ if (crystalfreq == 0)
|
|
+ crystalfreq = 25000;
|
|
ssb_pmu0_pllinit_r0(cc, crystalfreq);
|
|
break;
|
|
case 0x4322:
|
|
@@ -607,3 +614,34 @@ void ssb_pmu_set_ldo_paref(struct ssb_ch
|
|
|
|
EXPORT_SYMBOL(ssb_pmu_set_ldo_voltage);
|
|
EXPORT_SYMBOL(ssb_pmu_set_ldo_paref);
|
|
+
|
|
+u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc)
|
|
+{
|
|
+ struct ssb_bus *bus = cc->dev->bus;
|
|
+
|
|
+ switch (bus->chip_id) {
|
|
+ case 0x5354:
|
|
+ /* 5354 chip uses a non programmable PLL of frequency 240MHz */
|
|
+ return 240000000;
|
|
+ default:
|
|
+ ssb_printk(KERN_ERR PFX
|
|
+ "ERROR: PMU cpu clock unknown for device %04X\n",
|
|
+ bus->chip_id);
|
|
+ return 0;
|
|
+ }
|
|
+}
|
|
+
|
|
+u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc)
|
|
+{
|
|
+ struct ssb_bus *bus = cc->dev->bus;
|
|
+
|
|
+ switch (bus->chip_id) {
|
|
+ case 0x5354:
|
|
+ return 120000000;
|
|
+ default:
|
|
+ ssb_printk(KERN_ERR PFX
|
|
+ "ERROR: PMU controlclock unknown for device %04X\n",
|
|
+ bus->chip_id);
|
|
+ return 0;
|
|
+ }
|
|
+}
|
|
--- a/drivers/ssb/driver_mipscore.c
|
|
+++ b/drivers/ssb/driver_mipscore.c
|
|
@@ -232,6 +232,9 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
|
|
struct ssb_bus *bus = mcore->dev->bus;
|
|
u32 pll_type, n, m, rate = 0;
|
|
|
|
+ if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
|
|
+ return ssb_pmu_get_cpu_clock(&bus->chipco);
|
|
+
|
|
if (bus->extif.dev) {
|
|
ssb_extif_get_clockcontrol(&bus->extif, &pll_type, &n, &m);
|
|
} else if (bus->chipco.dev) {
|
|
--- a/drivers/ssb/main.c
|
|
+++ b/drivers/ssb/main.c
|
|
@@ -1094,6 +1094,9 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
|
|
u32 plltype;
|
|
u32 clkctl_n, clkctl_m;
|
|
|
|
+ if (bus->chipco.capabilities & SSB_CHIPCO_CAP_PMU)
|
|
+ return ssb_pmu_get_controlclock(&bus->chipco);
|
|
+
|
|
if (ssb_extif_available(&bus->extif))
|
|
ssb_extif_get_clockcontrol(&bus->extif, &plltype,
|
|
&clkctl_n, &clkctl_m);
|
|
--- a/drivers/ssb/ssb_private.h
|
|
+++ b/drivers/ssb/ssb_private.h
|
|
@@ -211,4 +211,8 @@ static inline void b43_pci_ssb_bridge_ex
|
|
}
|
|
#endif /* CONFIG_SSB_B43_PCI_BRIDGE */
|
|
|
|
+/* driver_chipcommon_pmu.c */
|
|
+extern u32 ssb_pmu_get_cpu_clock(struct ssb_chipcommon *cc);
|
|
+extern u32 ssb_pmu_get_controlclock(struct ssb_chipcommon *cc);
|
|
+
|
|
#endif /* LINUX_SSB_PRIVATE_H_ */
|