diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2011-05-11 02:08:09 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-05-11 14:50:41 -0400 |
| commit | 1073e4ee595265086a592a056d903bf4fcc8885a (patch) | |
| tree | 1cd9726f80abf3625df6ac7c31ffd68087c7bff1 /drivers/bcma | |
| parent | f59a59fea3be78c2bda23cb7f55225b33c502c3c (diff) | |
| download | linux-stable-1073e4ee595265086a592a056d903bf4fcc8885a.tar.gz linux-stable-1073e4ee595265086a592a056d903bf4fcc8885a.tar.bz2 linux-stable-1073e4ee595265086a592a056d903bf4fcc8885a.zip | |
bcma: add missing GPIO defines, use PULL register only when available
Similar patch was commited to ssb.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma')
| -rw-r--r-- | drivers/bcma/driver_chipcommon.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c index caf596091d4d..606102256b44 100644 --- a/drivers/bcma/driver_chipcommon.c +++ b/drivers/bcma/driver_chipcommon.c @@ -29,8 +29,10 @@ void bcma_core_chipcommon_init(struct bcma_drv_cc *cc) if (cc->core->id.rev >= 35) cc->capabilities_ext = bcma_cc_read32(cc, BCMA_CC_CAP_EXT); - bcma_cc_write32(cc, 0x58, 0); - bcma_cc_write32(cc, 0x5C, 0); + if (cc->core->id.rev >= 20) { + bcma_cc_write32(cc, BCMA_CC_GPIOPULLUP, 0); + bcma_cc_write32(cc, BCMA_CC_GPIOPULLDOWN, 0); + } if (cc->capabilities & BCMA_CC_CAP_PMU) bcma_pmu_init(cc); |