rockchip: use OF_UPSTREAM for rk3288
Subsystems (4)
v2 cover rockchip: use OF_UPSTREAM for rk3288
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.
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/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/radxa/rock2/MAINTAINERS | 1 -
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(+), 4531 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
PATCH v2 2/6 ARM: dts: rockchip: Add spi_flash label to rk3288-veyron
The u-boot,spl-boot-order property requires a label at a boot device node. In order to migrate to OF_UPSTREAM more easier add a spi_flash label to the rk3288-veyron.dtsi file.
[ upstream commit: ac7116a626e00d3024adedb43b74bdf2ce45efc2 ]
(cherry picked from commit 38e6f7cd300f66cc9f657cd0e8881a01acc664d0)
--- dts/upstream/src/arm/rockchip/rk3288-veyron.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
dts/upstream/src/arm/rockchip/rk3288-veyron.dtsi +1 -1
@@ -388,7 +388,7 @@ rx-sample-delay-ns = <12>; - flash@0 { + spi_flash: flash@0 { compatible = "jedec,spi-nor"; spi-max-frequency = <50000000>; reg = <0>;
--
2.39.5
PATCH v2 3/6 ARM: dts: rockchip: move edp assigned-clocks to edp node on rk3288
In reply to Johan JonkerThe rk3288 power-controller node contains an assigned-clocks property that conflicts with the bindings. From the git history it shows that they wanted to assign the rk3288 EDP_24M clock input centrally before an edp node was available. Move the edp assigned-clocks property to the edp node to reduce dtbs_check output.
[ upstream commit: 10712ce694a67304a99dbba20f8cb146ca5f4fd6 ]
(cherry picked from commit e1b4137b6bbc9998b13cde2eba0655cfdd358c69)
--- dts/upstream/src/arm/rockchip/rk3288.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
dts/upstream/src/arm/rockchip/rk3288.dtsi +2 -3
@@ -741,9 +741,6 @@ #address-cells = <1>; #size-cells = <0>; - assigned-clocks = <&cru SCLK_EDP_24M>; - assigned-clock-parents = <&xin24m>; - /* * Note: Although SCLK_* are the working clocks * of device without including on the NOC, needed for
@@ -1193,6 +1190,8 @@ compatible = "rockchip,rk3288-dp"; reg = <0x0 0xff970000 0x0 0x4000>; interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; + assigned-clocks = <&cru SCLK_EDP_24M>; + assigned-clock-parents = <&xin24m>; clocks = <&cru SCLK_EDP>, <&cru PCLK_EDP_CTRL>; clock-names = "dp", "pclk"; phys = <&edp_phy>;
--
2.39.5
PATCH v2 4/6 rockchip: Switch rk3288-veyron boards to upstream devicetree
In reply to Johan JonkerSwitch rk3288-veyron boards to upstream devicetree.
---
Changed V2:
Moved upstream changes to separate patches
Add missing MAINTAINERS entry
--- arch/arm/dts/cros-ec-sbs.dtsi | 52 -- 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 --------------------- board/google/veyron/MAINTAINERS | 10 +- configs/chromebit_mickey_defconfig | 5 +- configs/chromebook_jerry_defconfig | 5 +- configs/chromebook_minnie_defconfig | 5 +- configs/chromebook_speedy_defconfig | 5 +- 12 files changed, 13 insertions(+), 1988 deletions(-) delete mode 100644 arch/arm/dts/cros-ec-sbs.dtsi 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
arch/arm/dts/cros-ec-sbs.dtsi deleted +0 -52
@@ -1,52 +0,0 @@ -/* - * Smart battery dts fragment for devices that use cros-ec-sbs - * - * Copyright (c) 2015 Google, Inc - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -&i2c_tunnel { - battery: sbs-battery@b { - compatible = "sbs,sbs-battery"; - reg = <0xb>; - sbs,i2c-retry-count = <2>; - sbs,poll-retry-count = <1>; - }; -};
arch/arm/dts/rk3288-veyron-chromebook.dtsi deleted +0 -205
205 lines not on this page · raw message
arch/arm/dts/rk3288-veyron-jerry.dts deleted +0 -208
208 lines not on this page · raw message
arch/arm/dts/rk3288-veyron-mickey.dts deleted +0 -266
266 lines not on this page · raw message
arch/arm/dts/rk3288-veyron-minnie.dts deleted +0 -302
302 lines not on this page · raw message
arch/arm/dts/rk3288-veyron-speedy.dts deleted +0 -143
143 lines not on this page · raw message
arch/arm/dts/rk3288-veyron.dtsi deleted +0 -795
795 lines not on this page · raw message
board/google/veyron/MAINTAINERS +1 -9
@@ -1,7 +1,6 @@ CHROMEBOOK JERRY BOARD M: Simon Glass <[email protected]> S: Maintained -F: arch/arm/dts/rk3288-veyron-jerry.dts F: arch/arm/dts/rk3288-veyron-jerry-u-boot.dtsi F: board/google/veyron/ F: include/configs/veyron.h
@@ -10,7 +9,6 @@ F: configs/chromebook_jerry_defconfig CHROMEBIT MICKEY BOARD M: Simon Glass <[email protected]> S: Maintained -F: arch/arm/dts/rk3288-veyron-mickey.dts F: arch/arm/dts/rk3288-veyron-mickey-u-boot.dtsi F: board/google/veyron/ F: include/configs/veyron.h
@@ -19,7 +17,6 @@ F: configs/chromebit_mickey_defconfig CHROMEBOOK MINNIE BOARD M: Simon Glass <[email protected]> S: Maintained -F: arch/arm/dts/rk3288-veyron-minnie.dts F: arch/arm/dts/rk3288-veyron-minnie-u-boot.dtsi F: board/google/veyron/ F: include/configs/veyron.h
@@ -28,7 +25,6 @@ F: configs/chromebook_minnie_defconfig CHROMEBOOK SPEEDY BOARD M: Simon Glass <[email protected]> S: Maintained -F: arch/arm/dts/rk3288-veyron-speedy.dts F: arch/arm/dts/rk3288-veyron-speedy-u-boot.dtsi F: board/google/veyron/ F: include/configs/veyron.h
@@ -37,8 +33,4 @@ F: configs/chromebook_speedy_defconfig CHROMEBOOK VEYRON COMMON FILES M: Simon Glass <[email protected]> S: Maintained -F: arch/arm/dts/rk3288-veyron.dtsi -F: arch/arm/dts/rk3288-veyron-analog-audio.dtsi -F: arch/arm/dts/rk3288-veyron-broadcom-bluetooth.dtsi -F: arch/arm/dts/rk3288-veyron-chromebook.dtsi -F: arch/arm/dts/rk3288-veyron-edp.dtsi +F: arch/arm/dts/rk3288-veyron-u-boot.dtsi
configs/chromebit_mickey_defconfig +3 -2
@@ -8,7 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-mickey" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-veyron-mickey" CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y
@@ -29,7 +29,7 @@ CONFIG_SPL_SPI=y CONFIG_SPL_PAYLOAD="u-boot.img" CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-mickey.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3288-veyron-mickey.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_LOG=y # CONFIG_DISPLAY_CPUINFO is not set
@@ -56,6 +56,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/chromebook_jerry_defconfig +3 -2
@@ -8,7 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-jerry" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-veyron-jerry" CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y
@@ -28,7 +28,7 @@ CONFIG_SPL_SPI=y CONFIG_SPL_PAYLOAD="u-boot.img" CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-jerry.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3288-veyron-jerry.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_LOG=y # CONFIG_DISPLAY_CPUINFO is not set
@@ -56,6 +56,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/chromebook_minnie_defconfig +3 -2
@@ -8,7 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-minnie" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-veyron-minnie" CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y
@@ -29,7 +29,7 @@ CONFIG_SPL_SPI=y CONFIG_SPL_PAYLOAD="u-boot.img" CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-minnie.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3288-veyron-minnie.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_LOG=y # CONFIG_DISPLAY_CPUINFO is not set
@@ -57,6 +57,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/chromebook_speedy_defconfig +3 -2
@@ -8,7 +8,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-veyron-speedy" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-veyron-speedy" CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y
@@ -29,7 +29,7 @@ CONFIG_SPL_SPI=y CONFIG_SPL_PAYLOAD="u-boot.img" CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3288-veyron-speedy.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3288-veyron-speedy.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_LOG=y # CONFIG_DISPLAY_CPUINFO is not set
@@ -57,6 +57,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
--
2.39.5
PATCH v2 5/6 rockchip: Switch remaining rk3288 boards to upstream devicetree
In reply to Johan JonkerSwitch remaining rk3288 boards to upstream devicetree.
---
...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-vmarc-som.dtsi | 361 ------------
arch/arm/dts/rk3288-vyasa.dts | 473 ---------------
.../dts/rockchip-radxa-dalang-carrier.dtsi | 137 -----
board/amarula/vyasa-rk3288/MAINTAINERS | 1 -
board/chipspark/popmetal_rk3288/MAINTAINERS | 1 -
board/radxa/rock2/MAINTAINERS | 1 -
board/rockchip/evb_rk3288/MAINTAINERS | 6 +-
...8_defconfig => evb-rk3288-rk808_defconfig} | 5 +-
configs/phycore-rk3288_defconfig | 2 +-
configs/popmetal-rk3288_defconfig | 5 +-
configs/rock-pi-n8-rk3288_defconfig | 3 +-
configs/rock2_defconfig | 5 +-
configs/vyasa-rk3288_defconfig | 5 +-
doc/board/rockchip/rockchip.rst | 8 +-
22 files changed, 22 insertions(+), 2530 deletions(-)
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-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} (94%)arch/arm/dts/rk3288-evb-rk808-u-boot.dtsi renamed from arch/arm/dts/rk3288-evb-u-boot.dtsi +0 -0
arch/arm/dts/rk3288-evb.dts deleted +0 -20
@@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - */ - -/dts-v1/; -#include "rk3288-evb.dtsi" - -/ { - model = "Evb-RK3288"; - compatible = "evb-rk3288,evb-rk3288", "rockchip,rk3288"; - - chosen { - stdout-path = &uart2; - }; -}; - -&pwm1 { - status = "okay"; -};
arch/arm/dts/rk3288-evb.dtsi deleted +0 -476
476 lines not on this page · raw message
arch/arm/dts/rk3288-popmetal.dts deleted +0 -20
@@ -1,20 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR X11 -/* - * (C) Copyright 2016 Rockchip Electronics Co., Ltd - */ - -/dts-v1/; -#include "rk3288-popmetal.dtsi" - -/ { - model = "PopMetal-RK3288"; - compatible = "chipspark,popmetal-rk3288", "rockchip,rk3288"; - - chosen { - stdout-path = &uart2; - }; -}; - -&pwm1 { - status = "okay"; -};
arch/arm/dts/rk3288-popmetal.dtsi deleted +0 -547
547 lines not on this page · raw message
arch/arm/dts/rk3288-rock-pi-n8.dts deleted +0 -17
@@ -1,17 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd - * Copyright (c) 2019 Vamrs Limited - * Copyright (c) 2019 Amarula Solutions(India) - */ - -/dts-v1/; -#include "rk3288.dtsi" -#include <rockchip-radxa-dalang-carrier.dtsi> -#include "rk3288-vmarc-som.dtsi" - -/ { - model = "Radxa ROCK Pi N8"; - compatible = "radxa,rockpi-n8", "vamrs,rk3288-vmarc-som", - "rockchip,rk3288"; -};
arch/arm/dts/rk3288-rock2-som.dtsi deleted +0 -278
278 lines not on this page · raw message
arch/arm/dts/rk3288-rock2-square.dts deleted +0 -181
181 lines not on this page · raw message
arch/arm/dts/rk3288-vmarc-som.dtsi deleted +0 -361
361 lines not on this page · raw message
arch/arm/dts/rk3288-vyasa.dts deleted +0 -473
473 lines not on this page · raw message
arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi deleted +0 -137
137 lines not on this page · raw message
board/amarula/vyasa-rk3288/MAINTAINERS +0 -1
@@ -4,5 +4,4 @@ S: Maintained F: board/amarula/vyasa-rk3288 F: include/configs/vyasa-rk3288.h F: configs/vyasa-rk3288_defconfig -F: arch/arm/dts/rk3288-vyasa.dts F: arch/arm/dts/rk3288-vyasa-u-boot.dtsi
board/chipspark/popmetal_rk3288/MAINTAINERS +0 -1
@@ -1,7 +1,6 @@ POPMETAL-RK3288 M: Lin Huang <[email protected]> S: Maintained -F: arch/arm/dts/rk3288-popmetal.dts F: arch/arm/dts/rk3288-popmetal-u-boot.dtsi F: board/chipspark/popmetal_rk3288 F: include/configs/popmetal_rk3288.h
board/radxa/rock2/MAINTAINERS +0 -1
@@ -1,7 +1,6 @@ FIREFLY M: Simon Glass <[email protected]> S: Maintained -F: arch/arm/dts/rk3288-rock2* F: board/radxa/rock2 F: include/configs/rock2.h F: configs/rock2_defconfig
board/rockchip/evb_rk3288/MAINTAINERS +2 -4
@@ -1,12 +1,10 @@ EVB-RK3288 M: Lin Huang <[email protected]> S: Maintained -F: arch/arm/dts/rk3288-evb.dts -F: arch/arm/dts/rk3288-evb.dtsi -F: arch/arm/dts/rk3288-evb-u-boot.dtsi +F: arch/arm/dts/rk3288-evb-rk808-u-boot.dtsi F: board/rockchip/evb_rk3288 F: include/configs/evb_rk3288.h -F: configs/evb-rk3288_defconfig +F: configs/evb-rk3288-rk808_defconfig ROCK-PI-N8 M: Jagan Teki <[email protected]>
configs/evb-rk3288-rk808_defconfig renamed from configs/evb-rk3288_defconfig +3 -2
@@ -9,7 +9,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-evb" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-evb-rk808" CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y
@@ -29,7 +29,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3288-evb-rk808.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3288-evb-rk808.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_NO_BSS_LIMIT=y
@@ -52,6 +52,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/phycore-rk3288_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_DEBUG_UART=y CONFIG_LTO=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3288-phycore-rdk.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3288-phycore-rdk.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_DISPLAY_BOARDINFO_LATE=y
configs/popmetal-rk3288_defconfig +3 -2
@@ -8,7 +8,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-popmetal" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-popmetal" CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
@@ -25,7 +25,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3288-popmetal.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3288-popmetal.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_CONSOLE_MUX=y CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -47,6 +47,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/rock-pi-n8-rk3288_defconfig +2 -1
@@ -10,7 +10,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock-pi-n8" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-rock-pi-n8" CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y
@@ -45,6 +45,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/rock2_defconfig +3 -2
@@ -8,7 +8,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock2-square" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-rock2-square" CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
@@ -25,7 +25,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3288-rock2-square.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3288-rock2-square.dtb" CONFIG_SILENT_CONSOLE=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -47,6 +47,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/vyasa-rk3288_defconfig +3 -2
@@ -11,7 +11,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x100000 CONFIG_SF_DEFAULT_SPEED=20000000 CONFIG_ENV_OFFSET=0x3F8000 -CONFIG_DEFAULT_DEVICE_TREE="rk3288-vyasa" +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3288-vyasa" CONFIG_DM_RESET=y CONFIG_SYS_MONITOR_LEN=614400 CONFIG_ROCKCHIP_RK3288=y
@@ -26,7 +26,7 @@ CONFIG_DEBUG_UART_BASE=0xff690000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y CONFIG_USE_PREBOOT=y -CONFIG_DEFAULT_FDT_FILE="rk3288-vyasa.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3288-vyasa.dtb" CONFIG_SILENT_CONSOLE=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_SPL_NO_BSS_LIMIT=y
@@ -53,6 +53,7 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
doc/board/rockchip/rockchip.rst +5 -3
@@ -40,15 +40,17 @@ List of mainline supported Rockchip boards: * rk3229 - Rockchip Evb-RK3229 (evb-rk3229) * rk3288 - - Rockchip Evb-RK3288 (evb-rk3288) + - Rockchip Evb-RK3288-rk808 (evb-rk3288-rk808) - Firefly-RK3288 (firefly-rk3288) - MQmaker MiQi (miqi-rk3288) - Phytec RK3288 PCM-947 (phycore-rk3288) - PopMetal-RK3288 (popmetal-rk3288) - Radxa Rock 2 Square (rock2) + - Radxa Rock Pi N8 (rock-pi-n8-rk3288) - Tinker-RK3288 (tinker-rk3288) + - Tinker-S-RK3288 (tinker-s-rk3288) - Google Jerry (chromebook_jerry) - - Google Mickey (chromebook_mickey) + - Google Mickey (chromebit_mickey) - Google Minnie (chromebook_minnie) - Google Speedy (chromebook_speedy) - Amarula Vyasa-RK3288 (vyasa-rk3288)
@@ -244,7 +246,7 @@ To build rk3288 boards: .. code-block:: bash - make evb-rk3288_defconfig + make evb-rk3288-mk808_defconfig make CROSS_COMPILE=arm-linux-gnueabihf- To build rk3308 boards:
--
2.39.5
PATCH v2 6/6 rockchip: imply OF_UPSTREAM for rk3288 boards
In reply to Johan JonkerImply OF_UPSTREAM for rk3288 boards.
--- arch/arm/mach-rockchip/Kconfig | 1 + configs/chromebit_mickey_defconfig | 1 - configs/chromebook_jerry_defconfig | 1 - configs/chromebook_minnie_defconfig | 1 - configs/chromebook_speedy_defconfig | 1 - configs/evb-rk3288-rk808_defconfig | 1 - configs/firefly-rk3288_defconfig | 1 - configs/miqi-rk3288_defconfig | 1 - configs/phycore-rk3288_defconfig | 1 - configs/popmetal-rk3288_defconfig | 1 - configs/rock-pi-n8-rk3288_defconfig | 1 - configs/rock2_defconfig | 1 - configs/tinker-rk3288_defconfig | 1 - configs/tinker-s-rk3288_defconfig | 1 - configs/vyasa-rk3288_defconfig | 1 - 15 files changed, 1 insertion(+), 14 deletions(-)
arch/arm/mach-rockchip/Kconfig +1 -0
@@ -132,6 +132,7 @@ config ROCKCHIP_RK3288 select SPL select SUPPORT_TPL select FDT_64BIT + imply OF_UPSTREAM imply PRE_CONSOLE_BUFFER imply ROCKCHIP_COMMON_BOARD imply SPL_ROCKCHIP_COMMON_BOARD
configs/chromebit_mickey_defconfig +0 -1
@@ -56,7 +56,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/chromebook_jerry_defconfig +0 -1
@@ -56,7 +56,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/chromebook_minnie_defconfig +0 -1
@@ -57,7 +57,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/chromebook_speedy_defconfig +0 -1
@@ -57,7 +57,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/evb-rk3288-rk808_defconfig +0 -1
@@ -52,7 +52,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/firefly-rk3288_defconfig +0 -1
@@ -42,7 +42,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/miqi-rk3288_defconfig +0 -1
@@ -41,7 +41,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/phycore-rk3288_defconfig +0 -1
@@ -48,7 +48,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/popmetal-rk3288_defconfig +0 -1
@@ -47,7 +47,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/rock-pi-n8-rk3288_defconfig +0 -1
@@ -45,7 +45,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/rock2_defconfig +0 -1
@@ -47,7 +47,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/tinker-rk3288_defconfig +0 -1
@@ -42,7 +42,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/tinker-s-rk3288_defconfig +0 -1
@@ -42,7 +42,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIVE=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
configs/vyasa-rk3288_defconfig +0 -1
@@ -53,7 +53,6 @@ CONFIG_CMD_REGULATOR=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_EFI_PARTITION is not set CONFIG_SPL_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_RELOC_GD_ENV_ADDR=y
--
2.39.5
PATCH v2 1/6 ARM: dts: rockchip: Remove mshc aliases from RK3288
In reply to Johan JonkerThe use of mshc aliases is deprecated for some while, so remove them from the rk3288.dtsi file.
[ upstream commit: cafaf99e4a790f8492a034a3470f878779c8c535 ]
(cherry picked from commit faefae4ca217961a0d96a54c9618e56aa8fd37b3)
--- dts/upstream/src/arm/rockchip/rk3288.dtsi | 4 ---- 1 file changed, 4 deletions(-)
dts/upstream/src/arm/rockchip/rk3288.dtsi +0 -4
@@ -34,10 +34,6 @@ i2c3 = &i2c3; i2c4 = &i2c4; i2c5 = &i2c5; - mshc0 = &emmc; - mshc1 = &sdmmc; - mshc2 = &sdio0; - mshc3 = &sdio1; serial0 = &uart0; serial1 = &uart1; serial2 = &uart2;
--
2.39.5
Quoted 10 lines · Johan Jonker
The device tree for rk3288 combined is now available in the /dts/upstream directory. Use imply
OF_UPSTREAMto migrate all rk3288 boards. Clean upMAINTAINERS.Changed V2:
Rebase
Moved upstream changes to separate patches Split in smaller pieces
Quoted 7 lines
Johan Jonker (6):
ARM: dts: rockchip: Remove mshc aliases from RK3288
ARM: dts: rockchip: Addspi_flashlabel 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: implyOF_UPSTREAMfor rk3288 boards
Glad to see the diffstat, fwiw:
-Sumit
Quoted 66 lines
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/radxa/rock2/MAINTAINERS | 1 - 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(+), 4531 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