From: Olof Johansson Date: Tue, 22 Dec 2015 21:07:11 +0000 (-0800) Subject: Merge tag 'v4.5-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=84658cbde8e3a7ef36f75a12929d49fedc0eff8c;p=linux.git Merge tag 'v4.5-rockchip-dts32-2' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt Another new soc - the rk3228 quad-core cortex-a7, a new rk3036 board, support for the efuses on Rockchip socs and some improvements for rk3288 regulators. * tag 'v4.5-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add the kylin board for rk3036 ARM: dts: rockchip: add the sdio/sdmmc node for rk3036 ARM: dts: rockchip: fix the pinctrl bias settings for rk3036 ARM: dts: rockchip: add eFuse node for rk3188 SoCs ARM: dts: rockchip: add eFuse node for rk3066a SoCs ARM: dts: rockchip: add eFuse config of rk3288 SoC ARM: dts: rockchip: add rk3228-evb board ARM: dts: rockchip: add core rk3228 dtsi clk: rockchip: Add the clock ids of rk3288 eFuses ARM: dts: rockchip: Fix typo in rk3288 sdmmc card detect pin name ARM: dts: rockchip: fix voltage ranges for rk3288-evb-act8846 board ARM: dts: rockchip: move the public part to rk3288-evb common ARM: dts: rockchip: add 2 regulators for rk3288-evb-act8846 ARM: dts: rockchip: correct the name of REG8 for rk3288-evb-act8846 clk: rockchip: add dt-binding header for rk3228 clk: rockchip: add id for mipidsi sclk on rk3288 Signed-off-by: Olof Johansson --- 84658cbde8e3a7ef36f75a12929d49fedc0eff8c diff --cc arch/arm/boot/dts/Makefile index 84a4dbb9b20e0,bf5470c577f93..7177a427c3c88 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -523,10 -510,10 +523,11 @@@ dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8960-cdp.dtb \ qcom-msm8974-sony-xperia-honami.dtb dtb-$(CONFIG_ARCH_REALVIEW) += \ - arm-realview-pb1176.dtb + arm-realview-pb1176.dtb \ + arm-realview-pb11mp.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3036-evb.dtb \ + rk3036-kylin.dtb \ rk3066a-bqcurie2.dtb \ rk3066a-marsboard.dtb \ rk3066a-rayeager.dtb \