diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 06:45:10 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 06:45:10 -0700 |
| commit | b633b314061ea26cefa2600bf4d353a462f0c7aa (patch) | |
| tree | 529dce3c569d94843f817be0e4615770037ebf28 /arch/arm/boot/dts/Makefile | |
| parent | 6daf2aab1ca801a2e8a42537aadad26fd321e90d (diff) | |
| parent | 81507732449076de35db3b5a439e4dfd548c6b5a (diff) | |
| download | talos-op-linux-b633b314061ea26cefa2600bf4d353a462f0c7aa.tar.gz talos-op-linux-b633b314061ea26cefa2600bf4d353a462f0c7aa.zip | |
Merge tag 'v4.12-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Support for the usb-sata controller on the rock2 and another new rk3288
board, the phyCORE som and its PCM-947 carrier board from Phytec.
* tag 'v4.12-rockchip-dts32-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: Add support for PCM-947 carrier board
dt-bindings: Document Phytec phyCORE-RK3288 RDK
ARM: dts: rockchip: Add support for phyCORE-RK3288 SoM
ARM: dts: rockchip: Enable sata support on rock2 square
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 884239f339d3..05b6eb2c6629 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -722,6 +722,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-firefly.dtb \ rk3288-firefly-reload.dtb \ rk3288-miqi.dtb \ + rk3288-phycore-rdk.dtb \ rk3288-popmetal.dtb \ rk3288-r89.dtb \ rk3288-rock2-square.dtb \ |
