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

Commit 1c277cae authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'pxa-for-4.6' of https://github.com/rjarzmik/linux into next/soc 

Merge "pxa changes for v4.6 cycle" from Robert Jarzmik:

This is a minor cycle with :
 - cleanup fixes from Arnd, mainly build oriented and sparse type ones
 - dma fixes for requestors above 32 (impacting mainly camera driver)
 - some minor cleanup on pxa3xx device-tree side

* tag 'pxa-for-4.6' of https://github.com/rjarzmik/linux:
  dmaengine: pxa_dma: fix the maximum requestor line
  ARM: pxa: add the number of DMA requestor lines
  dmaengine: mmp-pdma: add number of requestors
  dma: mmp_pdma: Add the #dma-requests DT property documentation
  ARM: pxa: pxa3xx device-tree support cleanup
  ARM: pxa: don't select RFKILL if CONFIG_NET is disabled
  ARM: pxa: fix building without IWMMXT
  ARM: pxa: move extern declarations to pm.h
  ARM: pxa: always select one of the two CPU types
  ARM: pxa: don't select GPIO_SYSFS for MIOA701
  ARM: pxa: mark unused eseries code as __maybe_unused
  ARM: pxa: mark spitz_card_pwr_ctrl as __maybe_unused
  ARM: pxa: define clock registers as __iomem
parents 7b8685d9 6bab1c6a

Documentation/devicetree/bindings/dma/mmp-dma.txt

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ Required properties: 
Optional properties:

- #dma-channels: Number of DMA channels supported by the controller (defaults

  to 32 when not specified)

- #dma-requests: Number of DMA requestor lines supported by the controller

  (defaults to 32 when not specified)



"marvell,pdma-1.0"

Used platforms: pxa25x, pxa27x, pxa3xx, pxa93x, pxa168, pxa910, pxa688.

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ config ARCH_PXA 
	select CLKSRC_PXA

	select CLKSRC_MMIO

	select CLKSRC_OF

	select CPU_XSCALE if !CPU_XSC3

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select HAVE_IDE

arch/arm/boot/dts/pxa27x.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
			interrupts = <25>;

			#dma-channels = <32>;

			#dma-cells = <2>;

			#dma-requests = <75>;

			status = "okay";

		};

arch/arm/boot/dts/pxa3xx.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
			interrupts = <25>;

			#dma-channels = <32>;

			#dma-cells = <2>;

			#dma-requests = <100>;

			status = "okay";

		};

arch/arm/configs/pxa_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -378,6 +378,7 @@ CONFIG_GPIO_PALMAS=y 
CONFIG_GPIO_TPS6586X=y

CONFIG_GPIO_TPS65910=y

CONFIG_GPIO_MAX7301=m

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_SUPPLY_DEBUG=y

CONFIG_PDA_POWER=m

CONFIG_BATTERY_SBS=m