bcma: handle more devices in bcma_pmu_get_alp_clock()

Add some more chip IDs to bcma_pmu_get_alp_clock() Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>

bcma: handle more devices in bcma_pmu_get_alp_clock()
Add some more chip IDs to bcma_pmu_get_alp_clock() Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Hauke Mehrtens · John W. Linville
1 parent e3f2ae179c
Showing 2 changed files with 21 additions and 4 deletions Side-by-side Diff
drivers/bcma/driver_chipcommon_pmu.c
include/linux/bcma/bcma_driver_chipcommon.h
@@ -174,19 +174,35 @@
 	struct bcma_bus *bus = cc->core->bus;
  
 	switch (bus->chipinfo.id) {
+	case BCMA_CHIP_ID_BCM4313:
+	case BCMA_CHIP_ID_BCM43224:
+	case BCMA_CHIP_ID_BCM43225:
+	case BCMA_CHIP_ID_BCM43227:
+	case BCMA_CHIP_ID_BCM43228:
+	case BCMA_CHIP_ID_BCM4331:
+	case BCMA_CHIP_ID_BCM43421:
+	case BCMA_CHIP_ID_BCM43428:
+	case BCMA_CHIP_ID_BCM43431:
 	case BCMA_CHIP_ID_BCM4716:
-	case BCMA_CHIP_ID_BCM4748:
 	case BCMA_CHIP_ID_BCM47162:
-	case BCMA_CHIP_ID_BCM4313:
-	case BCMA_CHIP_ID_BCM5357:
+	case BCMA_CHIP_ID_BCM4748:
 	case BCMA_CHIP_ID_BCM4749:
+	case BCMA_CHIP_ID_BCM5357:
 	case BCMA_CHIP_ID_BCM53572:
+	case BCMA_CHIP_ID_BCM6362:
 		/* always 20Mhz */
 		return 20000 * 1000;
-	case BCMA_CHIP_ID_BCM5356:
 	case BCMA_CHIP_ID_BCM4706:
+	case BCMA_CHIP_ID_BCM5356:
 		/* always 25Mhz */
 		return 25000 * 1000;
+	case BCMA_CHIP_ID_BCM43460:
+	case BCMA_CHIP_ID_BCM4352:
+	case BCMA_CHIP_ID_BCM4360:
+		if (cc->status & BCMA_CC_CHIPST_4360_XTAL_40MZ)
+			return 40000 * 1000;
+		else
+			return 20000 * 1000;
 	default:
 		bcma_warn(bus, "No ALP clock specified for %04X device, pmu rev. %d, using default %d Hz\n",
 			  bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
@@ -104,6 +104,7 @@
 #define  BCMA_CC_CHIPST_4706_MIPS_BENDIAN	BIT(3) /* 0: little, 1: big endian */
 #define  BCMA_CC_CHIPST_4706_PCIE1_DISABLE	BIT(5) /* PCIE1 enable strap pin */
 #define  BCMA_CC_CHIPST_5357_NAND_BOOT		BIT(4) /* NAND boot, valid for CC rev 38 and/or BCM5357 */
+#define  BCMA_CC_CHIPST_4360_XTAL_40MZ		0x00000001
 #define BCMA_CC_JCMD			0x0030		/* Rev >= 10 only */
 #define  BCMA_CC_JCMD_START		0x80000000
 #define  BCMA_CC_JCMD_BUSY		0x80000000
...	...	@@ -174,19 +174,35 @@
174	174	struct bcma_bus *bus = cc->core->bus;
175	175
176	176	switch (bus->chipinfo.id) {
	177	+ case BCMA_CHIP_ID_BCM4313:
	178	+ case BCMA_CHIP_ID_BCM43224:
	179	+ case BCMA_CHIP_ID_BCM43225:
	180	+ case BCMA_CHIP_ID_BCM43227:
	181	+ case BCMA_CHIP_ID_BCM43228:
	182	+ case BCMA_CHIP_ID_BCM4331:
	183	+ case BCMA_CHIP_ID_BCM43421:
	184	+ case BCMA_CHIP_ID_BCM43428:
	185	+ case BCMA_CHIP_ID_BCM43431:
177	186	case BCMA_CHIP_ID_BCM4716:
178		- case BCMA_CHIP_ID_BCM4748:
179	187	case BCMA_CHIP_ID_BCM47162:
180		- case BCMA_CHIP_ID_BCM4313:
181		- case BCMA_CHIP_ID_BCM5357:
	188	+ case BCMA_CHIP_ID_BCM4748:
182	189	case BCMA_CHIP_ID_BCM4749:
	190	+ case BCMA_CHIP_ID_BCM5357:
183	191	case BCMA_CHIP_ID_BCM53572:
	192	+ case BCMA_CHIP_ID_BCM6362:
184	193	/* always 20Mhz */
185	194	return 20000 * 1000;
186		- case BCMA_CHIP_ID_BCM5356:
187	195	case BCMA_CHIP_ID_BCM4706:
	196	+ case BCMA_CHIP_ID_BCM5356:
188	197	/* always 25Mhz */
189	198	return 25000 * 1000;
	199	+ case BCMA_CHIP_ID_BCM43460:
	200	+ case BCMA_CHIP_ID_BCM4352:
	201	+ case BCMA_CHIP_ID_BCM4360:
	202	+ if (cc->status & BCMA_CC_CHIPST_4360_XTAL_40MZ)
	203	+ return 40000 * 1000;
	204	+ else
	205	+ return 20000 * 1000;
190	206	default:
191	207	bcma_warn(bus, "No ALP clock specified for %04X device, pmu rev. %d, using default %d Hz\n",
192	208	bus->chipinfo.id, cc->pmu.rev, BCMA_CC_PMU_ALP_CLOCK);
...	...	@@ -104,6 +104,7 @@
104	104	#define BCMA_CC_CHIPST_4706_MIPS_BENDIAN BIT(3) /* 0: little, 1: big endian */
105	105	#define BCMA_CC_CHIPST_4706_PCIE1_DISABLE BIT(5) /* PCIE1 enable strap pin */
106	106	#define BCMA_CC_CHIPST_5357_NAND_BOOT BIT(4) /* NAND boot, valid for CC rev 38 and/or BCM5357 */
	107	+#define BCMA_CC_CHIPST_4360_XTAL_40MZ 0x00000001
107	108	#define BCMA_CC_JCMD 0x0030 /* Rev >= 10 only */
108	109	#define BCMA_CC_JCMD_START 0x80000000
109	110	#define BCMA_CC_JCMD_BUSY 0x80000000