diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 13:07:11 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 13:07:11 -0800 |
| commit | 84658cbde8e3a7ef36f75a12929d49fedc0eff8c (patch) | |
| tree | ed55861a6c35a98f4b70f26c2895e7573bc19112 /arch/arm/boot/dts/Makefile | |
| parent | 12ee126d9140944abdf1ae76c169e49d22f4bd4e (diff) | |
| parent | 94cf32b97bbb043b99e914aacff1a6d7833daf58 (diff) | |
| download | blackbird-op-linux-84658cbde8e3a7ef36f75a12929d49fedc0eff8c.tar.gz blackbird-op-linux-84658cbde8e3a7ef36f75a12929d49fedc0eff8c.zip | |
Merge tag 'v4.5-rockchip-dts32-2' of git://git.kernel.org/pub/scm/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 <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 84a4dbb9b20e..7177a427c3c8 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -527,10 +527,12 @@ dtb-$(CONFIG_ARCH_REALVIEW) += \ arm-realview-pb11mp.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3036-evb.dtb \ + rk3036-kylin.dtb \ rk3066a-bqcurie2.dtb \ rk3066a-marsboard.dtb \ rk3066a-rayeager.dtb \ rk3188-radxarock.dtb \ + rk3228-evb.dtb \ rk3288-evb-act8846.dtb \ rk3288-evb-rk808.dtb \ rk3288-firefly-beta.dtb \ |
