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

Commit ff933a08 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next 

Pull ARM SoC low-priority fixes from Olof Johansson:
 "A small selection of fixes coming in late during the release cycle and
  not being critical enough for 3.15 inclusion"

* tag 'fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: shmobile: armadillo800eva: fixup HDMI sound flags setting
  ARM: msm: Silence readb/writeb warnings due to missing IOMEM()
  ARM: dts: am43xx: fix starting offset of NAND.filesystem MTD partition
  ARM: dts: am335x-boneblack: remove use of ti,vcc-aux-disable-is-sleep
  ARM: OMAP2+: free use_gptimer_clksrc variable after boot
  ARM: OMAP5: Redo THUMB mode switch on secondary CPU
  ARM: dts: AM4372: add l3-noc information
  ARM: dts: DRA7: Use dra7-l3-noc instead of omap4-l3-noc
  reset: Add of_reset_control_get to reset.h
parents 80081ec3 da98f44f

arch/arm/boot/dts/am335x-boneblack.dts

+0 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 
	pinctrl-0 = <&emmc_pins>;

	pinctrl-0 = <&emmc_pins>;

	bus-width = <8>;

	bus-width = <8>;

	status = "okay";

	status = "okay";

	ti,vcc-aux-disable-is-sleep;

};

};





&am33xx_pinmux {

&am33xx_pinmux {

arch/arm/boot/dts/am4372.dtsi

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

	};





	ocp {

	ocp {

		compatible = "simple-bus";

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

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;

		ranges;

		ranges;

		ti,hwmods = "l3_main";

		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 {

		prcm: prcm@44df0000 {

			compatible = "ti,am4-prcm";

			compatible = "ti,am4-prcm";

arch/arm/boot/dts/am43x-epos-evm.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -341,7 +341,7 @@ 
		};

		};

		partition@9 {

		partition@9 {

			label = "NAND.file-system";

			label = "NAND.file-system";

			reg = <0x00800000 0x1F600000>;

			reg = <0x00a00000 0x1f600000>;

		};

		};

	};

	};

};

};

arch/arm/boot/dts/dra7.dtsi

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

	 * hierarchy.

	 */

	 */

	ocp {

	ocp {

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

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

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <1>;

		#size-cells = <1>;

		ranges;

		ranges;

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

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

		reg = <0x44000000 0x2000>,

		reg = <0x44000000 0x1000000>,

		      <0x44800000 0x3000>;

		      <0x45000000 0x1000>;

		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/mach-msm/board-trout-gpio.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ static int trout_gpio_to_irq(struct gpio_chip *chip, unsigned offset) 
			.base		  = base_gpio,			\

			.base		  = base_gpio,			\

			.ngpio		  = 8,				\

			.ngpio		  = 8,				\

		},							\

		},							\

		.reg = (void *) reg_num + TROUT_CPLD_BASE,		\

		.reg = reg_num + TROUT_CPLD_BASE,			\

		.shadow = shadow_val,					\

		.shadow = shadow_val,					\

	}

	}