rockchip: Use files from dts/upstream

Most Rockchip aarch64 targets have now migrated to use OF_UPSTREAM,
however a few of the old dtsi and dt-bindings files still remain.

Remove remaining common dtsi and header files that can be included
directly from dts/upstream to prevent possible issues when future tags
from devicetree-binding is merged. No changes is expected with this.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>

diff --git a/arch/arm/dts/rockchip-pinconf.dtsi b/arch/arm/dts/rockchip-pinconf.dtsi
deleted file mode 100644 (file)
index 5c64543..0000000
--- a/arch/arm/dts/rockchip-pinconf.dtsi
+++ /dev/null
@@ -1,344 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2021 Rockchip Electronics Co., Ltd.
- */
-
-&pinctrl {
-       /omit-if-no-ref/
-       pcfg_pull_up: pcfg-pull-up {
-               bias-pull-up;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down: pcfg-pull-down {
-               bias-pull-down;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none: pcfg-pull-none {
-               bias-disable;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_0: pcfg-pull-none-drv-level-0 {
-               bias-disable;
-               drive-strength = <0>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_1: pcfg-pull-none-drv-level-1 {
-               bias-disable;
-               drive-strength = <1>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_2: pcfg-pull-none-drv-level-2 {
-               bias-disable;
-               drive-strength = <2>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_3: pcfg-pull-none-drv-level-3 {
-               bias-disable;
-               drive-strength = <3>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_4: pcfg-pull-none-drv-level-4 {
-               bias-disable;
-               drive-strength = <4>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_5: pcfg-pull-none-drv-level-5 {
-               bias-disable;
-               drive-strength = <5>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_6: pcfg-pull-none-drv-level-6 {
-               bias-disable;
-               drive-strength = <6>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_7: pcfg-pull-none-drv-level-7 {
-               bias-disable;
-               drive-strength = <7>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_8: pcfg-pull-none-drv-level-8 {
-               bias-disable;
-               drive-strength = <8>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_9: pcfg-pull-none-drv-level-9 {
-               bias-disable;
-               drive-strength = <9>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_10: pcfg-pull-none-drv-level-10 {
-               bias-disable;
-               drive-strength = <10>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_11: pcfg-pull-none-drv-level-11 {
-               bias-disable;
-               drive-strength = <11>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_12: pcfg-pull-none-drv-level-12 {
-               bias-disable;
-               drive-strength = <12>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_13: pcfg-pull-none-drv-level-13 {
-               bias-disable;
-               drive-strength = <13>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_14: pcfg-pull-none-drv-level-14 {
-               bias-disable;
-               drive-strength = <14>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_15: pcfg-pull-none-drv-level-15 {
-               bias-disable;
-               drive-strength = <15>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_0: pcfg-pull-up-drv-level-0 {
-               bias-pull-up;
-               drive-strength = <0>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_1: pcfg-pull-up-drv-level-1 {
-               bias-pull-up;
-               drive-strength = <1>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_2: pcfg-pull-up-drv-level-2 {
-               bias-pull-up;
-               drive-strength = <2>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_3: pcfg-pull-up-drv-level-3 {
-               bias-pull-up;
-               drive-strength = <3>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_4: pcfg-pull-up-drv-level-4 {
-               bias-pull-up;
-               drive-strength = <4>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_5: pcfg-pull-up-drv-level-5 {
-               bias-pull-up;
-               drive-strength = <5>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_6: pcfg-pull-up-drv-level-6 {
-               bias-pull-up;
-               drive-strength = <6>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_7: pcfg-pull-up-drv-level-7 {
-               bias-pull-up;
-               drive-strength = <7>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_8: pcfg-pull-up-drv-level-8 {
-               bias-pull-up;
-               drive-strength = <8>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_9: pcfg-pull-up-drv-level-9 {
-               bias-pull-up;
-               drive-strength = <9>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_10: pcfg-pull-up-drv-level-10 {
-               bias-pull-up;
-               drive-strength = <10>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_11: pcfg-pull-up-drv-level-11 {
-               bias-pull-up;
-               drive-strength = <11>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_12: pcfg-pull-up-drv-level-12 {
-               bias-pull-up;
-               drive-strength = <12>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_13: pcfg-pull-up-drv-level-13 {
-               bias-pull-up;
-               drive-strength = <13>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_14: pcfg-pull-up-drv-level-14 {
-               bias-pull-up;
-               drive-strength = <14>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_drv_level_15: pcfg-pull-up-drv-level-15 {
-               bias-pull-up;
-               drive-strength = <15>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_0: pcfg-pull-down-drv-level-0 {
-               bias-pull-down;
-               drive-strength = <0>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_1: pcfg-pull-down-drv-level-1 {
-               bias-pull-down;
-               drive-strength = <1>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_2: pcfg-pull-down-drv-level-2 {
-               bias-pull-down;
-               drive-strength = <2>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_3: pcfg-pull-down-drv-level-3 {
-               bias-pull-down;
-               drive-strength = <3>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_4: pcfg-pull-down-drv-level-4 {
-               bias-pull-down;
-               drive-strength = <4>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_5: pcfg-pull-down-drv-level-5 {
-               bias-pull-down;
-               drive-strength = <5>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_6: pcfg-pull-down-drv-level-6 {
-               bias-pull-down;
-               drive-strength = <6>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_7: pcfg-pull-down-drv-level-7 {
-               bias-pull-down;
-               drive-strength = <7>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_8: pcfg-pull-down-drv-level-8 {
-               bias-pull-down;
-               drive-strength = <8>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_9: pcfg-pull-down-drv-level-9 {
-               bias-pull-down;
-               drive-strength = <9>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_10: pcfg-pull-down-drv-level-10 {
-               bias-pull-down;
-               drive-strength = <10>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_11: pcfg-pull-down-drv-level-11 {
-               bias-pull-down;
-               drive-strength = <11>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_12: pcfg-pull-down-drv-level-12 {
-               bias-pull-down;
-               drive-strength = <12>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_13: pcfg-pull-down-drv-level-13 {
-               bias-pull-down;
-               drive-strength = <13>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_14: pcfg-pull-down-drv-level-14 {
-               bias-pull-down;
-               drive-strength = <14>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_drv_level_15: pcfg-pull-down-drv-level-15 {
-               bias-pull-down;
-               drive-strength = <15>;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_up_smt: pcfg-pull-up-smt {
-               bias-pull-up;
-               input-schmitt-enable;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_down_smt: pcfg-pull-down-smt {
-               bias-pull-down;
-               input-schmitt-enable;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_smt: pcfg-pull-none-smt {
-               bias-disable;
-               input-schmitt-enable;
-       };
-
-       /omit-if-no-ref/
-       pcfg_pull_none_drv_level_0_smt: pcfg-pull-none-drv-level-0-smt {
-               bias-disable;
-               drive-strength = <0>;
-               input-schmitt-enable;
-       };
-
-       /omit-if-no-ref/
-       pcfg_output_high: pcfg-output-high {
-               output-high;
-       };
-
-       /omit-if-no-ref/
-       pcfg_output_low: pcfg-output-low {
-               output-low;
-       };
-};

diff --git a/include/dt-bindings/clock/rockchip,rk808.h b/include/dt-bindings/clock/rockchip,rk808.h
deleted file mode 100644 (file)
index 1a87343..0000000
--- a/include/dt-bindings/clock/rockchip,rk808.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * This header provides constants clk index RK808 pmic clkout
- */
-#ifndef _CLK_ROCKCHIP_RK808
-#define _CLK_ROCKCHIP_RK808
-
-/* CLOCKOUT index */
-#define RK808_CLKOUT0          0
-#define RK808_CLKOUT1          1
-
-#endif

diff --git a/include/dt-bindings/soc/rockchip,boot-mode.h b/include/dt-bindings/soc/rockchip,boot-mode.h
deleted file mode 100644 (file)
index 4b0914c..0000000
--- a/include/dt-bindings/soc/rockchip,boot-mode.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __ROCKCHIP_BOOT_MODE_H
-#define __ROCKCHIP_BOOT_MODE_H
-
-/*high 24 bits is tag, low 8 bits is type*/
-#define REBOOT_FLAG            0x5242C300
-/* normal boot */
-#define BOOT_NORMAL            (REBOOT_FLAG + 0)
-/* enter bootloader rockusb mode */
-#define BOOT_BL_DOWNLOAD       (REBOOT_FLAG + 1)
-/* enter recovery */
-#define BOOT_RECOVERY          (REBOOT_FLAG + 3)
- /* enter fastboot mode */
-#define BOOT_FASTBOOT          (REBOOT_FLAG + 9)
-
-#endif

diff --git a/include/dt-bindings/soc/rockchip,vop2.h b/include/dt-bindings/soc/rockchip,vop2.h
deleted file mode 100644 (file)
index 668f199..0000000
--- a/include/dt-bindings/soc/rockchip,vop2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause */
-
-#ifndef __DT_BINDINGS_ROCKCHIP_VOP2_H
-#define __DT_BINDINGS_ROCKCHIP_VOP2_H
-
-#define ROCKCHIP_VOP2_EP_RGB0  1
-#define ROCKCHIP_VOP2_EP_HDMI0 2
-#define ROCKCHIP_VOP2_EP_EDP0  3
-#define ROCKCHIP_VOP2_EP_MIPI0 4
-#define ROCKCHIP_VOP2_EP_LVDS0 5
-#define ROCKCHIP_VOP2_EP_MIPI1 6
-#define ROCKCHIP_VOP2_EP_LVDS1 7
-#define ROCKCHIP_VOP2_EP_HDMI1 8
-#define ROCKCHIP_VOP2_EP_EDP1  9
-#define ROCKCHIP_VOP2_EP_DP0   10
-#define ROCKCHIP_VOP2_EP_DP1   11
-
-#endif /* __DT_BINDINGS_ROCKCHIP_VOP2_H */