Commit 40e71e70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC board specific changes from Arnd Bergmann:
 "These are 18 branches on 9 platforms with board specific changes,
  mostly for defconfig files, but nothing really exciting in here.

  Since the shmobile platform still uses board files for some of the
  newer machines, we get a few changes there as the result of drivers
  getting enabled for those boards.  This causes some conflicts with
  contents getting added from multiple branches in sh-mobile specific
  files.  Renesas is putting a lot of work into migrating to device-tree
  based setup, which will make all those files obsolete in the future
  and avoid both the conflicts and the need to have these files in the
  first place."

* tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
  arm: multi_v7_defconfig: Enable initrd/initramfs support
  arm: multi_v7_defconfig: Enable Zynq UART driver
  ARM: omap2plus_defconfig: enable USB_PHY and NOP_USB_XCEIV
  ARM: OMAP1: nokia770: enable Tahvo
  ARM: OMAP3EVM: Marking omap3_evm_display_init() with CONFIG_BROKEN
  arm: omap: board-overo: reset GPIO for SMSC911x
  ARM: shmobile: BOCK-W: change Ether device name
  ARM: ux500: board-mop500: remove unused pin modes
  ARM: shmobile: bockw: add MMCIF support
  ARM: shmobile: bockw: add SPI FLASH support
  ARM: shmobile: bockw: add I2C device support
  ARM: shmobile: BOCK-W: add Ether support
  ARM: tegra: defconfig updates
  ARM: shmobile: bockw defconfig: add MMCIF support
  ARM: shmobile: bockw defconfig: add M25P80 support
  ARM: shmobile: bockw defconfig: add RTC RX8581 support
  ARM: shmobile: marzen: keep local function as static
  ARM: shmobile: bockw: add SDHI0 support
  ARM: shmobile: marzen: Use INTC External IRQ pin driver for SMSC
  ARM: shmobile: lager: support GPIO switches
  ...
parents 3883cbb6 f8ace40e

arch/arm/boot/dts/kirkwood-lsxl.dtsi

+4 −0
Original line number Original line Diff line number Diff line
@@ -172,6 +172,10 @@ 
		alarm-gpios = <&gpio1 8 0>;

		alarm-gpios = <&gpio1 8 0>;

	};

	};





	restart_poweroff {

		compatible = "restart-poweroff";

	};



	regulators {

	regulators {

		compatible = "simple-bus";

		compatible = "simple-bus";

		#address-cells = <1>;

		#address-cells = <1>;

arch/arm/boot/dts/kirkwood-ts219.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,11 @@ 
			clock-frequency = <200000000>;

			clock-frequency = <200000000>;

			status = "okay";

			status = "okay";

		};

		};

		poweroff@12100 {

			compatible = "qnap,power-off";

			reg = <0x12000 0x100>;

			clocks = <&gate_clk 7>;

		};

		spi@10600 {

		spi@10600 {

			status = "okay";

			status = "okay";

arch/arm/configs/armadillo800eva_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ CONFIG_TOUCHSCREEN_ST1232=y 
# CONFIG_SERIO is not set

# CONFIG_SERIO is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI=y

CONFIG_SERIAL_SH_SCI_NR_UARTS=8

CONFIG_SERIAL_SH_SCI_NR_UARTS=9

CONFIG_SERIAL_SH_SCI_CONSOLE=y

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C=y

arch/arm/configs/bcm2835_defconfig

+16 −3
Original line number Original line Diff line number Diff line
@@ -55,14 +55,11 @@ CONFIG_DEVTMPFS_MOUNT=y 
# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set

# CONFIG_DEVKMEM is not set

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_TTY_PRINTK=y

CONFIG_TTY_PRINTK=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_BCM2835=y

CONFIG_I2C=y

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_BCM2835=y

CONFIG_I2C_BCM2835=y
@@ -70,11 +67,27 @@ CONFIG_SPI=y 
CONFIG_SPI_BCM2835=y

CONFIG_SPI_BCM2835=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

# CONFIG_HWMON is not set

CONFIG_FB=y

CONFIG_FB_SIMPLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_USB_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_MMC=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_BCM2835=y

CONFIG_MMC_SDHCI_BCM2835=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_ONESHOT=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_LEDS_TRIGGER_GPIO=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_LEDS_TRIGGER_TRANSIENT=y

CONFIG_LEDS_TRIGGER_CAMERA=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_XATTR=y

arch/arm/configs/bockw_defconfig

+26 −1
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ CONFIG_CMDLINE="console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp" 
CONFIG_CMDLINE_FORCE=y

CONFIG_CMDLINE_FORCE=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

# CONFIG_SUSPEND is not set

CONFIG_PM_RUNTIME=y

CONFIG_NET=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_INET=y
@@ -48,6 +49,14 @@ CONFIG_DEVTMPFS_MOUNT=y 
# CONFIG_STANDALONE is not set

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

# CONFIG_FW_LOADER is not set

CONFIG_MTD=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_M25P80=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_NETDEVICES=y

CONFIG_NETDEVICES=y

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_CADENCE is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROADCOM is not set
@@ -71,7 +80,23 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=6 
CONFIG_SERIAL_SH_SCI_CONSOLE=y

CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

# CONFIG_HWMON is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_I2C=y

CONFIG_I2C_RCAR=y

CONFIG_SPI=y

CONFIG_SPI_SH_HSPI=y

CONFIG_USB=y

CONFIG_USB_ANNOUNCE_NEW_DEVICES=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_OHCI_HCD=y

CONFIG_USB_OHCI_HCD_PLATFORM=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_RCAR_PHY=y

CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_RX8581=y

CONFIG_UIO=y

CONFIG_UIO=y

CONFIG_UIO_PDRV_GENIRQ=y

CONFIG_UIO_PDRV_GENIRQ=y

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_IOMMU_SUPPORT is not set

CRA Git | Maintained and supported by SUSTech CRA and CCSE