]> Git Repo - linux.git/commitdiff
arm64: dts: mediatek: Move reset controller constants into common location
authorEnric Balletbo i Serra <[email protected]>
Thu, 30 Sep 2021 08:31:44 +0000 (10:31 +0200)
committerMatthias Brugger <[email protected]>
Fri, 8 Oct 2021 13:11:13 +0000 (15:11 +0200)
The DT binding includes for reset controllers are located in
include/dt-bindings/reset/. Move the Mediatek reset constants in there.

Signed-off-by: Enric Balletbo i Serra <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Reviewed-by: Matthias Brugger <[email protected]>
Link: https://lore.kernel.org/r/20210930103105.v4.1.I514d9aafff3a062f751b37d3fea7402f67595b86@changeid
Signed-off-by: Matthias Brugger <[email protected]>
arch/arm64/boot/dts/mediatek/mt8183.dtsi
drivers/watchdog/mtk_wdt.c
include/dt-bindings/reset-controller/mt2712-resets.h [deleted file]
include/dt-bindings/reset-controller/mt8183-resets.h [deleted file]
include/dt-bindings/reset-controller/mt8192-resets.h [deleted file]
include/dt-bindings/reset/mt2712-resets.h [new file with mode: 0644]
include/dt-bindings/reset/mt8183-resets.h [new file with mode: 0644]
include/dt-bindings/reset/mt8192-resets.h [new file with mode: 0644]

index 9ea4c5001b1e6b0ae71345157966eab5a3cb5420..de12f78c2ee0cd011f8ccff436f0130e1202d14d 100644 (file)
@@ -11,7 +11,7 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/memory/mt8183-larb-port.h>
 #include <dt-bindings/power/mt8183-power.h>
-#include <dt-bindings/reset-controller/mt8183-resets.h>
+#include <dt-bindings/reset/mt8183-resets.h>
 #include <dt-bindings/phy/phy.h>
 #include <dt-bindings/thermal/thermal.h>
 #include <dt-bindings/pinctrl/mt8183-pinfunc.h>
index 796fbb048cbea9edfc926a18563969bcb0223ba8..3d208d627fb0279509b953d3b170f866ba0fbab1 100644 (file)
@@ -9,9 +9,9 @@
  * Based on sunxi_wdt.c
  */
 
-#include <dt-bindings/reset-controller/mt2712-resets.h>
-#include <dt-bindings/reset-controller/mt8183-resets.h>
-#include <dt-bindings/reset-controller/mt8192-resets.h>
+#include <dt-bindings/reset/mt2712-resets.h>
+#include <dt-bindings/reset/mt8183-resets.h>
+#include <dt-bindings/reset/mt8192-resets.h>
 #include <dt-bindings/reset/mt8195-resets.h>
 #include <linux/delay.h>
 #include <linux/err.h>
diff --git a/include/dt-bindings/reset-controller/mt2712-resets.h b/include/dt-bindings/reset-controller/mt2712-resets.h
deleted file mode 100644 (file)
index 9e7ee76..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2019 MediaTek Inc.
- * Author: Yong Liang <[email protected]>
- */
-
-#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT2712
-#define _DT_BINDINGS_RESET_CONTROLLER_MT2712
-
-#define MT2712_TOPRGU_INFRA_SW_RST                             0
-#define MT2712_TOPRGU_MM_SW_RST                                        1
-#define MT2712_TOPRGU_MFG_SW_RST                               2
-#define MT2712_TOPRGU_VENC_SW_RST                              3
-#define MT2712_TOPRGU_VDEC_SW_RST                              4
-#define MT2712_TOPRGU_IMG_SW_RST                               5
-#define MT2712_TOPRGU_INFRA_AO_SW_RST                          8
-#define MT2712_TOPRGU_USB_SW_RST                               9
-#define MT2712_TOPRGU_APMIXED_SW_RST                           10
-
-#define MT2712_TOPRGU_SW_RST_NUM                               11
-
-#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT2712 */
diff --git a/include/dt-bindings/reset-controller/mt8183-resets.h b/include/dt-bindings/reset-controller/mt8183-resets.h
deleted file mode 100644 (file)
index a1bbd41..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2019 MediaTek Inc.
- * Author: Yong Liang <[email protected]>
- */
-
-#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8183
-#define _DT_BINDINGS_RESET_CONTROLLER_MT8183
-
-/* INFRACFG AO resets */
-#define MT8183_INFRACFG_AO_THERM_SW_RST                                0
-#define MT8183_INFRACFG_AO_USB_TOP_SW_RST                      1
-#define MT8183_INFRACFG_AO_MM_IOMMU_SW_RST                     3
-#define MT8183_INFRACFG_AO_MSDC3_SW_RST                                4
-#define MT8183_INFRACFG_AO_MSDC2_SW_RST                                5
-#define MT8183_INFRACFG_AO_MSDC1_SW_RST                                6
-#define MT8183_INFRACFG_AO_MSDC0_SW_RST                                7
-#define MT8183_INFRACFG_AO_APDMA_SW_RST                                9
-#define MT8183_INFRACFG_AO_MIMP_D_SW_RST                       10
-#define MT8183_INFRACFG_AO_BTIF_SW_RST                         12
-#define MT8183_INFRACFG_AO_DISP_PWM_SW_RST                     14
-#define MT8183_INFRACFG_AO_AUXADC_SW_RST                       15
-
-#define MT8183_INFRACFG_AO_IRTX_SW_RST                         32
-#define MT8183_INFRACFG_AO_SPI0_SW_RST                         33
-#define MT8183_INFRACFG_AO_I2C0_SW_RST                         34
-#define MT8183_INFRACFG_AO_I2C1_SW_RST                         35
-#define MT8183_INFRACFG_AO_I2C2_SW_RST                         36
-#define MT8183_INFRACFG_AO_I2C3_SW_RST                         37
-#define MT8183_INFRACFG_AO_UART0_SW_RST                                38
-#define MT8183_INFRACFG_AO_UART1_SW_RST                                39
-#define MT8183_INFRACFG_AO_UART2_SW_RST                                40
-#define MT8183_INFRACFG_AO_PWM_SW_RST                          41
-#define MT8183_INFRACFG_AO_SPI1_SW_RST                         42
-#define MT8183_INFRACFG_AO_I2C4_SW_RST                         43
-#define MT8183_INFRACFG_AO_DVFSP_SW_RST                                44
-#define MT8183_INFRACFG_AO_SPI2_SW_RST                         45
-#define MT8183_INFRACFG_AO_SPI3_SW_RST                         46
-#define MT8183_INFRACFG_AO_UFSHCI_SW_RST                       47
-
-#define MT8183_INFRACFG_AO_PMIC_WRAP_SW_RST                    64
-#define MT8183_INFRACFG_AO_SPM_SW_RST                          65
-#define MT8183_INFRACFG_AO_USBSIF_SW_RST                       66
-#define MT8183_INFRACFG_AO_KP_SW_RST                           68
-#define MT8183_INFRACFG_AO_APXGPT_SW_RST                       69
-#define MT8183_INFRACFG_AO_CLDMA_AO_SW_RST                     70
-#define MT8183_INFRACFG_AO_UNIPRO_UFS_SW_RST                   71
-#define MT8183_INFRACFG_AO_DX_CC_SW_RST                                72
-#define MT8183_INFRACFG_AO_UFSPHY_SW_RST                       73
-
-#define MT8183_INFRACFG_AO_DX_CC_SEC_SW_RST                    96
-#define MT8183_INFRACFG_AO_GCE_SW_RST                          97
-#define MT8183_INFRACFG_AO_CLDMA_SW_RST                                98
-#define MT8183_INFRACFG_AO_TRNG_SW_RST                         99
-#define MT8183_INFRACFG_AO_AP_MD_CCIF_1_SW_RST                 103
-#define MT8183_INFRACFG_AO_AP_MD_CCIF_SW_RST                   104
-#define MT8183_INFRACFG_AO_I2C1_IMM_SW_RST                     105
-#define MT8183_INFRACFG_AO_I2C1_ARB_SW_RST                     106
-#define MT8183_INFRACFG_AO_I2C2_IMM_SW_RST                     107
-#define MT8183_INFRACFG_AO_I2C2_ARB_SW_RST                     108
-#define MT8183_INFRACFG_AO_I2C5_SW_RST                         109
-#define MT8183_INFRACFG_AO_I2C5_IMM_SW_RST                     110
-#define MT8183_INFRACFG_AO_I2C5_ARB_SW_RST                     111
-#define MT8183_INFRACFG_AO_SPI4_SW_RST                         112
-#define MT8183_INFRACFG_AO_SPI5_SW_RST                         113
-#define MT8183_INFRACFG_AO_INFRA2MFGAXI_CBIP_CLAS_SW_RST       114
-#define MT8183_INFRACFG_AO_MFGAXI2INFRA_M0_CBIP_GLAS_OUT_SW_RST        115
-#define MT8183_INFRACFG_AO_MFGAXI2INFRA_M1_CBIP_GLAS_OUT_SW_RST        116
-#define MT8183_INFRACFG_AO_UFS_AES_SW_RST                      117
-#define MT8183_INFRACFG_AO_CCU_I2C_IRQ_SW_RST                  118
-#define MT8183_INFRACFG_AO_CCU_I2C_DMA_SW_RST                  119
-#define MT8183_INFRACFG_AO_I2C6_SW_RST                         120
-#define MT8183_INFRACFG_AO_CCU_GALS_SW_RST                     121
-#define MT8183_INFRACFG_AO_IPU_GALS_SW_RST                     122
-#define MT8183_INFRACFG_AO_CONN2AP_GALS_SW_RST                 123
-#define MT8183_INFRACFG_AO_AP_MD_CCIF2_SW_RST                  124
-#define MT8183_INFRACFG_AO_AP_MD_CCIF3_SW_RST                  125
-#define MT8183_INFRACFG_AO_I2C7_SW_RST                         126
-#define MT8183_INFRACFG_AO_I2C8_SW_RST                         127
-
-#define MT8183_INFRACFG_SW_RST_NUM                             128
-
-#define MT8183_TOPRGU_MM_SW_RST                                        1
-#define MT8183_TOPRGU_MFG_SW_RST                               2
-#define MT8183_TOPRGU_VENC_SW_RST                              3
-#define MT8183_TOPRGU_VDEC_SW_RST                              4
-#define MT8183_TOPRGU_IMG_SW_RST                               5
-#define MT8183_TOPRGU_MD_SW_RST                                        7
-#define MT8183_TOPRGU_CONN_SW_RST                              9
-#define MT8183_TOPRGU_CONN_MCU_SW_RST                          12
-#define MT8183_TOPRGU_IPU0_SW_RST                              14
-#define MT8183_TOPRGU_IPU1_SW_RST                              15
-#define MT8183_TOPRGU_AUDIO_SW_RST                             17
-#define MT8183_TOPRGU_CAMSYS_SW_RST                            18
-
-#define MT8183_TOPRGU_SW_RST_NUM                               19
-
-#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT8183 */
diff --git a/include/dt-bindings/reset-controller/mt8192-resets.h b/include/dt-bindings/reset-controller/mt8192-resets.h
deleted file mode 100644 (file)
index be9a7ca..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (c) 2020 MediaTek Inc.
- * Author: Yong Liang <[email protected]>
- */
-
-#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8192
-#define _DT_BINDINGS_RESET_CONTROLLER_MT8192
-
-#define MT8192_TOPRGU_MM_SW_RST                                        1
-#define MT8192_TOPRGU_MFG_SW_RST                               2
-#define MT8192_TOPRGU_VENC_SW_RST                              3
-#define MT8192_TOPRGU_VDEC_SW_RST                              4
-#define MT8192_TOPRGU_IMG_SW_RST                               5
-#define MT8192_TOPRGU_MD_SW_RST                                        7
-#define MT8192_TOPRGU_CONN_SW_RST                              9
-#define MT8192_TOPRGU_CONN_MCU_SW_RST                  12
-#define MT8192_TOPRGU_IPU0_SW_RST                              14
-#define MT8192_TOPRGU_IPU1_SW_RST                              15
-#define MT8192_TOPRGU_AUDIO_SW_RST                             17
-#define MT8192_TOPRGU_CAMSYS_SW_RST                            18
-#define MT8192_TOPRGU_MJC_SW_RST                               19
-#define MT8192_TOPRGU_C2K_S2_SW_RST                            20
-#define MT8192_TOPRGU_C2K_SW_RST                               21
-#define MT8192_TOPRGU_PERI_SW_RST                              22
-#define MT8192_TOPRGU_PERI_AO_SW_RST                   23
-
-#define MT8192_TOPRGU_SW_RST_NUM                               23
-
-#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT8192 */
diff --git a/include/dt-bindings/reset/mt2712-resets.h b/include/dt-bindings/reset/mt2712-resets.h
new file mode 100644 (file)
index 0000000..9e7ee76
--- /dev/null
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2019 MediaTek Inc.
+ * Author: Yong Liang <[email protected]>
+ */
+
+#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT2712
+#define _DT_BINDINGS_RESET_CONTROLLER_MT2712
+
+#define MT2712_TOPRGU_INFRA_SW_RST                             0
+#define MT2712_TOPRGU_MM_SW_RST                                        1
+#define MT2712_TOPRGU_MFG_SW_RST                               2
+#define MT2712_TOPRGU_VENC_SW_RST                              3
+#define MT2712_TOPRGU_VDEC_SW_RST                              4
+#define MT2712_TOPRGU_IMG_SW_RST                               5
+#define MT2712_TOPRGU_INFRA_AO_SW_RST                          8
+#define MT2712_TOPRGU_USB_SW_RST                               9
+#define MT2712_TOPRGU_APMIXED_SW_RST                           10
+
+#define MT2712_TOPRGU_SW_RST_NUM                               11
+
+#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT2712 */
diff --git a/include/dt-bindings/reset/mt8183-resets.h b/include/dt-bindings/reset/mt8183-resets.h
new file mode 100644 (file)
index 0000000..a1bbd41
--- /dev/null
@@ -0,0 +1,98 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2019 MediaTek Inc.
+ * Author: Yong Liang <[email protected]>
+ */
+
+#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8183
+#define _DT_BINDINGS_RESET_CONTROLLER_MT8183
+
+/* INFRACFG AO resets */
+#define MT8183_INFRACFG_AO_THERM_SW_RST                                0
+#define MT8183_INFRACFG_AO_USB_TOP_SW_RST                      1
+#define MT8183_INFRACFG_AO_MM_IOMMU_SW_RST                     3
+#define MT8183_INFRACFG_AO_MSDC3_SW_RST                                4
+#define MT8183_INFRACFG_AO_MSDC2_SW_RST                                5
+#define MT8183_INFRACFG_AO_MSDC1_SW_RST                                6
+#define MT8183_INFRACFG_AO_MSDC0_SW_RST                                7
+#define MT8183_INFRACFG_AO_APDMA_SW_RST                                9
+#define MT8183_INFRACFG_AO_MIMP_D_SW_RST                       10
+#define MT8183_INFRACFG_AO_BTIF_SW_RST                         12
+#define MT8183_INFRACFG_AO_DISP_PWM_SW_RST                     14
+#define MT8183_INFRACFG_AO_AUXADC_SW_RST                       15
+
+#define MT8183_INFRACFG_AO_IRTX_SW_RST                         32
+#define MT8183_INFRACFG_AO_SPI0_SW_RST                         33
+#define MT8183_INFRACFG_AO_I2C0_SW_RST                         34
+#define MT8183_INFRACFG_AO_I2C1_SW_RST                         35
+#define MT8183_INFRACFG_AO_I2C2_SW_RST                         36
+#define MT8183_INFRACFG_AO_I2C3_SW_RST                         37
+#define MT8183_INFRACFG_AO_UART0_SW_RST                                38
+#define MT8183_INFRACFG_AO_UART1_SW_RST                                39
+#define MT8183_INFRACFG_AO_UART2_SW_RST                                40
+#define MT8183_INFRACFG_AO_PWM_SW_RST                          41
+#define MT8183_INFRACFG_AO_SPI1_SW_RST                         42
+#define MT8183_INFRACFG_AO_I2C4_SW_RST                         43
+#define MT8183_INFRACFG_AO_DVFSP_SW_RST                                44
+#define MT8183_INFRACFG_AO_SPI2_SW_RST                         45
+#define MT8183_INFRACFG_AO_SPI3_SW_RST                         46
+#define MT8183_INFRACFG_AO_UFSHCI_SW_RST                       47
+
+#define MT8183_INFRACFG_AO_PMIC_WRAP_SW_RST                    64
+#define MT8183_INFRACFG_AO_SPM_SW_RST                          65
+#define MT8183_INFRACFG_AO_USBSIF_SW_RST                       66
+#define MT8183_INFRACFG_AO_KP_SW_RST                           68
+#define MT8183_INFRACFG_AO_APXGPT_SW_RST                       69
+#define MT8183_INFRACFG_AO_CLDMA_AO_SW_RST                     70
+#define MT8183_INFRACFG_AO_UNIPRO_UFS_SW_RST                   71
+#define MT8183_INFRACFG_AO_DX_CC_SW_RST                                72
+#define MT8183_INFRACFG_AO_UFSPHY_SW_RST                       73
+
+#define MT8183_INFRACFG_AO_DX_CC_SEC_SW_RST                    96
+#define MT8183_INFRACFG_AO_GCE_SW_RST                          97
+#define MT8183_INFRACFG_AO_CLDMA_SW_RST                                98
+#define MT8183_INFRACFG_AO_TRNG_SW_RST                         99
+#define MT8183_INFRACFG_AO_AP_MD_CCIF_1_SW_RST                 103
+#define MT8183_INFRACFG_AO_AP_MD_CCIF_SW_RST                   104
+#define MT8183_INFRACFG_AO_I2C1_IMM_SW_RST                     105
+#define MT8183_INFRACFG_AO_I2C1_ARB_SW_RST                     106
+#define MT8183_INFRACFG_AO_I2C2_IMM_SW_RST                     107
+#define MT8183_INFRACFG_AO_I2C2_ARB_SW_RST                     108
+#define MT8183_INFRACFG_AO_I2C5_SW_RST                         109
+#define MT8183_INFRACFG_AO_I2C5_IMM_SW_RST                     110
+#define MT8183_INFRACFG_AO_I2C5_ARB_SW_RST                     111
+#define MT8183_INFRACFG_AO_SPI4_SW_RST                         112
+#define MT8183_INFRACFG_AO_SPI5_SW_RST                         113
+#define MT8183_INFRACFG_AO_INFRA2MFGAXI_CBIP_CLAS_SW_RST       114
+#define MT8183_INFRACFG_AO_MFGAXI2INFRA_M0_CBIP_GLAS_OUT_SW_RST        115
+#define MT8183_INFRACFG_AO_MFGAXI2INFRA_M1_CBIP_GLAS_OUT_SW_RST        116
+#define MT8183_INFRACFG_AO_UFS_AES_SW_RST                      117
+#define MT8183_INFRACFG_AO_CCU_I2C_IRQ_SW_RST                  118
+#define MT8183_INFRACFG_AO_CCU_I2C_DMA_SW_RST                  119
+#define MT8183_INFRACFG_AO_I2C6_SW_RST                         120
+#define MT8183_INFRACFG_AO_CCU_GALS_SW_RST                     121
+#define MT8183_INFRACFG_AO_IPU_GALS_SW_RST                     122
+#define MT8183_INFRACFG_AO_CONN2AP_GALS_SW_RST                 123
+#define MT8183_INFRACFG_AO_AP_MD_CCIF2_SW_RST                  124
+#define MT8183_INFRACFG_AO_AP_MD_CCIF3_SW_RST                  125
+#define MT8183_INFRACFG_AO_I2C7_SW_RST                         126
+#define MT8183_INFRACFG_AO_I2C8_SW_RST                         127
+
+#define MT8183_INFRACFG_SW_RST_NUM                             128
+
+#define MT8183_TOPRGU_MM_SW_RST                                        1
+#define MT8183_TOPRGU_MFG_SW_RST                               2
+#define MT8183_TOPRGU_VENC_SW_RST                              3
+#define MT8183_TOPRGU_VDEC_SW_RST                              4
+#define MT8183_TOPRGU_IMG_SW_RST                               5
+#define MT8183_TOPRGU_MD_SW_RST                                        7
+#define MT8183_TOPRGU_CONN_SW_RST                              9
+#define MT8183_TOPRGU_CONN_MCU_SW_RST                          12
+#define MT8183_TOPRGU_IPU0_SW_RST                              14
+#define MT8183_TOPRGU_IPU1_SW_RST                              15
+#define MT8183_TOPRGU_AUDIO_SW_RST                             17
+#define MT8183_TOPRGU_CAMSYS_SW_RST                            18
+
+#define MT8183_TOPRGU_SW_RST_NUM                               19
+
+#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT8183 */
diff --git a/include/dt-bindings/reset/mt8192-resets.h b/include/dt-bindings/reset/mt8192-resets.h
new file mode 100644 (file)
index 0000000..be9a7ca
--- /dev/null
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Copyright (c) 2020 MediaTek Inc.
+ * Author: Yong Liang <[email protected]>
+ */
+
+#ifndef _DT_BINDINGS_RESET_CONTROLLER_MT8192
+#define _DT_BINDINGS_RESET_CONTROLLER_MT8192
+
+#define MT8192_TOPRGU_MM_SW_RST                                        1
+#define MT8192_TOPRGU_MFG_SW_RST                               2
+#define MT8192_TOPRGU_VENC_SW_RST                              3
+#define MT8192_TOPRGU_VDEC_SW_RST                              4
+#define MT8192_TOPRGU_IMG_SW_RST                               5
+#define MT8192_TOPRGU_MD_SW_RST                                        7
+#define MT8192_TOPRGU_CONN_SW_RST                              9
+#define MT8192_TOPRGU_CONN_MCU_SW_RST                  12
+#define MT8192_TOPRGU_IPU0_SW_RST                              14
+#define MT8192_TOPRGU_IPU1_SW_RST                              15
+#define MT8192_TOPRGU_AUDIO_SW_RST                             17
+#define MT8192_TOPRGU_CAMSYS_SW_RST                            18
+#define MT8192_TOPRGU_MJC_SW_RST                               19
+#define MT8192_TOPRGU_C2K_S2_SW_RST                            20
+#define MT8192_TOPRGU_C2K_SW_RST                               21
+#define MT8192_TOPRGU_PERI_SW_RST                              22
+#define MT8192_TOPRGU_PERI_AO_SW_RST                   23
+
+#define MT8192_TOPRGU_SW_RST_NUM                               23
+
+#endif  /* _DT_BINDINGS_RESET_CONTROLLER_MT8192 */
This page took 0.090741 seconds and 4 git commands to generate.