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

Commit cd954274 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'soc-part2-for-v3.18' of... 

Merge tag 'soc-part2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

 into next/soc

Pull "part 2 of omap SoC changes" from Tony Lindgren:

Few hwmod changes to support upcoming 8250 driver with DMA,
start using the SRAM driver for some omaps, and update the
defconfig.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'soc-part2-for-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4+: Remove static iotable mappings for SRAM
  ARM: OMAP4+: Move SRAM data to DT
  ARM: AM335x: Get rid of unused sram init function
  ARM: omap2plus_defconfig: Enable some display features
  ARM: omap2plus_defconfig: Enable battery and reset drivers
  ARM: omap2plus_defconfig: Add support for distros with systemd
  ARM: omap2plus_defconfig: Add cpufreq to defconfig
  ARM: omap2plus_defconfig: Shrink with savedefconfig
  ARM: OMAP3: Use manual idle for UARTs because of DMA errata
  ARM: OMAP2+: Add hwmod flag for HWMOD_RECONFIG_IO_CHAIN
parents e1e85e76 1306c08a

Documentation/devicetree/bindings/arm/omap/mpu.txt

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ Required properties: 
	       Should be "ti,omap5-mpu" for OMAP5

- ti,hwmods: "mpu"



Optional properties:

- sram:	Phandle to the ocmcram node



Examples:



- For an OMAP5 SMP system:

arch/arm/boot/dts/am33xx.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -726,9 +726,8 @@ 
		};



		ocmcram: ocmcram@40300000 {

			compatible = "ti,am3352-ocmcram";

			reg = <0x40300000 0x10000>;

			ti,hwmods = "ocmcram";

			compatible = "mmio-sram";

			reg = <0x40300000 0x10000>; /* 64k */

		};



		wkup_m3: wkup_m3@44d00000 {

arch/arm/boot/dts/am4372.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -885,6 +885,11 @@ 
				clock-names = "fck";

			};

		};



		ocmcram: ocmcram@40300000 {

			compatible = "mmio-sram";

			reg = <0x40300000 0x40000>; /* 256k */

		};

	};

};

arch/arm/boot/dts/omap4.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
		mpu {

			compatible = "ti,omap4-mpu";

			ti,hwmods = "mpu";

			sram = <&ocmcram>;

		};



		dsp {
@@ -209,6 +210,11 @@ 
			};

		};



		ocmcram: ocmcram@40304000 {

			compatible = "mmio-sram";

			reg = <0x40304000 0xa000>; /* 40k */

		};



		sdma: dma-controller@4a056000 {

			compatible = "ti,omap4430-sdma";

			reg = <0x4a056000 0x1000>;

arch/arm/boot/dts/omap5.dtsi

+7 −1
Original line number Diff line number Diff line
@@ -104,8 +104,9 @@ 
	soc {

		compatible = "ti,omap-infra";

		mpu {

			compatible = "ti,omap5-mpu";

			compatible = "ti,omap4-mpu";

			ti,hwmods = "mpu";

			sram = <&ocmcram>;

		};

	};
@@ -220,6 +221,11 @@ 
			};

		};



		ocmcram: ocmcram@40300000 {

			compatible = "mmio-sram";

			reg = <0x40300000 0x20000>; /* 128k */

		};



		sdma: dma-controller@4a056000 {

			compatible = "ti,omap4430-sdma";

			reg = <0x4a056000 0x1000>;