]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge tag 'mvebu-dt-4.10-1' of git://git.infradead.org/linux-mvebu into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 25 Nov 2016 23:45:02 +0000 (00:45 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 25 Nov 2016 23:45:02 +0000 (00:45 +0100)
Pull "mvebu dt for 4.10 (part 1)" from Gregory CLEMENT:

Add missing pinmux declaration for netgear NASes
Fix i2c compatible string for netgear NASes
Fix on a wrong comment about PLL frequency
Fix spelling mistake of the manufacturer's name of the Topkick
Add dt support for the orion5x ls-chl Linkstation device
First step of fixing DTC warning for Armada 370, 375 and XP

* tag 'mvebu-dt-4.10-1' of git://git.infradead.org/linux-mvebu: (30 commits)
  ARM: dts: armada-375: Fixup ethernet child DT warning
  ARM: dts: armada-375: Fixup memory DT warning
  ARM: dts: armada-375: Remove skeleton.dtsi
  ARM: dts: armada-375: Fixup pinctrl DT warnings
  ARM: dts: armada-375: Fixup pcie DT warnings
  ARM: dts: armada-375: Fixup mdio DT warning
  ARM: dts: armada-375: Use the node labels
  ARM: dts: armada-375: Add node labels
  ARM: dts: armada-370-xp: Fixup regulator DT warning
  ARM: dts: armada-370-xp: Remove button address and fixup names
  ARM: dts: armada-370-xp: Remove address from dsa unit name
  ARM: dts: armada-370-xp: Fixup memory DT warning
  ARM: dts: armada-370-xp: Fixup l2-cache DT warning
  ARM: dts: armada-370-xp: Remove skeleton.dtsi
  ARM: dts: armada-370: Fixup pcie DT warnings
  ARM: dts: armada-xp: Fixup pcie DT warnings
  ARM: dts: armada-370-xp: Fixup mdio DT warning
  ARM: dts: armada-370-xp: Use the node labels
  ARM: dts: armada-370-xp: add node labels
  ARM: dts: armada-370-xp: move the cpurst node in the common file
  ...

1  2 
arch/arm/boot/dts/Makefile

index 5a9fb0ea6566d55edf139e61ac05355d002ae485,48530491491634d09d3c55a3c050197c89d30952..9181613c9344e83ca252999e13bfa3c20f8bf038
@@@ -136,7 -136,6 +136,7 @@@ dtb-$(CONFIG_ARCH_EXYNOS4) += 
        exynos4210-smdkv310.dtb \
        exynos4210-trats.dtb \
        exynos4210-universal_c210.dtb \
 +      exynos4412-itop-elite.dtb \
        exynos4412-odroidu3.dtb \
        exynos4412-odroidx.dtb \
        exynos4412-odroidx2.dtb \
@@@ -331,7 -330,6 +331,7 @@@ dtb-$(CONFIG_SOC_IMX6Q) += 
        imx6dl-aristainetos_7.dtb \
        imx6dl-aristainetos2_4.dtb \
        imx6dl-aristainetos2_7.dtb \
 +      imx6dl-colibri-eval-v3.dtb \
        imx6dl-cubox-i.dtb \
        imx6dl-dfi-fs700-m60.dtb \
        imx6dl-gw51xx.dtb \
        imx6dl-gw552x.dtb \
        imx6dl-gw553x.dtb \
        imx6dl-hummingboard.dtb \
 +      imx6dl-icore.dtb \
        imx6dl-nit6xlite.dtb \
        imx6dl-nitrogen6x.dtb \
        imx6dl-phytec-pbab01.dtb \
        imx6q-gw553x.dtb \
        imx6q-h100.dtb \
        imx6q-hummingboard.dtb \
 +      imx6q-icore.dtb \
        imx6q-icore-rqs.dtb \
        imx6q-marsboard.dtb \
        imx6q-nitrogen6x.dtb \
        imx6q-nitrogen6_max.dtb \
 +      imx6q-nitrogen6_som2.dtb \
        imx6q-novena.dtb \
        imx6q-phytec-pbab01.dtb \
        imx6q-rex-pro.dtb \
@@@ -421,19 -416,14 +421,19 @@@ dtb-$(CONFIG_SOC_IMX6SX) += 
        imx6sx-sabreauto.dtb \
        imx6sx-sdb-reva.dtb \
        imx6sx-sdb-sai.dtb \
 -      imx6sx-sdb.dtb
 +      imx6sx-sdb.dtb \
 +      imx6sx-udoo-neo-basic.dtb \
 +      imx6sx-udoo-neo-extended.dtb \
 +      imx6sx-udoo-neo-full.dtb
  dtb-$(CONFIG_SOC_IMX6UL) += \
        imx6ul-14x14-evk.dtb \
        imx6ul-geam-kit.dtb \
 +      imx6ul-liteboard.dtb \
        imx6ul-pico-hobbit.dtb \
        imx6ul-tx6ul-0010.dtb \
        imx6ul-tx6ul-0011.dtb \
 -      imx6ul-tx6ul-mainboard.dtb
 +      imx6ul-tx6ul-mainboard.dtb \
 +      imx6ull-14x14-evk.dtb
  dtb-$(CONFIG_SOC_IMX7D) += \
        imx7d-cl-som-imx7.dtb \
        imx7d-colibri-eval-v3.dtb \
@@@ -571,7 -561,6 +571,7 @@@ dtb-$(CONFIG_SOC_AM33XX) += 
        am335x-sl50.dtb \
        am335x-wega-rdk.dtb
  dtb-$(CONFIG_ARCH_OMAP4) += \
 +      omap4-droid4-xt894.dtb \
        omap4-duovero-parlor.dtb \
        omap4-kc1.dtb \
        omap4-panda.dtb \
@@@ -601,14 -590,14 +601,15 @@@ dtb-$(CONFIG_SOC_DRA7XX) += 
        am572x-idk.dtb \
        dra7-evm.dtb \
        dra72-evm.dtb \
 -      dra72-evm-revc.dtb
 +      dra72-evm-revc.dtb \
 +      dra71-evm.dtb
  dtb-$(CONFIG_ARCH_ORION5X) += \
        orion5x-kuroboxpro.dtb \
        orion5x-lacie-d2-network.dtb \
        orion5x-lacie-ethernet-disk-mini-v2.dtb \
        orion5x-linkstation-lsgl.dtb \
        orion5x-linkstation-lswtgl.dtb \
+       orion5x-lschl.dtb \
        orion5x-lswsgl.dtb \
        orion5x-maxtor-shared-storage-2.dtb \
        orion5x-netgear-wnr854t.dtb \
  dtb-$(CONFIG_ARCH_PRIMA2) += \
        prima2-evb.dtb
  dtb-$(CONFIG_ARCH_OXNAS) += \
 -      wd-mbwe.dtb
 +      wd-mbwe.dtb \
 +      cloudengines-pogoplug-series-3.dtb
  dtb-$(CONFIG_ARCH_QCOM) += \
        qcom-apq8060-dragonboard.dtb \
        qcom-apq8064-arrow-sd-600eval.dtb \
        qcom-msm8660-surf.dtb \
        qcom-msm8960-cdp.dtb \
        qcom-msm8974-lge-nexus5-hammerhead.dtb \
 -      qcom-msm8974-sony-xperia-honami.dtb
 +      qcom-msm8974-sony-xperia-honami.dtb \
 +      qcom-mdm9615-wp8548-mangoh-green.dtb
  dtb-$(CONFIG_ARCH_REALVIEW) += \
        arm-realview-pb1176.dtb \
        arm-realview-pb11mp.dtb \
@@@ -653,9 -640,7 +654,9 @@@ dtb-$(CONFIG_ARCH_ROCKCHIP) += 
        rk3036-kylin.dtb \
        rk3066a-bqcurie2.dtb \
        rk3066a-marsboard.dtb \
 +      rk3066a-mk808.dtb \
        rk3066a-rayeager.dtb \
 +      rk3188-px3-evb.dtb \
        rk3188-radxarock.dtb \
        rk3228-evb.dtb \
        rk3229-evb.dtb \
@@@ -706,14 -691,12 +707,14 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += 
        sh73a0-kzm9g.dtb
  dtb-$(CONFIG_ARCH_SOCFPGA) += \
        socfpga_arria5_socdk.dtb \
 +      socfpga_arria10_socdk_qspi.dtb \
        socfpga_arria10_socdk_sdmmc.dtb \
        socfpga_cyclone5_mcvevk.dtb \
        socfpga_cyclone5_socdk.dtb \
        socfpga_cyclone5_de0_sockit.dtb \
        socfpga_cyclone5_sockit.dtb \
        socfpga_cyclone5_socrates.dtb \
 +      socfpga_cyclone5_sodia.dtb \
        socfpga_cyclone5_vining_fpga.dtb \
        socfpga_vt.dtb
  dtb-$(CONFIG_ARCH_SPEAR13XX) += \
@@@ -730,12 -713,16 +731,12 @@@ dtb-$(CONFIG_ARCH_STI) += 
        stih407-b2120.dtb \
        stih410-b2120.dtb \
        stih410-b2260.dtb \
 -      stih415-b2000.dtb \
 -      stih415-b2020.dtb \
 -      stih416-b2000.dtb \
 -      stih416-b2020.dtb \
 -      stih416-b2020e.dtb \
        stih418-b2199.dtb
  dtb-$(CONFIG_ARCH_STM32)+= \
        stm32f429-disco.dtb \
        stm32f469-disco.dtb \
 -      stm32429i-eval.dtb
 +      stm32429i-eval.dtb \
 +      stm32746g-eval.dtb
  dtb-$(CONFIG_MACH_SUN4I) += \
        sun4i-a10-a1000.dtb \
        sun4i-a10-ba10-tvbox.dtb \