Merge remote-tracking branch 'renesas/next'

diff --combined arch/arm/boot/dts/Makefile
index e8656fcf2f2c3781fb8dea4266a0764f8537bad9,80193b3a450be6a63cfbc6389f3b65874f5ef6d3..cc339f980acc0828a759137ea81b9b0ecbd78c3c
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -69,8 -69,7 +69,8 @@@ dtb-$(CONFIG_ARCH_BCM2835) += 
        bcm2835-rpi-b-rev2.dtb \
        bcm2835-rpi-b-plus.dtb \
        bcm2835-rpi-a-plus.dtb \
 -      bcm2836-rpi-2-b.dtb
 +      bcm2836-rpi-2-b.dtb \
 +      bcm2835-rpi-zero.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
        bcm4708-asus-rt-ac56u.dtb \
        bcm4708-asus-rt-ac68u.dtb \
@@@ -316,7 -315,6 +316,7 @@@ dtb-$(CONFIG_SOC_IMX53) += 
        imx53-smd.dtb \
        imx53-tx53-x03x.dtb \
        imx53-tx53-x13x.dtb \
 +      imx53-usbarmory.dtb \
        imx53-voipac-bsb.dtb
  dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6dl-apf6dev.dtb \
@@@ -332,7 -330,6 +332,7 @@@
        imx6dl-gw54xx.dtb \
        imx6dl-gw551x.dtb \
        imx6dl-gw552x.dtb \
 +      imx6dl-gw553x.dtb \
        imx6dl-hummingboard.dtb \
        imx6dl-nit6xlite.dtb \
        imx6dl-nitrogen6x.dtb \
@@@ -342,7 -339,6 +342,7 @@@
        imx6dl-sabreauto.dtb \
        imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
 +      imx6dl-ts4900.dtb \
        imx6dl-tx6dl-comtft.dtb \
        imx6dl-tx6s-8034.dtb \
        imx6dl-tx6s-8035.dtb \
@@@ -372,7 -368,6 +372,7 @@@
        imx6q-gw54xx.dtb \
        imx6q-gw551x.dtb \
        imx6q-gw552x.dtb \
 +      imx6q-gw553x.dtb \
        imx6q-h100.dtb \
        imx6q-hummingboard.dtb \
        imx6q-icore-rqs.dtb \
@@@ -387,7 -382,6 +387,7 @@@
        imx6q-sabresd.dtb \
        imx6q-sbc6x.dtb \
        imx6q-tbs2910.dtb \
 +      imx6q-ts4900.dtb \
        imx6q-tx6q-1010.dtb \
        imx6q-tx6q-1010-comtft.dtb \
        imx6q-tx6q-1020.dtb \
@@@ -413,7 -407,6 +413,7 @@@ dtb-$(CONFIG_SOC_IMX6SX) += 
        imx6sx-sdb.dtb
  dtb-$(CONFIG_SOC_IMX6UL) += \
        imx6ul-14x14-evk.dtb \
 +      imx6ul-geam-kit.dtb \
        imx6ul-pico-hobbit.dtb \
        imx6ul-tx6ul-0010.dtb \
        imx6ul-tx6ul-0011.dtb \
@@@ -424,8 -417,7 +424,8 @@@ dtb-$(CONFIG_SOC_IMX7D) += 
        imx7d-nitrogen7.dtb \
        imx7d-sbc-imx7.dtb \
        imx7d-sdb.dtb \
 -      imx7s-colibri-eval-v3.dtb
 +      imx7s-colibri-eval-v3.dtb \
 +      imx7s-warp.dtb
  dtb-$(CONFIG_SOC_LS1021A) += \
        ls1021a-qds.dtb \
        ls1021a-twr.dtb
@@@ -611,7 -603,6 +611,7 @@@ dtb-$(CONFIG_ARCH_QCOM) += 
        qcom-ipq8064-ap148.dtb \
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
 +      qcom-msm8974-lge-nexus5-hammerhead.dtb \
        qcom-msm8974-sony-xperia-honami.dtb
  dtb-$(CONFIG_ARCH_REALVIEW) += \
        arm-realview-pb1176.dtb \
@@@ -660,6 -651,7 +660,7 @@@ dtb-$(CONFIG_ARCH_S5PV210) += 
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
        emev2-kzm9d.dtb \
        r7s72100-genmai.dtb \
+       r7s72100-rskrza1.dtb \
        r8a73a4-ape6evm.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
@@@ -668,6 -660,7 +669,7 @@@
        r8a7791-koelsch.dtb \
        r8a7791-porter.dtb \
        r8a7792-blanche.dtb \
+       r8a7792-wheat.dtb \
        r8a7793-gose.dtb \
        r8a7794-alt.dtb \
        r8a7794-silk.dtb \

diff --combined arch/arm64/configs/defconfig
index 10d1dd2498f2eabe8246a171b48bd337d39cf88b,2c0be455230f758b442ad9c9dae50e30101af2f4..aaae7cf6b40af1cb8d84d3eeb8ec814b14d49b84
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1,3 -1,4 +1,3 @@@
 -# CONFIG_LOCALVERSION_AUTO is not set
  CONFIG_SYSVIPC=y
  CONFIG_POSIX_MQUEUE=y
  CONFIG_AUDIT=y
@@@ -14,14 -15,10 +14,14 @@@ CONFIG_IKCONFIG_PROC=
  CONFIG_LOG_BUF_SHIFT=14
  CONFIG_MEMCG=y
  CONFIG_MEMCG_SWAP=y
 +CONFIG_BLK_CGROUP=y
 +CONFIG_CGROUP_PIDS=y
  CONFIG_CGROUP_HUGETLB=y
 -# CONFIG_UTS_NS is not set
 -# CONFIG_IPC_NS is not set
 -# CONFIG_NET_NS is not set
 +CONFIG_CPUSETS=y
 +CONFIG_CGROUP_DEVICE=y
 +CONFIG_CGROUP_CPUACCT=y
 +CONFIG_CGROUP_PERF=y
 +CONFIG_USER_NS=y
  CONFIG_SCHED_AUTOGROUP=y
  CONFIG_BLK_DEV_INITRD=y
  CONFIG_KALLSYMS_ALL=y
@@@ -61,7 -58,6 +61,7 @@@ CONFIG_ARCH_ZYNQMP=
  CONFIG_PCI=y
  CONFIG_PCI_MSI=y
  CONFIG_PCI_IOV=y
 +CONFIG_PCI_AARDVARK=y
  CONFIG_PCIE_RCAR=y
  CONFIG_PCI_HOST_GENERIC=y
  CONFIG_PCI_XGENE=y
@@@ -75,7 -71,6 +75,7 @@@ CONFIG_PREEMPT=
  CONFIG_KSM=y
  CONFIG_TRANSPARENT_HUGEPAGE=y
  CONFIG_CMA=y
 +CONFIG_SECCOMP=y
  CONFIG_XEN=y
  CONFIG_KEXEC=y
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@@ -89,37 -84,10 +89,37 @@@ CONFIG_NET=
  CONFIG_PACKET=y
  CONFIG_UNIX=y
  CONFIG_INET=y
 +CONFIG_IP_MULTICAST=y
  CONFIG_IP_PNP=y
  CONFIG_IP_PNP_DHCP=y
  CONFIG_IP_PNP_BOOTP=y
 -# CONFIG_IPV6 is not set
 +CONFIG_IPV6=m
 +CONFIG_NETFILTER=y
 +CONFIG_NF_CONNTRACK=m
 +CONFIG_NF_CONNTRACK_EVENTS=y
 +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 +CONFIG_NETFILTER_XT_TARGET_LOG=m
 +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
 +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
 +CONFIG_NF_CONNTRACK_IPV4=m
 +CONFIG_IP_NF_IPTABLES=m
 +CONFIG_IP_NF_FILTER=m
 +CONFIG_IP_NF_TARGET_REJECT=m
 +CONFIG_IP_NF_NAT=m
 +CONFIG_IP_NF_TARGET_MASQUERADE=m
 +CONFIG_IP_NF_MANGLE=m
 +CONFIG_NF_CONNTRACK_IPV6=m
 +CONFIG_IP6_NF_IPTABLES=m
 +CONFIG_IP6_NF_FILTER=m
 +CONFIG_IP6_NF_TARGET_REJECT=m
 +CONFIG_IP6_NF_MANGLE=m
 +CONFIG_IP6_NF_NAT=m
 +CONFIG_IP6_NF_TARGET_MASQUERADE=m
 +CONFIG_BRIDGE=m
 +CONFIG_BRIDGE_VLAN_FILTERING=y
 +CONFIG_VLAN_8021Q=m
 +CONFIG_VLAN_8021Q_GVRP=y
 +CONFIG_VLAN_8021Q_MVRP=y
  CONFIG_BPF_JIT=y
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
@@@ -135,7 -103,6 +135,7 @@@ CONFIG_MTD=
  CONFIG_MTD_M25P80=y
  CONFIG_MTD_SPI_NOR=y
  CONFIG_BLK_DEV_LOOP=y
 +CONFIG_BLK_DEV_NBD=m
  CONFIG_VIRTIO_BLK=y
  CONFIG_SRAM=y
  # CONFIG_SCSI_PROC_FS is not set
@@@ -153,10 -120,7 +153,10 @@@ CONFIG_SATA_SIL24=
  CONFIG_PATA_PLATFORM=y
  CONFIG_PATA_OF_PLATFORM=y
  CONFIG_NETDEVICES=y
 +CONFIG_MACVLAN=m
 +CONFIG_MACVTAP=m
  CONFIG_TUN=y
 +CONFIG_VETH=m
  CONFIG_VIRTIO_NET=y
  CONFIG_AMD_XGBE=y
  CONFIG_NET_XGENE=y
@@@ -212,6 -176,7 +212,6 @@@ CONFIG_SERIAL_XILINX_PS_UART=
  CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
  CONFIG_SERIAL_MVEBU_UART=y
  CONFIG_VIRTIO_CONSOLE=y
 -# CONFIG_HW_RANDOM is not set
  CONFIG_I2C_CHARDEV=y
  CONFIG_I2C_MUX=y
  CONFIG_I2C_MUX_PCA954x=y
@@@ -234,7 -199,6 +234,7 @@@ CONFIG_PINCTRL_SINGLE=
  CONFIG_PINCTRL_MAX77620=y
  CONFIG_PINCTRL_MSM8916=y
  CONFIG_PINCTRL_MSM8996=y
 +CONFIG_PINCTRL_QDF2XXX=y
  CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_DWAPB=y
@@@ -257,8 -221,6 +257,8 @@@ CONFIG_EXYNOS_THERMAL=
  CONFIG_WATCHDOG=y
  CONFIG_RENESAS_WDT=y
  CONFIG_S3C2410_WATCHDOG=y
 +CONFIG_MESON_GXBB_WATCHDOG=m
 +CONFIG_MESON_WATCHDOG=m
  CONFIG_MFD_MAX77620=y
  CONFIG_MFD_SPMI_PMIC=y
  CONFIG_MFD_SEC_CORE=y
@@@ -295,7 -257,6 +295,7 @@@ CONFIG_SND_SOC_AK4613=
  CONFIG_USB=y
  CONFIG_USB_OTG=y
  CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_PLATFORM=y
  CONFIG_USB_XHCI_RCAR=y
  CONFIG_USB_EHCI_EXYNOS=y
  CONFIG_USB_XHCI_TEGRA=y
@@@ -305,6 -266,7 +305,7 @@@ CONFIG_USB_EHCI_HCD_PLATFORM=
  CONFIG_USB_OHCI_EXYNOS=y
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
+ CONFIG_USB_RENESAS_USBHS=m
  CONFIG_USB_STORAGE=y
  CONFIG_USB_DWC2=y
  CONFIG_USB_DWC3=y
@@@ -316,21 -278,21 +317,23 @@@ CONFIG_USB_HSIC_USB3503=
  CONFIG_USB_MSM_OTG=y
  CONFIG_USB_ULPI=y
  CONFIG_USB_GADGET=y
+ CONFIG_USB_RENESAS_USBHS_UDC=m
  CONFIG_MMC=y
  CONFIG_MMC_BLOCK_MINORS=32
  CONFIG_MMC_ARMMMCI=y
  CONFIG_MMC_SDHCI=y
 +CONFIG_MMC_SDHCI_ACPI=y
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_OF_ESDHC=y
  CONFIG_MMC_SDHCI_TEGRA=y
  CONFIG_MMC_SDHCI_MSM=y
  CONFIG_MMC_SPI=y
+ CONFIG_MMC_SDHI=y
  CONFIG_MMC_DW=y
  CONFIG_MMC_DW_EXYNOS=y
  CONFIG_MMC_DW_K3=y
  CONFIG_MMC_SUNXI=y
 +CONFIG_MMC_MESON_GXBB=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_GPIO=y
@@@ -352,8 -314,6 +355,8 @@@ CONFIG_DMADEVICES=
  CONFIG_PL330_DMA=y
  CONFIG_TEGRA20_APB_DMA=y
  CONFIG_QCOM_BAM_DMA=y
 +CONFIG_QCOM_HIDMA_MGMT=y
 +CONFIG_QCOM_HIDMA=y
  CONFIG_RCAR_DMAC=y
  CONFIG_VFIO=y
  CONFIG_VFIO_PCI=y
@@@ -394,16 -354,12 +397,16 @@@ CONFIG_EXYNOS_ADC=
  CONFIG_PWM_SAMSUNG=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
 +CONFIG_EXT4_FS_POSIX_ACL=y
 +CONFIG_BTRFS_FS=m
 +CONFIG_BTRFS_FS_POSIX_ACL=y
  CONFIG_FANOTIFY=y
  CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
  CONFIG_QUOTA=y
  CONFIG_AUTOFS4_FS=y
 -CONFIG_FUSE_FS=y
 -CONFIG_CUSE=y
 +CONFIG_FUSE_FS=m
 +CONFIG_CUSE=m
 +CONFIG_OVERLAY_FS=m
  CONFIG_VFAT_FS=y
  CONFIG_TMPFS=y
  CONFIG_HUGETLBFS=y