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

Commit 6d9431a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "These bug fixes are for the largest part for mvebu/kirkwood, which saw
  a few regressions after the clock infrastructure was enabled, and for
  OMAP, which showed a few more preexisting bugs with the new
  multiplatform support.

  Other small fixes are for imx, mxs, tegra, spear and socfpga"

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  ARM: spear3xx: Use correct pl080 header file
  Arm: socfpga: pl330: Add #dma-cells for generic dma binding support
  ARM: multiplatform: Sort the max gpio numbers.
  ARM: imx: fix typo "DEBUG_IMX50_IMX53_UART"
  ARM: imx: pll1_sys should be an initial on clk
  arm: mach-orion5x: fix typo in compatible string of a .dts file
  arm: mvebu: fix address-cells in mpic DT node
  arm: plat-orion: fix address decoding when > 4GB is used
  arm: mvebu: Reduce reg-io-width with UARTs
  ARM: Dove: add RTC device node
  arm: mvebu: enable the USB ports on Armada 370 Reference Design board
  ARM: dove: drop "select COMMON_CLK_DOVE"
  rtc: rtc-mv: Add support for clk to avoid lockups
  gpio: mvebu: Add clk support to prevent lockup
  ARM: kirkwood: fix to retain gbe MAC addresses for DT kernels
  ARM: kirkwood: of_serial: fix clock gating by removing clock-frequency
  ARM: mxs: cfa10049: Fix fb initialisation function
  ARM: SPEAr13xx: Fix typo "ARCH_HAVE_CPUFREQ"
  ARM: OMAP: RX-51: add missing USB phy binding
  clk: Tegra: Remove duplicate smp_twd clock
  ...
parents 4388817f 27f423fe

arch/arm/Kconfig

+5 −3
Original line number Diff line number Diff line
@@ -556,7 +556,6 @@ config ARCH_IXP4XX 
config ARCH_DOVE

	bool "Marvell Dove"

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLK_DOVE

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI
@@ -1657,13 +1656,16 @@ config LOCAL_TIMERS 
	  accounting to be spread across the timer interval, preventing a

	  "thundering herd" at every timer tick.



# The GPIO number here must be sorted by descending number. In case of

# a multiplatform kernel, we just want the highest value required by the

# selected platforms.

config ARCH_NR_GPIO

	int

	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 355 if ARCH_U8500

	default 264 if MACH_H4700

	default 512 if SOC_OMAP5

	default 355 if ARCH_U8500

	default 288 if ARCH_VT8500 || ARCH_SUNXI

	default 264 if MACH_H4700

	default 0

	help

	  Maximum number of GPIOs in the system.

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ config DEBUG_IMX_UART_PORT 
						DEBUG_IMX31_UART || \

						DEBUG_IMX35_UART || \

						DEBUG_IMX51_UART || \

						DEBUG_IMX50_IMX53_UART || \

						DEBUG_IMX53_UART || \

						DEBUG_IMX6Q_UART

	default 1

	help

arch/arm/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -115,4 +115,4 @@ i: 
	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(obj)/Image System.map "$(INSTALL_PATH)"



subdir-	    := bootp compressed
 
subdir-	    := bootp compressed dts

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

+8 −0
Original line number Diff line number Diff line
@@ -64,5 +64,13 @@ 
			status = "okay";

			/* No CD or WP GPIOs */

		};



		usb@d0050000 {

			status = "okay";

		};



		usb@d0051000 {

			status = "okay";

		};

	};

};

arch/arm/boot/dts/armada-370-xp.dtsi

+2 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
	mpic: interrupt-controller@d0020000 {

	      compatible = "marvell,mpic";

	      #interrupt-cells = <1>;

	      #address-cells = <1>;

	      #size-cells = <1>;

	      interrupt-controller;

	};
@@ -54,7 +53,7 @@ 
				reg = <0xd0012000 0x100>;

				reg-shift = <2>;

				interrupts = <41>;

				reg-io-width = <4>;

				reg-io-width = <1>;

				status = "disabled";

		};

		serial@d0012100 {
@@ -62,7 +61,7 @@ 
				reg = <0xd0012100 0x100>;

				reg-shift = <2>;

				interrupts = <42>;

				reg-io-width = <4>;

				reg-io-width = <1>;

				status = "disabled";

		};