diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-02-27 21:59:03 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2016-02-27 21:59:03 +0200 |
| commit | 51bcc7386a01074452c585e421a24dfc7b19063b (patch) | |
| tree | f9c7633d6d4349c0e21b23090b857a0fcd790418 /arch/x86/platform/atom/punit_atom_debug.c | |
| parent | c89e333d5e4a27f736c960b29040b261c21563a5 (diff) | |
| parent | 50ee738d7271fe825e4024cdfa5c5301a871e2c2 (diff) | |
Merge tag 'mac80211-next-for-davem-2016-02-26' into next2
Here's another round of updates for -next:
* big A-MSDU RX performance improvement (avoid linearize of paged RX)
* rfkill changes: cleanups, documentation, platform properties
* basic PBSS support in cfg80211
* MU-MIMO action frame processing support
* BlockAck reordering & duplicate detection offload support
* various cleanups & little fixes
Diffstat (limited to 'arch/x86/platform/atom/punit_atom_debug.c')
| -rw-r--r-- | arch/x86/platform/atom/punit_atom_debug.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86/platform/atom/punit_atom_debug.c b/arch/x86/platform/atom/punit_atom_debug.c index 5ca8ead91579..81c769e80614 100644 --- a/arch/x86/platform/atom/punit_atom_debug.c +++ b/arch/x86/platform/atom/punit_atom_debug.c @@ -25,8 +25,6 @@ #include <asm/cpu_device_id.h> #include <asm/iosf_mbi.h> -/* Side band Interface port */ -#define PUNIT_PORT 0x04 /* Power gate status reg */ #define PWRGT_STATUS 0x61 /* Subsystem config/status Video processor */ @@ -85,9 +83,8 @@ static int punit_dev_state_show(struct seq_file *seq_file, void *unused) seq_puts(seq_file, "\n\nPUNIT NORTH COMPLEX DEVICES :\n"); while (punit_devp->name) { - status = iosf_mbi_read(PUNIT_PORT, BT_MBI_PMC_READ, - punit_devp->reg, - &punit_pwr_status); + status = iosf_mbi_read(BT_MBI_UNIT_PMC, MBI_REG_READ, + punit_devp->reg, &punit_pwr_status); if (status) { seq_printf(seq_file, "%9s : Read Failed\n", punit_devp->name); |