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

Commit 44d8a7d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "This is the final small set of ARM SoC bug fixes for linux-4.4, almost
  all regressions:

  OMAP:
   - data corruption on the Nokia N900 flash

  Allwinner:
   - Two defconfig change to get USB working again

  ARM Versatile:
   - Interrupt numbers gone bad after an older bug fix

  Nomadik:
   - Crashes from incorrect L2 cache settings

  VIA vt8500:
   - SD/MMC support on WM8650 never worked"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  dts: vt8500: Add SDHC node to DTS file for WM8650
  ARM: Fix broken USB support in multi_v7_defconfig for sunxi devices
  ARM: versatile: fix MMC/SD interrupt assignment
  ARM: nomadik: set latencies to 8 cycles
  ARM: OMAP2+: Fix onenand rate detection to avoid filesystem corruption
  ARM: Fix broken USB support in sunxi_defconfig
parents 516c50cd 841bcd2e

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ 
		cache-sets = <512>;

		cache-line-size = <32>;

		/* At full speed latency must be >=2 */

		arm,tag-latency = <2>;

		arm,data-latency = <2 2>;

		arm,dirty-latency = <2>;

		arm,tag-latency = <8>;

		arm,data-latency = <8 8>;

		arm,dirty-latency = <8>;

	};



	mtu0: mtu@101e2000 {

arch/arm/boot/dts/versatile-ab.dts

+7 −3
Original line number Diff line number Diff line
@@ -110,7 +110,11 @@ 
			interrupt-parent = <&vic>;

			interrupts = <31>; /* Cascaded to vic */

			clear-mask = <0xffffffff>;

			valid-mask = <0xffc203f8>;

			/*

			 * Valid interrupt lines mask according to

			 * table 4-36 page 4-50 of ARM DUI 0225D

			 */

			valid-mask = <0x0760031b>;

		};



		dma@10130000 {
@@ -267,7 +271,7 @@ 
			mmc@5000 {

				compatible = "arm,pl180", "arm,primecell";

				reg = <0x5000 0x1000>;

				interrupts-extended = <&vic 22 &sic 2>;

				interrupts-extended = <&vic 22 &sic 1>;

				clocks = <&xtal24mhz>, <&pclk>;

				clock-names = "mclk", "apb_pclk";

			};

arch/arm/boot/dts/versatile-pb.dts

+19 −1
Original line number Diff line number Diff line
@@ -5,6 +5,16 @@ 
	compatible = "arm,versatile-pb";



	amba {

		/* The Versatile PB is using more SIC IRQ lines than the AB */

		sic: intc@10003000 {

			clear-mask = <0xffffffff>;

			/*

			 * Valid interrupt lines mask according to

			 * figure 3-30 page 3-74 of ARM DUI 0224B

			 */

			valid-mask = <0x7fe003ff>;

		};



		gpio2: gpio@101e6000 {

			compatible = "arm,pl061", "arm,primecell";

			reg = <0x101e6000 0x1000>;
@@ -67,6 +77,13 @@ 
		};



		fpga {

			mmc@5000 {

				/*

				 * Overrides the interrupt assignment from

				 * the Versatile AB board file.

				 */

				interrupts-extended = <&sic 22 &sic 23>;

			};

			uart@9000 {

				compatible = "arm,pl011", "arm,primecell";

				reg = <0x9000 0x1000>;
@@ -86,7 +103,8 @@ 
			mmc@b000 {

				compatible = "arm,pl180", "arm,primecell";

				reg = <0xb000 0x1000>;

				interrupts-extended = <&vic 23 &sic 2>;

				interrupt-parent = <&sic>;

				interrupts = <1>, <2>;

				clocks = <&xtal24mhz>, <&pclk>;

				clock-names = "mclk", "apb_pclk";

			};

arch/arm/boot/dts/wm8650.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -187,6 +187,15 @@ 
			interrupts = <43>;

		};



		sdhc@d800a000 {

			compatible = "wm,wm8505-sdhc";

			reg = <0xd800a000 0x400>;

			interrupts = <20>, <21>;

			clocks = <&clksdhc>;

			bus-width = <4>;

			sdon-inverted;

		};



		fb: fb@d8050800 {

			compatible = "wm,wm8505-fb";

			reg = <0xd8050800 0x200>;

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ CONFIG_BATTERY_MAX17042=m 
CONFIG_CHARGER_MAX14577=m

CONFIG_CHARGER_MAX77693=m

CONFIG_CHARGER_TPS65090=y

CONFIG_AXP20X_POWER=m

CONFIG_POWER_RESET_AS3722=y

CONFIG_POWER_RESET_GPIO=y

CONFIG_POWER_RESET_GPIO_RESTART=y