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

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

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

arch/powerpc/boot/dts/mpc5200b.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -231,6 +231,12 @@ 
			interrupts = <2 7 0>;

		};



		sclpc@3c00 {

			compatible = "fsl,mpc5200-lpbfifo";

			reg = <0x3c00 0x60>;

			interrupts = <2 23 0>;

		};



		i2c@3d00 {

			#address-cells = <1>;

			#size-cells = <0>;

arch/powerpc/boot/dts/o2d.dtsi

+0 −6
Original line number Diff line number Diff line
@@ -86,12 +86,6 @@ 
				reg = <0>;

			};

		};



		sclpc@3c00 {

			compatible = "fsl,mpc5200-lpbfifo";

			reg = <0x3c00 0x60>;

			interrupts = <3 23 0>;

		};

	};



	localbus {

arch/powerpc/boot/dts/pcm030.dts

+6 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
			#gpio-cells = <2>;

		};



		psc@2000 { /* PSC1 in ac97 mode */

		audioplatform: psc@2000 { /* PSC1 in ac97 mode */

			compatible = "mpc5200b-psc-ac97","fsl,mpc5200b-psc-ac97";

			cell-index = <0>;

		};
@@ -134,4 +134,9 @@ 
	localbus {

		status = "disabled";

	};



	sound {

		compatible = "phytec,pcm030-audio-fabric";

		asoc-platform = <&audioplatform>;

	};

};

arch/powerpc/platforms/52xx/mpc52xx_pic.c

+5 −4
Original line number Diff line number Diff line
@@ -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_PERP: irqchip = &mpc52xx_periph_irqchip; break;

	case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;

	default:

		pr_err("%s: invalid irq: virq=%i, l1=%i, l2=%i\n",

		       __func__, virq, l1irq, l2irq);

		return -EINVAL;

	case MPC52xx_IRQ_L1_CRIT:

		pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",

			__func__, l2irq);

		irq_set_chip(virq, &no_irq_chip);

		return 0;

	}



	irq_set_chip_and_handler(virq, irqchip, handle_level_irq);