This SoC is similar to Hi3798CV200 with a few more clocks in CRG module.
Note this driver is still ongoing, many clocks are not registered in the
driver now. Feedback is welcomed, especially from HiSilicon people.
Signed-off-by: Yang Xiwen <[email protected]>
---
Changes in v3:
- remove RFC (Krzysztof Kozlowski)
- rearrange patches so dt-binding comes before drivers (Krzysztof Kozlowski)
- dt-bindings: Remove lots of properties
- dt-bindings: stop merging all hisi-clock bindings, only convert hisi-crg.txt for now.
- dt-bindings: remove hisilicon,hisi-sdmmc-dll subnode (Rob Herring, Krzysztof Kozlowski)
- split histb-clock.h into two files, deprecate this header file
- fix all users (hi3798cv200.dtsi and hi3798cv200 CRG driver)
- hi3798mv200-crg: add a few missing clocks
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- s/dt-binding/dt-bindings in commit logs: (Krzysztof Kozlowski)
- fix bot error by adding "hisilicon,hisi-sdmmc-dll" to syscon.yaml (Rob Herring)
- hi3798mv200-crg: assign fixed rate parents to some gates
- hi3798mv200-crg: s/ETH/FEMAC, add GMAC ctrl clock
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Yang Xiwen (8):
dt-bindings: clock: convert hisi-crg.txt to YAML
ARM: dts: hisilicon: add missing compatibles to CRG node
dt-bindings: clock: histb-clock: split into two header files
arm64: dts: hisilicon: fix include path
clk: hisilicon: fix include path for crg-hi3798cv200
dt-bindings: clock: hisilicon,clock-reset-controller: add Hi3798MV200 SoC
dt-bindings: clock: hisilicon: add clock definitions for Hi3798MV200
clk: hisilicon: add CRG driver for Hi3798MV200 SoC
.../bindings/clock/hisilicon,hisi-crg.yaml | 71 ++++
arch/arm/boot/dts/hisilicon/hi3519.dtsi | 2 +-
arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 3 +-
drivers/clk/hisilicon/Kconfig | 8 +
drivers/clk/hisilicon/Makefile | 1 +
drivers/clk/hisilicon/crg-hi3798cv200.c | 3 +-
drivers/clk/hisilicon/crg-hi3798mv200.c | 462 +++++++++++++++++++++
.../dt-bindings/clock/hisilicon,hi3798cv200-crg.h | 62 +++
.../clock/hisilicon,hi3798cv200-sysctrl.h | 17 +
.../dt-bindings/clock/hisilicon,hi3798mv200-crg.h | 150 +++++++
.../clock/hisilicon,hi3798mv200-sysctrl.h | 21 +
include/dt-bindings/clock/histb-clock.h | 73 +---
12 files changed, 805 insertions(+), 68 deletions(-)
---
base-commit: 8d3dea210042f54b952b481838c1e7dfc4ec751d
change-id: 20240216-clk-mv200-cc8cae396ee0
Best regards,
--
Yang Xiwen <[email protected]>
From: Yang Xiwen <[email protected]>
The CRG driver between different SoCs provides different clocks and
resets. We should not provide a generic header file across all HiSTB
SoCs, instead each CRG driver should provide its own.
Split histb-clock.h into two files: hisilicon,hi3798cv200-crg.h and
hisilicon,hi3798cv200-sysctrl.h. This header file is for Hi3798CV200
only actually. For other HiSTB SoCs, some clock definitions are missing.
Create a new histb-clock.h to include these two files for backward
compatibility only. Deprecate this file as well.
Signed-off-by: Yang Xiwen <[email protected]>
---
.../dt-bindings/clock/hisilicon,hi3798cv200-crg.h | 62 ++++++++++++++++++
.../clock/hisilicon,hi3798cv200-sysctrl.h | 17 +++++
include/dt-bindings/clock/histb-clock.h | 73 +++-------------------
3 files changed, 87 insertions(+), 65 deletions(-)
diff --git a/include/dt-bindings/clock/hisilicon,hi3798cv200-crg.h b/include/dt-bindings/clock/hisilicon,hi3798cv200-crg.h
new file mode 100644
index 000000000000..7c8928192af6
--- /dev/null
+++ b/include/dt-bindings/clock/hisilicon,hi3798cv200-crg.h
@@ -0,0 +1,62 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
+ */
+
+#ifndef __DTS_HI3798CV200_CRG_H
+#define __DTS_HI3798CV200_CRG_H
+
+/* clocks provided by core CRG */
+#define HISTB_OSC_CLK 0
+#define HISTB_APB_CLK 1
+#define HISTB_AHB_CLK 2
+#define HISTB_UART1_CLK 3
+#define HISTB_UART2_CLK 4
+#define HISTB_UART3_CLK 5
+#define HISTB_I2C0_CLK 6
+#define HISTB_I2C1_CLK 7
+#define HISTB_I2C2_CLK 8
+#define HISTB_I2C3_CLK 9
+#define HISTB_I2C4_CLK 10
+#define HISTB_I2C5_CLK 11
+#define HISTB_SPI0_CLK 12
+#define HISTB_SPI1_CLK 13
+#define HISTB_SPI2_CLK 14
+#define HISTB_SCI_CLK 15
+#define HISTB_FMC_CLK 16
+#define HISTB_MMC_BIU_CLK 17
+#define HISTB_MMC_CIU_CLK 18
+#define HISTB_MMC_DRV_CLK 19
+#define HISTB_MMC_SAMPLE_CLK 20
+#define HISTB_SDIO0_BIU_CLK 21
+#define HISTB_SDIO0_CIU_CLK 22
+#define HISTB_SDIO0_DRV_CLK 23
+#define HISTB_SDIO0_SAMPLE_CLK 24
+#define HISTB_PCIE_AUX_CLK 25
+#define HISTB_PCIE_PIPE_CLK 26
+#define HISTB_PCIE_SYS_CLK 27
+#define HISTB_PCIE_BUS_CLK 28
+#define HISTB_ETH0_MAC_CLK 29
+#define HISTB_ETH0_MACIF_CLK 30
+#define HISTB_ETH1_MAC_CLK 31
+#define HISTB_ETH1_MACIF_CLK 32
+#define HISTB_COMBPHY1_CLK 33
+#define HISTB_USB2_BUS_CLK 34
+#define HISTB_USB2_PHY_CLK 35
+#define HISTB_USB2_UTMI_CLK 36
+#define HISTB_USB2_12M_CLK 37
+#define HISTB_USB2_48M_CLK 38
+#define HISTB_USB2_OTG_UTMI_CLK 39
+#define HISTB_USB2_PHY1_REF_CLK 40
+#define HISTB_USB2_PHY2_REF_CLK 41
+#define HISTB_COMBPHY0_CLK 42
+#define HISTB_USB3_BUS_CLK 43
+#define HISTB_USB3_UTMI_CLK 44
+#define HISTB_USB3_PIPE_CLK 45
+#define HISTB_USB3_SUSPEND_CLK 46
+#define HISTB_USB3_BUS_CLK1 47
+#define HISTB_USB3_UTMI_CLK1 48
+#define HISTB_USB3_PIPE_CLK1 49
+#define HISTB_USB3_SUSPEND_CLK1 50
+
+#endif /* __DTS_HI3798CV200_CRG_H */
diff --git a/include/dt-bindings/clock/hisilicon,hi3798cv200-sysctrl.h b/include/dt-bindings/clock/hisilicon,hi3798cv200-sysctrl.h
new file mode 100644
index 000000000000..ca07020e0f8c
--- /dev/null
+++ b/include/dt-bindings/clock/hisilicon,hi3798cv200-sysctrl.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/*
+ * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
+ */
+
+#ifndef __DTS_HI3798CV200_SYSCTRL_H
+#define __DTS_HI3798CV200_SYSCTRL_H
+
+/* clocks provided by mcu CRG */
+#define HISTB_MCE_CLK 1
+#define HISTB_IR_CLK 2
+#define HISTB_TIMER01_CLK 3
+#define HISTB_LEDC_CLK 4
+#define HISTB_UART0_CLK 5
+#define HISTB_LSADC_CLK 6
+
+#endif /* __DTS_HI3798CV200_SYSCTRL_H */
diff --git a/include/dt-bindings/clock/histb-clock.h b/include/dt-bindings/clock/histb-clock.h
index e64e5770ada6..56b39eb99d2c 100644
--- a/include/dt-bindings/clock/histb-clock.h
+++ b/include/dt-bindings/clock/histb-clock.h
@@ -1,70 +1,13 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
- * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
+ * DEPRECATED
+ *
+ * Each CRG driver should have its own clock number definitions header file.
+ * This file is only reserved for backward compatibility for Hi3798CV200
*/
-#ifndef __DTS_HISTB_CLOCK_H
-#define __DTS_HISTB_CLOCK_H
+#warning "This header file is deprecated, include hisilicon,hi3798cv200-crg.h \
+and hisilicon,hi3798cv200-sysctrl.h directly instead"
-/* clocks provided by core CRG */
-#define HISTB_OSC_CLK 0
-#define HISTB_APB_CLK 1
-#define HISTB_AHB_CLK 2
-#define HISTB_UART1_CLK 3
-#define HISTB_UART2_CLK 4
-#define HISTB_UART3_CLK 5
-#define HISTB_I2C0_CLK 6
-#define HISTB_I2C1_CLK 7
-#define HISTB_I2C2_CLK 8
-#define HISTB_I2C3_CLK 9
-#define HISTB_I2C4_CLK 10
-#define HISTB_I2C5_CLK 11
-#define HISTB_SPI0_CLK 12
-#define HISTB_SPI1_CLK 13
-#define HISTB_SPI2_CLK 14
-#define HISTB_SCI_CLK 15
-#define HISTB_FMC_CLK 16
-#define HISTB_MMC_BIU_CLK 17
-#define HISTB_MMC_CIU_CLK 18
-#define HISTB_MMC_DRV_CLK 19
-#define HISTB_MMC_SAMPLE_CLK 20
-#define HISTB_SDIO0_BIU_CLK 21
-#define HISTB_SDIO0_CIU_CLK 22
-#define HISTB_SDIO0_DRV_CLK 23
-#define HISTB_SDIO0_SAMPLE_CLK 24
-#define HISTB_PCIE_AUX_CLK 25
-#define HISTB_PCIE_PIPE_CLK 26
-#define HISTB_PCIE_SYS_CLK 27
-#define HISTB_PCIE_BUS_CLK 28
-#define HISTB_ETH0_MAC_CLK 29
-#define HISTB_ETH0_MACIF_CLK 30
-#define HISTB_ETH1_MAC_CLK 31
-#define HISTB_ETH1_MACIF_CLK 32
-#define HISTB_COMBPHY1_CLK 33
-#define HISTB_USB2_BUS_CLK 34
-#define HISTB_USB2_PHY_CLK 35
-#define HISTB_USB2_UTMI_CLK 36
-#define HISTB_USB2_12M_CLK 37
-#define HISTB_USB2_48M_CLK 38
-#define HISTB_USB2_OTG_UTMI_CLK 39
-#define HISTB_USB2_PHY1_REF_CLK 40
-#define HISTB_USB2_PHY2_REF_CLK 41
-#define HISTB_COMBPHY0_CLK 42
-#define HISTB_USB3_BUS_CLK 43
-#define HISTB_USB3_UTMI_CLK 44
-#define HISTB_USB3_PIPE_CLK 45
-#define HISTB_USB3_SUSPEND_CLK 46
-#define HISTB_USB3_BUS_CLK1 47
-#define HISTB_USB3_UTMI_CLK1 48
-#define HISTB_USB3_PIPE_CLK1 49
-#define HISTB_USB3_SUSPEND_CLK1 50
-
-/* clocks provided by mcu CRG */
-#define HISTB_MCE_CLK 1
-#define HISTB_IR_CLK 2
-#define HISTB_TIMER01_CLK 3
-#define HISTB_LEDC_CLK 4
-#define HISTB_UART0_CLK 5
-#define HISTB_LSADC_CLK 6
-
-#endif /* __DTS_HISTB_CLOCK_H */
+#include "hisilicon,hi3798cv200-crg.h"
+#include "hisilicon,hi3798cv200-sysctrl.h"
--
2.43.0
From: Yang Xiwen <[email protected]>
This SoC is similar to Hi3798CV200.
Signed-off-by: Yang Xiwen <[email protected]>
---
Documentation/devicetree/bindings/clock/hisilicon,hisi-crg.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/clock/hisilicon,hisi-crg.yaml b/Documentation/devicetree/bindings/clock/hisilicon,hisi-crg.yaml
index 2cf21cb5ff27..41d35de47252 100644
--- a/Documentation/devicetree/bindings/clock/hisilicon,hisi-crg.yaml
+++ b/Documentation/devicetree/bindings/clock/hisilicon,hisi-crg.yaml
@@ -22,6 +22,8 @@ properties:
- hisilicon,hi3519-crg
- hisilicon,hi3798cv200-crg
- hisilicon,hi3798cv200-sysctrl
+ - hisilicon,hi3798mv200-crg
+ - hisilicon,hi3798mv200-sysctrl
- const: syscon
- const: simple-mfd
--
2.43.0
From: Yang Xiwen <[email protected]>
histb-clock.h is now deprecated. Include hisilicon,hi3798cv200-crg.h and
hisilicon-sysctrl.h directly instead.
Signed-off-by: Yang Xiwen <[email protected]>
---
drivers/clk/hisilicon/crg-hi3798cv200.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/hisilicon/crg-hi3798cv200.c b/drivers/clk/hisilicon/crg-hi3798cv200.c
index f651b197e45a..3e26a8f6df36 100644
--- a/drivers/clk/hisilicon/crg-hi3798cv200.c
+++ b/drivers/clk/hisilicon/crg-hi3798cv200.c
@@ -5,7 +5,8 @@
* Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
*/
-#include <dt-bindings/clock/histb-clock.h>
+#include <dt-bindings/clock/hisilicon,hi3798cv200-crg.h>
+#include <dt-bindings/clock/hisilicon,hi3798cv200-sysctrl.h>
#include <linux/clk-provider.h>
#include <linux/module.h>
#include <linux/of.h>
--
2.43.0
From: Yang Xiwen <[email protected]>
Add clock definitions for core CRG and mcu CRG for Hi3798MV200 SoC.
Signed-off-by: Yang Xiwen <[email protected]>
---
.../dt-bindings/clock/hisilicon,hi3798mv200-crg.h | 150 +++++++++++++++++++++
.../clock/hisilicon,hi3798mv200-sysctrl.h | 21 +++
2 files changed, 171 insertions(+)
diff --git a/include/dt-bindings/clock/hisilicon,hi3798mv200-crg.h b/include/dt-bindings/clock/hisilicon,hi3798mv200-crg.h
new file mode 100644
index 000000000000..bf6b6b855724
--- /dev/null
+++ b/include/dt-bindings/clock/hisilicon,hi3798mv200-crg.h
@@ -0,0 +1,150 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
+/*
+ * Copyright (c) 2024 Yang Xiwen <[email protected]>
+ */
+
+#ifndef __DTS_HI3798MV200_CRG_H
+#define __DTS_HI3798MV200_CRG_H
+
+/* clocks provided by core CRG */
+#define HI3798MV200_OSC_CLK 0
+#define HI3798MV200_APB_CLK 1
+#define HI3798MV200_AHB_CLK 2
+#define HI3798MV200_APLL_CLK 3
+#define HI3798MV200_BPLL_CLK 4
+#define HI3798MV200_DPLL_CLK 5
+#define HI3798MV200_VPLL_CLK 6
+#define HI3798MV200_HPLL_CLK 7
+#define HI3798MV200_EPLL_CLK 8
+#define HI3798MV200_QPLL_CLK 9
+#define HI3798MV200_PERI_DIV_CLK 10
+#define HI3798MV200_CORE_BUS_CLK 11
+#define HI3798MV200_MDE0_BUS_CLK 12
+#define HI3798MV200_MDE1_BUS_CLK 13
+#define HI3798MV200_MDE2_BUS_CLK 14
+#define HI3798MV200_MDE3_BUS_CLK 15
+/* UART1 does not exist */
+#define HI3798MV200_UART2_CLK 16
+#define HI3798MV200_UART3_CLK 17
+#define HI3798MV200_I2C0_CLK 18
+#define HI3798MV200_I2C1_CLK 19
+#define HI3798MV200_I2C2_CLK 20
+#define HI3798MV200_SPI0_CLK 21
+#define HI3798MV200_SCI0_CLK 22
+#define HI3798MV200_SCI1_CLK 23
+#define HI3798MV200_VDH_CLK 24
+#define HI3798MV200_VDH_DSP_CLK 25
+#define HI3798MV200_JPGD_CLK 26
+#define HI3798MV200_PGD_CLK 27
+#define HI3798MV200_BPD_CLK 28
+#define HI3798MV200_VENV_CLK 29
+#define HI3798MV200_VENV_AXI_CLK 30
+#define HI3798MV200_JPGE_CLK 31
+#define HI3798MV200_TDE_CLK 32
+#define HI3798MV200_SDIO0_BIU_CLK 33
+#define HI3798MV200_SDIO0_CIU_CLK 34
+#define HI3798MV200_SDIO0_DRV_CLK 35
+#define HI3798MV200_SDIO0_SAMPLE_CLK 36
+#define HI3798MV200_MMC_BIU_CLK 37
+#define HI3798MV200_MMC_CIU_CLK 38
+#define HI3798MV200_MMC_DRV_CLK 39
+#define HI3798MV200_MMC_SAMPLE_CLK 40
+#define HI3798MV200_SATA_CLK 41
+#define HI3798MV200_SATA_RX_CLK 42
+#define HI3798MV200_SATA_CKO_ALIVE_CLK 43
+#define HI3798MV200_SATA_TX_CLK 44
+#define HI3798MV200_USB3_BUS_CLK 45
+#define HI3798MV200_USB3_REF_CLK 46
+#define HI3798MV200_USB3_SUSPEND_CLK 47
+#define HI3798MV200_USB3_PIPE_CLK 48
+#define HI3798MV200_USB3_UTMI_CLK 49
+#define HI3798MV200_USB3_GS_CLK 50
+#define HI3798MV200_USB3_GM_CLK 51
+#define HI3798MV200_USB2_BUS_CLK 52
+#define HI3798MV200_USB2_48M_CLK 53
+#define HI3798MV200_USB2_12M_CLK 54
+#define HI3798MV200_USB2_OTG_UTMI_CLK 55
+#define HI3798MV200_USB2_HST_PHY_CLK 56
+#define HI3798MV200_USB2_UTMI0_CLK 57
+#define HI3798MV200_USB2_UTMI1_CLK 58
+#define HI3798MV200_USB2_PHY1_REF_CLK 59
+#define HI3798MV200_USB2_PHY2_REF_CLK 60
+#define HI3798MV200_SHA0_CLK 61
+#define HI3798MV200_SHA1_CLK 62
+#define HI3798MV200_PMC_CLK 63
+#define HI3798MV200_GSF_CLK 64
+#define HI3798MV200_GMAC_CLK 65
+#define HI3798MV200_EXT_NETPHY_CLK 66
+#define HI3798MV200_ETH_BUS_CLK 67
+#define HI3798MV200_ETH_CLK 68
+#define HI3798MV200_GPU_CLK 69
+#define HI3798MV200_VO_BUS 70
+#define HI3798MV200_VO_SD 71
+#define HI3798MV200_VO_SDATE 72
+#define HI3798MV200_VDAC_CH0_CLK 73
+#define HI3798MV200_VO_HD 74
+#define HI3798MV200_VDP_CLK 75
+#define HI3798MV200_VDP_CFG_CLK 76
+#define HI3798MV200_VPSS_CLK 77
+#define HI3798MV200_PVR_BUS_CLK 78
+#define HI3798MV200_PVR_DMX_CLK 79
+#define HI3798MV200_PVR_27M_CLK 80
+#define HI3798MV200_PVR_TSI1_CLK 81
+#define HI3798MV200_PVR_TSI2_CLK 82
+#define HI3798MV200_PVR_TSI3_CLK 83
+#define HI3798MV200_PVR_TSI4_CLK 84
+#define HI3798MV200_PVR_TS0_CLK 85
+#define HI3798MV200_PVR_TSOUT0_CLK 86
+#define HI3798MV200_HDMITX_SSC_CLK 87
+#define HI3798MV200_HDMITX_SSC_BYPASS_CLK 88
+#define HI3798MV200_HDMITX_CTRL_24M_CLK 89
+#define HI3798MV200_HDMITX_CTRL_CEC_CLK 90
+#define HI3798MV200_HDMITX_CTRL_60M_CLK 91
+#define HI3798MV200_HDMITX_CTRL_AS_CLK 92
+#define HI3798MV200_HDMITX_PHY_TMDS_CLK 93
+#define HI3798MV200_ADAC_CLK 94
+#define HI3798MV200_AIAO_CLK 95
+#define HI3798MV200_VDAC_CHOP_CLK 96
+#define HI3798MV200_WDG0_CLK 97
+#define HI3798MV200_COMBPHY_CLK 98
+#define HI3798MV200_PCIE_BUS_CLK 99
+#define HI3798MV200_PCIE_SYS_CLK 100
+#define HI3798MV200_PCIE_PIPE_CLK 101
+#define HI3798MV200_PCIE_AUX_CLK 102
+#define HI3798MV200_SDIO1_BIU_CLK 103
+#define HI3798MV200_SDIO1_CIU_CLK 104
+#define HI3798MV200_SDIO1_DRV_CLK 105
+#define HI3798MV200_SDIO1_SAMPLE_CLK 106
+#define HI3798MV200_VENC_SMMU_CLK 107
+#define HI3798MV200_TDE_SMMU_CLK 108
+#define HI3798MV200_JPGD_SMMU_CLK 109
+#define HI3798MV200_VDH_SMMU_CLK 110
+#define HI3798MV200_VDP_SMMU_CLK 111
+#define HI3798MV200_VPSS_SMMU_CLK 112
+#define HI3798MV200_PGD_SMMU_CLK 113
+#define HI3798MV200_VO_BP_CLK 114
+#define HI3798MV200_VDP_G4_CLK 115
+#define HI3798MV200_VDP_V3_CLK 116
+#define HI3798MV200_VDP_SD_CLK 117
+#define HI3798MV200_VDP_WBC_CP_CLK 118
+#define HI3798MV200_VDP_WBC_GP_CLK 119
+#define HI3798MV200_VDP_WBC_HD_CLK 120
+#define HI3798MV200_VDP_G3_CLK 121
+#define HI3798MV200_VDP_G1_CLK 122
+#define HI3798MV200_VDP_G0_CLK 123
+#define HI3798MV200_VDP_V1_CLK 124
+#define HI3798MV200_VDP_V0_CLK 125
+#define HI3798MV200_VDP_HD_CLK 126
+#define HI3798MV200_CIPHER_SMMU_CLK 127
+#define HI3798MV200_FMC_CLK 128
+#define HI3798MV200_FEPHY_CLK 129
+#define HI3798MV200_DMAC_CLK 130
+#define HI3798MV200_GZIP_CLK 131
+#define HI3798MV200_GZIP_AXI_CLK 132
+#define HI3798MV200_GZIP_APB_CLK 133
+#define HI3798MV200_PM_CLK 134
+#define HI3798MV200_FRACDIV_CLK 135
+
+#define HI3798MV200_CRG_CLK_COUNT 136
+
+#endif /* __DTS_HI3798MV200_CRG_H */
diff --git a/include/dt-bindings/clock/hisilicon,hi3798mv200-sysctrl.h b/include/dt-bindings/clock/hisilicon,hi3798mv200-sysctrl.h
new file mode 100644
index 000000000000..82411d28a8c7
--- /dev/null
+++ b/include/dt-bindings/clock/hisilicon,hi3798mv200-sysctrl.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
+/*
+ * Copyright (c) 2024 Yang Xiwen <[email protected]>
+ */
+
+#ifndef __DTS_HI3798MV200_SYSCTRL_H
+#define __DTS_HI3798MV200_SYSCTRL_H
+
+/* clocks provided by mcu CRG */
+#define HI3798MV200_MCU_BUS_CLK 0
+#define HI3798MV200_MCE_CLK 1
+#define HI3798MV200_IR_CLK 2
+#define HI3798MV200_TIMER01_CLK 3
+#define HI3798MV200_LEDC_CLK 4
+#define HI3798MV200_UART0_CLK 5
+#define HI3798MV200_WIFI_CLK 6
+#define HI3798MV200_LSADC_CLK 7
+
+#define HI3798MV200_SYSCTRL_CLK_COUNT 8
+
+#endif /* __DTS_HI3798MV200_SYSCTRL_H */
--
2.43.0
From: Yang Xiwen <[email protected]>
Add CRG driver for Hi3798MV200 SoC. CRG(Clock and Reset Generator) module
generates clock and reset signals used by other module blocks on SoC.
Only currently used clocks are added. Clocks without mainline user are omitted.
Notably PLLs are missing due to the lack of PLL driver.
Signed-off-by: Yang Xiwen <[email protected]>
---
drivers/clk/hisilicon/Kconfig | 8 +
drivers/clk/hisilicon/Makefile | 1 +
drivers/clk/hisilicon/crg-hi3798mv200.c | 462 ++++++++++++++++++++++++++++++++
3 files changed, 471 insertions(+)
diff --git a/drivers/clk/hisilicon/Kconfig b/drivers/clk/hisilicon/Kconfig
index c1ec75aa4ccd..fab8059240b7 100644
--- a/drivers/clk/hisilicon/Kconfig
+++ b/drivers/clk/hisilicon/Kconfig
@@ -45,6 +45,14 @@ config COMMON_CLK_HI3798CV200
help
Build the clock driver for hi3798cv200.
+config COMMON_CLK_HI3798MV200
+ tristate "Hi3798MV200 Clock Driver"
+ depends on ARCH_HISI || COMPILE_TEST
+ select RESET_HISI
+ default ARCH_HISI
+ help
+ Build the clock driver for hi3798mv200.
+
config COMMON_CLK_HI6220
bool "Hi6220 Clock Driver"
depends on ARCH_HISI || COMPILE_TEST
diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile
index 2978e56cb876..7acb63e909bd 100644
--- a/drivers/clk/hisilicon/Makefile
+++ b/drivers/clk/hisilicon/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_COMMON_CLK_HI3559A) += clk-hi3559a.o
obj-$(CONFIG_COMMON_CLK_HI3660) += clk-hi3660.o
obj-$(CONFIG_COMMON_CLK_HI3670) += clk-hi3670.o
obj-$(CONFIG_COMMON_CLK_HI3798CV200) += crg-hi3798cv200.o
+obj-$(CONFIG_COMMON_CLK_HI3798MV200) += crg-hi3798mv200.o
obj-$(CONFIG_COMMON_CLK_HI6220) += clk-hi6220.o
obj-$(CONFIG_RESET_HISI) += reset.o
obj-$(CONFIG_STUB_CLK_HI6220) += clk-hi6220-stub.o
diff --git a/drivers/clk/hisilicon/crg-hi3798mv200.c b/drivers/clk/hisilicon/crg-hi3798mv200.c
new file mode 100644
index 000000000000..065def955e6a
--- /dev/null
+++ b/drivers/clk/hisilicon/crg-hi3798mv200.c
@@ -0,0 +1,462 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Hi3798MV200 Clock and Reset Generator Driver
+ *
+ * Copyright (c) 2024 Yang Xiwen <[email protected]>
+ * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
+ */
+
+#include <dt-bindings/clock/hisilicon,hi3798mv200-crg.h>
+#include <dt-bindings/clock/hisilicon,hi3798mv200-sysctrl.h>
+#include <linux/clk-provider.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include "clk.h"
+#include "crg.h"
+#include "reset.h"
+
+/* hi3798MV200 core CRG */
+enum hi3798mv200_crg_inner_clk {
+ HI3798MV200_FIXED_3M = HI3798MV200_CRG_CLK_COUNT,
+ HI3798MV200_FIXED_12M,
+ HI3798MV200_FIXED_24M,
+ HI3798MV200_FIXED_25M,
+ HI3798MV200_FIXED_27M,
+ HI3798MV200_FIXED_48M,
+ HI3798MV200_FIXED_50M,
+ HI3798MV200_FIXED_54M,
+ HI3798MV200_FIXED_60M,
+ HI3798MV200_FIXED_75M,
+ HI3798MV200_FIXED_100M,
+ HI3798MV200_FIXED_125M,
+ HI3798MV200_FIXED_150M,
+ HI3798MV200_FIXED_200M,
+ HI3798MV200_FIXED_250M,
+ HI3798MV200_FIXED_300M,
+ HI3798MV200_FIXED_400M,
+ HI3798MV200_FIXED_450M,
+ HI3798MV200_MMC_MUX,
+ HI3798MV200_SDIO0_MUX,
+ HI3798MV200_SDIO1_MUX,
+ HI3798MV200_COMBPHY0_MUX,
+ HI3798MV200_FEMAC_MUX,
+ HI3798MV200_GMAC_MUX,
+ HI3798MV200_CRG_NR_CLKS,
+};
+
+static const struct hisi_fixed_rate_clock hi3798mv200_fixed_rate_clks[] = {
+ { HI3798MV200_OSC_CLK, "clk_osc", NULL, 0, 24000000, },
+ { HI3798MV200_APB_CLK, "clk_apb", NULL, 0, 100000000, },
+ { HI3798MV200_AHB_CLK, "clk_ahb", NULL, 0, 200000000, },
+ { HI3798MV200_FIXED_3M, "3m", NULL, 0, 3000000, },
+ { HI3798MV200_FIXED_12M, "12m", NULL, 0, 12000000, },
+ { HI3798MV200_FIXED_24M, "24m", NULL, 0, 24000000, },
+ { HI3798MV200_FIXED_25M, "25m", NULL, 0, 25000000, },
+ { HI3798MV200_FIXED_27M, "27m", NULL, 0, 27000000, },
+ { HI3798MV200_FIXED_48M, "48m", NULL, 0, 48000000, },
+ { HI3798MV200_FIXED_50M, "50m", NULL, 0, 50000000, },
+ { HI3798MV200_FIXED_54M, "54m", NULL, 0, 54000000, },
+ { HI3798MV200_FIXED_60M, "60m", NULL, 0, 60000000, },
+ { HI3798MV200_FIXED_75M, "75m", NULL, 0, 75000000, },
+ { HI3798MV200_FIXED_100M, "100m", NULL, 0, 100000000, },
+ { HI3798MV200_FIXED_125M, "125m", NULL, 0, 125000000, },
+ { HI3798MV200_FIXED_150M, "150m", NULL, 0, 150000000, },
+ { HI3798MV200_FIXED_200M, "200m", NULL, 0, 200000000, },
+};
+
+static const char *const sdio_mux_p[] = { "100m", "50m", "150m", "25m" };
+static u32 sdio_mux_table[] = {0, 1, 2, 3};
+
+static const char *const mmc_mux_p[] = { "100m", "50m", "25m", "200m", "150m" };
+static u32 mmc_mux_table[] = {0, 1, 2, 3, 6};
+
+static const char *const comphy_mux_p[] = { "25m", "100m"};
+static const char *const femac_mux_p[] = { "54m", "27m" };
+static const char *const gmac_mux_p[] = { "125m", "75m" };
+static const char *const ext_netphy_mux_p[] = { "25m", "50m" };
+static const char *const mde1_bus_mux_p[] = { "24m", "200m" };
+static const char *const mde3_bus_mux_p[] = { "24m", "400m" };
+static u32 mux_table_1bit[] = {0, 1};
+
+static const char *const core_bus_mux_p[] = { "24m", "200m", "250m" };
+static const char *const mde0_bus_mux_p[] = { "24m", "300m", "400m" };
+static const char *const mde2_bus_mux_p[] = { "24m", "400m", "450m" };
+static u32 mux_table_2bit_pattern1[] = {0, 1, 2};
+
+static struct hisi_mux_clock hi3798mv200_mux_clks[] = {
+ { HI3798MV200_CORE_BUS_CLK, "clk_core_bus", core_bus_mux_p, ARRAY_SIZE(core_bus_mux_p),
+ 0, 0x58, 0, 2, 0, mux_table_2bit_pattern1, },
+ { HI3798MV200_MDE0_BUS_CLK, "clk_mde0_bus", mde0_bus_mux_p, ARRAY_SIZE(mde0_bus_mux_p),
+ 0, 0x58, 2, 2, 0, mux_table_2bit_pattern1, },
+ { HI3798MV200_MDE1_BUS_CLK, "clk_mde1_bus", mde1_bus_mux_p, ARRAY_SIZE(mde1_bus_mux_p),
+ 0, 0x58, 4, 1, 0, mux_table_1bit, },
+ { HI3798MV200_MDE2_BUS_CLK, "clk_mde2_bus", mde2_bus_mux_p, ARRAY_SIZE(mde2_bus_mux_p),
+ 0, 0x58, 8, 2, 0, mux_table_2bit_pattern1, },
+ { HI3798MV200_MDE3_BUS_CLK, "clk_mde3_bus", mde3_bus_mux_p, ARRAY_SIZE(mde3_bus_mux_p),
+ 0, 0x58, 10, 1, 0, mux_table_1bit, },
+ { HI3798MV200_MMC_MUX, "mmc_mux", mmc_mux_p, ARRAY_SIZE(mmc_mux_p),
+ 0, 0xa0, 8, 3, CLK_MUX_ROUND_CLOSEST, mmc_mux_table, },
+ { HI3798MV200_COMBPHY0_MUX, "combphy_mux", comphy_mux_p,
+ ARRAY_SIZE(comphy_mux_p), 0, 0x188, 3, 1, 0, mux_table_1bit, },
+ { HI3798MV200_SDIO0_MUX, "sdio0_mux", sdio_mux_p, ARRAY_SIZE(sdio_mux_p),
+ 0, 0x9c, 8, 2, CLK_MUX_ROUND_CLOSEST, sdio_mux_table, },
+ { HI3798MV200_SDIO1_MUX, "sdio1_mux", sdio_mux_p, ARRAY_SIZE(sdio_mux_p),
+ 0, 0x28c, 8, 2, CLK_MUX_ROUND_CLOSEST, sdio_mux_table, },
+ { HI3798MV200_FEMAC_MUX, "femac_mux", femac_mux_p, ARRAY_SIZE(femac_mux_p),
+ 0, 0xd0, 2, 1, 0, mux_table_1bit, },
+ { HI3798MV200_GMAC_MUX, "gmac_mux", gmac_mux_p, ARRAY_SIZE(gmac_mux_p),
+ 0, 0xcc, 7, 1, 0, mux_table_1bit, },
+ { HI3798MV200_EXT_NETPHY_CLK, "ext_netphy_mux", ext_netphy_mux_p, ARRAY_SIZE(ext_netphy_mux_p),
+ 0, 0xcc, 6, 1, 0, mux_table_1bit, },
+};
+
+static u32 mmc_phase_regvals[] = {0, 1, 2, 3, 4, 5, 6, 7};
+static u32 mmc_phase_degrees[] = {0, 45, 90, 135, 180, 225, 270, 315};
+
+static struct hisi_phase_clock hi3798mv200_phase_clks[] = {
+ { HI3798MV200_SDIO0_SAMPLE_CLK, "sdio0_sample", "clk_sdio0_ciu",
+ 0, 0x9c, 12, 3, mmc_phase_degrees,
+ mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) },
+ { HI3798MV200_SDIO0_DRV_CLK, "sdio0_drive", "clk_sdio0_ciu",
+ 0, 0x9c, 16, 3, mmc_phase_degrees,
+ mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) },
+ { HI3798MV200_SDIO1_SAMPLE_CLK, "sdio1_sample", "clk_sdio1_ciu",
+ 0, 0x28c, 12, 3, mmc_phase_degrees,
+ mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) },
+ { HI3798MV200_SDIO1_DRV_CLK, "sdio1_drive", "clk_sdio1_ciu",
+ 0, 0x28c, 16, 3, mmc_phase_degrees,
+ mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) },
+ { HI3798MV200_MMC_SAMPLE_CLK, "mmc_sample", "clk_mmc_ciu",
+ 0, 0xa0, 12, 3, mmc_phase_degrees,
+ mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) },
+ { HI3798MV200_MMC_DRV_CLK, "mmc_drive", "clk_mmc_ciu",
+ 0, 0xa0, 16, 3, mmc_phase_degrees,
+ mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) },
+};
+
+static const struct hisi_gate_clock hi3798mv200_gate_clks[] = {
+ /* UART */
+ { HI3798MV200_UART2_CLK, "clk_uart2", "75m",
+ CLK_SET_RATE_PARENT, 0x68, 4, 0, },
+ { HI3798MV200_UART3_CLK, "clk_uart3", "75m",
+ CLK_SET_RATE_PARENT, 0x68, 6, 0, },
+ /* I2C */
+ { HI3798MV200_I2C0_CLK, "clk_i2c0", "clk_apb",
+ CLK_SET_RATE_PARENT, 0x6c, 4, 0, },
+ { HI3798MV200_I2C1_CLK, "clk_i2c1", "clk_apb",
+ CLK_SET_RATE_PARENT, 0x6c, 8, 0, },
+ { HI3798MV200_I2C2_CLK, "clk_i2c2", "clk_apb",
+ CLK_SET_RATE_PARENT, 0x6c, 12, 0, },
+ /* SPI */
+ { HI3798MV200_SPI0_CLK, "clk_spi0", "clk_apb",
+ CLK_SET_RATE_PARENT, 0x70, 0, 0, },
+ /* SCI */
+ { HI3798MV200_SCI0_CLK, "clk_sci0", "clk_apb",
+ CLK_SET_RATE_PARENT, 0x74, 0, 0, },
+ { HI3798MV200_SCI1_CLK, "clk_sci1", "clk_apb",
+ CLK_SET_RATE_PARENT, 0x74, 2, 0, },
+ /* SDIO */
+ { HI3798MV200_SDIO0_BIU_CLK, "clk_sdio0_biu", "clk_ahb",
+ CLK_SET_RATE_PARENT, 0x9c, 0, 0, },
+ { HI3798MV200_SDIO0_CIU_CLK, "clk_sdio0_ciu", "sdio0_mux",
+ CLK_SET_RATE_PARENT, 0x9c, 1, 0, },
+ { HI3798MV200_SDIO1_BIU_CLK, "clk_sdio1_biu", "clk_ahb",
+ CLK_SET_RATE_PARENT, 0x28c, 0, 0, },
+ { HI3798MV200_SDIO1_CIU_CLK, "clk_sdio1_ciu", "sdio1_mux",
+ CLK_SET_RATE_PARENT, 0x28c, 1, 0, },
+ /* EMMC */
+ { HI3798MV200_MMC_BIU_CLK, "clk_mmc_biu", "clk_ahb",
+ CLK_SET_RATE_PARENT, 0xa0, 0, 0, },
+ { HI3798MV200_MMC_CIU_CLK, "clk_mmc_ciu", "mmc_mux",
+ CLK_SET_RATE_PARENT, 0xa0, 1, 0, },
+ /* Ethernet */
+ { HI3798MV200_GMAC_CLK, "clk_gmac", "gmac_mux",
+ CLK_SET_RATE_PARENT, 0xcc, 2, 0, },
+ { HI3798MV200_GSF_CLK, "clk_gmacif", "clk_ahb",
+ CLK_SET_RATE_PARENT, 0xcc, 0, 0, },
+ { HI3798MV200_ETH_CLK, "clk_femac", "femac_mux",
+ CLK_SET_RATE_PARENT, 0xd0, 1, 0, },
+ { HI3798MV200_ETH_BUS_CLK, "clk_femacif", "clk_ahb",
+ CLK_SET_RATE_PARENT, 0xd0, 0, 0, },
+ { HI3798MV200_FEPHY_CLK, "clk_fephy", "25m",
+ CLK_SET_RATE_PARENT, 0x388, 0, 0, },
+ /* COMBPHY */
+ { HI3798MV200_COMBPHY_CLK, "clk_combphy", "combphy_mux",
+ CLK_SET_RATE_PARENT, 0x188, 0, 0, },
+ /* USB2 */
+ { HI3798MV200_USB2_BUS_CLK, "clk_u2_bus", "clk_ahb",
+ CLK_SET_RATE_PARENT, 0xb8, 0, 0, },
+ { HI3798MV200_USB2_HST_PHY_CLK, "clk_u2_phy", "60m",
+ CLK_SET_RATE_PARENT, 0xb8, 4, 0, },
+ { HI3798MV200_USB2_12M_CLK, "clk_u2_12m", "12m",
+ CLK_SET_RATE_PARENT, 0xb8, 2, 0 },
+ { HI3798MV200_USB2_48M_CLK, "clk_u2_48m", "48m",
+ CLK_SET_RATE_PARENT, 0xb8, 1, 0 },
+ { HI3798MV200_USB2_UTMI0_CLK, "clk_u2_utmi0", "60m",
+ CLK_SET_RATE_PARENT, 0xb8, 5, 0 },
+ { HI3798MV200_USB2_UTMI1_CLK, "clk_u2_utmi1", "60m",
+ CLK_SET_RATE_PARENT, 0xb8, 6, 0 },
+ { HI3798MV200_USB2_OTG_UTMI_CLK, "clk_u2_otg_utmi", "60m",
+ CLK_SET_RATE_PARENT, 0xb8, 3, 0 },
+ { HI3798MV200_USB2_PHY1_REF_CLK, "clk_u2_phy1_ref", "24m",
+ CLK_SET_RATE_PARENT, 0xbc, 0, 0 },
+ { HI3798MV200_USB2_PHY2_REF_CLK, "clk_u2_phy2_ref", "24m",
+ CLK_SET_RATE_PARENT, 0xbc, 2, 0 },
+ /* USB3 bus */
+ { HI3798MV200_USB3_GM_CLK, "clk_u3_gm", "clk_ahb",
+ CLK_SET_RATE_PARENT, 0xb0, 6, 0 },
+ { HI3798MV200_USB3_GS_CLK, "clk_u3_gs", "clk_ahb",
+ CLK_SET_RATE_PARENT, 0xb0, 5, 0 },
+ { HI3798MV200_USB3_BUS_CLK, "clk_u3_bus", "clk_ahb",
+ CLK_SET_RATE_PARENT, 0xb0, 0, 0 },
+ /* USB3 ctrl */
+ { HI3798MV200_USB3_SUSPEND_CLK, "clk_u3_suspend", NULL,
+ CLK_SET_RATE_PARENT, 0xb0, 2, 0 },
+ { HI3798MV200_USB3_PIPE_CLK, "clk_u3_pipe", NULL,
+ CLK_SET_RATE_PARENT, 0xb0, 3, 0 },
+ { HI3798MV200_USB3_REF_CLK, "clk_u3_ref", "125m",
+ CLK_SET_RATE_PARENT, 0xb0, 1, 0 },
+ { HI3798MV200_USB3_UTMI_CLK, "clk_u3_utmi", "60m",
+ CLK_SET_RATE_PARENT, 0xb0, 4, 0 },
+ /* Watchdog */
+ { HI3798MV200_WDG0_CLK, "clk_wdg0", "clk_osc",
+ CLK_SET_RATE_PARENT, 0x178, 0, 0 },
+};
+
+static struct hisi_clock_data *hi3798mv200_clk_register(
+ struct platform_device *pdev)
+{
+ struct hisi_clock_data *clk_data;
+ int ret;
+
+ clk_data = hisi_clk_alloc(pdev, HI3798MV200_CRG_NR_CLKS);
+ if (!clk_data)
+ return ERR_PTR(-ENOMEM);
+
+ /* hisi_phase_clock is resource managed */
+ ret = hisi_clk_register_phase(&pdev->dev,
+ hi3798mv200_phase_clks,
+ ARRAY_SIZE(hi3798mv200_phase_clks),
+ clk_data);
+ if (ret)
+ return ERR_PTR(ret);
+
+ ret = hisi_clk_register_fixed_rate(hi3798mv200_fixed_rate_clks,
+ ARRAY_SIZE(hi3798mv200_fixed_rate_clks),
+ clk_data);
+ if (ret)
+ return ERR_PTR(ret);
+
+ ret = hisi_clk_register_mux(hi3798mv200_mux_clks,
+ ARRAY_SIZE(hi3798mv200_mux_clks),
+ clk_data);
+ if (ret)
+ goto unregister_fixed_rate;
+
+ ret = hisi_clk_register_gate(hi3798mv200_gate_clks,
+ ARRAY_SIZE(hi3798mv200_gate_clks),
+ clk_data);
+ if (ret)
+ goto unregister_mux;
+
+ ret = of_clk_add_provider(pdev->dev.of_node,
+ of_clk_src_onecell_get, &clk_data->clk_data);
+ if (ret)
+ goto unregister_gate;
+
+ return clk_data;
+
+unregister_gate:
+ hisi_clk_unregister_gate(hi3798mv200_gate_clks,
+ ARRAY_SIZE(hi3798mv200_gate_clks),
+ clk_data);
+unregister_mux:
+ hisi_clk_unregister_mux(hi3798mv200_mux_clks,
+ ARRAY_SIZE(hi3798mv200_mux_clks),
+ clk_data);
+unregister_fixed_rate:
+ hisi_clk_unregister_fixed_rate(hi3798mv200_fixed_rate_clks,
+ ARRAY_SIZE(hi3798mv200_fixed_rate_clks),
+ clk_data);
+ return ERR_PTR(ret);
+}
+
+static void hi3798mv200_clk_unregister(struct platform_device *pdev)
+{
+ struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
+
+ of_clk_del_provider(pdev->dev.of_node);
+
+ hisi_clk_unregister_gate(hi3798mv200_gate_clks,
+ ARRAY_SIZE(hi3798mv200_gate_clks),
+ crg->clk_data);
+ hisi_clk_unregister_mux(hi3798mv200_mux_clks,
+ ARRAY_SIZE(hi3798mv200_mux_clks),
+ crg->clk_data);
+ hisi_clk_unregister_fixed_rate(hi3798mv200_fixed_rate_clks,
+ ARRAY_SIZE(hi3798mv200_fixed_rate_clks),
+ crg->clk_data);
+}
+
+static const struct hisi_crg_funcs hi3798mv200_crg_funcs = {
+ .register_clks = hi3798mv200_clk_register,
+ .unregister_clks = hi3798mv200_clk_unregister,
+};
+
+/* hi3798MV200 sysctrl CRG */
+
+enum hi3798mv200_sysctrl_inner_clk {
+ HI3798MV200_UART0_MUX = HI3798MV200_SYSCTRL_CLK_COUNT,
+
+ HI3798MV200_SYSCTRL_NR_CLKS
+};
+
+static const char *const uart0_mux_p[] = { "3m", "75m" };
+
+static const char *const mcu_bus_mux_p[] = { "24m", "200m", "6m" };
+
+static const struct hisi_mux_clock hi3798mv200_sysctrl_mux_clks[] = {
+ { HI3798MV200_UART0_MUX, "uart0_mux", uart0_mux_p, ARRAY_SIZE(uart0_mux_p),
+ CLK_SET_RATE_PARENT, 0x48, 29, 1, 0, mux_table_1bit, },
+ { HI3798MV200_MCU_BUS_CLK, "mcu_bus_mux", mcu_bus_mux_p, ARRAY_SIZE(mcu_bus_mux_p),
+ CLK_SET_RATE_PARENT, 0x0, 0, 2, 0, mux_table_2bit_pattern1, },
+};
+
+static const struct hisi_gate_clock hi3798mv200_sysctrl_gate_clks[] = {
+ { HI3798MV200_MCE_CLK, "clk_mce", "mcu_bus_mux",
+ CLK_SET_RATE_PARENT, 0x48, 0, 0, },
+ { HI3798MV200_IR_CLK, "clk_ir", "clk_osc",
+ CLK_SET_RATE_PARENT, 0x48, 4, 0, },
+ { HI3798MV200_TIMER01_CLK, "clk_timer01", "clk_osc",
+ CLK_SET_RATE_PARENT, 0x48, 6, 0, },
+ { HI3798MV200_UART0_CLK, "clk_uart0", "uart0_mux",
+ CLK_SET_RATE_PARENT, 0x48, 12, 0, },
+};
+
+static struct hisi_clock_data *hi3798mv200_sysctrl_clk_register(
+ struct platform_device *pdev)
+{
+ struct hisi_clock_data *clk_data;
+ int ret;
+
+ clk_data = hisi_clk_alloc(pdev, HI3798MV200_SYSCTRL_NR_CLKS);
+ if (!clk_data)
+ return ERR_PTR(-ENOMEM);
+
+ ret = hisi_clk_register_mux(hi3798mv200_sysctrl_mux_clks,
+ ARRAY_SIZE(hi3798mv200_sysctrl_mux_clks),
+ clk_data);
+ if (ret)
+ return ERR_PTR(ret);
+
+ ret = hisi_clk_register_gate(hi3798mv200_sysctrl_gate_clks,
+ ARRAY_SIZE(hi3798mv200_sysctrl_gate_clks),
+ clk_data);
+ if (ret)
+ goto unregister_mux;
+
+ ret = of_clk_add_provider(pdev->dev.of_node,
+ of_clk_src_onecell_get, &clk_data->clk_data);
+ if (ret)
+ goto unregister_gate;
+
+ return clk_data;
+
+unregister_gate:
+ hisi_clk_unregister_gate(hi3798mv200_sysctrl_gate_clks,
+ ARRAY_SIZE(hi3798mv200_sysctrl_gate_clks),
+ clk_data);
+unregister_mux:
+ hisi_clk_unregister_mux(hi3798mv200_sysctrl_mux_clks,
+ ARRAY_SIZE(hi3798mv200_sysctrl_mux_clks),
+ clk_data);
+ return ERR_PTR(ret);
+}
+
+static void hi3798mv200_sysctrl_clk_unregister(struct platform_device *pdev)
+{
+ struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
+
+ of_clk_del_provider(pdev->dev.of_node);
+
+ hisi_clk_unregister_gate(hi3798mv200_sysctrl_gate_clks,
+ ARRAY_SIZE(hi3798mv200_sysctrl_gate_clks),
+ crg->clk_data);
+ hisi_clk_unregister_mux(hi3798mv200_sysctrl_mux_clks,
+ ARRAY_SIZE(hi3798mv200_sysctrl_mux_clks),
+ crg->clk_data);
+}
+
+static const struct hisi_crg_funcs hi3798mv200_sysctrl_funcs = {
+ .register_clks = hi3798mv200_sysctrl_clk_register,
+ .unregister_clks = hi3798mv200_sysctrl_clk_unregister,
+};
+
+static const struct of_device_id hi3798mv200_crg_match_table[] = {
+ { .compatible = "hisilicon,hi3798mv200-crg",
+ .data = &hi3798mv200_crg_funcs },
+ { .compatible = "hisilicon,hi3798mv200-sysctrl",
+ .data = &hi3798mv200_sysctrl_funcs },
+ { }
+};
+MODULE_DEVICE_TABLE(of, hi3798mv200_crg_match_table);
+
+static int hi3798mv200_crg_probe(struct platform_device *pdev)
+{
+ struct hisi_crg_dev *crg;
+
+ crg = devm_kmalloc(&pdev->dev, sizeof(*crg), GFP_KERNEL);
+ if (!crg)
+ return -ENOMEM;
+
+ crg->funcs = of_device_get_match_data(&pdev->dev);
+ if (!crg->funcs)
+ return -ENOENT;
+
+ crg->rstc = hisi_reset_init(pdev);
+ if (!crg->rstc)
+ return -ENOMEM;
+
+ crg->clk_data = crg->funcs->register_clks(pdev);
+ if (IS_ERR(crg->clk_data)) {
+ hisi_reset_exit(crg->rstc);
+ return PTR_ERR(crg->clk_data);
+ }
+
+ platform_set_drvdata(pdev, crg);
+ return 0;
+}
+
+static int hi3798mv200_crg_remove(struct platform_device *pdev)
+{
+ struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
+
+ hisi_reset_exit(crg->rstc);
+ crg->funcs->unregister_clks(pdev);
+ return 0;
+}
+
+static struct platform_driver hi3798mv200_crg_driver = {
+ .probe = hi3798mv200_crg_probe,
+ .remove = hi3798mv200_crg_remove,
+ .driver = {
+ .name = "hi3798mv200-crg",
+ .of_match_table = hi3798mv200_crg_match_table,
+ },
+};
+
+static int __init hi3798mv200_crg_init(void)
+{
+ return platform_driver_register(&hi3798mv200_crg_driver);
+}
+core_initcall(hi3798mv200_crg_init);
+
+static void __exit hi3798mv200_crg_exit(void)
+{
+ platform_driver_unregister(&hi3798mv200_crg_driver);
+}
+module_exit(hi3798mv200_crg_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("HiSilicon Hi3798MV200 CRG Driver");
--
2.43.0
On 21/02/2024 17:41, Yang Xiwen via B4 Relay wrote:
> From: Yang Xiwen <[email protected]>
>
> The CRG driver between different SoCs provides different clocks and
> resets. We should not provide a generic header file across all HiSTB
> SoCs, instead each CRG driver should provide its own.
>
> Split histb-clock.h into two files: hisilicon,hi3798cv200-crg.h and
> hisilicon,hi3798cv200-sysctrl.h. This header file is for Hi3798CV200
> only actually. For other HiSTB SoCs, some clock definitions are missing.
>
> Create a new histb-clock.h to include these two files for backward
> compatibility only. Deprecate this file as well.
>
> Signed-off-by: Yang Xiwen <[email protected]>
> ---
> .../dt-bindings/clock/hisilicon,hi3798cv200-crg.h | 62 ++++++++++++++++++
> .../clock/hisilicon,hi3798cv200-sysctrl.h | 17 +++++
> include/dt-bindings/clock/histb-clock.h | 73 +++-------------------
> 3 files changed, 87 insertions(+), 65 deletions(-)
Acked-by: Krzysztof Kozlowski <[email protected]>
Best regards,
Krzysztof
On 21/02/2024 17:41, Yang Xiwen via B4 Relay wrote:
> From: Yang Xiwen <[email protected]>
>
> Add clock definitions for core CRG and mcu CRG for Hi3798MV200 SoC.
>
> Signed-off-by: Yang Xiwen <[email protected]>
> ---
> .../dt-bindings/clock/hisilicon,hi3798mv200-crg.h | 150 +++++++++++++++++++++
> .../clock/hisilicon,hi3798mv200-sysctrl.h | 21 +++
> 2 files changed, 171 insertions(+)
>
> diff --git a/include/dt-bindings/clock/hisilicon,hi3798mv200-crg.h b/include/dt-bindings/clock/hisilicon,hi3798mv200-crg.h
> new file mode 100644
> index 000000000000..bf6b6b855724
> --- /dev/null
> +++ b/include/dt-bindings/clock/hisilicon,hi3798mv200-crg.h
> @@ -0,0 +1,150 @@
> +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */
> +/*
> + * Copyright (c) 2024 Yang Xiwen <[email protected]>
> + */
> +
> +#ifndef __DTS_HI3798MV200_CRG_H
__DT_BINDINGS_CLOCK_HI3798MV200_CRG_H
That's not a DTS.
> +#define __DTS_HI3798MV200_CRG_H
> +
> +/* clocks provided by core CRG */
> +#define HI3798MV200_OSC_CLK 0
> +#define HI3798MV200_APB_CLK 1
> +#define HI3798MV200_AHB_CLK 2
> +#define HI3798MV200_APLL_CLK 3
> +#define HI3798MV200_BPLL_CLK 4
> +#define HI3798MV200_DPLL_CLK 5
> +#define HI3798MV200_VPLL_CLK 6
> +#define HI3798MV200_HPLL_CLK 7
> +#define HI3798MV200_EPLL_CLK 8
> +#define HI3798MV200_QPLL_CLK 9
> +#define HI3798MV200_PERI_DIV_CLK 10
> +#define HI3798MV200_CORE_BUS_CLK 11
> +#define HI3798MV200_MDE0_BUS_CLK 12
> +#define HI3798MV200_MDE1_BUS_CLK 13
> +#define HI3798MV200_MDE2_BUS_CLK 14
> +#define HI3798MV200_MDE3_BUS_CLK 15
> +/* UART1 does not exist */
> +#define HI3798MV200_UART2_CLK 16
> +#define HI3798MV200_UART3_CLK 17
> +#define HI3798MV200_I2C0_CLK 18
> +#define HI3798MV200_I2C1_CLK 19
> +#define HI3798MV200_I2C2_CLK 20
> +#define HI3798MV200_SPI0_CLK 21
> +#define HI3798MV200_SCI0_CLK 22
> +#define HI3798MV200_SCI1_CLK 23
> +#define HI3798MV200_VDH_CLK 24
> +#define HI3798MV200_VDH_DSP_CLK 25
You have mixed/mess indentation.
> +#define HI3798MV200_JPGD_CLK 26
> +#define HI3798MV200_PGD_CLK 27
Best regards,
Krzysztof
On 2/23/2024 2:11 AM, Krzysztof Kozlowski wrote:
> On 21/02/2024 17:41, Yang Xiwen via B4 Relay wrote:
>> From: Yang Xiwen <[email protected]>
>>
>> The CRG driver between different SoCs provides different clocks and
>> resets. We should not provide a generic header file across all HiSTB
>> SoCs, instead each CRG driver should provide its own.
>>
>> Split histb-clock.h into two files: hisilicon,hi3798cv200-crg.h and
>> hisilicon,hi3798cv200-sysctrl.h. This header file is for Hi3798CV200
>> only actually. For other HiSTB SoCs, some clock definitions are missing.
>>
>> Create a new histb-clock.h to include these two files for backward
>> compatibility only. Deprecate this file as well.
>>
>> Signed-off-by: Yang Xiwen <[email protected]>
>> ---
>> .../dt-bindings/clock/hisilicon,hi3798cv200-crg.h | 62 ++++++++++++++++++
>> .../clock/hisilicon,hi3798cv200-sysctrl.h | 17 +++++
>> include/dt-bindings/clock/histb-clock.h | 73 +++-------------------
>> 3 files changed, 87 insertions(+), 65 deletions(-)
Should I fix the #ifndef #define #endif stuffs here? i.e. s/DTS/DT_BINDING
> Acked-by: Krzysztof Kozlowski <[email protected]>
>
> Best regards,
> Krzysztof
>
--
Regards,
Yang Xiwen
On 21/02/2024 17:41, Yang Xiwen via B4 Relay wrote:
> +#endif /* __DTS_HI3798CV200_SYSCTRL_H */
> diff --git a/include/dt-bindings/clock/histb-clock.h b/include/dt-bindings/clock/histb-clock.h
> index e64e5770ada6..56b39eb99d2c 100644
> --- a/include/dt-bindings/clock/histb-clock.h
> +++ b/include/dt-bindings/clock/histb-clock.h
> @@ -1,70 +1,13 @@
> /* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> - * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
> + * DEPRECATED
> + *
> + * Each CRG driver should have its own clock number definitions header file.
> + * This file is only reserved for backward compatibility for Hi3798CV200
> */
>
> -#ifndef __DTS_HISTB_CLOCK_H
> -#define __DTS_HISTB_CLOCK_H
These should stay.
Best regards,
Krzysztof
On 22/02/2024 19:15, Yang Xiwen wrote:
> On 2/23/2024 2:11 AM, Krzysztof Kozlowski wrote:
>> On 21/02/2024 17:41, Yang Xiwen via B4 Relay wrote:
>>> From: Yang Xiwen <[email protected]>
>>>
>>> The CRG driver between different SoCs provides different clocks and
>>> resets. We should not provide a generic header file across all HiSTB
>>> SoCs, instead each CRG driver should provide its own.
>>>
>>> Split histb-clock.h into two files: hisilicon,hi3798cv200-crg.h and
>>> hisilicon,hi3798cv200-sysctrl.h. This header file is for Hi3798CV200
>>> only actually. For other HiSTB SoCs, some clock definitions are missing.
>>>
>>> Create a new histb-clock.h to include these two files for backward
>>> compatibility only. Deprecate this file as well.
>>>
>>> Signed-off-by: Yang Xiwen <[email protected]>
>>> ---
>>> .../dt-bindings/clock/hisilicon,hi3798cv200-crg.h | 62 ++++++++++++++++++
>>> .../clock/hisilicon,hi3798cv200-sysctrl.h | 17 +++++
>>> include/dt-bindings/clock/histb-clock.h | 73 +++-------------------
>>> 3 files changed, 87 insertions(+), 65 deletions(-)
>
>
> Should I fix the #ifndef #define #endif stuffs here? i.e. s/DTS/DT_BINDING
I would not care. But new files could be correct.
Best regards,
Krzysztof