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

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

Merge tag 'pxa-for-5.1' of https://github.com/rjarzmik/linux into arm/fixes 

This is the pxa changes for 5.1 cycle:
 - the last step of raumfeld board conversion to devicetree is here,
   ie. the platform_data file removal
   The previous cycle dealt with devicetree inclusion already.
 - an empty file removal

* tag 'pxa-for-5.1' of https://github.com/rjarzmik/linux

:
  ARM: pxa: remove unused empty mach/pxa25x-udc.h file
  ARM: pxa: remove raumfeld board files and defconfig

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7dd50e2c d6299848

arch/arm/configs/pxa_defconfig

+0 −4
Original line number Original line Diff line number Diff line
@@ -66,9 +66,6 @@ CONFIG_MACH_MIOA701=y 
CONFIG_PXA_EZX=y

CONFIG_PXA_EZX=y

CONFIG_MACH_MP900C=y

CONFIG_MACH_MP900C=y

CONFIG_ARCH_PXA_PALM=y

CONFIG_ARCH_PXA_PALM=y

CONFIG_MACH_RAUMFELD_RC=y

CONFIG_MACH_RAUMFELD_CONNECTOR=y

CONFIG_MACH_RAUMFELD_SPEAKER=y

CONFIG_PXA_SHARPSL=y

CONFIG_PXA_SHARPSL=y

CONFIG_MACH_POODLE=y

CONFIG_MACH_POODLE=y

CONFIG_MACH_CORGI=y

CONFIG_MACH_CORGI=y
@@ -498,7 +495,6 @@ CONFIG_SND_PXA2XX_SOC_E800=m 
CONFIG_SND_PXA2XX_SOC_EM_X270=m

CONFIG_SND_PXA2XX_SOC_EM_X270=m

CONFIG_SND_PXA2XX_SOC_PALM27X=y

CONFIG_SND_PXA2XX_SOC_PALM27X=y

CONFIG_SND_SOC_ZYLONITE=m

CONFIG_SND_SOC_ZYLONITE=m

CONFIG_SND_SOC_RAUMFELD=m

CONFIG_SND_PXA2XX_SOC_HX4700=m

CONFIG_SND_PXA2XX_SOC_HX4700=m

CONFIG_SND_PXA2XX_SOC_MAGICIAN=m

CONFIG_SND_PXA2XX_SOC_MAGICIAN=m

CONFIG_SND_PXA2XX_SOC_MIOA701=m

CONFIG_SND_PXA2XX_SOC_MIOA701=m

arch/arm/configs/raumfeld_defconfig

deleted100644 → 0
+0 −197
Original line number Original line Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_PXA=y

CONFIG_MACH_RAUMFELD_RC=y

CONFIG_MACH_RAUMFELD_CONNECTOR=y

CONFIG_MACH_RAUMFELD_SPEAKER=y

CONFIG_NO_HZ=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_CMDLINE="console=ttyS0,115200 rw"

CONFIG_CPU_FREQ=y

CONFIG_CPU_IDLE=y

CONFIG_PM=y

CONFIG_APM_EMULATION=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_PNP=y

CONFIG_SYN_COOKIES=y

CONFIG_IPV6=y

CONFIG_CFG80211=y

CONFIG_MAC80211=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_MTD=y

CONFIG_MTD_BLOCK=y

CONFIG_NFTL=y

CONFIG_NFTL_RW=y

CONFIG_MTD_BLOCK2MTD=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_MARVELL=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_ISL29003=y

CONFIG_IIO=y

CONFIG_AD5446=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMSC911X=y

CONFIG_LIBERTAS=y

CONFIG_LIBERTAS_SDIO=m

CONFIG_USB_USBNET=y

# CONFIG_USB_NET_AX8817X is not set

# CONFIG_USB_NET_NET1080 is not set

CONFIG_USB_NET_MCS7830=y

# CONFIG_USB_NET_CDC_SUBSET is not set

# CONFIG_USB_NET_ZAURUS is not set

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_TOUCHSCREEN_EETI=m

CONFIG_INPUT_MISC=y

CONFIG_INPUT_GPIO_ROTARY_ENCODER=y

CONFIG_SERIAL_PXA=y

CONFIG_SERIAL_PXA_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_PXA=y

CONFIG_SPI=y

CONFIG_SPI_DEBUG=y

CONFIG_SPI_GPIO=y

CONFIG_SPI_SPIDEV=y

CONFIG_DEBUG_GPIO=y

CONFIG_W1_MASTER_GPIO=m

CONFIG_POWER_SUPPLY=y

CONFIG_PDA_POWER=y

CONFIG_BATTERY_DS2760=m

CONFIG_SENSORS_LIS3_SPI=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_DEBUG=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_MAX8660=y

CONFIG_FB=y

CONFIG_FB_PXA=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

# CONFIG_LCD_CLASS_DEVICE is not set

CONFIG_BACKLIGHT_CLASS_DEVICE=y

# CONFIG_BACKLIGHT_GENERIC is not set

CONFIG_BACKLIGHT_PWM=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set

# CONFIG_LOGO_LINUX_CLUT224 is not set

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_DRIVERS is not set

# CONFIG_SND_USB is not set

CONFIG_SND_SOC=y

CONFIG_SND_PXA2XX_SOC=y

CONFIG_SND_SOC_RAUMFELD=y

CONFIG_HID_DRAGONRISE=y

CONFIG_HID_GYRATION=y

CONFIG_HID_TWINHAN=y

CONFIG_HID_NTRIG=y

CONFIG_HID_PANTHERLORD=y

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

CONFIG_HID_GREENASIA=y

CONFIG_HID_SMARTJOYPLUS=y

CONFIG_HID_TOPSEED=y

CONFIG_HID_THRUSTMASTER=y

CONFIG_HID_ZEROPLUS=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_MON=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_USB_STORAGE_FREECOM=y

CONFIG_USB_STORAGE_ISD200=y

CONFIG_USB_STORAGE_USBAT=y

CONFIG_USB_STORAGE_SDDR09=y

CONFIG_USB_STORAGE_SDDR55=y

CONFIG_MMC=y

CONFIG_MMC_PXA=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_LT3593=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_BACKLIGHT=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_PXA=y

CONFIG_DMADEVICES=y

CONFIG_UIO=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XIP=y

CONFIG_EXT3_FS=y

CONFIG_FSCACHE=y

CONFIG_FSCACHE_STATS=y

CONFIG_CACHEFILES=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_UBIFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_ROOT_NFS=y

CONFIG_NFS_FSCACHE=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_CODEPAGE_737=y

CONFIG_NLS_CODEPAGE_775=y

CONFIG_NLS_CODEPAGE_850=y

CONFIG_NLS_CODEPAGE_852=y

CONFIG_NLS_CODEPAGE_855=y

CONFIG_NLS_CODEPAGE_857=y

CONFIG_NLS_CODEPAGE_860=y

CONFIG_NLS_CODEPAGE_861=y

CONFIG_NLS_CODEPAGE_862=y

CONFIG_NLS_CODEPAGE_863=y

CONFIG_NLS_CODEPAGE_864=y

CONFIG_NLS_CODEPAGE_865=y

CONFIG_NLS_CODEPAGE_866=y

CONFIG_NLS_CODEPAGE_869=y

CONFIG_NLS_CODEPAGE_936=y

CONFIG_NLS_CODEPAGE_950=y

CONFIG_NLS_CODEPAGE_932=y

CONFIG_NLS_CODEPAGE_949=y

CONFIG_NLS_CODEPAGE_874=y

CONFIG_NLS_ISO8859_8=y

CONFIG_NLS_CODEPAGE_1250=y

CONFIG_NLS_CODEPAGE_1251=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_NLS_ISO8859_2=y

CONFIG_NLS_ISO8859_3=y

CONFIG_NLS_ISO8859_4=y

CONFIG_NLS_ISO8859_5=y

CONFIG_NLS_ISO8859_6=y

CONFIG_NLS_ISO8859_7=y

CONFIG_NLS_ISO8859_9=y

CONFIG_NLS_ISO8859_13=y

CONFIG_NLS_ISO8859_14=y

CONFIG_NLS_ISO8859_15=y

CONFIG_NLS_KOI8_R=y

CONFIG_NLS_KOI8_U=y

CONFIG_NLS_UTF8=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

# CONFIG_CRYPTO_HW is not set

arch/arm/mach-pxa/Kconfig

+0 −18
Original line number Original line Diff line number Diff line
@@ -454,24 +454,6 @@ config MACH_TREO680 
	  Say Y here if you intend to run this kernel on Palm Treo 680

	  Say Y here if you intend to run this kernel on Palm Treo 680

	  smartphone.

	  smartphone.





config MACH_RAUMFELD_RC

	bool "Raumfeld Controller"

	select CPU_PXA300

	select POWER_SUPPLY

	select PXA3xx



config MACH_RAUMFELD_CONNECTOR

	bool "Raumfeld Connector"

	select CPU_PXA300

	select POWER_SUPPLY

	select PXA3xx



config MACH_RAUMFELD_SPEAKER

	bool "Raumfeld Speaker"

	select CPU_PXA300

	select POWER_SUPPLY

	select PXA3xx



config PXA_SHARPSL

config PXA_SHARPSL

	bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"

	bool "SHARP Zaurus SL-5600, SL-C7xx and SL-Cxx00 Models"

	select SHARP_PARAM

	select SHARP_PARAM

arch/arm/mach-pxa/Makefile

+0 −3
Original line number Original line Diff line number Diff line
@@ -86,9 +86,6 @@ obj-$(CONFIG_MACH_POODLE) += poodle.o 
obj-$(CONFIG_MACH_TOSA)		+= tosa.o

obj-$(CONFIG_MACH_TOSA)		+= tosa.o

obj-$(CONFIG_MACH_ICONTROL)     += icontrol.o mxm8x10.o

obj-$(CONFIG_MACH_ICONTROL)     += icontrol.o mxm8x10.o

obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o

obj-$(CONFIG_ARCH_PXA_ESERIES)	+= eseries.o

obj-$(CONFIG_MACH_RAUMFELD_RC)		+= raumfeld.o

obj-$(CONFIG_MACH_RAUMFELD_CONNECTOR)	+= raumfeld.o

obj-$(CONFIG_MACH_RAUMFELD_SPEAKER)	+= raumfeld.o

obj-$(CONFIG_MACH_ZIPIT2)	+= z2.o

obj-$(CONFIG_MACH_ZIPIT2)	+= z2.o





obj-$(CONFIG_PXA_SYSTEMS_CPLDS)	+= pxa_cplds_irqs.o

obj-$(CONFIG_PXA_SYSTEMS_CPLDS)	+= pxa_cplds_irqs.o

arch/arm/mach-pxa/include/mach/pxa25x-udc.h

deleted100644 → 0
+0 −0

Empty file deleted.