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

Commit 930b440c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC board changes from Arnd Bergmann:
 "As we continue to replace board files with device tree descriptions,
  this part of the ARM support is getting smaller.  We have basically
  just defconfig changes here this time, and a significant number of
  Renesas shmobile changes, as Renesas is still in the process of
  deprecating board file support"

* tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
  ARM: enable fhandle in multi_v7_defconfig
  ARM: tegra: enable fhandle in tegra_defconfig
  ARM: update multi_v7_defconfig for Tegra
  ARM: add Marvell Dove and some drivers to multi_v7 defconfig
  ARM: fix duplicate symbols in multi_v5_defconfig
  ARM: pxa: add gpio keys information
  ARM: tegra: defconfig updates
  ARM: config: keystone: enable AEMIF/NAND support
  ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig
  ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig
  ARM: config: Add mvebu_v5_defconfig
  ARM: config: Add a multi_v5_defconfig
  ARM: shmobile: r7s72100: update defconfig for I2C usage
  ARM: shmobile: Remove Lager DT reference legacy clock bits
  ARM: shmobile: Remove Koelsch DT reference legacy clock bits
  ARM: shmobile: Remove KZM9D board code
  ARM: mvebu: update defconfigs for Armada 375 and 38x
  ARM: dove: Enable watchdog support in the defconfig
  ARM: mvebu: Enable watchdog support in defconfig
  ARM: config: keystone: enable led support
  ...
parents ff050ad1 077492ac

arch/arm/boot/dts/r8a7778-bockw-reference.dts

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
/dts-v1/;

#include "r8a7778.dtsi"

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/gpio/gpio.h>



/ {

	model = "bockw";
@@ -84,7 +85,7 @@ 


	sdhi0_pins: sd0 {

		renesas,groups = "sdhi0_data4", "sdhi0_ctrl",

				  "sdhi0_cd", "sdhi0_wp";

				  "sdhi0_cd";

		renesas,function = "sdhi0";

	};
@@ -101,6 +102,7 @@ 
	vmmc-supply = <&fixedregulator3v3>;

	bus-width = <4>;

	status = "okay";

	wp-gpios = <&gpio3 18 GPIO_ACTIVE_HIGH>;

};



&hspi0 {

arch/arm/configs/ape6evm_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_IPV6_SIT is not set

CONFIG_NETFILTER=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_FW_LOADER_USER_HELPER is not set

CONFIG_NETDEVICES=y

# CONFIG_NET_CADENCE is not set

arch/arm/configs/armadillo800eva_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,8 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_IPV6 is not set

# CONFIG_WIRELESS is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_MD=y

arch/arm/configs/bockw_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_STANDALONE is not set

# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

arch/arm/configs/dove_defconfig

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ CONFIG_MTD_CFI_INTELEXT=y 
CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_COUNT=1
@@ -80,6 +79,8 @@ CONFIG_SPI_ORION=y 
# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_DOVE_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_ORION_WATCHDOG=y

CONFIG_USB=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y