OSDN Git Service

Merge tag 'omap-for-v4.20/dt-signed-part2' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Thu, 4 Oct 2018 14:13:04 +0000 (16:13 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 4 Oct 2018 14:14:05 +0000 (16:14 +0200)
More devicetree changes for omap variants

There's a patch for previously merged dts changes to remove the last
remaining use of legacy phy_id property.

For dra7, we have a non-urgent PCIe dts fix, enable a PCIe errata for
unaligned access.

For omap5, we enable omap5 USB OTG mode for DWC3 controller.

And we add support for am335x based Moxa UC-2100 series of industrial
computers.

* tag 'omap-for-v4.20/dt-signed-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x: Replace remaining legacy phy_id with phy-handle
  ARM: dts: am335x: add support for Moxa UC-2101 open platform
  ARM: dts: am335x: add common file for UC-2100 series
  ARM: dts: omap5: enable OTG role for DWC3 controller
  ARM: dts: dra7: Enable workaround for errata i870 in PCIe host mode
  ARM: dts: dra7: Fix up unaligned access setting for PCIe EP

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/boot/dts/Makefile

@@@ -81,7 -81,6 +81,7 @@@ dtb-$(CONFIG_ARCH_BCM2835) += 
        bcm2836-rpi-2-b.dtb \
        bcm2837-rpi-3-b.dtb \
        bcm2837-rpi-3-b-plus.dtb \
 +      bcm2837-rpi-cm3-io3.dtb \
        bcm2835-rpi-zero.dtb \
        bcm2835-rpi-zero-w.dtb
  dtb-$(CONFIG_ARCH_BCM_5301X) += \
@@@ -322,7 -321,6 +322,7 @@@ dtb-$(CONFIG_MACH_MESON6) += 
        meson6-atv1200.dtb
  dtb-$(CONFIG_MACH_MESON8) += \
        meson8-minix-neo-x8.dtb \
 +      meson8b-ec100.dtb \
        meson8b-mxq.dtb \
        meson8b-odroidc1.dtb \
        meson8m2-mxiii-plus.dtb
@@@ -550,7 -548,6 +550,7 @@@ dtb-$(CONFIG_SOC_IMX6SX) += 
  dtb-$(CONFIG_SOC_IMX6UL) += \
        imx6ul-14x14-evk.dtb \
        imx6ul-ccimx6ulsbcexpress.dtb \
 +      imx6ul-ccimx6ulsbcpro.dtb \
        imx6ul-geam.dtb \
        imx6ul-isiot-emmc.dtb \
        imx6ul-isiot-nand.dtb \
        imx6ul-tx6ul-mainboard.dtb \
        imx6ull-14x14-evk.dtb \
        imx6ull-colibri-eval-v3.dtb \
 -      imx6ull-colibri-wifi-eval-v3.dtb
 +      imx6ull-colibri-wifi-eval-v3.dtb \
 +      imx6ulz-14x14-evk.dtb
  dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \
        imx7d-colibri-emmc-eval-v3.dtb \
@@@ -711,6 -707,7 +711,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-evmsk.dtb \
        am335x-icev2.dtb \
        am335x-lxm.dtb \
+       am335x-moxa-uc-2101.dtb \
        am335x-moxa-uc-8100-me-t.dtb \
        am335x-nano.dtb \
        am335x-pdu001.dtb \
@@@ -897,7 -894,7 +898,7 @@@ dtb-$(CONFIG_ARCH_SOCFPGA) += 
        socfpga_arria10_socdk_sdmmc.dtb \
        socfpga_cyclone5_mcvevk.dtb \
        socfpga_cyclone5_socdk.dtb \
 -      socfpga_cyclone5_de0_sockit.dtb \
 +      socfpga_cyclone5_de0_nano_soc.dtb \
        socfpga_cyclone5_sockit.dtb \
        socfpga_cyclone5_socrates.dtb \
        socfpga_cyclone5_sodia.dtb \
@@@ -1038,7 -1035,6 +1039,7 @@@ dtb-$(CONFIG_MACH_SUN8I) += 
        sun8i-h2-plus-orangepi-r1.dtb \
        sun8i-h2-plus-orangepi-zero.dtb \
        sun8i-h3-bananapi-m2-plus.dtb \
 +      sun8i-h3-bananapi-m2-plus-v1.2.dtb \
        sun8i-h3-beelink-x2.dtb \
        sun8i-h3-libretech-all-h3-cc.dtb \
        sun8i-h3-nanopi-m1.dtb  \
        sun8i-h3-orangepi-pc-plus.dtb \
        sun8i-h3-orangepi-plus.dtb \
        sun8i-h3-orangepi-plus2e.dtb \
 +      sun8i-h3-orangepi-zero-plus2.dtb \
        sun8i-r16-bananapi-m2m.dtb \
        sun8i-r16-nintendo-nes-classic.dtb \
        sun8i-r16-nintendo-super-nes-classic.dtb \
@@@ -1068,7 -1063,6 +1069,7 @@@ dtb-$(CONFIG_ARCH_TANGO) += 
        tango4-vantage-1172.dtb
  dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \
        tegra20-harmony.dtb \
 +      tegra20-colibri-eval-v3.dtb \
        tegra20-colibri-iris.dtb \
        tegra20-medcom-wide.dtb \
        tegra20-paz00.dtb \
        tegra20-ventana.dtb
  dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \
        tegra30-apalis-eval.dtb \
 +      tegra30-apalis-v1.1-eval.dtb \
        tegra30-beaver.dtb \
        tegra30-cardhu-a02.dtb \
        tegra30-cardhu-a04.dtb \
@@@ -1158,7 -1151,6 +1159,7 @@@ dtb-$(CONFIG_MACH_ARMADA_370) += 
  dtb-$(CONFIG_MACH_ARMADA_375) += \
        armada-375-db.dtb
  dtb-$(CONFIG_MACH_ARMADA_38X) += \
 +      armada-385-db-88f6820-amc.dtb \
        armada-385-db-ap.dtb \
        armada-385-linksys-caiman.dtb \
        armada-385-linksys-cobra.dtb \
@@@ -1209,8 -1201,6 +1210,8 @@@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.d
  dtb-$(CONFIG_ARCH_ASPEED) += \
        aspeed-ast2500-evb.dtb \
        aspeed-bmc-arm-centriq2400-rep.dtb \
 +      aspeed-bmc-arm-stardragon4800-rep2.dtb \
 +      aspeed-bmc-facebook-tiogapass.dtb \
        aspeed-bmc-intel-s2600wf.dtb \
        aspeed-bmc-opp-lanyang.dtb \
        aspeed-bmc-opp-palmetto.dtb \