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

Commit e610c9d3 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'pull/l3noc/dts-fixes' of... 

Merge branch 'pull/l3noc/dts-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.16/fixes-not-urgent
parents 2347152b 2eeddb8a

arch/arm/boot/dts/am4372.dtsi

+5 −1
Original line number Diff line number Diff line
@@ -67,11 +67,15 @@ 
	};



	ocp {

		compatible = "simple-bus";

		compatible = "ti,am4372-l3-noc", "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		ti,hwmods = "l3_main";

		reg = <0x44000000 0x400000

		       0x44800000 0x400000>;

		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;



		prcm: prcm@44df0000 {

			compatible = "ti,am4-prcm";

arch/arm/boot/dts/dra7.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -99,13 +99,13 @@ 
	 * hierarchy.

	 */

	ocp {

		compatible = "ti,omap4-l3-noc", "simple-bus";

		compatible = "ti,dra7-l3-noc", "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		ti,hwmods = "l3_main_1", "l3_main_2";

		reg = <0x44000000 0x2000>,

		      <0x44800000 0x3000>;

		reg = <0x44000000 0x1000000>,

		      <0x45000000 0x1000>;

		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;