The device tree for rk3288 combined is now available in the /dts/upstream directory. Use imply OF_UPSTREAM to migrate all rk3288 boards. Clean up MAINTAINERS.
Acked-by: Sumit Garg <[email protected]> Changed V3: Makefile MAINTAINERS Changed V2: Rebase Moved upstream changes to separate patches Split in smaller pieces Johan Jonker (6): ARM: dts: rockchip: Remove mshc aliases from RK3288 ARM: dts: rockchip: Add spi_flash label to rk3288-veyron ARM: dts: rockchip: move edp assigned-clocks to edp node on rk3288 rockchip: Switch rk3288-veyron boards to upstream devicetree rockchip: Switch remaining rk3288 boards to upstream devicetree rockchip: imply OF_UPSTREAM for rk3288 boards arch/arm/dts/Makefile | 11 - arch/arm/dts/cros-ec-sbs.dtsi | 52 -- ...boot.dtsi => rk3288-evb-rk808-u-boot.dtsi} | 0 arch/arm/dts/rk3288-evb.dts | 20 - arch/arm/dts/rk3288-evb.dtsi | 476 ----------- arch/arm/dts/rk3288-popmetal.dts | 20 - arch/arm/dts/rk3288-popmetal.dtsi | 547 ------------ arch/arm/dts/rk3288-rock-pi-n8.dts | 17 - arch/arm/dts/rk3288-rock2-som.dtsi | 278 ------ arch/arm/dts/rk3288-rock2-square.dts | 181 ---- arch/arm/dts/rk3288-veyron-chromebook.dtsi | 205 ----- arch/arm/dts/rk3288-veyron-jerry.dts | 208 ----- arch/arm/dts/rk3288-veyron-mickey.dts | 266 ------ arch/arm/dts/rk3288-veyron-minnie.dts | 302 ------- arch/arm/dts/rk3288-veyron-speedy.dts | 143 ---- arch/arm/dts/rk3288-veyron.dtsi | 795 ------------------ arch/arm/dts/rk3288-vmarc-som.dtsi | 361 -------- arch/arm/dts/rk3288-vyasa.dts | 473 ----------- .../dts/rockchip-radxa-dalang-carrier.dtsi | 137 --- arch/arm/mach-rockchip/Kconfig | 1 + board/amarula/vyasa-rk3288/MAINTAINERS | 1 - board/chipspark/popmetal_rk3288/MAINTAINERS | 1 - board/google/veyron/MAINTAINERS | 10 +- board/rockchip/evb_rk3288/MAINTAINERS | 6 +- configs/chromebit_mickey_defconfig | 4 +- configs/chromebook_jerry_defconfig | 4 +- configs/chromebook_minnie_defconfig | 4 +- configs/chromebook_speedy_defconfig | 4 +- ...8_defconfig => evb-rk3288-rk808_defconfig} | 4 +- configs/firefly-rk3288_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/phycore-rk3288_defconfig | 3 +- configs/popmetal-rk3288_defconfig | 4 +- configs/rock-pi-n8-rk3288_defconfig | 2 +- configs/rock2_defconfig | 4 +- configs/tinker-rk3288_defconfig | 1 - configs/tinker-s-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 4 +- doc/board/rockchip/rockchip.rst | 8 +- .../src/arm/rockchip/rk3288-veyron.dtsi | 2 +- dts/upstream/src/arm/rockchip/rk3288.dtsi | 9 +- 41 files changed, 30 insertions(+), 4541 deletions(-) delete mode 100644 arch/arm/dts/cros-ec-sbs.dtsi rename arch/arm/dts/{rk3288-evb-u-boot.dtsi => rk3288-evb-rk808-u-boot.dtsi} (100%) delete mode 100644 arch/arm/dts/rk3288-evb.dts delete mode 100644 arch/arm/dts/rk3288-evb.dtsi delete mode 100644 arch/arm/dts/rk3288-popmetal.dts delete mode 100644 arch/arm/dts/rk3288-popmetal.dtsi delete mode 100644 arch/arm/dts/rk3288-rock-pi-n8.dts delete mode 100644 arch/arm/dts/rk3288-rock2-som.dtsi delete mode 100644 arch/arm/dts/rk3288-rock2-square.dts delete mode 100644 arch/arm/dts/rk3288-veyron-chromebook.dtsi delete mode 100644 arch/arm/dts/rk3288-veyron-jerry.dts delete mode 100644 arch/arm/dts/rk3288-veyron-mickey.dts delete mode 100644 arch/arm/dts/rk3288-veyron-minnie.dts delete mode 100644 arch/arm/dts/rk3288-veyron-speedy.dts delete mode 100644 arch/arm/dts/rk3288-veyron.dtsi delete mode 100644 arch/arm/dts/rk3288-vmarc-som.dtsi delete mode 100644 arch/arm/dts/rk3288-vyasa.dts delete mode 100644 arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi rename configs/{evb-rk3288_defconfig => evb-rk3288-rk808_defconfig} (95%) -- 2.39.5
