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

Commit 1c6ba37b 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 bug fixes from Arnd Bergmann:
 "Things are calming down for arm-soc as well.  This set of bug fixes is
  dominated in size by the at91 platform bug fixes.  Some of them were
  meant to go through the framebuffer tree during the merge window, but
  since the framebuffer maintainer could not be reached, I offered to
  take them here.  The other notable at91 change is the addition of
  pinctrl definitions to fix the NAND controller.

  The rest are mostly simple regression fixes:

   - Our removal of VIRT_TO_BUS conflicted with Stephen Rothwell's
     renaming of the Kconfig symbol.  You will get a trivial merge
     conflict here, we still want to remove it.
   - missing bits for clocks on imx and s5pv210
   - missing header inclusions in mmp and shmobile
   - typos in s5pv210 camera and vt8500 clock support code

  and three trivial fixes for pre-3.8 bugs:

   - an old bogus build warning in the joystick driver
   - a misleading Kconfig description
   - a NULL pointer check on davinci"

* tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: fix CONFIG_VIRT_TO_BUS handling
  ARM: i.MX35: enable MAX clock
  ARM: Scorpion is a v7 architecture, not v6
  ARM: mmp: add platform_device head file in gplugd
  input/joystick: use get_cycles on ARM
  [media] s5p-fimc: fix s5pv210 build
  clk: vt8500: Fix "fix device clock divisor calculations"
  ARM: i.MX25: Fix DT compilation
  ARM: at91: fix infinite loop in at91_irq_suspend/resume
  ARM: at91: add gpio suspend/resume support when using pinctrl
  ARM: at91: fix LCD-wiring mode
  atmel_lcdfb: fix 16-bpp modes on older SOCs
  ARM: at91: dt: at91sam9x5: complete NAND pinctrl
  ARM: at91: dt: at91sam9x5: correct NAND pins comments
  ARM: davinci: edma: fix dmaengine induced null pointer dereference on da830
  ARM: shmobile: marzen: Include mmc/host.h
  ARM: EXYNOS: Add #dma-cells for generic dma binding support for PL330
  ARM: S5PV210: Fix PL330 DMA controller clkdev entries
parents a15cd063 b4811bac

arch/arm/Kconfig

+4 −7
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ config ARM 
	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_UID16

	select VIRT_TO_BUS

	select KTIME_SCALAR

	select PERF_USE_VMALLOC

	select RTC_LIB
@@ -743,6 +742,7 @@ config ARCH_RPC 
	select NEED_MACH_IO_H

	select NEED_MACH_MEMORY_H

	select NO_IOPORT

	select VIRT_TO_BUS

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -878,6 +878,7 @@ config ARCH_SHARK 
	select ISA_DMA

	select NEED_MACH_MEMORY_H

	select PCI

	select VIRT_TO_BUS

	select ZONE_DMA

	help

	  Support for the StrongARM based Digital DNARD machine, also known
@@ -1005,12 +1006,12 @@ config ARCH_MULTI_V4_V5 
	bool



config ARCH_MULTI_V6

	bool "ARMv6 based platforms (ARM11, Scorpion, ...)"

	bool "ARMv6 based platforms (ARM11)"

	select ARCH_MULTI_V6_V7

	select CPU_V6



config ARCH_MULTI_V7

	bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"

	bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"

	default y

	select ARCH_MULTI_V6_V7

	select ARCH_VEXPRESS
@@ -1461,10 +1462,6 @@ 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/at91sam9x5.dtsi

+26 −2
Original line number Diff line number Diff line
@@ -238,8 +238,32 @@ 
				nand {

					pinctrl_nand: nand-0 {

						atmel,pins =

							<3 4 0x0 0x1	/* PD5 gpio RDY pin pull_up */

							 3 5 0x0 0x1>;	/* PD4 gpio enable pin pull_up */

							<3 0 0x1 0x0	/* PD0 periph A Read Enable */

							 3 1 0x1 0x0	/* PD1 periph A Write Enable */

							 3 2 0x1 0x0	/* PD2 periph A Address Latch Enable */

							 3 3 0x1 0x0	/* PD3 periph A Command Latch Enable */

							 3 4 0x0 0x1	/* PD4 gpio Chip Enable pin pull_up */

							 3 5 0x0 0x1	/* PD5 gpio RDY/BUSY pin pull_up */

							 3 6 0x1 0x0	/* PD6 periph A Data bit 0 */

							 3 7 0x1 0x0	/* PD7 periph A Data bit 1 */

							 3 8 0x1 0x0	/* PD8 periph A Data bit 2 */

							 3 9 0x1 0x0	/* PD9 periph A Data bit 3 */

							 3 10 0x1 0x0	/* PD10 periph A Data bit 4 */

							 3 11 0x1 0x0	/* PD11 periph A Data bit 5 */

							 3 12 0x1 0x0	/* PD12 periph A Data bit 6 */

							 3 13 0x1 0x0>;	/* PD13 periph A Data bit 7 */

					};



					pinctrl_nand_16bits: nand_16bits-0 {

						atmel,pins =

							<3 14 0x1 0x0	/* PD14 periph A Data bit 8 */

							 3 15 0x1 0x0	/* PD15 periph A Data bit 9 */

							 3 16 0x1 0x0	/* PD16 periph A Data bit 10 */

							 3 17 0x1 0x0	/* PD17 periph A Data bit 11 */

							 3 18 0x1 0x0	/* PD18 periph A Data bit 12 */

							 3 19 0x1 0x0	/* PD19 periph A Data bit 13 */

							 3 20 0x1 0x0	/* PD20 periph A Data bit 14 */

							 3 21 0x1 0x0>;	/* PD21 periph A Data bit 15 */

					};

				};

arch/arm/boot/dts/exynos4.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -275,18 +275,27 @@ 
			compatible = "arm,pl330", "arm,primecell";

			reg = <0x12680000 0x1000>;

			interrupts = <0 35 0>;

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};



		pdma1: pdma@12690000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x12690000 0x1000>;

			interrupts = <0 36 0>;

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};



		mdma1: mdma@12850000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x12850000 0x1000>;

			interrupts = <0 34 0>;

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <1>;

		};

	};

};

arch/arm/boot/dts/exynos5440.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -142,12 +142,18 @@ 
			compatible = "arm,pl330", "arm,primecell";

			reg = <0x120000 0x1000>;

			interrupts = <0 34 0>;

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};



		pdma1: pdma@121B0000 {

			compatible = "arm,pl330", "arm,primecell";

			reg = <0x121000 0x1000>;

			interrupts = <0 35 0>;

			#dma-cells = <1>;

			#dma-channels = <8>;

			#dma-requests = <32>;

		};

	};

arch/arm/mach-at91/include/mach/gpio.h

+8 −0
Original line number Diff line number Diff line
@@ -209,6 +209,14 @@ extern int at91_get_gpio_value(unsigned pin); 
extern void at91_gpio_suspend(void);

extern void at91_gpio_resume(void);



#ifdef CONFIG_PINCTRL_AT91

extern void at91_pinctrl_gpio_suspend(void);

extern void at91_pinctrl_gpio_resume(void);

#else

static inline void at91_pinctrl_gpio_suspend(void) {}

static inline void at91_pinctrl_gpio_resume(void) {}

#endif



#endif	/* __ASSEMBLY__ */



#endif