From: Arnd Bergmann Date: Thu, 20 Nov 2014 16:42:17 +0000 (+0100) Subject: Merge tag 'v3.19-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2dfb8bf3be899a685b7ec8713145e578d3c20f5b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge tag 'v3.19-rockchip-dts2' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt Pull "ARM: rockchip: second batch of dts related changes" from Heiko Stuebner: - the dts part of the rk3288 smp support - rate init for rk3288 clocks - enablement of various peripherals - new boardfile for Haoyu Marsboard (rk3066 based) * tag 'v3.19-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: enable PWM on Radxa Rock ARM: dts: rockchip: fix invalid unit-address in rk3188.dtsi ARM: dts: rk3288: add VOP iommu nodes ARM: dts: rockchip: add reset for CPU nodes ARM: dts: rockchip: add intmem node for rk3288 smp support ARM: dts: rockchip: add pmu references to cpus nodes ARM: dts: rockchip: add serial aliases for rk3066 and rk3188 ARM: dts: rockchip: Add devicetree source for MarsBoard RK3066 ARM: dts: rockchip: Add EMAC Rockchip for RK3066 SoCs Signed-off-by: Arnd Bergmann --- 2dfb8bf3be899a685b7ec8713145e578d3c20f5b diff --cc arch/arm/boot/dts/Makefile index 21dde4370955,45dc351a81fc..200b3448f1a9 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@@ -373,9 -363,9 +373,10 @@@ dtb-$(CONFIG_ARCH_QCOM) += qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb \ qcom-msm8974-sony-xperia-honami.dtb +dtb-$(CONFIG_ARCH_REALVIEW) += arm-realview-pb1176.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3066a-bqcurie2.dtb \ + rk3066a-marsboard.dtb \ rk3188-radxarock.dtb \ rk3288-evb-act8846.dtb \ rk3288-evb-rk808.dtb