← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to arch/sh/drivers/pci/fixups-rts7751r2d.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/sh/drivers/pci/fixups-rts7751r2d.c
15
15
#include <mach/lboxre2.h>
16
16
#include <mach/r2d.h>
17
17
#include "pci-sh4.h"
18
 
#include <asm/machtypes.h>
 
18
#include <generated/machtypes.h>
19
19
 
20
20
#define PCIMCR_MRSET_OFF        0xBFFFFFFF
21
21
#define PCIMCR_RFSH_OFF         0xFFFFFFFB
43
43
{
44
44
        unsigned long bcr1, mcr;
45
45
 
46
 
        bcr1 = ctrl_inl(SH7751_BCR1);
 
46
        bcr1 = __raw_readl(SH7751_BCR1);
47
47
        bcr1 |= 0x40080000;     /* Enable Bit 19 BREQEN, set PCIC to slave */
48
48
        pci_write_reg(chan, bcr1, SH4_PCIBCR1);
49
49
 
54
54
        pci_write_reg(chan, 0xfb900047, SH7751_PCICONF1);
55
55
        pci_write_reg(chan, 0xab000001, SH7751_PCICONF4);
56
56
 
57
 
        mcr = ctrl_inl(SH7751_MCR);
 
57
        mcr = __raw_readl(SH7751_MCR);
58
58
        mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
59
59
        pci_write_reg(chan, mcr, SH4_PCIMCR);
60
60