Drop in favour of dts/upstream.
Small driver adjustment to fix compatibility.
Signed-off-by: Caleb Connolly
---
drivers/pinctrl/rockchip/pinctrl-rk3568.c | 15 +
include/dt-bindings/pinctrl/rockchip.h| 60 --
include/dt-bindings/power/px30-power.h| 27 -
include/dt-bindings/power/rk3066-power.h | 22 -
include/dt-bindings/power/rk3188-power.h | 24 -
include/dt-bindings/power/rk3228-power.h | 21 -
include/dt-bindings/power/rk3288-power.h | 32 -
include/dt-bindings/power/rk3328-power.h | 19 -
include/dt-bindings/power/rk3399-power.h | 53 --
include/dt-bindings/power/rk3568-power.h | 32 -
include/dt-bindings/power/rk3588-power.h | 69 --
include/dt-bindings/power/rockchip,rv1126-power.h | 35 -
include/dt-bindings/reset/rockchip,rk3588-cru.h | 754 --
include/dt-bindings/soc/rockchip,boot-mode.h | 16 -
include/dt-bindings/soc/rockchip,vop2.h | 18 -
15 files changed, 15 insertions(+), 1182 deletions(-)
diff --git a/drivers/pinctrl/rockchip/pinctrl-rk3568.c
b/drivers/pinctrl/rockchip/pinctrl-rk3568.c
index 1d4391982605..35a69c2a1a28 100644
--- a/drivers/pinctrl/rockchip/pinctrl-rk3568.c
+++ b/drivers/pinctrl/rockchip/pinctrl-rk3568.c
@@ -11,8 +11,23 @@
#include
#include "pinctrl-rockchip.h"
+#define RK_GPIO0 0
+#define RK_GPIO1 1
+#define RK_GPIO2 2
+#define RK_GPIO3 3
+#define RK_GPIO4 4
+#define RK_GPIO6 6
+
+#define RK_FUNC_GPIO 0
+#define RK_FUNC_1 1
+#define RK_FUNC_2 2
+#define RK_FUNC_3 3
+#define RK_FUNC_4 4
+#define RK_FUNC_5 5
+#define RK_FUNC_6 6
+
static struct rockchip_mux_route_data rk3568_mux_route_data[] = {
MR_PMUGRF(RK_GPIO0, RK_PB7, RK_FUNC_1, 0x0110, RK_GENMASK_VAL(1, 0,
0)), /* PWM0 IO mux selection M0 */
MR_PMUGRF(RK_GPIO0, RK_PC7, RK_FUNC_2, 0x0110, RK_GENMASK_VAL(1, 0,
1)), /* PWM0 IO mux selection M1 */
MR_PMUGRF(RK_GPIO0, RK_PC0, RK_FUNC_1, 0x0110, RK_GENMASK_VAL(3, 2,
0)), /* PWM1 IO mux selection M0 */
diff --git a/include/dt-bindings/pinctrl/rockchip.h
b/include/dt-bindings/pinctrl/rockchip.h
deleted file mode 100644
index 1c28d6cb1fad..
--- a/include/dt-bindings/pinctrl/rockchip.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Header providing constants for Rockchip pinctrl bindings.
- *
- * Copyright (c) 2013 MundoReader S.L.
- * Author: Heiko Stuebner
- */
-
-#ifndef __DT_BINDINGS_ROCKCHIP_PINCTRL_H__
-#define __DT_BINDINGS_ROCKCHIP_PINCTRL_H__
-
-#define RK_GPIO0 0
-#define RK_GPIO1 1
-#define RK_GPIO2 2
-#define RK_GPIO3 3
-#define RK_GPIO4 4
-#define RK_GPIO6 6
-
-#define RK_PA0 0
-#define RK_PA1 1
-#define RK_PA2 2
-#define RK_PA3 3
-#define RK_PA4 4
-#define RK_PA5 5
-#define RK_PA6 6
-#define RK_PA7 7
-#define RK_PB0 8
-#define RK_PB1 9
-#define RK_PB2 10
-#define RK_PB3 11
-#define RK_PB4 12
-#define RK_PB5 13
-#define RK_PB6 14
-#define RK_PB7 15
-#define RK_PC0 16
-#define RK_PC1 17
-#define RK_PC2 18
-#define RK_PC3 19
-#define RK_PC4 20
-#define RK_PC5 21
-#define RK_PC6 22
-#define RK_PC7 23
-#define RK_PD0 24
-#define RK_PD1 25
-#define RK_PD2 26
-#define RK_PD3 27
-#define RK_PD4 28
-#define RK_PD5 29
-#define RK_PD6 30
-#define RK_PD7 31
-
-#define RK_FUNC_GPIO 0
-#define RK_FUNC_1 1
-#define RK_FUNC_2 2
-#define RK_FUNC_3 3
-#define RK_FUNC_4 4
-#define RK_FUNC_5 5
-#define RK_FUNC_6 6
-
-#endif
diff --git a/include/dt-bindings/power/px30-power.h
b/include/dt-bindings/power/px30-power.h
deleted file mode 100644
index 30917a99ad20..
--- a/include/dt-bindings/power/px30-power.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __DT_BINDINGS_POWER_PX30_POWER_H__
-#define __DT_BINDINGS_POWER_PX30_POWER_H__
-
-/* VD_CORE */
-#define PX30_PD_A35_0 0
-#define PX30_PD_A35_1 1
-#define PX30_PD_A35_2 2
-#define PX30_PD_A35_3 3
-#define PX30_PD_SCU4
-
-/* VD_LOGIC */
-#define PX30_PD_USB5
-#define PX30_PD_DDR6
-#define PX30_PD_SDCARD 7
-#define PX30_PD_CRYPTO 8
-#define PX30_PD_GMAC 9
-#define PX30_PD_MMC_NAND 10
-#define PX30_PD_VPU11
-#define PX30_PD_VO 12
-#define PX30_PD_VI 13
-#define PX30_PD_GPU14
-
-/* VD_PMU */
-#define PX30_PD_PMU15
-
-#endif
diff --git a/include/dt-bindings/power/rk3066-power.h
b/include/dt-bindings/power/rk3066-power.h
deleted file mode 100644
index acf9f310ac53..
---
