Commit 99b6e1e7 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull missed powerpc fixes from Benjamin Herrenschmidt:
 "Here are small 52xx fixes that Anatolij asked me to pull a while back
  and that I completely missed.  The stuff is local to that platform
  code, and was in next for a while, so it should still go into 3.7."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/mpc5200: move lpbfifo node and fix its interrupt property
  powerpc: 52xx: nop out unsupported critical IRQs
  powerpc/pcm030: add pcm030-audio-fabric to dts
parents 74dcc3f9 d6dc2461
...@@ -231,6 +231,12 @@ ata@3a00 { ...@@ -231,6 +231,12 @@ ata@3a00 {
interrupts = <2 7 0>; interrupts = <2 7 0>;
}; };
sclpc@3c00 {
compatible = "fsl,mpc5200-lpbfifo";
reg = <0x3c00 0x60>;
interrupts = <2 23 0>;
};
i2c@3d00 { i2c@3d00 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
...@@ -86,12 +86,6 @@ phy0: ethernet-phy@0 { ...@@ -86,12 +86,6 @@ phy0: ethernet-phy@0 {
reg = <0>; reg = <0>;
}; };
}; };
sclpc@3c00 {
compatible = "fsl,mpc5200-lpbfifo";
reg = <0x3c00 0x60>;
interrupts = <3 23 0>;
};
}; };
localbus { localbus {
......
...@@ -59,7 +59,7 @@ gpt7: timer@670 { // General Purpose Timer in GPIO mode ...@@ -59,7 +59,7 @@ gpt7: timer@670 { // General Purpose Timer in GPIO mode
#gpio-cells = <2>; #gpio-cells = <2>;
}; };
psc@2000 { /* PSC1 in ac97 mode */ audioplatform: psc@2000 { /* PSC1 in ac97 mode */
compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97"; compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97";
cell-index = <0>; cell-index = <0>;
}; };
...@@ -134,4 +134,9 @@ pci@f0000d00 { ...@@ -134,4 +134,9 @@ pci@f0000d00 {
localbus { localbus {
status = "disabled"; status = "disabled";
}; };
sound {
compatible = "phytec,pcm030-audio-fabric";
asoc-platform = <&audioplatform>;
};
}; };
...@@ -372,10 +372,11 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq, ...@@ -372,10 +372,11 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
case MPC52xx_IRQ_L1_MAIN: irqchip = &mpc52xx_main_irqchip; break; case MPC52xx_IRQ_L1_MAIN: irqchip = &mpc52xx_main_irqchip; break;
case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break; case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break; case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
default: case MPC52xx_IRQ_L1_CRIT:
pr_err("%s: invalid irq: virq=%i, l1=%i, l2=%i\n", pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",
__func__, virq, l1irq, l2irq); __func__, l2irq);
return -EINVAL; irq_set_chip(virq, &no_irq_chip);
return 0;
} }
irq_set_chip_and_handler(virq, irqchip, handle_level_irq); irq_set_chip_and_handler(virq, irqchip, handle_level_irq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment