[PATCH] xilinx: versal: Get rid of xlnx-versal-power.h from bindings

[Michal Simek]

Remove xlnx-versal-power.h dt binding header because they should be moved
directly to folder where DTs are. In the Linux kernel this shift already
started by moving xlnx-zynqmp-clk.h to arch/arm64/boot/dts/xilinx/ folder.

U-Boot is using only one PD_DEV_OSPI constact which is moved to
zynqmp_firmware.h header. But handling around it should be fixed anyway
because no driver should be calling xilinx_pm_request() directly.

Signed-off-by: Michal Simek <michal.simek at amd.com>
---

 drivers/spi/cadence_ospi_versal.c             |  1 -
 drivers/spi/cadence_qspi.c                    |  1 -
 include/dt-bindings/power/xlnx-versal-power.h | 54 -------------------
 include/zynqmp_firmware.h                     |  2 +
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 include/dt-bindings/power/xlnx-versal-power.h

diff --git a/drivers/spi/cadence_ospi_versal.c b/drivers/spi/cadence_ospi_versal.c
index e3ddf127e5a8..a00642d09d34 100644
--- a/drivers/spi/cadence_ospi_versal.c
+++ b/drivers/spi/cadence_ospi_versal.c
@@ -15,7 +15,6 @@
 #include <zynqmp_firmware.h>
 #include <asm/arch/hardware.h>
 #include "cadence_qspi.h"
-#include <dt-bindings/power/xlnx-versal-power.h>
 
 int cadence_qspi_apb_dma_read(struct cadence_spi_priv *priv,
 			      const struct spi_mem_op *op)
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c
index 2d2469565b5d..d1404e13810a 100644
--- a/drivers/spi/cadence_qspi.c
+++ b/drivers/spi/cadence_qspi.c
@@ -20,7 +20,6 @@
 #include <linux/time.h>
 #include <zynqmp_firmware.h>
 #include "cadence_qspi.h"
-#include <dt-bindings/power/xlnx-versal-power.h>
 
 #define CQSPI_STIG_READ			0
 #define CQSPI_STIG_WRITE		1
diff --git a/include/dt-bindings/power/xlnx-versal-power.h b/include/dt-bindings/power/xlnx-versal-power.h
deleted file mode 100644
index 51d1def67739..000000000000
--- a/include/dt-bindings/power/xlnx-versal-power.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *  Copyright (C) 2019 - 2021 Xilinx, Inc.
- */
-
-#ifndef _DT_BINDINGS_VERSAL_POWER_H
-#define _DT_BINDINGS_VERSAL_POWER_H
-
-#define PM_DEV_RPU0_0				(0x18110005U)
-#define PM_DEV_RPU0_1				(0x18110006U)
-#define PM_DEV_OCM_0				(0x18314007U)
-#define PM_DEV_OCM_1				(0x18314008U)
-#define PM_DEV_OCM_2				(0x18314009U)
-#define PM_DEV_OCM_3				(0x1831400aU)
-#define PM_DEV_TCM_0_A				(0x1831800bU)
-#define PM_DEV_TCM_0_B				(0x1831800cU)
-#define PM_DEV_TCM_1_A				(0x1831800dU)
-#define PM_DEV_TCM_1_B				(0x1831800eU)
-#define PM_DEV_USB_0				(0x18224018U)
-#define PM_DEV_GEM_0				(0x18224019U)
-#define PM_DEV_GEM_1				(0x1822401aU)
-#define PM_DEV_SPI_0				(0x1822401bU)
-#define PM_DEV_SPI_1				(0x1822401cU)
-#define PM_DEV_I2C_0				(0x1822401dU)
-#define PM_DEV_I2C_1				(0x1822401eU)
-#define PM_DEV_CAN_FD_0				(0x1822401fU)
-#define PM_DEV_CAN_FD_1				(0x18224020U)
-#define PM_DEV_UART_0				(0x18224021U)
-#define PM_DEV_UART_1				(0x18224022U)
-#define PM_DEV_GPIO				(0x18224023U)
-#define PM_DEV_TTC_0				(0x18224024U)
-#define PM_DEV_TTC_1				(0x18224025U)
-#define PM_DEV_TTC_2				(0x18224026U)
-#define PM_DEV_TTC_3				(0x18224027U)
-#define PM_DEV_SWDT_FPD				(0x18224029U)
-#define PM_DEV_OSPI				(0x1822402aU)
-#define PM_DEV_QSPI				(0x1822402bU)
-#define PM_DEV_GPIO_PMC				(0x1822402cU)
-#define PM_DEV_I2C_PMC				(0x1822402dU)
-#define PM_DEV_SDIO_0				(0x1822402eU)
-#define PM_DEV_SDIO_1				(0x1822402fU)
-#define PM_DEV_RTC				(0x18224034U)
-#define PM_DEV_ADMA_0				(0x18224035U)
-#define PM_DEV_ADMA_1				(0x18224036U)
-#define PM_DEV_ADMA_2				(0x18224037U)
-#define PM_DEV_ADMA_3				(0x18224038U)
-#define PM_DEV_ADMA_4				(0x18224039U)
-#define PM_DEV_ADMA_5				(0x1822403aU)
-#define PM_DEV_ADMA_6				(0x1822403bU)
-#define PM_DEV_ADMA_7				(0x1822403cU)
-#define PM_DEV_AMS_ROOT				(0x18224055U)
-#define PM_DEV_AI				(0x18224072U)
-
-#endif
diff --git a/include/zynqmp_firmware.h b/include/zynqmp_firmware.h
index 72f6459b91c8..05df49f292a1 100644
--- a/include/zynqmp_firmware.h
+++ b/include/zynqmp_firmware.h
@@ -527,4 +527,6 @@ extern smc_call_handler_t __data smc_call_handler;
 #define PLM_MODULE_ID_MASK	GENMASK(15, 8)
 #define API_ID_MASK		GENMASK(7, 0)
 
+#define PM_DEV_OSPI		(0x1822402aU)
+
 #endif /* _ZYNQMP_FIRMWARE_H_ */
-- 
2.43.0

base-commit: fd7564ce2f51d965c273e939e98de01beb92e6f5
branch: debian-sent3