]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge tag 'v4.10-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Wed, 30 Nov 2016 22:36:38 +0000 (23:36 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 30 Nov 2016 22:36:38 +0000 (23:36 +0100)
Pull "Rockchip dts32 changes for 4.10" from Heiko Stübner:

A bit of attention for the rk3066, fixed tsadc reset node
as well as enabling the dma for uart and mmc controllers.

And one new soc, the rk1108 combining a single-core Cortex-A7
with a separate DSP core.

* tag 'v4.10-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  ARM: dts: rockchip: add the sdmmc pinctrl for rk1108
  ARM: dts: rockchip: add rockchip RK1108 Evaluation board
  ARM: dts: rockchip: add basic support for RK1108 SOC
  clk: rockchip: add dt-binding header for rk1108
  dt-bindings: rockchip-dw-mshc: add RK1108 dw-mshc description
  ARM: dts: rockchip: enable dma for uart and mmc on rk3066a
  ARM: dts: rockchip: fix TSADC reset node for rk3066a

1  2 
arch/arm/boot/dts/Makefile

index ecc3fc94c0b4afe78a839064dc3bcbbf653f938d,249dca960cdd82f2f9be3178af6d721e0b849db5..01b77cea3a5555a198ac8d90e19c0160ef9c7456
@@@ -75,7 -75,6 +75,7 @@@ dtb-$(CONFIG_ARCH_BCM_5301X) += 
        bcm4708-asus-rt-ac56u.dtb \
        bcm4708-asus-rt-ac68u.dtb \
        bcm4708-buffalo-wzr-1750dhp.dtb \
 +      bcm4708-luxul-xap-1510.dtb \
        bcm4708-luxul-xwc-1000.dtb \
        bcm4708-netgear-r6250.dtb \
        bcm4708-netgear-r6300-v2.dtb \
        bcm4709-buffalo-wxr-1900dhp.dtb \
        bcm4709-netgear-r7000.dtb \
        bcm4709-netgear-r8000.dtb \
 +      bcm4709-tplink-archer-c9-v1.dtb \
        bcm47094-dlink-dir-885l.dtb \
 +      bcm47094-luxul-xwr-3100.dtb \
 +      bcm47094-netgear-r8500.dtb \
        bcm94708.dtb \
        bcm94709.dtb \
        bcm953012er.dtb \
        bcm953012k.dtb
 +dtb-$(CONFIG_ARCH_BCM_53573) += \
 +      bcm47189-tenda-ac9.dtb
  dtb-$(CONFIG_ARCH_BCM_63XX) += \
        bcm963138dvt.dtb
  dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \
@@@ -142,7 -136,6 +142,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 \
@@@ -337,7 -330,6 +337,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 \
@@@ -427,19 -416,14 +427,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 \
@@@ -577,7 -561,6 +577,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 \
@@@ -607,15 -590,13 +607,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 \
        arm-realview-pba8.dtb \
        arm-realview-pbx-a9.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += \
+       rk1108-evb.dtb \
        rk3036-evb.dtb \
        rk3036-kylin.dtb \
        rk3066a-bqcurie2.dtb \
@@@ -700,8 -680,6 +701,8 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += 
        r7s72100-rskrza1.dtb \
        r8a73a4-ape6evm.dtb \
        r8a7740-armadillo800eva.dtb \
 +      r8a7743-sk-rzg1m.dtb \
 +      r8a7745-sk-rzg1e.dtb \
        r8a7778-bockw.dtb \
        r8a7779-marzen.dtb \
        r8a7790-lager.dtb \
        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) += \
@@@ -739,12 -715,16 +740,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 \
        sun4i-a10-pcduino2.dtb \
        sun4i-a10-pov-protab2-ips9.dtb
  dtb-$(CONFIG_MACH_SUN5I) += \
 -      ntc-gr8-evb.dtb \
        sun5i-a10s-auxtek-t003.dtb \
        sun5i-a10s-auxtek-t004.dtb \
        sun5i-a10s-mk802.dtb \
        sun5i-a13-olinuxino-micro.dtb \
        sun5i-a13-q8-tablet.dtb \
        sun5i-a13-utoo-p66.dtb \
 +      sun5i-gr8-chip-pro.dtb \
 +      sun5i-gr8-evb.dtb \
        sun5i-r8-chip.dtb
  dtb-$(CONFIG_MACH_SUN6I) += \
        sun6i-a31-app4-evb1.dtb \