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

Commit be46f95b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Pull "This is the pxa changes for v4.9 cycle" from Robert Jarzmik:

This cycle is covering :
 - the removal of the legacy DMA API
   This is the major contributor to the negative diffstat, as dmaengine
   have taken over in this area.
 - IDE subsystem defconfig fixes
 - preparation for pxa25x to be device-tree compliant
 - various irq related fixes

* tag 'pxa-for-4.9' of https://github.com/rjarzmik/linux:
  ARM: pxa: pxa_cplds: fix interrupt handling
  ARM: pxa: remove irq init from dt machines
  ARM: pxa: Use kmalloc_array() in pxa_pm_init()
  ARM: pxa: magician: Remove duplicated I2C pins declaration
  ARM: pxa: fix GPIO double shifts
  arm: trizeps4_defconfig: disable IDE subsystem
  arm: pxa255-idp_defconfig: disable IDE subsystem
  arm: lpda270_defconfig: disable IDE subsystem
  arm: colibri_pxa270_defconfig: disable IDE subsystem
  ARM: pxa: add pxa25x device-tree support
  ARM: pxa: prepare pxa25x interrupts for device-tree platforms
  ARM: pxa: remove platform dma code
  ARM: pxa: remove devicetree boards from pxa_defconfig
parents f6b2dae7 9ba63e3c

arch/arm/configs/colibri_pxa270_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=8

CONFIG_IDE=y

CONFIG_NETDEVICES=y

CONFIG_PHYLIB=y

CONFIG_NET_ETHERNET=y

arch/arm/configs/lpd270_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ CONFIG_MTD_CFI_GEOMETRY=y 
# CONFIG_MTD_CFI_I1 is not set

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_BLK_DEV_NBD=y

CONFIG_IDE=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=y

arch/arm/configs/pxa255-idp_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ CONFIG_MTD_CFI_GEOMETRY=y 
# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set

# CONFIG_MTD_CFI_I1 is not set

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_IDE=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=y

arch/arm/configs/pxa_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_LDM_PARTITION=y

CONFIG_CMDLINE_PARTITION=y

CONFIG_ARCH_PXA=y

CONFIG_MACH_PXA27X_DT=y

CONFIG_MACH_PXA3XX_DT=y

CONFIG_ARCH_LUBBOCK=y

CONFIG_MACH_MAINSTONE=y

CONFIG_MACH_ZYLONITE300=y

arch/arm/configs/trizeps4_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m 
CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=8

CONFIG_IDE=y

CONFIG_BLK_DEV_IDECS=m

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y