Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70e1584d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'orion_fixes_for_3.7' of git://git.infradead.org/users/jcooper/linux into fixes 

From Jason Cooper:

orion fixes for v3.7
 - dove irq fix
 - kirkwood pcie fix

* tag 'orion_fixes_for_3.7' of git://git.infradead.org/users/jcooper/linux:
  ARM: Kirkwood: Update PCI-E fixup
  Dove: Fix irq_to_pmu()
  Dove: Attempt to fix PMU/RTC interrupts
parents c667f757 1dc831bf

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ config ARCH_KIRKWOOD 
	select CPU_FEROCEON

	select GENERIC_CLOCKEVENTS

	select PCI

	select PCI_QUIRKS

	select PLAT_ORION_LEGACY

	help

	  Support for the following Marvell Kirkwood series SoCs:

arch/arm/mach-dove/include/mach/pm.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static inline int pmu_to_irq(int pin) 


static inline int irq_to_pmu(int irq)

{

	if (IRQ_DOVE_PMU_START < irq && irq < NR_IRQS)

	if (IRQ_DOVE_PMU_START <= irq && irq < NR_IRQS)

		return irq - IRQ_DOVE_PMU_START;



	return -EINVAL;

arch/arm/mach-dove/irq.c

+13 −1
Original line number Diff line number Diff line
@@ -46,8 +46,20 @@ static void pmu_irq_ack(struct irq_data *d) 
	int pin = irq_to_pmu(d->irq);

	u32 u;



	/*

	 * The PMU mask register is not RW0C: it is RW.  This means that

	 * the bits take whatever value is written to them; if you write

	 * a '1', you will set the interrupt.

	 *

	 * Unfortunately this means there is NO race free way to clear

	 * these interrupts.

	 *

	 * So, let's structure the code so that the window is as small as

	 * possible.

	 */

	u = ~(1 << (pin & 31));

	writel(u, PMU_INTERRUPT_CAUSE);

	u &= readl_relaxed(PMU_INTERRUPT_CAUSE);

	writel_relaxed(u, PMU_INTERRUPT_CAUSE);

}



static struct irq_chip pmu_irq_chip = {

arch/arm/mach-kirkwood/pcie.c

+8 −3
Original line number Diff line number Diff line
@@ -207,14 +207,19 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) 
	return 1;

}



static void __devinit rc_pci_fixup(struct pci_dev *dev)

{

/*

	 * Prevent enumeration of root complex.

 * The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it

 * is operating as a root complex this needs to be switched to

 * PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on

 * the device. Decoding setup is handled by the orion code.

 */

static void __devinit rc_pci_fixup(struct pci_dev *dev)

{

	if (dev->bus->parent == NULL && dev->devfn == 0) {

		int i;



		dev->class &= 0xff;

		dev->class |= PCI_CLASS_BRIDGE_HOST << 8;

		for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {

			dev->resource[i].start = 0;

			dev->resource[i].end   = 0;