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

Commit 2084becb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-for-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "A surprisingly small batch of fixes for -rc3.  Suspiciously small, I'd
  say.

  Anyway, most of this are a few defconfig updates.  Some for omap to
  deal with kernel binary size (moving ipv6 to module, etc).  A larger
  one for socfpga that refreshes with some churn, but also turns on a
  few options that makes the newly-added board in my bootfarm usable for
  testing.

  OMAP3 will also now warn when booted with legacy (non-DT) boot
  protocols, hopefully encouraging those who still care about some of
  those platforms to submit DT support and report bugs where needed.
  Nothing stops working though, this is just to warn for future
  deprecation.

  Beyond this, very few actual bugfixes.  A PXA fix for DEBUG_LL boot
  hangs, a missing terminting entry in a dt_match array on RealView a
  MTD fix on OMAP with NAND"

[ Obviously missed rc3, will make rc4 instead ;) ]

* tag 'armsoc-for-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  MAINTAINERS: drop list entry for davinci
  ARM: OMAP2+: Warn about deprecated legacy booting mode
  ARM: omap2plus_defconfig: Fix errors with NAND BCH
  ARM: multi_v7_defconfig: fix support for APQ8084
  soc: versatile: Add terminating entry for realview_soc_of_match
  ARM: ixp4xx: remove compilation warnings in io.h
  MAINTAINERS: Add Soren as reviewer for Zynq
  ARM: omap2plus_defconfig: Fix bloat caused by having ipv6 built-in
  ARM: socfpga_defconfig: Update defconfig for SoCFPGA
  ARM: pxa: fix hang on startup with DEBUG_LL
parents 0df1f248 4257412d

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -1543,6 +1543,7 @@ F: arch/arm/mach-pxa/include/mach/z2.h 


ARM/ZYNQ ARCHITECTURE

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

R:	Sören Brinkmann <soren.brinkmann@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
@@ -8483,7 +8484,6 @@ F: arch/arm/mach-s3c24xx/bast-irq.c 
TI DAVINCI MACHINE SUPPORT

M:	Sekhar Nori <nsekhar@ti.com>

M:	Kevin Hilman <khilman@deeprootsystems.com>

L:	davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)

T:	git git://gitorious.org/linux-davinci/linux-davinci.git

Q:	http://patchwork.kernel.org/project/linux-davinci/list/

S:	Supported
@@ -8493,7 +8493,6 @@ F: drivers/i2c/busses/i2c-davinci.c 
TI DAVINCI SERIES MEDIA DRIVER

M:	Lad, Prabhakar <prabhakar.csengg@gmail.com>

L:	linux-media@vger.kernel.org

L:	davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)

W:	http://linuxtv.org/

Q:	http://patchwork.linuxtv.org/project/linux-media/list/

T:	git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ config DEBUG_UART_VIRT 
	default 0xf1c28000 if DEBUG_SUNXI_UART0

	default 0xf1c28400 if DEBUG_SUNXI_UART1

	default 0xf1f02800 if DEBUG_SUNXI_R_UART

	default 0xf2100000 if DEBUG_PXA_UART1

	default 0xf6200000 if DEBUG_PXA_UART1

	default 0xf4090000 if ARCH_LPC32XX

	default 0xf4200000 if ARCH_GEMINI

	default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \

arch/arm/configs/multi_v7_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ CONFIG_SPI_TEGRA20_SLINK=y 
CONFIG_SPI_XILINX=y

CONFIG_PINCTRL_AS3722=y

CONFIG_PINCTRL_PALMAS=y

CONFIG_PINCTRL_APQ8084=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_GENERIC_PLATFORM=y

CONFIG_GPIO_DWAPB=y
@@ -411,6 +412,7 @@ CONFIG_NVEC_POWER=y 
CONFIG_NVEC_PAZ00=y

CONFIG_QCOM_GSBI=y

CONFIG_COMMON_CLK_QCOM=y

CONFIG_APQ_MMCC_8084=y

CONFIG_MSM_GCC_8660=y

CONFIG_MSM_MMCC_8960=y

CONFIG_MSM_MMCC_8974=y

arch/arm/configs/omap2plus_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ CONFIG_IP_PNP_DHCP=y 
CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y

CONFIG_NETFILTER=y

CONFIG_CAN=m

CONFIG_CAN_C_CAN=m
@@ -112,6 +111,7 @@ CONFIG_MTD_OOPS=y 
CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ECC_BCH=y

CONFIG_MTD_NAND_OMAP2=y

CONFIG_MTD_ONENAND=y

CONFIG_MTD_ONENAND_VERIFY_WRITE=y
@@ -317,7 +317,7 @@ CONFIG_EXT4_FS=y 
CONFIG_FANOTIFY=y

CONFIG_QUOTA=y

CONFIG_QFMT_V2=y

CONFIG_AUTOFS4_FS=y

CONFIG_AUTOFS4_FS=m

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

arch/arm/configs/socfpga_defconfig

+28 −43
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_FHANDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14
@@ -11,23 +12,17 @@ CONFIG_PROFILING=y 
CONFIG_OPROFILE=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_HOTPLUG=y

# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_SOCFPGA=y

CONFIG_MACH_SOCFPGA_CYCLONE5=y

CONFIG_ARM_THUMBEE=y

# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set

# CONFIG_CACHE_L2X0 is not set

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE=""

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_NET=y
@@ -41,38 +36,30 @@ CONFIG_IP_PNP=y 
CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

CONFIG_IPV6=y

CONFIG_NETWORK_PHY_TIMESTAMPING=y

CONFIG_VLAN_8021Q=y

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_CAN=y

CONFIG_CAN_RAW=y

CONFIG_CAN_BCM=y

CONFIG_CAN_GW=y

CONFIG_CAN_DEV=y

CONFIG_CAN_CALC_BITTIMING=y

CONFIG_CAN_C_CAN=y

CONFIG_CAN_C_CAN_PLATFORM=y

CONFIG_CAN_DEBUG_DEVICES=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_PROC_DEVICETREE=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=2

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_SRAM=y

CONFIG_SCSI=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_STMMAC_ETH=y

CONFIG_DWMAC_SOCFPGA=y

CONFIG_MICREL_PHY=y

# CONFIG_STMMAC_PHY_ID_ZERO_WORKAROUND is not set

CONFIG_INPUT_EVDEV=y

CONFIG_DWMAC_SOCFPGA=y

CONFIG_PPS=y

CONFIG_NETWORK_PHY_TIMESTAMPING=y

CONFIG_PTP_1588_CLOCK=y

CONFIG_VLAN_8021Q=y

CONFIG_VLAN_8021Q_GVRP=y

CONFIG_GARP=y

CONFIG_IPV6=y

# CONFIG_SERIO_SERPORT is not set

CONFIG_SERIO_AMBAKMI=y

CONFIG_LEGACY_PTY_COUNT=16
@@ -81,45 +68,43 @@ CONFIG_SERIAL_8250_CONSOLE=y 
CONFIG_SERIAL_8250_NR_UARTS=2

CONFIG_SERIAL_8250_RUNTIME_UARTS=2

CONFIG_SERIAL_8250_DW=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_DWAPB=y

# CONFIG_RTC_HCTOSYS is not set

CONFIG_PMBUS=y

CONFIG_SENSORS_LTC2978=y

CONFIG_SENSORS_LTC2978_REGULATOR=y

CONFIG_WATCHDOG=y

CONFIG_DW_WATCHDOG=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_USB=y

CONFIG_USB_DWC2=y

CONFIG_USB_DWC2_HOST=y

CONFIG_MMC=y

CONFIG_MMC_DW=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

CONFIG_EXT3_FS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set

CONFIG_FHANDLE=y

CONFIG_EXT4_FS=y

CONFIG_VFAT_FS=y

CONFIG_NTFS_FS=y

CONFIG_NTFS_RW=y

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_CONFIGFS_FS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_INFO=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_DEBUG_INFO=y

CONFIG_ENABLE_DEFAULT_TRACERS=y

CONFIG_DEBUG_USER=y

CONFIG_XZ_DEC=y
 
CONFIG_I2C=y

CONFIG_I2C_DESIGNWARE_CORE=y

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_I2C_CHARDEV=y

CONFIG_MMC=y

CONFIG_MMC_DW=y

CONFIG_PM=y

CONFIG_SUSPEND=y

CONFIG_MMC_UNSAFE_RESUME=y

CONFIG_USB=y

CONFIG_USB_DWC2=y

CONFIG_USB_DWC2_HOST=y

CONFIG_USB_DWC2_PLATFORM=y