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

Commit 9bb29b6b 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:
 "A very small set of fixes for 3.19, as everyone was out.

  The clocksource patch was something I missed for the merge window
  after the change that broke arm64 was merged through arm-soc.  The
  other two patches are a fix for an undetected merge problem in mvebu
  and a defconfig change to make some exynos boards work with the normal
  multi_v7_defconfig"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  Add USB_EHCI_EXYNOS to multi_v7_defconfig
  ARM: mvebu: Fix pinctrl configuration for Armada 370 DB
  clocksource: arch_timer: Only use the virtual counter (CNTVCT) on arm64
parents e4811a27 007487f1

arch/arm/boot/dts/armada-370-db.dts

+0 −24
Original line number Diff line number Diff line
@@ -203,27 +203,3 @@ 
		compatible = "linux,spdif-dir";

	};

};
 


&pinctrl {

	/*

	 * These pins might be muxed as I2S by

	 * the bootloader, but it conflicts

	 * with the real I2S pins that are

	 * muxed using i2s_pins. We must mux

	 * those pins to a function other than

	 * I2S.

	 */

	pinctrl-0 = <&hog_pins1 &hog_pins2>;

	pinctrl-names = "default";



	hog_pins1: hog-pins1 {

		marvell,pins = "mpp6",  "mpp8", "mpp10",

			       "mpp12", "mpp13";

		marvell,function = "gpio";

	};



	hog_pins2: hog-pins2 {

		marvell,pins = "mpp5", "mpp7", "mpp9";

		marvell,function = "gpo";

	};

};

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ CONFIG_USB=y 
CONFIG_USB_XHCI_HCD=y

CONFIG_USB_XHCI_MVEBU=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_EXYNOS=y

CONFIG_USB_EHCI_TEGRA=y

CONFIG_USB_EHCI_HCD_STI=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

drivers/clocksource/arm_arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ static void __init arch_counter_register(unsigned type) 


	/* Register the CP15 based counter if we have one */

	if (type & ARCH_CP15_TIMER) {

		if (arch_timer_use_virtual)

		if (IS_ENABLED(CONFIG_ARM64) || arch_timer_use_virtual)

			arch_timer_read_counter = arch_counter_get_cntvct;

		else

			arch_timer_read_counter = arch_counter_get_cntpct;