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

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

Merge tag 'omap-for-v4.4/fixes-rc4' of... 

Merge tag 'omap-for-v4.4/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "omap fixes against v4.4-rc4" from Tony Lindgren

Few fixes for omaps for v4.4-rc cycle:

- Fix clock source for ARM TWD and global timers on am437x

- Always select REGULATOR_FIXED_VOLTAGE for omap2+ instead of
  when MACH_OMAP3_PANDORA is selected

- Fix SPI DMA handles for dm816x as only some were mapped

- Fix up mbox cells for dm816x to make mailbox usable

* tag 'omap-for-v4.4/fixes-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am4372: fix clock source for arm twd and global timers
  ARM: OMAP2+: enable REGULATOR_FIXED_VOLTAGE
  ARM: dts: add dm816x missing spi DT dma handles
  ARM: dts: add dm816x missing #mbox-cells
parents ddd47fbc 14054fb1

arch/arm/boot/dts/am4372.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
		reg = <0x48240200 0x100>;

		interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-parent = <&gic>;

		clocks = <&dpll_mpu_m2_ck>;

		clocks = <&mpu_periphclk>;

	};



	local_timer: timer@48240600 {
@@ -82,7 +82,7 @@ 
		reg = <0x48240600 0x100>;

		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-parent = <&gic>;

		clocks = <&dpll_mpu_m2_ck>;

		clocks = <&mpu_periphclk>;

	};



	l2-cache-controller@48242000 {

arch/arm/boot/dts/am43xx-clocks.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -259,6 +259,14 @@ 
		ti,invert-autoidle-bit;

	};



	mpu_periphclk: mpu_periphclk {

		#clock-cells = <0>;

		compatible = "fixed-factor-clock";

		clocks = <&dpll_mpu_m2_ck>;

		clock-mult = <1>;

		clock-div = <2>;

	};



	dpll_ddr_ck: dpll_ddr_ck {

		#clock-cells = <0>;

		compatible = "ti,am3-dpll-clock";

arch/arm/boot/dts/dm816x.dtsi

+6 −2
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ 
			reg = <0x480c8000 0x2000>;

			interrupts = <77>;

			ti,hwmods = "mailbox";

			#mbox-cells = <1>;

			ti,mbox-num-users = <4>;

			ti,mbox-num-fifos = <12>;

			mbox_dsp: mbox_dsp {
@@ -279,8 +280,11 @@ 
			ti,spi-num-cs = <4>;

			ti,hwmods = "mcspi1";

			dmas = <&edma 16 &edma 17

				&edma 18 &edma 19>;

			dma-names = "tx0", "rx0", "tx1", "rx1";

				&edma 18 &edma 19

				&edma 20 &edma 21

				&edma 22 &edma 23>;

			dma-names = "tx0", "rx0", "tx1", "rx1",

				    "tx2", "rx2", "tx3", "rx3";

		};



		mmc1: mmc@48060000 {

arch/arm/mach-omap2/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ config ARCH_OMAP2PLUS_TYPICAL 
	select NEON if CPU_V7

	select PM

	select REGULATOR

	select REGULATOR_FIXED_VOLTAGE

	select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4

	select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4

	select VFP
@@ -201,7 +202,6 @@ config MACH_OMAP3_PANDORA 
	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_NOKIA_N810

       bool