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

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

Pull non-critical ARM SoC bug fixes from Arnd Bergmann:
 "Bug fixes that did not make it into v3.8, mostly because they were not
  considered important enough, and in some cases because bugs only show
  up in combination with other patches destined for 3.9.  This includes
  a few larger patches for GPIO on the Marvell PXA platform and a lot of
  Samsung specific bug fixes, as well as a series from Arnd to fix older
  build warnings."

* tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
  ARM: SPEAr13xx: Enable CONFIG_ARCH_HAS_CPUFREQ
  ARM: imx: MACH_MX31ADS_WM1133_EV1 needs REGULATOR_WM8350
  scripts/sortextable: silence script output
  ARM: s3c: i2c: add platform_device forward declaration
  ARM: mvebu: allow selecting mvebu without Armada XP
  ARM: pick Versatile by default for !MMU
  ARM: integrator: fix build with INTEGRATOR_AP off
  ARM: integrator/versatile: fix NOMMU warnings
  ARM: sa1100: don't warn about mach/ide.h
  ARM: shmobile: fix defconfig warning on CONFIG_USB
  ARM: w90x900: fix legacy assembly syntax
  ARM: samsung: fix assembly syntax for new gas
  ARM: disable virt_to_bus/virt_to_bus almost everywhere
  ARM: dts: Correct pin configuration of SD 4 for exynos4x12-pinctrl
  ARM: SAMSUNG: Silence empty switch warning in fimc-core.h
  ARM: SAMSUNG: Silence empty switch warning in sdhci.h
  ARM: msm: proc_comm_boot_wait should not be __init
  arm: vt8500: Update MAINTAINERS entry for arch-vt8500
  ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU
  ARM: S5PV210: Fix early uart output in fifo mode
  ...
parents 7ed214ac be8fd292

Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt

+6 −6
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ on-chip controllers onto these pads. 


Required Properties:

- compatible: should be one of the following.

  - "samsung,pinctrl-exynos4210": for Exynos4210 compatible pin-controller.

  - "samsung,pinctrl-exynos4x12": for Exynos4x12 compatible pin-controller.

  - "samsung,pinctrl-exynos5250": for Exynos5250 compatible pin-controller.

  - "samsung,exynos4210-pinctrl": for Exynos4210 compatible pin-controller.

  - "samsung,exynos4x12-pinctrl": for Exynos4x12 compatible pin-controller.

  - "samsung,exynos5250-pinctrl": for Exynos5250 compatible pin-controller.



- reg: Base address of the pin controller hardware module and length of

  the address space it occupies.
@@ -142,7 +142,7 @@ the following format 'pinctrl{n}' where n is a unique number for the alias. 
Example: A pin-controller node with pin banks:



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;
@@ -185,7 +185,7 @@ Example: A pin-controller node with pin banks: 
Example 1: A pin-controller node with pin groups.



	pinctrl_0: pinctrl@11400000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11400000 0x1000>;

		interrupts = <0 47 0>;
@@ -230,7 +230,7 @@ Example 1: A pin-controller node with pin groups. 
Example 2: A pin-controller node with external wakeup interrupt controller node.



	pinctrl_1: pinctrl@11000000 {

		compatible = "samsung,pinctrl-exynos4210";

		compatible = "samsung,exynos4210-pinctrl";

		reg = <0x11000000 0x1000>;

		interrupts = <0 46 0>

MAINTAINERS

+16 −3
Original line number Diff line number Diff line
@@ -1256,12 +1256,17 @@ M: Tony Prisk <linux@prisktech.co.nz> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/mach-vt8500/

F:	drivers/clocksource/vt8500_timer.c

F:	drivers/gpio/gpio-vt8500.c

F:	drivers/mmc/host/wmt-sdmmc.c

F:	drivers/pwm/pwm-vt8500.c

F:	drivers/rtc/rtc-vt8500.c

F:	drivers/tty/serial/vt8500_serial.c

F:	drivers/usb/host/ehci-vt8500.c

F:	drivers/usb/host/uhci-platform.c

F:	drivers/video/vt8500lcdfb.*

F:	drivers/video/wm8505fb*

F:	drivers/video/wmt_ge_rops.*

F:	drivers/tty/serial/vt8500_serial.c

F:	drivers/rtc/rtc-vt8500.c

F:	drivers/mmc/host/wmt-sdmmc.c



ARM/ZIPIT Z2 SUPPORT

M:	Marek Vasut <marek.vasut@gmail.com>
@@ -1270,6 +1275,14 @@ S: Maintained 
F:	arch/arm/mach-pxa/z2.c

F:	arch/arm/mach-pxa/include/mach/z2.h



ARM/ZYNQ ARCHITECTURE

M:	Michal Simek <michal.simek@xilinx.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://wiki.xilinx.com

T:	git git://git.xilinx.com/linux-xlnx.git

S:	Supported

F:	arch/arm/mach-zynq/



ARM64 PORT (AARCH64 ARCHITECTURE)

M:	Catalin Marinas <catalin.marinas@arm.com>

M:	Will Deacon <will.deacon@arm.com>

arch/arm/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -260,7 +260,8 @@ config MMU 
#

choice

	prompt "ARM system type"

	default ARCH_MULTIPLATFORM

	default ARCH_VERSATILE if !MMU

	default ARCH_MULTIPLATFORM if MMU



config ARCH_MULTIPLATFORM

	bool "Allow multiple platforms to be selected"
@@ -1449,6 +1450,10 @@ config ISA_DMA 
	bool

	select ISA_DMA_API



config ARCH_NO_VIRT_TO_BUS

	def_bool y

	depends on !ARCH_RPC && !ARCH_NETWINDER && !ARCH_SHARK



# Select ISA DMA interface

config ISA_DMA_API

	bool

arch/arm/boot/dts/at91sam9n12.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -324,8 +324,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf801c000 0x4000>;

				interrupts = <5 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart0>;

				status = "disabled";
@@ -335,8 +333,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8020000 0x4000>;

				interrupts = <6 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart1>;

				status = "disabled";
@@ -346,8 +342,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8024000 0x4000>;

				interrupts = <7 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart2>;

				status = "disabled";
@@ -357,8 +351,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8028000 0x4000>;

				interrupts = <8 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart3>;

				status = "disabled";

arch/arm/boot/dts/at91sam9x5.dtsi

+2 −8
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ 
				};



				usart3 {

					pinctrl_uart3: usart3-0 {

					pinctrl_usart3: usart3-0 {

						atmel,pins =

							<2 23 0x2 0x1	/* PC22 periph B with pullup */

							<2 22 0x2 0x1	/* PC22 periph B with pullup */

							 2 23 0x2 0x0>;	/* PC23 periph B */

					};
@@ -402,8 +402,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf801c000 0x200>;

				interrupts = <5 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart0>;

				status = "disabled";
@@ -413,8 +411,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8020000 0x200>;

				interrupts = <6 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart1>;

				status = "disabled";
@@ -424,8 +420,6 @@ 
				compatible = "atmel,at91sam9260-usart";

				reg = <0xf8024000 0x200>;

				interrupts = <7 4 5>;

				atmel,use-dma-rx;

				atmel,use-dma-tx;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_usart2>;

				status = "disabled";

CRA Git | Maintained and supported by SUSTech CRA and CCSE