* Re: [PATCH RFC 1/8] dt-bindings: clk: sun60i-a733-ccu: Add allwinner A733 support [not found] ` <20260310-a733-clk-v1-1-36b4e9b24457@pigmoral.tech> @ 2026-03-28 12:07 ` Chen-Yu Tsai 0 siblings, 0 replies; 6+ messages in thread From: Chen-Yu Tsai @ 2026-03-28 12:07 UTC (permalink / raw) To: Junhui Liu Cc: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Jernej Skrabec, Samuel Holland, Philipp Zabel, Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti, Richard Cochran, linux-clk, devicetree, linux-arm-kernel, linux-sunxi, linux-kernel, linux-riscv, netdev On Tue, Mar 10, 2026 at 4:42 PM Junhui Liu <junhui.liu@pigmoral.tech> wrote: > > The CCU and R-CCU (PRCM) modules provide clocks and reset functions for > the Allwinner A733 SoC. The clock architecture of the A733 is evolved > from the A523, though the root clocking strategy transitions from a > static oscillator frequency in the Devicetree to the "hosc" clock, which > is determined by choosing from three possible frequencies (19.2MHz, > 24MHz, or 26MHz) by the RTC hardware, and finally feeds the CCU and > R-CCU. > > Additionally, the MCU_CCU module found in previous designs is removed > from the A733, and the clock tree is expanded with more clock outputs > to support new functional modules. > > Signed-off-by: Junhui Liu <junhui.liu@pigmoral.tech> > --- > .../bindings/clock/allwinner,sun60i-a733-ccu.yaml | 107 ++++++++ > include/dt-bindings/clock/sun60i-a733-ccu.h | 289 +++++++++++++++++++++ > include/dt-bindings/clock/sun60i-a733-r-ccu.h | 39 +++ > include/dt-bindings/reset/sun60i-a733-ccu.h | 131 ++++++++++ > include/dt-bindings/reset/sun60i-a733-r-ccu.h | 23 ++ > 5 files changed, 589 insertions(+) > > diff --git a/Documentation/devicetree/bindings/clock/allwinner,sun60i-a733-ccu.yaml b/Documentation/devicetree/bindings/clock/allwinner,sun60i-a733-ccu.yaml > new file mode 100644 > index 000000000000..aff3ff731285 > --- /dev/null > +++ b/Documentation/devicetree/bindings/clock/allwinner,sun60i-a733-ccu.yaml > @@ -0,0 +1,107 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/clock/allwinner,sun60i-a733-ccu.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Allwinner A733 Clock Control Unit > + > +maintainers: > + - Junhui Liu <junhui.liu@pigmoral.tech> > + > +properties: > + "#clock-cells": > + const: 1 > + > + "#reset-cells": > + const: 1 > + > + compatible: > + enum: > + - allwinner,sun60i-a733-ccu > + - allwinner,sun60i-a733-r-ccu > + > + reg: > + maxItems: 1 > + > + clocks: > + minItems: 4 > + maxItems: 7 > + > + clock-names: > + minItems: 4 > + maxItems: 7 > + > +required: > + - "#clock-cells" > + - "#reset-cells" > + - compatible > + - reg > + - clocks > + - clock-names > + > +allOf: > + - if: > + properties: > + compatible: > + enum: > + - allwinner,sun60i-a733-ccu > + > + then: > + properties: > + clocks: > + items: > + - description: High Frequency Oscillator (19.2MHz, 24MHz, or 26MHz) > + - description: Low Frequency Oscillator (usually at 32kHz) > + - description: Internal Oscillator > + - description: Low Frequency Oscillator fanout > + > + clock-names: > + items: > + - const: hosc > + - const: losc > + - const: iosc > + - const: losc-fanout > + > + - if: > + properties: > + compatible: > + enum: > + - allwinner,sun60i-a733-r-ccu > + > + then: > + properties: > + clocks: > + items: > + - description: High Frequency Oscillator (19.2MHz, 24MHz, or 26MHz) > + - description: Low Frequency Oscillator (usually at 32kHz) > + - description: Internal Oscillator > + - description: System 24MHz Clock > + - description: Peripherals PLL 0 (200 MHz output) > + - description: Peripherals PLL 0 (300 MHz output) > + - description: Peripherals PLL 1 (300 MHz output) > + > + clock-names: > + items: > + - const: hosc > + - const: losc > + - const: iosc > + - const: sys-24m > + - const: pll-periph0-200m > + - const: pll-periph0-300m > + - const: pll-periph1-300m > + > +additionalProperties: false > + > +examples: > + - | > + clock-controller@2002000 { > + compatible = "allwinner,sun60i-a733-ccu"; > + reg = <0x02002000 0x2000>; > + clocks = <&rtc 2>, <&rtc 1>, <&rtc 0>, <&rtc 4>; > + clock-names = "hosc", "losc", "iosc", "losc-fanout"; > + #clock-cells = <1>; > + #reset-cells = <1>; > + }; > + > +... This part looks correct. > diff --git a/include/dt-bindings/clock/sun60i-a733-ccu.h b/include/dt-bindings/clock/sun60i-a733-ccu.h > new file mode 100644 > index 000000000000..1a98bea8ca9a > --- /dev/null > +++ b/include/dt-bindings/clock/sun60i-a733-ccu.h > @@ -0,0 +1,289 @@ > +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ > +/* > + * Copyright (C) 2026 Junhui Liu <junhui.liu@pigmoral.tech> > + */ > + > +#ifndef _DT_BINDINGS_CLK_SUN60I_A733_CCU_H_ > +#define _DT_BINDINGS_CLK_SUN60I_A733_CCU_H_ > + > +#define CLK_PLL_REF 0 > +#define CLK_SYS_24M 1 > +#define CLK_PLL_DDR 2 > +#define CLK_PLL_PERIPH0_4X 3 > +#define CLK_PLL_PERIPH0_2X 4 > +#define CLK_PLL_PERIPH0_800M 5 > +#define CLK_PLL_PERIPH0_480M 6 > +#define CLK_PLL_PERIPH0_600M 7 > +#define CLK_PLL_PERIPH0_400M 8 > +#define CLK_PLL_PERIPH0_300M 9 > +#define CLK_PLL_PERIPH0_200M 10 > +#define CLK_PLL_PERIPH0_160M 11 > +#define CLK_PLL_PERIPH0_150M 12 > +#define CLK_PLL_PERIPH1_4X 13 > +#define CLK_PLL_PERIPH1_2X 14 > +#define CLK_PLL_PERIPH1_800M 15 > +#define CLK_PLL_PERIPH1_480M 16 > +#define CLK_PLL_PERIPH1_600M 17 > +#define CLK_PLL_PERIPH1_400M 18 > +#define CLK_PLL_PERIPH1_300M 19 > +#define CLK_PLL_PERIPH1_200M 20 > +#define CLK_PLL_PERIPH1_160M 21 > +#define CLK_PLL_PERIPH1_150M 22 > +#define CLK_PLL_GPU 23 Please keep the unit number even if there is only one instance. This is PLL_GPU0. > +#define CLK_PLL_VIDEO0_8X 24 If this is the common parent for the 4X and 3X dividers, shouldn't it be 12X? > +#define CLK_PLL_VIDEO0_4X 25 > +#define CLK_PLL_VIDEO0_3X 26 > +#define CLK_PLL_VIDEO1_8X 27 Same here. > +#define CLK_PLL_VIDEO1_4X 28 > +#define CLK_PLL_VIDEO1_3X 29 > +#define CLK_PLL_VIDEO2_8X 30 And here. > +#define CLK_PLL_VIDEO2_4X 31 > +#define CLK_PLL_VIDEO2_3X 32 > +#define CLK_PLL_VE0 33 > +#define CLK_PLL_VE1 34 > +#define CLK_PLL_AUDIO0_4X 35 > +#define CLK_PLL_AUDIO1 36 > +#define CLK_PLL_AUDIO1_DIV2 37 > +#define CLK_PLL_AUDIO1_DIV5 38 > +#define CLK_PLL_NPU 39 > +#define CLK_PLL_DE 40 Should be DE_12X? > +#define CLK_PLL_DE_4X 41 > +#define CLK_PLL_DE_3X 42 > +#define CLK_AHB 43 > +#define CLK_APB0 44 > +#define CLK_APB1 45 > +#define CLK_APB_UART 46 > +#define CLK_TRACE 47 > +#define CLK_GIC 48 > +#define CLK_CPU_PERI 49 > +#define CLK_BUS_ITS_PCIE 50 Please preserve the _ACLK suffix. Please keep the unit number even if there is only one instance. Basically, use the naming from the user manual. This is ITS0. > +#define CLK_NSI 51 > +#define CLK_BUS_NSI 52 CLK_BUS_NSI_CFG > +#define CLK_MBUS 53 > +#define CLK_MBUS_IOMMU0_SYS 54 > +#define CLK_APB_IOMMU0_SYS 55 > +#define CLK_AHB_IOMMU0_SYS 56 Please add a comment at the top describing the renaming to let the reader know how to search for the in the user manual. PCLK -> APB HCLK -> AHB MCLK -> MBUS And that the bus name was moved from the end of the name to the front. > +#define CLK_BUS_MSI_LITE0 57 > +#define CLK_BUS_MSI_LITE1 58 > +#define CLK_BUS_MSI_LITE2 59 > +#define CLK_MBUS_IOMMU1_SYS 60 > +#define CLK_APB_IOMMU1_SYS 61 > +#define CLK_AHB_IOMMU1_SYS 62 > +#define CLK_AHB_VE_DEC 63 > +#define CLK_AHB_VE_ENC 64 > +#define CLK_AHB_VID_IN 65 > +#define CLK_AHB_VID_COUT0 66 > +#define CLK_AHB_VID_COUT1 67 > +#define CLK_AHB_DE 68 > +#define CLK_AHB_NPU 69 > +#define CLK_AHB_GPU0 70 > +#define CLK_AHB_SERDES 71 > +#define CLK_AHB_USB_SYS 72 > +#define CLK_AHB_MSI_LITE0 73 > +#define CLK_AHB_STORE 74 > +#define CLK_AHB_CPUS 75 > +#define CLK_MBUS_IOMMU0 76 > +#define CLK_MBUS_IOMMU1 77 > +#define CLK_MBUS_DESYS 78 > +#define CLK_MBUS_VE_ENC_GATE 79 Please keep the unit number even if there is only one instance. This is VE_ENC0. > +#define CLK_MBUS_VE_DEC_GATE 80 > +#define CLK_MBUS_GPU0 81 > +#define CLK_MBUS_NPU 82 > +#define CLK_MBUS_VID_IN 83 > +#define CLK_MBUS_SERDES 84 > +#define CLK_MBUS_MSI_LITE0 85 > +#define CLK_MBUS_STORE 86 > +#define CLK_MBUS_MSI_LITE2 87 > +#define CLK_MBUS_DMA0 88 > +#define CLK_MBUS_VE_ENC 89 > +#define CLK_MBUS_CE 90 > +#define CLK_MBUS_DMA1 91 > +#define CLK_MBUS_NAND 92 > +#define CLK_MBUS_CSI 93 > +#define CLK_MBUS_ISP 94 > +#define CLK_MBUS_GMAC0 95 > +#define CLK_MBUS_GMAC1 96 There is no GMAC1 in the A733 user manual v0.92. Please add a note about where this came from. > +#define CLK_MBUS_VE_DEC 97 > +#define CLK_BUS_DMA0 98 > +#define CLK_BUS_DMA1 99 > +#define CLK_BUS_SPINLOCK 100 > +#define CLK_BUS_MSGBOX 101 Please keep the unit number even if there is only one instance. This is MSGBOX0. > +#define CLK_BUS_PWM0 102 > +#define CLK_BUS_PWM1 103 > +#define CLK_BUS_DBG 104 > +#define CLK_BUS_SYSDAP 105 > +#define CLK_TIMER0 106 > +#define CLK_TIMER1 107 > +#define CLK_TIMER2 108 > +#define CLK_TIMER3 109 > +#define CLK_TIMER4 110 > +#define CLK_TIMER5 111 > +#define CLK_TIMER6 112 > +#define CLK_TIMER7 113 > +#define CLK_TIMER8 114 > +#define CLK_TIMER9 115 > +#define CLK_BUS_TIMER 116 > +#define CLK_AVS 117 There is no AVS in the A733 user manual v0.92. Please add a note about where this came from. > +#define CLK_DE 118 Please keep the unit number even if there is only one instance. This is DE0. > +#define CLK_BUS_DE 119 Same here. > +#define CLK_DI 120 > +#define CLK_BUS_DI 121 > +#define CLK_G2D 122 > +#define CLK_BUS_G2D 123 > +#define CLK_EINK 124 > +#define CLK_EINK_PANEL 125 > +#define CLK_BUS_EINK 126 > +#define CLK_VE_ENC 127 Please keep the unit number even if there is only one instance. This is VE_ENC0. > +#define CLK_VE_DEC 128 > +#define CLK_BUS_VE_ENC 129 Same here. > +#define CLK_BUS_VE_DEC 130 > +#define CLK_CE 131 > +#define CLK_BUS_CE 132 > +#define CLK_BUS_CE_SYS 133 > +#define CLK_NPU 134 > +#define CLK_BUS_NPU 135 > +#define CLK_GPU 136 > +#define CLK_BUS_GPU 137 Please keep the unit number even if there is only one instance. This is GPU0. > +#define CLK_DRAM 138 > +#define CLK_BUS_DRAM 139 This is DRAM0. > +#define CLK_NAND0 140 CLK_NAND0_CLK0 > +#define CLK_NAND1 141 CLK_NAND0_CLK1 > +#define CLK_BUS_NAND 142 CLK_BUS_NAND0 > +#define CLK_MMC0 143 > +#define CLK_MMC1 144 > +#define CLK_MMC2 145 > +#define CLK_MMC3 146 > +#define CLK_BUS_MMC0 147 > +#define CLK_BUS_MMC1 148 > +#define CLK_BUS_MMC2 149 > +#define CLK_BUS_MMC3 150 The ordering is wrong. The module clocks and bus clocks are interleaved. MMC0, BUS_MMC0, MMC1, BUS_MMC1, ... > +#define CLK_UFS_AXI 151 > +#define CLK_UFS_CFG 152 > +#define CLK_BUS_UFS 153 > +#define CLK_BUS_UART0 154 > +#define CLK_BUS_UART1 155 > +#define CLK_BUS_UART2 156 > +#define CLK_BUS_UART3 157 > +#define CLK_BUS_UART4 158 > +#define CLK_BUS_UART5 159 > +#define CLK_BUS_UART6 160 > +#define CLK_BUS_I2C0 161 > +#define CLK_BUS_I2C1 162 > +#define CLK_BUS_I2C2 163 > +#define CLK_BUS_I2C3 164 > +#define CLK_BUS_I2C4 165 > +#define CLK_BUS_I2C5 166 > +#define CLK_BUS_I2C6 167 > +#define CLK_BUS_I2C7 168 > +#define CLK_BUS_I2C8 169 > +#define CLK_BUS_I2C9 170 > +#define CLK_BUS_I2C10 171 > +#define CLK_BUS_I2C11 172 > +#define CLK_BUS_I2C12 173 > +#define CLK_SPI0 174 > +#define CLK_SPI1 175 > +#define CLK_SPI2 176 > +#define CLK_SPI3 177 > +#define CLK_SPI4 178 > +#define CLK_BUS_SPI0 179 > +#define CLK_BUS_SPI1 180 > +#define CLK_BUS_SPI2 181 > +#define CLK_BUS_SPI3 182 > +#define CLK_BUS_SPI4 183 Same as MMC ones, SPI module clocks and bus clocks are interleaved. The user manual doesn't show SPI4. Please add a note saying where the information is from. > +#define CLK_SPIF 184 > +#define CLK_BUS_SPIF 185 SPIF comes before SPI3. Please keep the ordering based on the registers. > +#define CLK_GPADC 186 CLK_GPADC_24M > +#define CLK_BUS_GPADC 187 CLK_BUS_GPADC0 > +#define CLK_BUS_THS 188 CLK_BUS_THS0 > +#define CLK_IRRX 189 > +#define CLK_BUS_IRRX 190 > +#define CLK_IRTX 191 > +#define CLK_BUS_IRTX 192 > +#define CLK_BUS_LRADC 193 > +#define CLK_SGPIO 194 > +#define CLK_BUS_SGPIO 195 > +#define CLK_LPC 196 > +#define CLK_BUS_LPC 197 These aren't found in the user manual. Please document where they were found. > +#define CLK_I2SPCM0 198 > +#define CLK_I2SPCM1 199 > +#define CLK_I2SPCM2 200 > +#define CLK_I2SPCM3 201 > +#define CLK_I2SPCM4 202 > +#define CLK_BUS_I2SPCM0 203 > +#define CLK_BUS_I2SPCM1 204 > +#define CLK_BUS_I2SPCM2 205 > +#define CLK_BUS_I2SPCM3 206 > +#define CLK_BUS_I2SPCM4 207 Module clocks and bus clocks are interleaved. > +#define CLK_I2SPCM2_ASRC 208 This would come before BUS_I2SPCM2. > +#define CLK_OWA_TX 209 > +#define CLK_OWA_RX 210 > +#define CLK_BUS_OWA 211 s/OWA/SPDIF/ > +#define CLK_DMIC 212 > +#define CLK_BUS_DMIC 213 > +#define CLK_USB_OHCI0 214 > +#define CLK_BUS_OTG 215 > +#define CLK_BUS_EHCI0 216 > +#define CLK_BUS_OHCI0 217 Order should be OHCI0 -> EHCI0 -> OTG > +#define CLK_USB_OHCI1 218 > +#define CLK_BUS_EHCI1 219 > +#define CLK_BUS_OHCI1 220 OHCI1, then EHCI1. > +#define CLK_USB_REF 221 USB01_REF to keep the numbering but keeping it short. > +#define CLK_USB2_U2_REF 222 > +#define CLK_USB2_SUSPEND 223 > +#define CLK_USB2_MF 224 > +#define CLK_USB2_U3_UTMI 225 > +#define CLK_USB2_U2_PIPE 226 Side-note: I think the manual got this reversed, since UTMI is used for USB 2.0, while PIPE is used for USB 3.0. But we will stick to whatever the user manual says. > +#define CLK_PCIE_AUX 227 > +#define CLK_PCIE_AXI_SLV 228 > +#define CLK_SERDES_PHY 229 > +#define CLK_GMAC_PTP 230 > +#define CLK_GMAC0_PHY 231 > +#define CLK_GMAC1_PHY 232 > +#define CLK_BUS_GMAC0 233 Based on your driver, BUS_GMAC0 should come before GMAC1_PHY. > +#define CLK_BUS_GMAC1 234 There is no GMAC1 mentioned in the A733 manual. Please document where you found this. > +#define CLK_TCON_LCD0 235 > +#define CLK_TCON_LCD1 236 > +#define CLK_TCON_LCD2 237 > +#define CLK_BUS_TCON_LCD0 238 > +#define CLK_BUS_TCON_LCD1 239 > +#define CLK_BUS_TCON_LCD2 240 Module clocks are interleaved with bus clock gates. > +#define CLK_DSI0 241 > +#define CLK_DSI1 242 > +#define CLK_BUS_DSI0 243 > +#define CLK_BUS_DSI1 244 Same for DSI. > +#define CLK_COMBPHY0 245 > +#define CLK_COMBPHY1 246 > +#define CLK_BUS_TCON_TV0 247 > +#define CLK_BUS_TCON_TV1 248 > +#define CLK_EDP_TV 249 > +#define CLK_BUS_EDP_TV 250 > +#define CLK_HDMI_CEC_32K 251 > +#define CLK_HDMI_CEC 252 > +#define CLK_HDMI_TV 253 > +#define CLK_BUS_HDMI_TV 254 > +#define CLK_HDMI_SFR 255 > +#define CLK_HDMI_ESM 256 HDCP_ESM. > +#define CLK_BUS_DPSS_TOP0 257 > +#define CLK_BUS_DPSS_TOP1 258 > +#define CLK_LEDC 259 > +#define CLK_BUS_LEDC 260 > +#define CLK_BUS_DSC 261 > +#define CLK_CSI_MASTER0 262 > +#define CLK_CSI_MASTER1 263 > +#define CLK_CSI_MASTER2 264 > +#define CLK_CSI 265 > +#define CLK_BUS_CSI 266 > +#define CLK_ISP 267 I guess we don't need to add any of the PLL output gates since they are auto-gated? Also, there is a RES_DCAP_24M_GATE at 0x1a00. Any idea about this one? > +#define CLK_APB2JTAG 268 > +#define CLK_FANOUT_24M 269 > +#define CLK_FANOUT_12M 270 > +#define CLK_FANOUT_16M 271 > +#define CLK_FANOUT_25M 272 > +#define CLK_FANOUT_27M 273 > +#define CLK_FANOUT_PCLK 274 > +#define CLK_FANOUT0 275 > +#define CLK_FANOUT1 276 > +#define CLK_FANOUT2 277 > +#define CLK_FANOUT3 278 The rest are fine. > +#endif /* _DT_BINDINGS_CLK_SUN60I_A733_CCU_H_ */ > diff --git a/include/dt-bindings/clock/sun60i-a733-r-ccu.h b/include/dt-bindings/clock/sun60i-a733-r-ccu.h > new file mode 100644 > index 000000000000..1c717cc588b8 > --- /dev/null > +++ b/include/dt-bindings/clock/sun60i-a733-r-ccu.h > @@ -0,0 +1,39 @@ > +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ > +/* > + * Copyright (C) 2026 Junhui Liu <junhui.liu@pigmoral.tech> > + */ > + > +#ifndef _DT_BINDINGS_CLK_SUN60I_A733_R_CCU_H_ > +#define _DT_BINDINGS_CLK_SUN60I_A733_R_CCU_H_ > + > +#define CLK_R_AHB 0 > +#define CLK_R_APB0 1 > +#define CLK_R_APB1 2 > +#define CLK_R_TIMER0 3 > +#define CLK_R_TIMER1 4 > +#define CLK_R_TIMER2 5 > +#define CLK_R_TIMER3 6 > +#define CLK_BUS_R_TIMER 7 > +#define CLK_BUS_R_TWD 8 > +#define CLK_R_PWMCTRL 9 > +#define CLK_BUS_R_PWMCTRL 10 *_R_PWM. > +#define CLK_R_SPI 11 > +#define CLK_BUS_R_SPI 12 > +#define CLK_BUS_R_MSGBOX 13 > +#define CLK_BUS_R_UART0 14 > +#define CLK_BUS_R_UART1 15 > +#define CLK_BUS_R_I2C0 16 > +#define CLK_BUS_R_I2C1 17 > +#define CLK_BUS_R_I2C2 18 > +#define CLK_BUS_R_PPU 19 > +#define CLK_BUS_R_TZMA 20 > +#define CLK_BUS_R_CPU_BIST 21 > +#define CLK_R_IR_RX 22 > +#define CLK_BUS_R_IR_RX 23 > +#define CLK_BUS_R_RTC 24 > +#define CLK_R_RISCV 25 > +#define CLK_BUS_R_RISCV 26 > +#define CLK_BUS_R_RISCV_CFG 27 > +#define CLK_BUS_R_CPUCFG 28 > + > +#endif /* _DT_BINDINGS_CLK_SUN60I_A733_R_CCU_H_ */ > diff --git a/include/dt-bindings/reset/sun60i-a733-ccu.h b/include/dt-bindings/reset/sun60i-a733-ccu.h > new file mode 100644 > index 000000000000..11ce78cf04dd > --- /dev/null > +++ b/include/dt-bindings/reset/sun60i-a733-ccu.h > @@ -0,0 +1,131 @@ > +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ > +/* > + * Copyright (C) 2026 Junhui Liu <junhui.liu@pigmoral.tech> > + */ > + > +#ifndef _DT_BINDINGS_RST_SUN60I_A733_CCU_H_ > +#define _DT_BINDINGS_RST_SUN60I_A733_CCU_H_ > + > +#define RST_BUS_ITS_PCIE 0 > +#define RST_BUS_NSI 1 > +#define RST_BUS_NSI_CFG 2 > +#define RST_BUS_IOMMU0_SYS 3 > +#define RST_BUS_MSI_LITE0_AHB 4 > +#define RST_BUS_MSI_LITE0_MBUS 5 > +#define RST_BUS_MSI_LITE1_AHB 6 > +#define RST_BUS_MSI_LITE1_MBUS 7 > +#define RST_BUS_MSI_LITE2_AHB 8 > +#define RST_BUS_MSI_LITE2_MBUS 9 > +#define RST_BUS_IOMMU1_SYS 10 > +#define RST_BUS_DMA0 11 > +#define RST_BUS_DMA1 12 > +#define RST_BUS_SPINLOCK 13 > +#define RST_BUS_MSGBOX 14 > +#define RST_BUS_PWM0 15 > +#define RST_BUS_PWM1 16 > +#define RST_BUS_DBG 17 > +#define RST_BUS_SYSDAP 18 > +#define RST_BUS_TIMER0 19 > +#define RST_BUS_DE 20 Please keep the unit number even if there is only one instance. This is DE0. > +#define RST_BUS_DI 21 > +#define RST_BUS_G2D 22 > +#define RST_BUS_EINK 23 > +#define RST_BUS_DE_SYS 24 > +#define RST_BUS_VE_ENC 25 Please keep the unit number even if there is only one instance. This is VE_ENC0. > +#define RST_BUS_VE_DEC 26 > +#define RST_BUS_CE 27 > +#define RST_BUS_CE_SYS 28 > +#define RST_BUS_NPU_CORE 29 > +#define RST_BUS_NPU_AXI 30 > +#define RST_BUS_NPU_AHB 31 > +#define RST_BUS_NPU_SRAM 32 > +#define RST_BUS_GPU 33 > +#define RST_BUS_DRAM 34 > +#define RST_BUS_NAND 35 > +#define RST_BUS_MMC0 36 > +#define RST_BUS_MMC1 37 > +#define RST_BUS_MMC2 38 > +#define RST_BUS_MMC3 39 > +#define RST_BUS_UFS_AHB 40 > +#define RST_BUS_UFS_AXI 41 > +#define RST_BUS_UFS_PHY 42 > +#define RST_BUS_UFS_CORE 43 > +#define RST_BUS_UART0 44 > +#define RST_BUS_UART1 45 > +#define RST_BUS_UART2 46 > +#define RST_BUS_UART3 47 > +#define RST_BUS_UART4 48 > +#define RST_BUS_UART5 49 > +#define RST_BUS_UART6 50 > +#define RST_BUS_I2C0 51 > +#define RST_BUS_I2C1 52 > +#define RST_BUS_I2C2 53 > +#define RST_BUS_I2C3 54 > +#define RST_BUS_I2C4 55 > +#define RST_BUS_I2C5 56 > +#define RST_BUS_I2C6 57 > +#define RST_BUS_I2C7 58 > +#define RST_BUS_I2C8 59 > +#define RST_BUS_I2C9 60 > +#define RST_BUS_I2C10 61 > +#define RST_BUS_I2C11 62 > +#define RST_BUS_I2C12 63 > +#define RST_BUS_SPI0 64 > +#define RST_BUS_SPI1 65 > +#define RST_BUS_SPI2 66 > +#define RST_BUS_SPIF 67 Here you have SPIF in the correct position. > +#define RST_BUS_SPI3 68 > +#define RST_BUS_SPI4 69 Please add a note saying where SPI4 was found. > +#define RST_BUS_GPADC 70 RST_BUS_GPADC0 > +#define RST_BUS_THS 71 RST_BUS_THS0 > +#define RST_BUS_IRRX 72 > +#define RST_BUS_IRTX 73 > +#define RST_BUS_LRADC 74 > +#define RST_BUS_SGPIO 75 > +#define RST_BUS_LPC 76 > +#define RST_BUS_I2SPCM0 77 > +#define RST_BUS_I2SPCM1 78 > +#define RST_BUS_I2SPCM2 79 > +#define RST_BUS_I2SPCM3 80 > +#define RST_BUS_I2SPCM4 81 > +#define RST_BUS_OWA 82 > +#define RST_BUS_DMIC 83 > +#define RST_USB_PHY0 84 > +#define RST_BUS_OHCI0 85 > +#define RST_BUS_EHCI0 86 > +#define RST_BUS_OTG 87 > +#define RST_USB_PHY1 88 > +#define RST_BUS_OHCI1 89 > +#define RST_BUS_EHCI1 90 > +#define RST_BUS_USB2 91 > +#define RST_BUS_PCIE 92 > +#define RST_BUS_PCIE_PWRUP 93 PCIE_PWRUP comes before PCIE. > +#define RST_BUS_SERDES 94 > +#define RST_BUS_GMAC0 95 > +#define RST_BUS_GMAC0_AXI 96 > +#define RST_BUS_GMAC1 97 > +#define RST_BUS_GMAC1_AXI 98 > +#define RST_BUS_TCON_LCD0 99 > +#define RST_BUS_TCON_LCD1 100 > +#define RST_BUS_TCON_LCD2 101 > +#define RST_BUS_LVDS0 102 > +#define RST_BUS_LVDS1 103 > +#define RST_BUS_DSI0 104 > +#define RST_BUS_DSI1 105 > +#define RST_BUS_TCON_TV0 106 > +#define RST_BUS_TCON_TV1 107 > +#define RST_BUS_EDP 108 > +#define RST_BUS_HDMI_MAIN 109 > +#define RST_BUS_HDMI_SUB 110 > +#define RST_BUS_HDMI_HDCP 111 > +#define RST_BUS_DPSS_TOP0 112 > +#define RST_BUS_DPSS_TOP1 113 > +#define RST_BUS_VIDEO_OUT0 114 > +#define RST_BUS_VIDEO_OUT1 115 > +#define RST_BUS_LEDC 116 > +#define RST_BUS_DSC 117 > +#define RST_BUS_CSI 118 > +#define RST_BUS_VIDEO_IN 119 > +#define RST_BUS_APB2JTAG 120 > + The rest look correct. > +#endif /* _DT_BINDINGS_RST_SUN60I_A733_CCU_H_ */ > diff --git a/include/dt-bindings/reset/sun60i-a733-r-ccu.h b/include/dt-bindings/reset/sun60i-a733-r-ccu.h > new file mode 100644 > index 000000000000..629e546d1998 > --- /dev/null > +++ b/include/dt-bindings/reset/sun60i-a733-r-ccu.h > @@ -0,0 +1,23 @@ > +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ > +/* > + * Copyright (C) 2026 Junhui Liu <junhui.liu@pigmoral.tech> > + */ > + > +#ifndef _DT_BINDINGS_RST_SUN60I_A733_R_CCU_H_ > +#define _DT_BINDINGS_RST_SUN60I_A733_R_CCU_H_ > + > +#define RST_BUS_R_TIMER 0 > +#define RST_BUS_R_PWM 1 > +#define RST_BUS_R_SPI 2 > +#define RST_BUS_R_MSGBOX 3 > +#define RST_BUS_R_UART0 4 > +#define RST_BUS_R_UART1 5 > +#define RST_BUS_R_I2C0 6 > +#define RST_BUS_R_I2C1 7 > +#define RST_BUS_R_I2C2 8 > +#define RST_BUS_R_IR_RX 9 > +#define RST_BUS_R_RTC 10 > +#define RST_BUS_R_RISCV_CFG 11 > +#define RST_BUS_R_CPUCFG 12 > + > +#endif /* _DT_BINDINGS_RST_SUN60I_A733_R_CCU_H_ */ This part looks correct. ChenYu ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20260310-a733-clk-v1-3-36b4e9b24457@pigmoral.tech>]
* Re: [PATCH RFC 3/8] clk: sunxi-ng: a733: Add PRCM CCU [not found] ` <20260310-a733-clk-v1-3-36b4e9b24457@pigmoral.tech> @ 2026-03-28 15:04 ` Chen-Yu Tsai 0 siblings, 0 replies; 6+ messages in thread From: Chen-Yu Tsai @ 2026-03-28 15:04 UTC (permalink / raw) To: Junhui Liu Cc: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Jernej Skrabec, Samuel Holland, Philipp Zabel, Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti, Richard Cochran, linux-clk, devicetree, linux-arm-kernel, linux-sunxi, linux-kernel, linux-riscv, netdev On Tue, Mar 10, 2026 at 4:42 PM Junhui Liu <junhui.liu@pigmoral.tech> wrote: > > Add support for the Power Reset Clock Management (PRCM) module found in > the Allwinner A733 SoC. This clock controller manages the clock control > and reset functions for device modules within the CPUS domain. > > The PRCM module includes the management of three primary buses: r-ahb, > r-apb0, and r-apb1. It also provides clocking for several key > peripherals, such as R-UART, R-I2C, R-SPI, and the R-RISCV subsystem. > Additionally, the reset lines for these modules are integrated. > > Signed-off-by: Junhui Liu <junhui.liu@pigmoral.tech> > --- > drivers/clk/sunxi-ng/Kconfig | 5 + > drivers/clk/sunxi-ng/Makefile | 2 + > drivers/clk/sunxi-ng/ccu-sun60i-a733-r.c | 276 +++++++++++++++++++++++++++++++ > 3 files changed, 283 insertions(+) > > diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig > index 6af2d020e03e..202e793dc754 100644 > --- a/drivers/clk/sunxi-ng/Kconfig > +++ b/drivers/clk/sunxi-ng/Kconfig > @@ -67,6 +67,11 @@ config SUN55I_A523_R_CCU > default ARCH_SUNXI > depends on ARM64 || COMPILE_TEST > > +config SUN60I_A733_R_CCU > + tristate "Support for the Allwinner A733 PRCM CCU" > + default ARCH_SUNXI > + depends on ARM64 || COMPILE_TEST > + > config SUN4I_A10_CCU > tristate "Support for the Allwinner A10/A20 CCU" > default ARCH_SUNXI > diff --git a/drivers/clk/sunxi-ng/Makefile b/drivers/clk/sunxi-ng/Makefile > index a1c4087d7241..d3702bdb7a23 100644 > --- a/drivers/clk/sunxi-ng/Makefile > +++ b/drivers/clk/sunxi-ng/Makefile > @@ -36,6 +36,7 @@ obj-$(CONFIG_SUN50I_H616_CCU) += sun50i-h616-ccu.o > obj-$(CONFIG_SUN55I_A523_CCU) += sun55i-a523-ccu.o > obj-$(CONFIG_SUN55I_A523_MCU_CCU) += sun55i-a523-mcu-ccu.o > obj-$(CONFIG_SUN55I_A523_R_CCU) += sun55i-a523-r-ccu.o > +obj-$(CONFIG_SUN60I_A733_R_CCU) += sun60i-a733-r-ccu.o > obj-$(CONFIG_SUN4I_A10_CCU) += sun4i-a10-ccu.o > obj-$(CONFIG_SUN5I_CCU) += sun5i-ccu.o > obj-$(CONFIG_SUN6I_A31_CCU) += sun6i-a31-ccu.o > @@ -64,6 +65,7 @@ sun50i-h616-ccu-y += ccu-sun50i-h616.o > sun55i-a523-ccu-y += ccu-sun55i-a523.o > sun55i-a523-mcu-ccu-y += ccu-sun55i-a523-mcu.o > sun55i-a523-r-ccu-y += ccu-sun55i-a523-r.o > +sun60i-a733-r-ccu-y += ccu-sun60i-a733-r.o > sun4i-a10-ccu-y += ccu-sun4i-a10.o > sun5i-ccu-y += ccu-sun5i.o > sun6i-a31-ccu-y += ccu-sun6i-a31.o > diff --git a/drivers/clk/sunxi-ng/ccu-sun60i-a733-r.c b/drivers/clk/sunxi-ng/ccu-sun60i-a733-r.c > new file mode 100644 > index 000000000000..06679be1eaae > --- /dev/null > +++ b/drivers/clk/sunxi-ng/ccu-sun60i-a733-r.c > @@ -0,0 +1,276 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* > + * Copyright (C) 2023 rengaomin@allwinnertech.com > + * Copyright (C) 2026 Junhui Liu <junhui.liu@pigmoral.tech> > + * Based on the A523 CCU driver: > + * Copyright (C) 2024 Arm Ltd. > + */ > + > +#include <linux/clk-provider.h> > +#include <linux/module.h> > +#include <linux/platform_device.h> > + > +#include <dt-bindings/clock/sun60i-a733-r-ccu.h> > +#include <dt-bindings/reset/sun60i-a733-r-ccu.h> > + > +#include "ccu_common.h" > +#include "ccu_reset.h" > + > +#include "ccu_gate.h" > +#include "ccu_mp.h" > + > +static const struct clk_parent_data r_ahb_parents[] = { > + { .fw_name = "hosc" }, > + { .fw_name = "losc" }, > + { .fw_name = "iosc" }, > + { .fw_name = "pll-periph0-200m" }, > + { .fw_name = "pll-periph0-300m" }, > +}; > +static SUNXI_CCU_M_DATA_WITH_MUX(r_ahb_clk, "r-ahb", r_ahb_parents, 0x000, > + 0, 5, /* M */ > + 24, 3, /* mux */ > + 0); > + > +static const struct clk_parent_data r_apb_parents[] = { > + { .fw_name = "hosc" }, > + { .fw_name = "losc" }, > + { .fw_name = "iosc" }, > + { .fw_name = "pll-periph0-200m" }, > + { .fw_name = "sys-24m" }, > +}; > + > +static SUNXI_CCU_M_DATA_WITH_MUX(r_apb0_clk, "r-apb0", r_apb_parents, 0x00c, > + 0, 5, /* M */ > + 24, 3, /* mux */ > + 0); > + > +static SUNXI_CCU_M_DATA_WITH_MUX(r_apb1_clk, "r-apb1", r_apb_parents, 0x010, > + 0, 5, /* M */ > + 24, 3, /* mux */ > + 0); > + > +static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(r_cpu_timer0, "r-timer0", r_apb_parents, 0x100, > + 0, 0, /* no M */ > + 1, 3, /* P */ > + 4, 3, /* mux */ > + BIT(0), /* gate */ > + 0); Use SUNXI_CCU_P_DATA_WITH_MUX_GATE(). Same for the other ones. > +static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(r_cpu_timer1, "r-timer1", r_apb_parents, 0x104, > + 0, 0, /* no M */ > + 1, 3, /* P */ > + 4, 3, /* mux */ > + BIT(0), /* gate */ > + 0); > +static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(r_cpu_timer2, "r-timer2", r_apb_parents, 0x108, > + 0, 0, /* no M */ > + 1, 3, /* P */ > + 4, 3, /* mux */ > + BIT(0), /* gate */ > + 0); > +static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(r_cpu_timer3, "r-timer3", r_apb_parents, 0x10c, > + 0, 0, /* no M */ > + 1, 3, /* P */ > + 4, 3, /* mux */ > + BIT(0), /* gate */ > + 0); > + > +static SUNXI_CCU_GATE_HW(bus_r_timer_clk, "bus-r-timer", &r_ahb_clk.common.hw, 0x11c, BIT(0), 0); > +static SUNXI_CCU_GATE_HW(bus_r_twd_clk, "bus-r-twd", &r_apb0_clk.common.hw, 0x12c, BIT(0), 0); > + > +static const struct clk_parent_data r_pwmctrl_parents[] = { > + { .fw_name = "hosc" }, > + { .fw_name = "losc" }, > + { .fw_name = "iosc" }, > + { .fw_name = "sys-24m" }, > +}; > +static SUNXI_CCU_MUX_DATA_WITH_GATE(r_pwmctrl_clk, "r-pwmctrl", r_pwmctrl_parents, 0x130, r_pwm_clk, "r-pwm", ... > + 24, 2, /* mux */ > + BIT(31), /* gate */ > + 0); > +static SUNXI_CCU_GATE_HW(bus_r_pwmctrl_clk, "bus-r-pwmctrl", bus_r_pwm_clk, "bus-r-pwm". > + &r_apb0_clk.common.hw, 0x13c, BIT(0), 0); > + > +static const struct clk_parent_data r_spi_parents[] = { > + { .fw_name = "hosc" }, > + { .fw_name = "pll-periph0-200m" }, > + { .fw_name = "pll-periph0-300m" }, > + { .fw_name = "pll-periph1-300m" }, > + { .fw_name = "sys-24m" }, > +}; > +static SUNXI_CCU_DUALDIV_MUX_GATE(r_spi_clk, "r-spi", r_spi_parents, 0x150, > + 0, 5, /* M */ > + 8, 5, /* N */ > + 24, 3, /* mux */ > + BIT(31), /* gate */ > + 0); > +static SUNXI_CCU_GATE_HW(bus_r_spi_clk, "bus-r-spi", &r_ahb_clk.common.hw, 0x15c, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HW(bus_r_msgbox_clk, "bus-r-msgbox", &r_ahb_clk.common.hw, 0x17c, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HW(bus_r_uart0_clk, "bus-r-uart0", &r_apb1_clk.common.hw, 0x18c, BIT(0), 0); > +static SUNXI_CCU_GATE_HW(bus_r_uart1_clk, "bus-r-uart1", &r_apb1_clk.common.hw, 0x18c, BIT(1), 0); > + > +static SUNXI_CCU_GATE_HW(bus_r_i2c0_clk, "bus-r-i2c0", &r_apb1_clk.common.hw, 0x19c, BIT(0), 0); > +static SUNXI_CCU_GATE_HW(bus_r_i2c1_clk, "bus-r-i2c1", &r_apb1_clk.common.hw, 0x19c, BIT(1), 0); > +static SUNXI_CCU_GATE_HW(bus_r_i2c2_clk, "bus-r-i2c2", &r_apb1_clk.common.hw, 0x19c, BIT(2), 0); > + > +static SUNXI_CCU_GATE_HW(bus_r_ppu_clk, "bus-r-ppu", &r_apb0_clk.common.hw, 0x1ac, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HW(bus_r_tzma_clk, "bus-r-tzma", &r_apb0_clk.common.hw, 0x1b0, BIT(0), 0); > +static SUNXI_CCU_GATE_HW(bus_r_cpu_bist_clk, "bus-r-cpu-bist", &r_apb0_clk.common.hw, > + 0x1bc, BIT(0), 0); > + > +static const struct clk_parent_data r_ir_rx_parents[] = { > + { .fw_name = "losc" }, > + { .fw_name = "hosc" }, > + { .fw_name = "sys-24m" }, > +}; > +static SUNXI_CCU_M_DATA_WITH_MUX_GATE(r_ir_rx_clk, "r-ir-rx", r_ir_rx_parents, 0x1c0, > + 0, 5, /* M */ > + 24, 2, /* mux */ > + BIT(31), /* gate */ > + 0); > +static SUNXI_CCU_GATE_HW(bus_r_ir_rx_clk, "bus-r-ir-rx", &r_apb0_clk.common.hw, 0x1cc, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HW(bus_r_rtc_clk, "bus-r-rtc", &r_ahb_clk.common.hw, 0x20c, BIT(0), 0); > + > +static const struct clk_parent_data r_riscv_parents[] = { > + { .fw_name = "hosc" }, > + { .fw_name = "losc" }, > + { .fw_name = "iosc" }, > +}; > +static SUNXI_CCU_MUX_DATA_WITH_GATE(r_riscv_clk, "r-riscv", r_riscv_parents, 0x210, > + 24, 2, /* mux */ > + BIT(31), /* gate */ > + 0); > +static SUNXI_CCU_GATE_HW(bus_r_riscv_clk, "bus-r-riscv", &r_apb0_clk.common.hw, > + 0x21c, BIT(0), 0); > +static SUNXI_CCU_GATE_HW(bus_r_riscv_cfg_clk, "bus-r-riscv-cfg", &r_apb0_clk.common.hw, > + 0x21c, BIT(1), 0); > + > +static SUNXI_CCU_GATE_HW(bus_r_cpucfg_clk, "bus-r-cpucfg", &r_apb0_clk.common.hw, > + 0x22c, BIT(0), CLK_IS_CRITICAL); > + > +static struct ccu_common *sun60i_a733_r_ccu_clks[] = { > + &r_ahb_clk.common, > + &r_apb0_clk.common, > + &r_apb1_clk.common, > + &r_cpu_timer0.common, > + &r_cpu_timer1.common, > + &r_cpu_timer2.common, > + &r_cpu_timer3.common, > + &bus_r_timer_clk.common, > + &bus_r_twd_clk.common, > + &r_pwmctrl_clk.common, > + &bus_r_pwmctrl_clk.common, > + &r_spi_clk.common, > + &bus_r_spi_clk.common, > + &bus_r_msgbox_clk.common, > + &bus_r_uart0_clk.common, > + &bus_r_uart1_clk.common, > + &bus_r_i2c0_clk.common, > + &bus_r_i2c1_clk.common, > + &bus_r_i2c2_clk.common, > + &bus_r_ppu_clk.common, > + &bus_r_tzma_clk.common, > + &bus_r_cpu_bist_clk.common, > + &r_ir_rx_clk.common, > + &bus_r_ir_rx_clk.common, > + &bus_r_rtc_clk.common, > + &r_riscv_clk.common, > + &bus_r_riscv_clk.common, > + &bus_r_riscv_cfg_clk.common, > + &bus_r_cpucfg_clk.common, > +}; > + > +static struct clk_hw_onecell_data sun60i_a733_r_hw_clks = { > + .hws = { > + [CLK_R_AHB] = &r_ahb_clk.common.hw, > + [CLK_R_APB0] = &r_apb0_clk.common.hw, > + [CLK_R_APB1] = &r_apb1_clk.common.hw, > + [CLK_R_TIMER0] = &r_cpu_timer0.common.hw, > + [CLK_R_TIMER1] = &r_cpu_timer1.common.hw, > + [CLK_R_TIMER2] = &r_cpu_timer2.common.hw, > + [CLK_R_TIMER3] = &r_cpu_timer3.common.hw, > + [CLK_BUS_R_TIMER] = &bus_r_timer_clk.common.hw, > + [CLK_BUS_R_TWD] = &bus_r_twd_clk.common.hw, > + [CLK_R_PWMCTRL] = &r_pwmctrl_clk.common.hw, > + [CLK_BUS_R_PWMCTRL] = &bus_r_pwmctrl_clk.common.hw, > + [CLK_R_SPI] = &r_spi_clk.common.hw, > + [CLK_BUS_R_SPI] = &bus_r_spi_clk.common.hw, > + [CLK_BUS_R_MSGBOX] = &bus_r_msgbox_clk.common.hw, > + [CLK_BUS_R_UART0] = &bus_r_uart0_clk.common.hw, > + [CLK_BUS_R_UART1] = &bus_r_uart1_clk.common.hw, > + [CLK_BUS_R_I2C0] = &bus_r_i2c0_clk.common.hw, > + [CLK_BUS_R_I2C1] = &bus_r_i2c1_clk.common.hw, > + [CLK_BUS_R_I2C2] = &bus_r_i2c2_clk.common.hw, > + [CLK_BUS_R_PPU] = &bus_r_ppu_clk.common.hw, > + [CLK_BUS_R_TZMA] = &bus_r_tzma_clk.common.hw, > + [CLK_BUS_R_CPU_BIST] = &bus_r_cpu_bist_clk.common.hw, > + [CLK_R_IR_RX] = &r_ir_rx_clk.common.hw, > + [CLK_BUS_R_IR_RX] = &bus_r_ir_rx_clk.common.hw, > + [CLK_BUS_R_RTC] = &bus_r_rtc_clk.common.hw, > + [CLK_R_RISCV] = &r_riscv_clk.common.hw, > + [CLK_BUS_R_RISCV] = &bus_r_riscv_clk.common.hw, > + [CLK_BUS_R_RISCV_CFG] = &bus_r_riscv_cfg_clk.common.hw, > + [CLK_BUS_R_CPUCFG] = &bus_r_cpucfg_clk.common.hw, > + }, > + .num = CLK_BUS_R_CPUCFG + 1, > +}; > + > +static struct ccu_reset_map sun60i_a733_r_ccu_resets[] = { > + [RST_BUS_R_TIMER] = { 0x11c, BIT(16) }, > + [RST_BUS_R_PWM] = { 0x13c, BIT(16) }, > + [RST_BUS_R_SPI] = { 0x15c, BIT(16) }, > + [RST_BUS_R_MSGBOX] = { 0x17c, BIT(16) }, > + [RST_BUS_R_UART0] = { 0x18c, BIT(16) }, > + [RST_BUS_R_UART1] = { 0x18c, BIT(17) }, > + [RST_BUS_R_I2C0] = { 0x19c, BIT(16) }, > + [RST_BUS_R_I2C1] = { 0x19c, BIT(17) }, > + [RST_BUS_R_I2C2] = { 0x19c, BIT(18) }, > + [RST_BUS_R_IR_RX] = { 0x1cc, BIT(16) }, > + [RST_BUS_R_RTC] = { 0x20c, BIT(16) }, > + [RST_BUS_R_RISCV_CFG] = { 0x21c, BIT(16) }, > + [RST_BUS_R_CPUCFG] = { 0x22c, BIT(16) }, > +}; > + > +static const struct sunxi_ccu_desc sun60i_a733_r_ccu_desc = { > + .ccu_clks = sun60i_a733_r_ccu_clks, > + .num_ccu_clks = ARRAY_SIZE(sun60i_a733_r_ccu_clks), > + > + .hw_clks = &sun60i_a733_r_hw_clks, > + > + .resets = sun60i_a733_r_ccu_resets, > + .num_resets = ARRAY_SIZE(sun60i_a733_r_ccu_resets), > +}; > + > +static int sun60i_a733_r_ccu_probe(struct platform_device *pdev) > +{ > + void __iomem *reg; > + > + reg = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(reg)) > + return PTR_ERR(reg); > + > + return devm_sunxi_ccu_probe(&pdev->dev, reg, &sun60i_a733_r_ccu_desc); > +} > + > +static const struct of_device_id sun60i_a733_r_ccu_ids[] = { > + { .compatible = "allwinner,sun60i-a733-r-ccu" }, > + { /* sentinel */ } > +}; > +MODULE_DEVICE_TABLE(of, sun60i_a733_r_ccu_ids); > + > +static struct platform_driver sun60i_a733_r_ccu_driver = { > + .probe = sun60i_a733_r_ccu_probe, > + .driver = { > + .name = "sun60i-a733-r-ccu", > + .suppress_bind_attrs = true, > + .of_match_table = sun60i_a733_r_ccu_ids, > + }, > +}; > +module_platform_driver(sun60i_a733_r_ccu_driver); > + > +MODULE_IMPORT_NS("SUNXI_CCU"); > +MODULE_DESCRIPTION("Support for the Allwinner A733 PRCM CCU"); > +MODULE_LICENSE("GPL"); The rest look OK. ChenYu ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20260310-a733-clk-v1-2-36b4e9b24457@pigmoral.tech>]
* Re: [PATCH RFC 2/8] clk: sunxi-ng: sdm: Add dual patterns support [not found] ` <20260310-a733-clk-v1-2-36b4e9b24457@pigmoral.tech> @ 2026-03-29 7:56 ` Chen-Yu Tsai 0 siblings, 0 replies; 6+ messages in thread From: Chen-Yu Tsai @ 2026-03-29 7:56 UTC (permalink / raw) To: Junhui Liu Cc: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Jernej Skrabec, Samuel Holland, Philipp Zabel, Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti, Richard Cochran, linux-clk, devicetree, linux-arm-kernel, linux-sunxi, linux-kernel, linux-riscv, netdev On Tue, Mar 10, 2026 at 4:42 PM Junhui Liu <junhui.liu@pigmoral.tech> wrote: > > On newer Allwinner platforms like the A733, the Sigma-Delta Modulation > (SDM) control logic is more complex. The SDM enable bit, which was > previously located in the PLL register, is now moved to a second > pattern register (PATTERN1). > > To support this, rename the existing "tuning" members to "pattern0" to > align with the datasheet, and introduce the _SUNXI_CCU_SDM_DUAL_PAT > macro to provide pattern1 register support. Related operations are also > updated. > > Signed-off-by: Junhui Liu <junhui.liu@pigmoral.tech> > --- > drivers/clk/sunxi-ng/ccu_sdm.c | 51 +++++++++++++++++++++++++++++------------- > drivers/clk/sunxi-ng/ccu_sdm.h | 32 +++++++++++++++++--------- > 2 files changed, 57 insertions(+), 26 deletions(-) > > diff --git a/drivers/clk/sunxi-ng/ccu_sdm.c b/drivers/clk/sunxi-ng/ccu_sdm.c > index c564e5f9e610..204e25feaa36 100644 > --- a/drivers/clk/sunxi-ng/ccu_sdm.c > +++ b/drivers/clk/sunxi-ng/ccu_sdm.c > @@ -18,7 +18,10 @@ bool ccu_sdm_helper_is_enabled(struct ccu_common *common, > if (sdm->enable && !(readl(common->base + common->reg) & sdm->enable)) > return false; > > - return !!(readl(common->base + sdm->tuning_reg) & sdm->tuning_enable); > + if (sdm->pat1_enable && !(readl(common->base + sdm->pat1_reg) & sdm->pat1_enable)) > + return false; > + > + return !!(readl(common->base + sdm->pat0_reg) & sdm->pat0_enable); > } > EXPORT_SYMBOL_NS_GPL(ccu_sdm_helper_is_enabled, "SUNXI_CCU"); > > @@ -37,18 +40,27 @@ void ccu_sdm_helper_enable(struct ccu_common *common, > for (i = 0; i < sdm->table_size; i++) > if (sdm->table[i].rate == rate) > writel(sdm->table[i].pattern, > - common->base + sdm->tuning_reg); > + common->base + sdm->pat0_reg); > > /* Make sure SDM is enabled */ > spin_lock_irqsave(common->lock, flags); > - reg = readl(common->base + sdm->tuning_reg); > - writel(reg | sdm->tuning_enable, common->base + sdm->tuning_reg); > + reg = readl(common->base + sdm->pat0_reg); > + writel(reg | sdm->pat0_enable, common->base + sdm->pat0_reg); > spin_unlock_irqrestore(common->lock, flags); > > - spin_lock_irqsave(common->lock, flags); > - reg = readl(common->base + common->reg); > - writel(reg | sdm->enable, common->base + common->reg); > - spin_unlock_irqrestore(common->lock, flags); > + if (sdm->enable) { > + spin_lock_irqsave(common->lock, flags); > + reg = readl(common->base + common->reg); > + writel(reg | sdm->enable, common->base + common->reg); > + spin_unlock_irqrestore(common->lock, flags); > + } > + > + if (sdm->pat1_enable) { > + spin_lock_irqsave(common->lock, flags); > + reg = readl(common->base + sdm->pat1_reg); > + writel(reg | sdm->pat1_enable, common->base + sdm->pat1_reg); > + spin_unlock_irqrestore(common->lock, flags); > + } > } > EXPORT_SYMBOL_NS_GPL(ccu_sdm_helper_enable, "SUNXI_CCU"); > > @@ -61,14 +73,23 @@ void ccu_sdm_helper_disable(struct ccu_common *common, > if (!(common->features & CCU_FEATURE_SIGMA_DELTA_MOD)) > return; > > - spin_lock_irqsave(common->lock, flags); > - reg = readl(common->base + common->reg); > - writel(reg & ~sdm->enable, common->base + common->reg); > - spin_unlock_irqrestore(common->lock, flags); > + if (sdm->enable) { > + spin_lock_irqsave(common->lock, flags); > + reg = readl(common->base + common->reg); > + writel(reg & ~sdm->enable, common->base + common->reg); > + spin_unlock_irqrestore(common->lock, flags); > + } > + > + if (sdm->pat1_enable) { > + spin_lock_irqsave(common->lock, flags); > + reg = readl(common->base + sdm->pat1_reg); > + writel(reg & ~sdm->pat1_enable, common->base + sdm->pat1_reg); > + spin_unlock_irqrestore(common->lock, flags); > + } > > spin_lock_irqsave(common->lock, flags); > - reg = readl(common->base + sdm->tuning_reg); > - writel(reg & ~sdm->tuning_enable, common->base + sdm->tuning_reg); > + reg = readl(common->base + sdm->pat0_reg); > + writel(reg & ~sdm->pat0_enable, common->base + sdm->pat0_reg); > spin_unlock_irqrestore(common->lock, flags); > } > EXPORT_SYMBOL_NS_GPL(ccu_sdm_helper_disable, "SUNXI_CCU"); > @@ -123,7 +144,7 @@ unsigned long ccu_sdm_helper_read_rate(struct ccu_common *common, > pr_debug("%s: clock is sigma-delta modulated\n", > clk_hw_get_name(&common->hw)); > > - reg = readl(common->base + sdm->tuning_reg); > + reg = readl(common->base + sdm->pat0_reg); > > pr_debug("%s: pattern reg is 0x%x", > clk_hw_get_name(&common->hw), reg); > diff --git a/drivers/clk/sunxi-ng/ccu_sdm.h b/drivers/clk/sunxi-ng/ccu_sdm.h > index c1a7159b89c3..c289be28e1b4 100644 > --- a/drivers/clk/sunxi-ng/ccu_sdm.h > +++ b/drivers/clk/sunxi-ng/ccu_sdm.h > @@ -33,21 +33,31 @@ struct ccu_sdm_internal { > u32 table_size; > /* early SoCs don't have the SDM enable bit in the PLL register */ > u32 enable; > - /* second enable bit in tuning register */ > - u32 tuning_enable; > - u16 tuning_reg; > + /* second enable bit in pattern0 register */ > + u32 pat0_enable; > + u16 pat0_reg; > + /* on some platforms, the sdm enable bit in pattern1 register */ > + u32 pat1_enable; > + u16 pat1_reg; > }; > > -#define _SUNXI_CCU_SDM(_table, _enable, \ > - _reg, _reg_enable) \ > - { \ > - .table = _table, \ > - .table_size = ARRAY_SIZE(_table), \ > - .enable = _enable, \ > - .tuning_enable = _reg_enable, \ > - .tuning_reg = _reg, \ > +#define __SUNXI_CCU_SDM(_table, _enable, _pat0, _pat0_enable, _pat1, _pat1_enable) \ > + { \ > + .table = _table, \ > + .table_size = ARRAY_SIZE(_table), \ > + .enable = _enable, \ > + .pat0_enable = _pat0_enable, \ > + .pat0_reg = _pat0, \ > + .pat1_enable = _pat1_enable, \ > + .pat1_reg = _pat1, \ > } > > +#define _SUNXI_CCU_SDM(_table, _enable, _pat0, _pat0_enable) \ > + __SUNXI_CCU_SDM(_table, _enable, _pat0, _pat0_enable, 0, 0) > + > +#define _SUNXI_CCU_SDM_DUAL_PAT(_table, _pat0, _pat0_enable, _pat1, _pat1_enable) \ > + __SUNXI_CCU_SDM(_table, 0, _pat0, _pat0_enable, _pat1, _pat1_enable) > + Don't introduce an intermediate macro that looks _almost_ the same as the macro the driver is actually supposed to use. Just declare _SUNXI_CCU_SDM_DUAL_PAT() to expand to the full entry, and _SUNXI_CCU_SDM() to _SUNXI_CCU_SDM_DUAL_PAT() with the last two parameters as zero. That takes less lines. ChenYu > bool ccu_sdm_helper_is_enabled(struct ccu_common *common, > struct ccu_sdm_internal *sdm); > void ccu_sdm_helper_enable(struct ccu_common *common, > > -- > 2.52.0 > > ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20260310-a733-clk-v1-7-36b4e9b24457@pigmoral.tech>]
* Re: [PATCH RFC 7/8] clk: sunxi-ng: a733: Add bus clock gates [not found] ` <20260310-a733-clk-v1-7-36b4e9b24457@pigmoral.tech> @ 2026-04-15 22:14 ` Andre Przywara 0 siblings, 0 replies; 6+ messages in thread From: Andre Przywara @ 2026-04-15 22:14 UTC (permalink / raw) To: Junhui Liu, Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec, Samuel Holland, Philipp Zabel, Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti, Richard Cochran Cc: linux-clk, devicetree, linux-arm-kernel, linux-sunxi, linux-kernel, linux-riscv, netdev Hi, cheekily jumping in here, for the parts that are easy to verify ;-) In general this series looks very good, and many thanks for splitting this up in reviewable chunks, that's much appreciated! On 3/10/26 09:34, Junhui Liu wrote: > Add the bus clock gates that control access to the devices' register > interface on the Allwinner A733 SoC. These clocks are typically > single-bit controls in the BGR registers, covering UARTs, SPI, I2C, and > various multimedia engines. It also includes bus gates for system > components like the IOMMU and MSI-lite interfaces. > > Signed-off-by: Junhui Liu <junhui.liu@pigmoral.tech> > > --- > The parents of some bus clocks are difficult to determine, as the user > manual only describes the clock source for a few instances. The current > configurations are based on references to previous Allwinner SoCs and > information gathered from the manual. Where documentation is lacking, > vendor practices are followed by setting the parent to "hosc" for now. > --- > drivers/clk/sunxi-ng/ccu-sun60i-a733.c | 475 ++++++++++++++++++++++++++++++++- > 1 file changed, 474 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/sunxi-ng/ccu-sun60i-a733.c b/drivers/clk/sunxi-ng/ccu-sun60i-a733.c > index 36b44568a56f..c0b09f9197d1 100644 > --- a/drivers/clk/sunxi-ng/ccu-sun60i-a733.c > +++ b/drivers/clk/sunxi-ng/ccu-sun60i-a733.c > @@ -408,16 +408,19 @@ static SUNXI_CCU_M_DATA_WITH_MUX(ahb_clk, "ahb", ahb_apb_parents, 0x500, > 0, 5, /* M */ > 24, 2, /* mux */ > 0); > +static const struct clk_hw *ahb_hws[] = { &ahb_clk.common.hw }; > > static SUNXI_CCU_M_DATA_WITH_MUX(apb0_clk, "apb0", ahb_apb_parents, 0x510, > 0, 5, /* M */ > 24, 2, /* mux */ > 0); > +static const struct clk_hw *apb0_hws[] = { &apb0_clk.common.hw }; > > static SUNXI_CCU_M_DATA_WITH_MUX(apb1_clk, "apb1", ahb_apb_parents, 0x518, > 0, 5, /* M */ > 24, 2, /* mux */ > 0); > +static const struct clk_hw *apb1_hws[] = { &apb1_clk.common.hw }; > > static const struct clk_parent_data apb_uart_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -430,6 +433,9 @@ static SUNXI_CCU_M_DATA_WITH_MUX(apb_uart_clk, "apb-uart", apb_uart_parents, 0x5 > 0, 5, /* M */ > 24, 3, /* mux */ > 0); > +static const struct clk_hw *apb_uart_hws[] = { > + &apb_uart_clk.common.hw > +}; > > static const struct clk_parent_data trace_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -463,6 +469,8 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(cpu_peri_clk, "cpu-peri", gic_cpu_peri_par > BIT(31), /* gate */ > 0); > > +static SUNXI_CCU_GATE_DATA(bus_its_pcie_clk, "bus-its-pcie", hosc, 0x574, BIT(1), 0); > + > static const struct clk_parent_data nsi_parents[] = { > { .hw = &sys_24M_clk.hw }, > { .hw = &pll_ddr_clk.common.hw }, > @@ -477,6 +485,7 @@ static SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT(nsi_clk, "nsi", nsi_parents, 0x580, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0, CCU_FEATURE_UPDATE_BIT); > +static SUNXI_CCU_GATE_DATA(bus_nsi_clk, "bus-nsi", hosc, 0x584, BIT(0), 0); > > static const struct clk_parent_data mbus_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -493,9 +502,117 @@ static SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT(mbus_clk, "mbus", mbus_parents, 0x58 > BIT(31), /* gate */ > CLK_IS_CRITICAL, > CCU_FEATURE_UPDATE_BIT); > +static const struct clk_hw *mbus_hws[] = { &mbus_clk.common.hw }; > + > +static SUNXI_CCU_GATE_HWS(mbus_iommu0_sys_clk, "mbus-iommu0-sys", mbus_hws, 0x58c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(apb_iommu0_sys_clk, "apb-iommu0-sys", apb0_hws, 0x58c, BIT(1), 0); > +static SUNXI_CCU_GATE_HWS(ahb_iommu0_sys_clk, "ahb-iommu0-sys", ahb_hws, 0x58c, BIT(2), 0); > + > +static SUNXI_CCU_GATE_DATA(bus_msi_lite0_clk, "bus-msi-lite0", hosc, 0x594, BIT(0), 0); > +static SUNXI_CCU_GATE_DATA(bus_msi_lite1_clk, "bus-msi-lite1", hosc, 0x59c, BIT(0), 0); > +static SUNXI_CCU_GATE_DATA(bus_msi_lite2_clk, "bus-msi-lite2", hosc, 0x5a4, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(mbus_iommu1_sys_clk, "mbus-iommu1-sys", mbus_hws, 0x5b4, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(apb_iommu1_sys_clk, "apb_iommu1-sys", apb0_hws, 0x5b4, BIT(1), 0); > +static SUNXI_CCU_GATE_HWS(ahb_iommu1_sys_clk, "ahb_iommu1-sys", ahb_hws, 0x5b4, BIT(2), 0); > + > +static SUNXI_CCU_GATE_HWS(ahb_ve_dec_clk, "ahb-ve-dec", ahb_hws, > + 0x5c0, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(ahb_ve_enc_clk, "ahb-ve-enc", ahb_hws, > + 0x5c0, BIT(1), 0); > +static SUNXI_CCU_GATE_HWS(ahb_vid_in_clk, "ahb-vid-in", ahb_hws, > + 0x5c0, BIT(2), 0); > +static SUNXI_CCU_GATE_HWS(ahb_vid_cout0_clk, "ahb-vid-cout0", ahb_hws, > + 0x5c0, BIT(3), 0); > +static SUNXI_CCU_GATE_HWS(ahb_vid_cout1_clk, "ahb-vid-cout1", ahb_hws, > + 0x5c0, BIT(4), 0); > +static SUNXI_CCU_GATE_HWS(ahb_de_clk, "ahb-de", ahb_hws, > + 0x5c0, BIT(5), 0); > +static SUNXI_CCU_GATE_HWS(ahb_npu_clk, "ahb-npu", ahb_hws, > + 0x5c0, BIT(6), 0); > +static SUNXI_CCU_GATE_HWS(ahb_gpu0_clk, "ahb-gpu0", ahb_hws, > + 0x5c0, BIT(7), 0); > +static SUNXI_CCU_GATE_HWS(ahb_serdes_clk, "ahb-serdes", ahb_hws, > + 0x5c0, BIT(8), 0); > +static SUNXI_CCU_GATE_HWS(ahb_usb_sys_clk, "ahb-usb-sys", ahb_hws, > + 0x5c0, BIT(9), 0); > +static SUNXI_CCU_GATE_HWS(ahb_msi_lite0_clk, "ahb-msi-lite0", ahb_hws, > + 0x5c0, BIT(16), 0); > +static SUNXI_CCU_GATE_HWS(ahb_store_clk, "ahb-store", ahb_hws, > + 0x5c0, BIT(24), 0); > +static SUNXI_CCU_GATE_HWS(ahb_cpus_clk, "ahb-cpus", ahb_hws, > + 0x5c0, BIT(28), 0); > + > +static SUNXI_CCU_GATE_HWS(mbus_iommu0_clk, "mbus-iommu0", mbus_hws, > + 0x5e0, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(mbus_iommu1_clk, "mbus-iommu1", mbus_hws, > + 0x5e0, BIT(1), 0); > +static SUNXI_CCU_GATE_HWS(mbus_desys_clk, "mbus-desys", mbus_hws, > + 0x5e0, BIT(11), 0); > +static SUNXI_CCU_GATE_HWS(mbus_ve_enc_gate_clk, "mbus-ve-enc-gate", mbus_hws, > + 0x5e0, BIT(12), 0); > +static SUNXI_CCU_GATE_HWS(mbus_ve_dec_gate_clk, "mbus-ve-dec-gate", mbus_hws, > + 0x5e0, BIT(14), 0); > +static SUNXI_CCU_GATE_HWS(mbus_gpu0_clk, "mbus-gpu0", mbus_hws, > + 0x5e0, BIT(16), 0); > +static SUNXI_CCU_GATE_HWS(mbus_npu_clk, "mbus-npu", mbus_hws, > + 0x5e0, BIT(18), 0); > +static SUNXI_CCU_GATE_HWS(mbus_vid_in_clk, "mbus-vid-in", mbus_hws, > + 0x5e0, BIT(24), 0); > +static SUNXI_CCU_GATE_HWS(mbus_serdes_clk, "mbus-serdes", mbus_hws, > + 0x5e0, BIT(28), 0); > +static SUNXI_CCU_GATE_HWS(mbus_msi_lite0_clk, "mbus-msi-lite0", mbus_hws, > + 0x5e0, BIT(29), 0); > +static SUNXI_CCU_GATE_HWS(mbus_store_clk, "mbus-store", mbus_hws, > + 0x5e0, BIT(30), 0); > +static SUNXI_CCU_GATE_HWS(mbus_msi_lite2_clk, "mbus-msi-lite2", mbus_hws, > + 0x5e0, BIT(31), 0); > + > +static SUNXI_CCU_GATE_HWS(mbus_dma0_clk, "mbus-dma0", mbus_hws, > + 0x5e4, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(mbus_ve_enc_clk, "mbus-ve-enc", mbus_hws, > + 0x5e4, BIT(1), 0); > +static SUNXI_CCU_GATE_HWS(mbus_ce_clk, "mbus-ce", mbus_hws, > + 0x5e4, BIT(2), 0); > +static SUNXI_CCU_GATE_HWS(mbus_dma1_clk, "mbus-dma1", mbus_hws, > + 0x5e4, BIT(3), 0); > +static SUNXI_CCU_GATE_HWS(mbus_nand_clk, "mbus-nand", mbus_hws, > + 0x5e4, BIT(5), 0); > +static SUNXI_CCU_GATE_HWS(mbus_csi_clk, "mbus-csi", mbus_hws, > + 0x5e4, BIT(8), 0); > +static SUNXI_CCU_GATE_HWS(mbus_isp_clk, "mbus-isp", mbus_hws, > + 0x5e4, BIT(9), 0); > +static SUNXI_CCU_GATE_HWS(mbus_gmac0_clk, "mbus-gmac0", mbus_hws, > + 0x5e4, BIT(11), 0); > +static SUNXI_CCU_GATE_HWS(mbus_gmac1_clk, "mbus-gmac1", mbus_hws, > + 0x5e4, BIT(12), 0); > +static SUNXI_CCU_GATE_HWS(mbus_ve_dec_clk, "mbus-ve-dec", mbus_hws, > + 0x5e4, BIT(18), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_dma0_clk, "bus-dma0", ahb_hws, > + 0x704, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_dma1_clk, "bus-dma1", ahb_hws, > + 0x70c, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_spinlock_clk, "bus-spinlock", ahb_hws, > + 0x724, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_msgbox_clk, "bus-msgbox", ahb_hws, > + 0x744, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_pwm0_clk, "bus-pwm0", apb0_hws, > + 0x784, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_pwm1_clk, "bus-pwm1", apb0_hws, > + 0x78c, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_dbg_clk, "bus-dbg", sys_24M_hws, > + 0x7a4, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_sysdap_clk, "bus-sysdap", apb1_hws, > + 0x88c, BIT(0), 0); > > /************************************************************************** > - * mod clocks * > + * mod clocks with gates * > **************************************************************************/ > > static const struct clk_parent_data timer_parents[] = { > @@ -565,6 +682,7 @@ static SUNXI_CCU_MP_DATA_WITH_MUX_GATE(timer9_clk, "timer9", timer_parents, 0x82 > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_timer_clk, "bus-timer", ahb_hws, 0x850, BIT(0), 0); > > static const struct clk_parent_data avs_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -589,6 +707,7 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(de_clk, "de", de_parents, 0xa00, > 24, 3, /* mux */ > BIT(31), /* gate */ > CLK_SET_RATE_PARENT); > +static SUNXI_CCU_GATE_HWS(bus_de_clk, "bus-de", ahb_hws, 0xa04, BIT(0), 0); > > static const struct clk_hw *di_parents[] = { > &pll_periph0_600M_clk.hw, > @@ -602,6 +721,7 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(di_clk, "di", di_parents, 0xa20, > 24, 3, /* mux */ > BIT(31), /* gate */ > CLK_SET_RATE_PARENT); > +static SUNXI_CCU_GATE_HWS(bus_di_clk, "bus-di", ahb_hws, 0xa24, BIT(0), 0); > > static const struct clk_hw *g2d_parents[] = { > &pll_periph0_400M_clk.hw, > @@ -614,6 +734,7 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(g2d_clk, "g2d", g2d_parents, 0xa40, > 24, 3, /* mux */ > BIT(31), /* gate */ > CLK_SET_RATE_PARENT); > +static SUNXI_CCU_GATE_HWS(bus_g2d_clk, "bus-g2d", ahb_hws, 0xa44, BIT(0), 0); > > static const struct clk_hw *eink_parents[] = { > &pll_periph0_480M_clk.common.hw, > @@ -637,6 +758,7 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(eink_panel_clk, "eink-panel", eink_panel_par > 24, 3, /* mux */ > BIT(31), /* gate */ > CLK_SET_RATE_PARENT); > +static SUNXI_CCU_GATE_HWS(bus_eink_clk, "bus-eink", ahb_hws, 0xa6c, BIT(0), 0); > > static const struct clk_hw *ve_enc_parents[] = { > &pll_ve0_clk.common.hw, > @@ -668,6 +790,9 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(ve_dec_clk, "ve-dec", ve_dec_parents, 0xa88, > BIT(31), /* gate */ > CLK_SET_RATE_PARENT); > > +static SUNXI_CCU_GATE_HWS(bus_ve_enc_clk, "bus-ve-enc", ahb_hws, 0xa8c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_ve_dec_clk, "bus-ve-dec", ahb_hws, 0xa8c, BIT(2), 0); > + > static const struct clk_hw *ce_parents[] = { > &sys_24M_clk.hw, > &pll_periph0_400M_clk.hw, > @@ -678,6 +803,8 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(ce_clk, "ce", ce_parents, 0xac0, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_ce_clk, "bus-ce", ahb_hws, 0xac4, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_ce_sys_clk, "bus-ce-sys", ahb_hws, 0xac4, BIT(1), 0); > > static const struct clk_hw *npu_parents[] = { > &pll_npu_clk.common.hw, > @@ -693,6 +820,7 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(npu_clk, "npu", npu_parents, 0xb00, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_DATA(bus_npu_clk, "bus-npu", hosc, 0xb04, BIT(0), 0); > > /* > * GPU_CLK = ClockSource * ((16 - M) / 16) > @@ -725,6 +853,7 @@ static struct ccu_div gpu_clk = { > &ccu_div_ops, 0), > } > }; > +static SUNXI_CCU_GATE_HWS(bus_gpu_clk, "bus-gpu", ahb_hws, 0xb24, BIT(0), 0); > > static const struct clk_parent_data dram_parents[] = { > { .hw = &pll_ddr_clk.common.hw, }, > @@ -740,6 +869,7 @@ static SUNXI_CCU_MP_DATA_WITH_MUX_GATE_FEAT(dram_clk, "dram", dram_parents, 0xc0 > BIT(31), /* gate */ > CLK_IS_CRITICAL, > CCU_FEATURE_UPDATE_BIT); > +static SUNXI_CCU_GATE_HWS(bus_dram_clk, "bus-dram", ahb_hws, 0xc0c, BIT(0), 0); > > static const struct clk_parent_data nand_mmc_parents[] = { > { .hw = &sys_24M_clk.hw, }, > @@ -758,6 +888,7 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(nand1_clk, "nand1", nand_mmc_parents, 0xc8 > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_nand_clk, "bus-nand", ahb_hws, 0xc8c, BIT(0), 0); > > static SUNXI_CCU_MP_MUX_GATE_POSTDIV_DUALDIV(mmc0_clk, "mmc0", nand_mmc_parents, 0xd00, > 0, 5, /* M */ > @@ -796,6 +927,11 @@ static SUNXI_CCU_MP_MUX_GATE_POSTDIV_DUALDIV(mmc3_clk, "mmc3", mmc2_mmc3_parents > 2, /* post div */ > 0); > > +static SUNXI_CCU_GATE_HWS(bus_mmc0_clk, "bus-mmc0", ahb_hws, 0xd0c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_mmc1_clk, "bus-mmc1", ahb_hws, 0xd1c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_mmc2_clk, "bus-mmc2", ahb_hws, 0xd2c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_mmc3_clk, "bus-mmc3", ahb_hws, 0xd3c, BIT(0), 0); > + > static const struct clk_hw *ufs_axi_parents[] = { > &pll_periph0_300M_clk.hw, > &pll_periph0_200M_clk.hw, > @@ -815,6 +951,29 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(ufs_cfg_clk, "ufs-cfg", ufs_cfg_parents, 0 > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_DATA(bus_ufs_clk, "bus-ufs", hosc, 0xd8c, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_uart0_clk, "bus-uart0", apb_uart_hws, 0xe00, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_uart1_clk, "bus-uart1", apb_uart_hws, 0xe04, BIT(1), 0); > +static SUNXI_CCU_GATE_HWS(bus_uart2_clk, "bus-uart2", apb_uart_hws, 0xe08, BIT(2), 0); > +static SUNXI_CCU_GATE_HWS(bus_uart3_clk, "bus-uart3", apb_uart_hws, 0xe0c, BIT(3), 0); > +static SUNXI_CCU_GATE_HWS(bus_uart4_clk, "bus-uart4", apb_uart_hws, 0xe10, BIT(4), 0); > +static SUNXI_CCU_GATE_HWS(bus_uart5_clk, "bus-uart5", apb_uart_hws, 0xe14, BIT(5), 0); > +static SUNXI_CCU_GATE_HWS(bus_uart6_clk, "bus-uart6", apb_uart_hws, 0xe18, BIT(6), 0); According to the manual the gate bits are always BIT(0), since each UART has its own bus gate register. > +static SUNXI_CCU_GATE_HWS(bus_i2c0_clk, "bus-i2c0", apb1_hws, 0xe80, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c1_clk, "bus-i2c1", apb1_hws, 0xe84, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c2_clk, "bus-i2c2", apb1_hws, 0xe88, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c3_clk, "bus-i2c3", apb1_hws, 0xe8c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c4_clk, "bus-i2c4", apb1_hws, 0xe90, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c5_clk, "bus-i2c5", apb1_hws, 0xe94, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c6_clk, "bus-i2c6", apb1_hws, 0xe98, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c7_clk, "bus-i2c7", apb1_hws, 0xe9c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c8_clk, "bus-i2c8", apb1_hws, 0xea0, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c9_clk, "bus-i2c9", apb1_hws, 0xea4, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c10_clk, "bus-i2c10", apb1_hws, 0xea8, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c11_clk, "bus-i2c11", apb1_hws, 0xeac, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_i2c12_clk, "bus-i2c12", apb1_hws, 0xeb0, BIT(0), 0); > > static const struct clk_parent_data spi_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -856,6 +1015,11 @@ static SUNXI_CCU_DUALDIV_MUX_GATE(spi4_clk, "spi4", spi_parents, 0xf28, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_spi0_clk, "bus-spi0", ahb_hws, 0xf04, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_spi1_clk, "bus-spi1", ahb_hws, 0xf0c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_spi2_clk, "bus-spi2", ahb_hws, 0xf14, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_spi3_clk, "bus-spi3", ahb_hws, 0xf24, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_spi4_clk, "bus-spi4", ahb_hws, 0xf2c, BIT(0), 0); > > static const struct clk_parent_data spif_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -873,6 +1037,7 @@ static SUNXI_CCU_DUALDIV_MUX_GATE(spif_clk, "spif", spif_parents, 0xf18, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_spif_clk, "bus-spif", ahb_hws, 0xf1c, BIT(0), 0); Can you please move that line into the other SPI gates above, so that it is ordered by address? > > static const struct clk_parent_data gpadc_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -883,6 +1048,9 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(gpadc_clk, "gpadc", gpadc_parents, 0xfc0, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_gpadc_clk, "bus-gpadc", ahb_hws, 0xfc4, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_ths_clk, "bus-ths", apb0_hws, 0xfe4, BIT(0), 0); > > static const struct clk_parent_data irrx_parents[] = { > { .fw_name = "losc"}, > @@ -894,6 +1062,7 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(irrx_clk, "irrx", irrx_parents, 0x1000, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_irrx_clk, "bus-irrx", apb0_hws, 0x1004, BIT(0), 0); > > static const struct clk_parent_data irtx_parents[] = { > { .fw_name = "losc"}, > @@ -905,6 +1074,9 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(irtx_clk, "irtx", irtx_parents, 0x1008, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_irtx_clk, "bus-irtx", apb0_hws, 0x100c, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_lradc_clk, "bus-lradc", apb0_hws, 0x1024, BIT(0), 0); > > static const struct clk_parent_data sgpio_parents[] = { > { .fw_name = "losc"}, > @@ -915,6 +1087,7 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(sgpio_clk, "sgpio", sgpio_parents, 0x1060, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_DATA(bus_sgpio_clk, "bus-sgpio", hosc, 0x1064, BIT(0), 0); > > static const struct clk_hw *lpc_parents[] = { > &pll_video0_3x_clk.common.hw, > @@ -927,6 +1100,7 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(lpc_clk, "lpc", lpc_parents, 0x1080, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_DATA(bus_lpc_clk, "bus-lpc", hosc, 0x1084, BIT(0), 0); where do these two clocks come from? They are not mentioned in the version of the manual I am looking at. If they come from BSP sources, please add a comment about that. > > static const struct clk_hw *i2spcm_parents[] = { > &pll_audio0_4x_clk.common.hw, > @@ -959,6 +1133,11 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(i2spcm4_clk, "i2spcm4", i2spcm_parents, 0x12 > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_DATA(bus_i2spcm0_clk, "bus-i2spcm0", hosc, 0x120c, BIT(0), 0); > +static SUNXI_CCU_GATE_DATA(bus_i2spcm1_clk, "bus-i2spcm1", hosc, 0x121c, BIT(0), 0); > +static SUNXI_CCU_GATE_DATA(bus_i2spcm2_clk, "bus-i2spcm2", hosc, 0x122c, BIT(0), 0); > +static SUNXI_CCU_GATE_DATA(bus_i2spcm3_clk, "bus-i2spcm3", hosc, 0x123c, BIT(0), 0); > +static SUNXI_CCU_GATE_DATA(bus_i2spcm4_clk, "bus-i2spcm4", hosc, 0x124c, BIT(0), 0); > > static const struct clk_hw *i2spcm2_asrc_parents[] = { > &pll_audio0_4x_clk.common.hw, > @@ -995,6 +1174,8 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(owa_rx_clk, "owa_rx", owa_rx_parents, 0x1284 > BIT(31), /* gate */ > 0); > > +static SUNXI_CCU_GATE_HWS(bus_owa_clk, "bus-owa", apb1_hws, 0x128c, BIT(0), 0); In mainline we use "spdif" instead of "owa", compare the other drivers. > + > static const struct clk_hw *dmic_parents[] = { > &pll_audio0_4x_clk.common.hw, > &pll_audio1_div2_clk.common.hw, > @@ -1006,6 +1187,8 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(dmic_clk, "dmic", dmic_parents, 0x12c0, > BIT(31), /* gate */ > 0); > > +static SUNXI_CCU_GATE_HWS(bus_dmic_clk, "bus-dmic", apb1_hws, 0x12cc, BIT(0), 0); > + > /* > * The first parent is a 48 MHz input clock divided by 4. That 48 MHz clock is > * a 2x multiplier from pll-ref synchronized by pll-periph0, and is also used by > @@ -1037,6 +1220,9 @@ static struct ccu_mux usb_ohci0_clk = { > &ccu_mux_ops, 0), > }, > }; > +static SUNXI_CCU_GATE_HWS(bus_ohci0_clk, "bus-ohci0", ahb_hws, 0x1304, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_ehci0_clk, "bus-ehci0", ahb_hws, 0x1304, BIT(4), 0); > +static SUNXI_CCU_GATE_HWS(bus_otg_clk, "bus-otg", ahb_hws, 0x1304, BIT(8), 0); > > static struct ccu_mux usb_ohci1_clk = { > .enable = BIT(31), > @@ -1053,6 +1239,8 @@ static struct ccu_mux usb_ohci1_clk = { > &ccu_mux_ops, 0), > }, > }; > +static SUNXI_CCU_GATE_HWS(bus_ohci1_clk, "bus-ohci1", ahb_hws, 0x130c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_ehci1_clk, "bus-ehci1", ahb_hws, 0x130c, BIT(4), 0); > > static const struct clk_parent_data usb_ref_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -1159,6 +1347,8 @@ static SUNXI_CCU_M_HWS_WITH_GATE(gmac1_phy_clk, "gmac1-phy", pll_periph0_150M_hw > 0, 5, /* M */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_gmac0_clk, "bus-gmac0", ahb_hws, 0x141c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_gmac1_clk, "bus-gmac1", ahb_hws, 0x142c, BIT(0), 0); That GMAC1 clock is not in the manual, where does it come from? > > static const struct clk_hw *tcon_lcd_parents[] = { > &pll_video0_4x_clk.common.hw, > @@ -1181,6 +1371,9 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(tcon_lcd2_clk, "tcon-lcd2", tcon_lcd_parents > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_tcon_lcd0_clk, "bus-tcon-lcd0", ahb_hws, 0x1504, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_tcon_lcd1_clk, "bus-tcon-lcd1", ahb_hws, 0x150c, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_tcon_lcd2_clk, "bus-tcon-lcd2", ahb_hws, 0x1514, BIT(0), 0); Same here, LCD2 is not listed. The rest looks alright when comparing to the manual, also the whole boilerplate with the SUNXI_CC_GATE_HWS macro, the list of hw clocks below and the assignment of the clock IDs to the clocks. Cheers, Andre > > static const struct clk_hw *dsi_parents[] = { > &sys_24M_clk.hw, > @@ -1197,6 +1390,8 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(dsi1_clk, "dsi1", dsi_parents, 0x1588, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_dsi0_clk, "bus-dsi0", ahb_hws, 0x1584, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_dsi1_clk, "bus-dsi1", ahb_hws, 0x158c, BIT(0), 0); > > static const struct clk_hw *combphy_parents[] = { > &pll_video0_4x_clk.common.hw, > @@ -1216,6 +1411,9 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(combphy1_clk, "combphy1", combphy_parents, 0 > BIT(31), /* gate */ > 0); > > +static SUNXI_CCU_GATE_HWS(bus_tcon_tv0_clk, "bus-tcon-tv0", ahb_hws, 0x1604, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_tcon_tv1_clk, "bus-tcon-tv1", ahb_hws, 0x160c, BIT(0), 0); > + > static const struct clk_hw *edp_tv_parents[] = { > &pll_video0_4x_clk.common.hw, > &pll_video1_4x_clk.common.hw, > @@ -1227,6 +1425,7 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(edp_tv_clk, "edp-tv", edp_tv_parents, 0x1640 > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_edp_tv_clk, "bus-edp-tv", ahb_hws, 0x164c, BIT(0), 0); > > static SUNXI_CCU_GATE_HWS_WITH_PREDIV(hdmi_cec_32k_clk, "hdmi-cec-32k", pll_periph0_2x_hws, 0x1680, > BIT(30), /* gate */ > @@ -1254,6 +1453,7 @@ static SUNXI_CCU_DUALDIV_MUX_GATE(hdmi_tv_clk, "hdmi-tv", hdmi_tv_parents, 0x168 > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_hdmi_tv_clk, "bus-hdmi-tv", ahb_hws, 0x168c, BIT(0), 0); > > static const struct clk_parent_data hdmi_sfr_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -1266,6 +1466,9 @@ static SUNXI_CCU_MUX_DATA_WITH_GATE(hdmi_sfr_clk, "hdmi-sfr", hdmi_sfr_parents, > > static SUNXI_CCU_GATE_HWS(hdmi_esm_clk, "hdmi-esm", pll_periph0_300M_hws, 0x1694, BIT(31), 0); > > +static SUNXI_CCU_GATE_HWS(bus_dpss_top0_clk, "bus-dpss-top0", ahb_hws, 0x16c4, BIT(0), 0); > +static SUNXI_CCU_GATE_HWS(bus_dpss_top1_clk, "bus-dpss-top1", ahb_hws, 0x16cc, BIT(0), 0); > + > static const struct clk_parent_data ledc_parents[] = { > { .hw = &sys_24M_clk.hw }, > { .hw = &pll_periph0_600M_clk.hw }, > @@ -1276,6 +1479,9 @@ static SUNXI_CCU_M_DATA_WITH_MUX_GATE(ledc_clk, "ledc", ledc_parents, 0x1700, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_ledc_clk, "bus-ledc", apb0_hws, 0x1704, BIT(0), 0); > + > +static SUNXI_CCU_GATE_HWS(bus_dsc_clk, "bus-dsc", ahb_hws, 0x1744, BIT(0), 0); > > static const struct clk_parent_data csi_master_parents[] = { > { .hw = &sys_24M_clk.hw }, > @@ -1317,6 +1523,7 @@ static SUNXI_CCU_M_HW_WITH_MUX_GATE(csi_clk, "csi", csi_parents, 0x1840, > 24, 3, /* mux */ > BIT(31), /* gate */ > 0); > +static SUNXI_CCU_GATE_HWS(bus_csi_clk, "bus-csi", ahb_hws, 0x1844, BIT(0), 0); > > static const struct clk_hw *isp_parents[] = { > &pll_video2_4x_clk.common.hw, > @@ -1446,8 +1653,62 @@ static struct ccu_common *sun60i_a733_ccu_clks[] = { > &trace_clk.common, > &gic_clk.common, > &cpu_peri_clk.common, > + &bus_its_pcie_clk.common, > &nsi_clk.common, > + &bus_nsi_clk.common, > &mbus_clk.common, > + &mbus_iommu0_sys_clk.common, > + &apb_iommu0_sys_clk.common, > + &ahb_iommu0_sys_clk.common, > + &bus_msi_lite0_clk.common, > + &bus_msi_lite1_clk.common, > + &bus_msi_lite2_clk.common, > + &mbus_iommu1_sys_clk.common, > + &apb_iommu1_sys_clk.common, > + &ahb_iommu1_sys_clk.common, > + &ahb_ve_dec_clk.common, > + &ahb_ve_enc_clk.common, > + &ahb_vid_in_clk.common, > + &ahb_vid_cout0_clk.common, > + &ahb_vid_cout1_clk.common, > + &ahb_de_clk.common, > + &ahb_npu_clk.common, > + &ahb_gpu0_clk.common, > + &ahb_serdes_clk.common, > + &ahb_usb_sys_clk.common, > + &ahb_msi_lite0_clk.common, > + &ahb_store_clk.common, > + &ahb_cpus_clk.common, > + &mbus_iommu0_clk.common, > + &mbus_iommu1_clk.common, > + &mbus_desys_clk.common, > + &mbus_ve_enc_gate_clk.common, > + &mbus_ve_dec_gate_clk.common, > + &mbus_gpu0_clk.common, > + &mbus_npu_clk.common, > + &mbus_vid_in_clk.common, > + &mbus_serdes_clk.common, > + &mbus_msi_lite0_clk.common, > + &mbus_store_clk.common, > + &mbus_msi_lite2_clk.common, > + &mbus_dma0_clk.common, > + &mbus_ve_enc_clk.common, > + &mbus_ce_clk.common, > + &mbus_dma1_clk.common, > + &mbus_nand_clk.common, > + &mbus_csi_clk.common, > + &mbus_isp_clk.common, > + &mbus_gmac0_clk.common, > + &mbus_gmac1_clk.common, > + &mbus_ve_dec_clk.common, > + &bus_dma0_clk.common, > + &bus_dma1_clk.common, > + &bus_spinlock_clk.common, > + &bus_msgbox_clk.common, > + &bus_pwm0_clk.common, > + &bus_pwm1_clk.common, > + &bus_dbg_clk.common, > + &bus_sysdap_clk.common, > &timer0_clk.common, > &timer1_clk.common, > &timer2_clk.common, > @@ -1458,48 +1719,111 @@ static struct ccu_common *sun60i_a733_ccu_clks[] = { > &timer7_clk.common, > &timer8_clk.common, > &timer9_clk.common, > + &bus_timer_clk.common, > &avs_clk.common, > &de_clk.common, > + &bus_de_clk.common, > &di_clk.common, > + &bus_di_clk.common, > &g2d_clk.common, > + &bus_g2d_clk.common, > &eink_clk.common, > &eink_panel_clk.common, > + &bus_eink_clk.common, > &ve_enc_clk.common, > &ve_dec_clk.common, > + &bus_ve_enc_clk.common, > + &bus_ve_dec_clk.common, > &ce_clk.common, > + &bus_ce_clk.common, > + &bus_ce_sys_clk.common, > &npu_clk.common, > + &bus_npu_clk.common, > &gpu_clk.common, > + &bus_gpu_clk.common, > &dram_clk.common, > + &bus_dram_clk.common, > &nand0_clk.common, > &nand1_clk.common, > + &bus_nand_clk.common, > &mmc0_clk.common, > &mmc1_clk.common, > &mmc2_clk.common, > &mmc3_clk.common, > + &bus_mmc0_clk.common, > + &bus_mmc1_clk.common, > + &bus_mmc2_clk.common, > + &bus_mmc3_clk.common, > &ufs_axi_clk.common, > &ufs_cfg_clk.common, > + &bus_ufs_clk.common, > + &bus_uart0_clk.common, > + &bus_uart1_clk.common, > + &bus_uart2_clk.common, > + &bus_uart3_clk.common, > + &bus_uart4_clk.common, > + &bus_uart5_clk.common, > + &bus_uart6_clk.common, > + &bus_i2c0_clk.common, > + &bus_i2c1_clk.common, > + &bus_i2c2_clk.common, > + &bus_i2c3_clk.common, > + &bus_i2c4_clk.common, > + &bus_i2c5_clk.common, > + &bus_i2c6_clk.common, > + &bus_i2c7_clk.common, > + &bus_i2c8_clk.common, > + &bus_i2c9_clk.common, > + &bus_i2c10_clk.common, > + &bus_i2c11_clk.common, > + &bus_i2c12_clk.common, > &spi0_clk.common, > &spi1_clk.common, > &spi2_clk.common, > &spi3_clk.common, > &spi4_clk.common, > + &bus_spi0_clk.common, > + &bus_spi1_clk.common, > + &bus_spi2_clk.common, > + &bus_spi3_clk.common, > + &bus_spi4_clk.common, > &spif_clk.common, > + &bus_spif_clk.common, > &gpadc_clk.common, > + &bus_gpadc_clk.common, > + &bus_ths_clk.common, > &irrx_clk.common, > + &bus_irrx_clk.common, > &irtx_clk.common, > + &bus_irtx_clk.common, > + &bus_lradc_clk.common, > &sgpio_clk.common, > + &bus_sgpio_clk.common, > &lpc_clk.common, > + &bus_lpc_clk.common, > &i2spcm0_clk.common, > &i2spcm1_clk.common, > &i2spcm2_clk.common, > &i2spcm3_clk.common, > &i2spcm4_clk.common, > + &bus_i2spcm0_clk.common, > + &bus_i2spcm1_clk.common, > + &bus_i2spcm2_clk.common, > + &bus_i2spcm3_clk.common, > + &bus_i2spcm4_clk.common, > &i2spcm2_asrc_clk.common, > &owa_tx_clk.common, > &owa_rx_clk.common, > + &bus_owa_clk.common, > &dmic_clk.common, > + &bus_dmic_clk.common, > &usb_ohci0_clk.common, > + &bus_otg_clk.common, > + &bus_ehci0_clk.common, > + &bus_ohci0_clk.common, > &usb_ohci1_clk.common, > + &bus_ehci1_clk.common, > + &bus_ohci1_clk.common, > &usb_ref_clk.common, > &usb2_u2_ref_clk.common, > &usb2_suspend_clk.common, > @@ -1512,24 +1836,40 @@ static struct ccu_common *sun60i_a733_ccu_clks[] = { > &gmac_ptp_clk.common, > &gmac0_phy_clk.common, > &gmac1_phy_clk.common, > + &bus_gmac0_clk.common, > + &bus_gmac1_clk.common, > &tcon_lcd0_clk.common, > &tcon_lcd1_clk.common, > &tcon_lcd2_clk.common, > + &bus_tcon_lcd0_clk.common, > + &bus_tcon_lcd1_clk.common, > + &bus_tcon_lcd2_clk.common, > &dsi0_clk.common, > &dsi1_clk.common, > + &bus_dsi0_clk.common, > + &bus_dsi1_clk.common, > &combphy0_clk.common, > &combphy1_clk.common, > + &bus_tcon_tv0_clk.common, > + &bus_tcon_tv1_clk.common, > &edp_tv_clk.common, > + &bus_edp_tv_clk.common, > &hdmi_cec_32k_clk.common, > &hdmi_cec_clk.common, > &hdmi_tv_clk.common, > + &bus_hdmi_tv_clk.common, > &hdmi_sfr_clk.common, > &hdmi_esm_clk.common, > + &bus_dpss_top0_clk.common, > + &bus_dpss_top1_clk.common, > &ledc_clk.common, > + &bus_ledc_clk.common, > + &bus_dsc_clk.common, > &csi_master0_clk.common, > &csi_master1_clk.common, > &csi_master2_clk.common, > &csi_clk.common, > + &bus_csi_clk.common, > &isp_clk.common, > &apb2jtag_clk.common, > &fanout_24M_clk.common, > @@ -1596,8 +1936,62 @@ static struct clk_hw_onecell_data sun60i_a733_hw_clks = { > [CLK_TRACE] = &trace_clk.common.hw, > [CLK_GIC] = &gic_clk.common.hw, > [CLK_CPU_PERI] = &cpu_peri_clk.common.hw, > + [CLK_BUS_ITS_PCIE] = &bus_its_pcie_clk.common.hw, > [CLK_NSI] = &nsi_clk.common.hw, > + [CLK_BUS_NSI] = &bus_nsi_clk.common.hw, > [CLK_MBUS] = &mbus_clk.common.hw, > + [CLK_MBUS_IOMMU0_SYS] = &mbus_iommu0_sys_clk.common.hw, > + [CLK_APB_IOMMU0_SYS] = &apb_iommu0_sys_clk.common.hw, > + [CLK_AHB_IOMMU0_SYS] = &ahb_iommu0_sys_clk.common.hw, > + [CLK_BUS_MSI_LITE0] = &bus_msi_lite0_clk.common.hw, > + [CLK_BUS_MSI_LITE1] = &bus_msi_lite1_clk.common.hw, > + [CLK_BUS_MSI_LITE2] = &bus_msi_lite2_clk.common.hw, > + [CLK_MBUS_IOMMU1_SYS] = &mbus_iommu1_sys_clk.common.hw, > + [CLK_APB_IOMMU1_SYS] = &apb_iommu1_sys_clk.common.hw, > + [CLK_AHB_IOMMU1_SYS] = &ahb_iommu1_sys_clk.common.hw, > + [CLK_AHB_VE_DEC] = &ahb_ve_dec_clk.common.hw, > + [CLK_AHB_VE_ENC] = &ahb_ve_enc_clk.common.hw, > + [CLK_AHB_VID_IN] = &ahb_vid_in_clk.common.hw, > + [CLK_AHB_VID_COUT0] = &ahb_vid_cout0_clk.common.hw, > + [CLK_AHB_VID_COUT1] = &ahb_vid_cout1_clk.common.hw, > + [CLK_AHB_DE] = &ahb_de_clk.common.hw, > + [CLK_AHB_NPU] = &ahb_npu_clk.common.hw, > + [CLK_AHB_GPU0] = &ahb_gpu0_clk.common.hw, > + [CLK_AHB_SERDES] = &ahb_serdes_clk.common.hw, > + [CLK_AHB_USB_SYS] = &ahb_usb_sys_clk.common.hw, > + [CLK_AHB_MSI_LITE0] = &ahb_msi_lite0_clk.common.hw, > + [CLK_AHB_STORE] = &ahb_store_clk.common.hw, > + [CLK_AHB_CPUS] = &ahb_cpus_clk.common.hw, > + [CLK_MBUS_IOMMU0] = &mbus_iommu0_clk.common.hw, > + [CLK_MBUS_IOMMU1] = &mbus_iommu1_clk.common.hw, > + [CLK_MBUS_DESYS] = &mbus_desys_clk.common.hw, > + [CLK_MBUS_VE_ENC_GATE] = &mbus_ve_enc_gate_clk.common.hw, > + [CLK_MBUS_VE_DEC_GATE] = &mbus_ve_dec_gate_clk.common.hw, > + [CLK_MBUS_GPU0] = &mbus_gpu0_clk.common.hw, > + [CLK_MBUS_NPU] = &mbus_npu_clk.common.hw, > + [CLK_MBUS_VID_IN] = &mbus_vid_in_clk.common.hw, > + [CLK_MBUS_SERDES] = &mbus_serdes_clk.common.hw, > + [CLK_MBUS_MSI_LITE0] = &mbus_msi_lite0_clk.common.hw, > + [CLK_MBUS_STORE] = &mbus_store_clk.common.hw, > + [CLK_MBUS_MSI_LITE2] = &mbus_msi_lite2_clk.common.hw, > + [CLK_MBUS_DMA0] = &mbus_dma0_clk.common.hw, > + [CLK_MBUS_VE_ENC] = &mbus_ve_enc_clk.common.hw, > + [CLK_MBUS_CE] = &mbus_ce_clk.common.hw, > + [CLK_MBUS_DMA1] = &mbus_dma1_clk.common.hw, > + [CLK_MBUS_NAND] = &mbus_nand_clk.common.hw, > + [CLK_MBUS_CSI] = &mbus_csi_clk.common.hw, > + [CLK_MBUS_ISP] = &mbus_isp_clk.common.hw, > + [CLK_MBUS_GMAC0] = &mbus_gmac0_clk.common.hw, > + [CLK_MBUS_GMAC1] = &mbus_gmac1_clk.common.hw, > + [CLK_MBUS_VE_DEC] = &mbus_ve_dec_clk.common.hw, > + [CLK_BUS_DMA0] = &bus_dma0_clk.common.hw, > + [CLK_BUS_DMA1] = &bus_dma1_clk.common.hw, > + [CLK_BUS_SPINLOCK] = &bus_spinlock_clk.common.hw, > + [CLK_BUS_MSGBOX] = &bus_msgbox_clk.common.hw, > + [CLK_BUS_PWM0] = &bus_pwm0_clk.common.hw, > + [CLK_BUS_PWM1] = &bus_pwm1_clk.common.hw, > + [CLK_BUS_DBG] = &bus_dbg_clk.common.hw, > + [CLK_BUS_SYSDAP] = &bus_sysdap_clk.common.hw, > [CLK_TIMER0] = &timer0_clk.common.hw, > [CLK_TIMER1] = &timer1_clk.common.hw, > [CLK_TIMER2] = &timer2_clk.common.hw, > @@ -1608,48 +2002,111 @@ static struct clk_hw_onecell_data sun60i_a733_hw_clks = { > [CLK_TIMER7] = &timer7_clk.common.hw, > [CLK_TIMER8] = &timer8_clk.common.hw, > [CLK_TIMER9] = &timer9_clk.common.hw, > + [CLK_BUS_TIMER] = &bus_timer_clk.common.hw, > [CLK_AVS] = &avs_clk.common.hw, > [CLK_DE] = &de_clk.common.hw, > + [CLK_BUS_DE] = &bus_de_clk.common.hw, > [CLK_DI] = &di_clk.common.hw, > + [CLK_BUS_DI] = &bus_di_clk.common.hw, > [CLK_G2D] = &g2d_clk.common.hw, > + [CLK_BUS_G2D] = &bus_g2d_clk.common.hw, > [CLK_EINK] = &eink_clk.common.hw, > [CLK_EINK_PANEL] = &eink_panel_clk.common.hw, > + [CLK_BUS_EINK] = &bus_eink_clk.common.hw, > [CLK_VE_ENC] = &ve_enc_clk.common.hw, > [CLK_VE_DEC] = &ve_dec_clk.common.hw, > + [CLK_BUS_VE_ENC] = &bus_ve_enc_clk.common.hw, > + [CLK_BUS_VE_DEC] = &bus_ve_dec_clk.common.hw, > [CLK_CE] = &ce_clk.common.hw, > + [CLK_BUS_CE] = &bus_ce_clk.common.hw, > + [CLK_BUS_CE_SYS] = &bus_ce_sys_clk.common.hw, > [CLK_NPU] = &npu_clk.common.hw, > + [CLK_BUS_NPU] = &bus_npu_clk.common.hw, > [CLK_GPU] = &gpu_clk.common.hw, > + [CLK_BUS_GPU] = &bus_gpu_clk.common.hw, > [CLK_DRAM] = &dram_clk.common.hw, > + [CLK_BUS_DRAM] = &bus_dram_clk.common.hw, > [CLK_NAND0] = &nand0_clk.common.hw, > [CLK_NAND1] = &nand1_clk.common.hw, > + [CLK_BUS_NAND] = &bus_nand_clk.common.hw, > [CLK_MMC0] = &mmc0_clk.common.hw, > [CLK_MMC1] = &mmc1_clk.common.hw, > [CLK_MMC2] = &mmc2_clk.common.hw, > [CLK_MMC3] = &mmc3_clk.common.hw, > + [CLK_BUS_MMC0] = &bus_mmc0_clk.common.hw, > + [CLK_BUS_MMC1] = &bus_mmc1_clk.common.hw, > + [CLK_BUS_MMC2] = &bus_mmc2_clk.common.hw, > + [CLK_BUS_MMC3] = &bus_mmc3_clk.common.hw, > [CLK_UFS_AXI] = &ufs_axi_clk.common.hw, > [CLK_UFS_CFG] = &ufs_cfg_clk.common.hw, > + [CLK_BUS_UFS] = &bus_ufs_clk.common.hw, > + [CLK_BUS_UART0] = &bus_uart0_clk.common.hw, > + [CLK_BUS_UART1] = &bus_uart1_clk.common.hw, > + [CLK_BUS_UART2] = &bus_uart2_clk.common.hw, > + [CLK_BUS_UART3] = &bus_uart3_clk.common.hw, > + [CLK_BUS_UART4] = &bus_uart4_clk.common.hw, > + [CLK_BUS_UART5] = &bus_uart5_clk.common.hw, > + [CLK_BUS_UART6] = &bus_uart6_clk.common.hw, > + [CLK_BUS_I2C0] = &bus_i2c0_clk.common.hw, > + [CLK_BUS_I2C1] = &bus_i2c1_clk.common.hw, > + [CLK_BUS_I2C2] = &bus_i2c2_clk.common.hw, > + [CLK_BUS_I2C3] = &bus_i2c3_clk.common.hw, > + [CLK_BUS_I2C4] = &bus_i2c4_clk.common.hw, > + [CLK_BUS_I2C5] = &bus_i2c5_clk.common.hw, > + [CLK_BUS_I2C6] = &bus_i2c6_clk.common.hw, > + [CLK_BUS_I2C7] = &bus_i2c7_clk.common.hw, > + [CLK_BUS_I2C8] = &bus_i2c8_clk.common.hw, > + [CLK_BUS_I2C9] = &bus_i2c9_clk.common.hw, > + [CLK_BUS_I2C10] = &bus_i2c10_clk.common.hw, > + [CLK_BUS_I2C11] = &bus_i2c11_clk.common.hw, > + [CLK_BUS_I2C12] = &bus_i2c12_clk.common.hw, > [CLK_SPI0] = &spi0_clk.common.hw, > [CLK_SPI1] = &spi1_clk.common.hw, > [CLK_SPI2] = &spi2_clk.common.hw, > [CLK_SPI3] = &spi3_clk.common.hw, > [CLK_SPI4] = &spi4_clk.common.hw, > + [CLK_BUS_SPI0] = &bus_spi0_clk.common.hw, > + [CLK_BUS_SPI1] = &bus_spi1_clk.common.hw, > + [CLK_BUS_SPI2] = &bus_spi2_clk.common.hw, > + [CLK_BUS_SPI3] = &bus_spi3_clk.common.hw, > + [CLK_BUS_SPI4] = &bus_spi4_clk.common.hw, > [CLK_SPIF] = &spif_clk.common.hw, > + [CLK_BUS_SPIF] = &bus_spif_clk.common.hw, > [CLK_GPADC] = &gpadc_clk.common.hw, > + [CLK_BUS_GPADC] = &bus_gpadc_clk.common.hw, > + [CLK_BUS_THS] = &bus_ths_clk.common.hw, > [CLK_IRRX] = &irrx_clk.common.hw, > + [CLK_BUS_IRRX] = &bus_irrx_clk.common.hw, > [CLK_IRTX] = &irtx_clk.common.hw, > + [CLK_BUS_IRTX] = &bus_irtx_clk.common.hw, > + [CLK_BUS_LRADC] = &bus_lradc_clk.common.hw, > [CLK_SGPIO] = &sgpio_clk.common.hw, > + [CLK_BUS_SGPIO] = &bus_sgpio_clk.common.hw, > [CLK_LPC] = &lpc_clk.common.hw, > + [CLK_BUS_LPC] = &bus_lpc_clk.common.hw, > [CLK_I2SPCM0] = &i2spcm0_clk.common.hw, > [CLK_I2SPCM1] = &i2spcm1_clk.common.hw, > [CLK_I2SPCM2] = &i2spcm2_clk.common.hw, > [CLK_I2SPCM3] = &i2spcm3_clk.common.hw, > [CLK_I2SPCM4] = &i2spcm4_clk.common.hw, > + [CLK_BUS_I2SPCM0] = &bus_i2spcm0_clk.common.hw, > + [CLK_BUS_I2SPCM1] = &bus_i2spcm1_clk.common.hw, > + [CLK_BUS_I2SPCM2] = &bus_i2spcm2_clk.common.hw, > + [CLK_BUS_I2SPCM3] = &bus_i2spcm3_clk.common.hw, > + [CLK_BUS_I2SPCM4] = &bus_i2spcm4_clk.common.hw, > [CLK_I2SPCM2_ASRC] = &i2spcm2_asrc_clk.common.hw, > [CLK_OWA_TX] = &owa_tx_clk.common.hw, > [CLK_OWA_RX] = &owa_rx_clk.common.hw, > + [CLK_BUS_OWA] = &bus_owa_clk.common.hw, > [CLK_DMIC] = &dmic_clk.common.hw, > + [CLK_BUS_DMIC] = &bus_dmic_clk.common.hw, > [CLK_USB_OHCI0] = &usb_ohci0_clk.common.hw, > + [CLK_BUS_OTG] = &bus_otg_clk.common.hw, > + [CLK_BUS_EHCI0] = &bus_ehci0_clk.common.hw, > + [CLK_BUS_OHCI0] = &bus_ohci0_clk.common.hw, > [CLK_USB_OHCI1] = &usb_ohci1_clk.common.hw, > + [CLK_BUS_EHCI1] = &bus_ehci1_clk.common.hw, > + [CLK_BUS_OHCI1] = &bus_ohci1_clk.common.hw, > [CLK_USB_REF] = &usb_ref_clk.common.hw, > [CLK_USB2_U2_REF] = &usb2_u2_ref_clk.common.hw, > [CLK_USB2_SUSPEND] = &usb2_suspend_clk.common.hw, > @@ -1662,24 +2119,40 @@ static struct clk_hw_onecell_data sun60i_a733_hw_clks = { > [CLK_GMAC_PTP] = &gmac_ptp_clk.common.hw, > [CLK_GMAC0_PHY] = &gmac0_phy_clk.common.hw, > [CLK_GMAC1_PHY] = &gmac1_phy_clk.common.hw, > + [CLK_BUS_GMAC0] = &bus_gmac0_clk.common.hw, > + [CLK_BUS_GMAC1] = &bus_gmac1_clk.common.hw, > [CLK_TCON_LCD0] = &tcon_lcd0_clk.common.hw, > [CLK_TCON_LCD1] = &tcon_lcd1_clk.common.hw, > [CLK_TCON_LCD2] = &tcon_lcd2_clk.common.hw, > + [CLK_BUS_TCON_LCD0] = &bus_tcon_lcd0_clk.common.hw, > + [CLK_BUS_TCON_LCD1] = &bus_tcon_lcd1_clk.common.hw, > + [CLK_BUS_TCON_LCD2] = &bus_tcon_lcd2_clk.common.hw, > [CLK_DSI0] = &dsi0_clk.common.hw, > [CLK_DSI1] = &dsi1_clk.common.hw, > + [CLK_BUS_DSI0] = &bus_dsi0_clk.common.hw, > + [CLK_BUS_DSI1] = &bus_dsi1_clk.common.hw, > [CLK_COMBPHY0] = &combphy0_clk.common.hw, > [CLK_COMBPHY1] = &combphy1_clk.common.hw, > + [CLK_BUS_TCON_TV0] = &bus_tcon_tv0_clk.common.hw, > + [CLK_BUS_TCON_TV1] = &bus_tcon_tv1_clk.common.hw, > [CLK_EDP_TV] = &edp_tv_clk.common.hw, > + [CLK_BUS_EDP_TV] = &bus_edp_tv_clk.common.hw, > [CLK_HDMI_CEC_32K] = &hdmi_cec_32k_clk.common.hw, > [CLK_HDMI_CEC] = &hdmi_cec_clk.common.hw, > [CLK_HDMI_TV] = &hdmi_tv_clk.common.hw, > + [CLK_BUS_HDMI_TV] = &bus_hdmi_tv_clk.common.hw, > [CLK_HDMI_SFR] = &hdmi_sfr_clk.common.hw, > [CLK_HDMI_ESM] = &hdmi_esm_clk.common.hw, > + [CLK_BUS_DPSS_TOP0] = &bus_dpss_top0_clk.common.hw, > + [CLK_BUS_DPSS_TOP1] = &bus_dpss_top1_clk.common.hw, > [CLK_LEDC] = &ledc_clk.common.hw, > + [CLK_BUS_LEDC] = &bus_ledc_clk.common.hw, > + [CLK_BUS_DSC] = &bus_dsc_clk.common.hw, > [CLK_CSI_MASTER0] = &csi_master0_clk.common.hw, > [CLK_CSI_MASTER1] = &csi_master1_clk.common.hw, > [CLK_CSI_MASTER2] = &csi_master2_clk.common.hw, > [CLK_CSI] = &csi_clk.common.hw, > + [CLK_BUS_CSI] = &bus_csi_clk.common.hw, > [CLK_ISP] = &isp_clk.common.hw, > [CLK_APB2JTAG] = &apb2jtag_clk.common.hw, > [CLK_FANOUT_24M] = &fanout_24M_clk.common.hw, > ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20260310-a733-clk-v1-8-36b4e9b24457@pigmoral.tech>]
* Re: [PATCH RFC 8/8] clk: sunxi-ng: a733: Add reset lines [not found] ` <20260310-a733-clk-v1-8-36b4e9b24457@pigmoral.tech> @ 2026-05-13 23:22 ` Andre Przywara 2026-05-14 2:41 ` Junhui Liu 0 siblings, 1 reply; 6+ messages in thread From: Andre Przywara @ 2026-05-13 23:22 UTC (permalink / raw) To: Junhui Liu Cc: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec, Samuel Holland, Philipp Zabel, Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti, Richard Cochran, linux-clk, devicetree, linux-arm-kernel, linux-sunxi, linux-kernel, linux-riscv, netdev On Tue, 10 Mar 2026 16:34:01 +0800 Junhui Liu <junhui.liu@pigmoral.tech> wrote: Hi, compare the list below against my version of the manual. You list more than shown there, can you say where those extra reset bits come from? > Add the reset lines for the Allwinner A733 SoC. These reset control bits > are integrated into the Bus Gate Reset (BGR) registers, typically > sharing the same register address with their corresponding bus clock > gates. Integrate them into the main CCU driver using the existing > sunxi-ng ccu_reset framework, allowing the CCU to also function as a > reset controller for the SoC. > > Signed-off-by: Junhui Liu <junhui.liu@pigmoral.tech> > --- > drivers/clk/sunxi-ng/ccu-sun60i-a733.c | 128 +++++++++++++++++++++++++++++++++ > 1 file changed, 128 insertions(+) > > diff --git a/drivers/clk/sunxi-ng/ccu-sun60i-a733.c b/drivers/clk/sunxi-ng/ccu-sun60i-a733.c > index c0b09f9197d1..7d1ee9235436 100644 > --- a/drivers/clk/sunxi-ng/ccu-sun60i-a733.c > +++ b/drivers/clk/sunxi-ng/ccu-sun60i-a733.c > @@ -17,6 +17,7 @@ > #include "../clk.h" > > #include "ccu_common.h" > +#include "ccu_reset.h" > > #include "ccu_div.h" > #include "ccu_gate.h" > @@ -2169,11 +2170,138 @@ static struct clk_hw_onecell_data sun60i_a733_hw_clks = { > .num = CLK_FANOUT3 + 1, > }; > > +static struct ccu_reset_map sun60i_a733_ccu_resets[] = { > + [RST_BUS_ITS_PCIE] = { 0x574, BIT(16) }, > + [RST_BUS_NSI] = { 0x580, BIT(30) }, What is this NSI device? Some interconnect? Do we really want to handle this reset and clock? Is there some device referencing this? Otherwise the kernel will turn at least the clock off, which is probably fatal. Also the manual says this is a secure register, so I feel like the kernel must not mess with this. > + [RST_BUS_NSI_CFG] = { 0x584, BIT(16) }, Similar here, I guess, though this might not be secure only. > + [RST_BUS_IOMMU0_SYS] = { 0x58c, BIT(16) }, > + [RST_BUS_MSI_LITE0_AHB] = { 0x594, BIT(16) }, > + [RST_BUS_MSI_LITE0_MBUS] = { 0x594, BIT(17) }, > + [RST_BUS_MSI_LITE1_AHB] = { 0x59c, BIT(16) }, > + [RST_BUS_MSI_LITE1_MBUS] = { 0x59c, BIT(17) }, > + [RST_BUS_MSI_LITE2_AHB] = { 0x5a4, BIT(16) }, > + [RST_BUS_MSI_LITE2_MBUS] = { 0x5a4, BIT(17) }, > + [RST_BUS_IOMMU1_SYS] = { 0x5b4, BIT(16) }, > + [RST_BUS_DMA0] = { 0x704, BIT(16) }, > + [RST_BUS_DMA1] = { 0x70c, BIT(16) }, > + [RST_BUS_SPINLOCK] = { 0x724, BIT(16) }, > + [RST_BUS_MSGBOX] = { 0x744, BIT(16) }, > + [RST_BUS_PWM0] = { 0x784, BIT(16) }, > + [RST_BUS_PWM1] = { 0x78c, BIT(16) }, > + [RST_BUS_DBG] = { 0x7a4, BIT(16) }, > + [RST_BUS_SYSDAP] = { 0x7ac, BIT(16) }, > + [RST_BUS_TIMER0] = { 0x850, BIT(16) }, > + [RST_BUS_DE] = { 0xa04, BIT(16) }, > + [RST_BUS_DI] = { 0xa24, BIT(16) }, > + [RST_BUS_G2D] = { 0xa44, BIT(16) }, > + [RST_BUS_EINK] = { 0xa6c, BIT(16) }, > + [RST_BUS_DE_SYS] = { 0xa74, BIT(16) }, > + [RST_BUS_VE_ENC] = { 0xa8c, BIT(16) }, The manual calls this ENC0, and since bit 17 is not documented, I wonder if there is an ENC1 used with some other packaging, maybe? So maybe calling it ENC0 would be safer here. > + [RST_BUS_VE_DEC] = { 0xa8c, BIT(18) }, > + [RST_BUS_CE] = { 0xac4, BIT(16) }, > + [RST_BUS_CE_SYS] = { 0xac4, BIT(17) }, > + [RST_BUS_NPU_CORE] = { 0xb04, BIT(16) }, > + [RST_BUS_NPU_AXI] = { 0xb04, BIT(17) }, > + [RST_BUS_NPU_AHB] = { 0xb04, BIT(18) }, > + [RST_BUS_NPU_SRAM] = { 0xb04, BIT(19) }, > + [RST_BUS_GPU] = { 0xb24, BIT(16) }, > + [RST_BUS_DRAM] = { 0xc0c, BIT(16) }, > + [RST_BUS_NAND] = { 0xc8c, BIT(16) }, > + [RST_BUS_MMC0] = { 0xd0c, BIT(16) }, > + [RST_BUS_MMC1] = { 0xd1c, BIT(16) }, > + [RST_BUS_MMC2] = { 0xd2c, BIT(16) }, > + [RST_BUS_MMC3] = { 0xd3c, BIT(16) }, > + [RST_BUS_UFS_AHB] = { 0xd8c, BIT(16) }, > + [RST_BUS_UFS_AXI] = { 0xd8c, BIT(17) }, > + [RST_BUS_UFS_PHY] = { 0xd8c, BIT(18) }, > + [RST_BUS_UFS_CORE] = { 0xd8c, BIT(19) }, > + [RST_BUS_UART0] = { 0xe00, BIT(16) }, > + [RST_BUS_UART1] = { 0xe04, BIT(16) }, > + [RST_BUS_UART2] = { 0xe08, BIT(16) }, > + [RST_BUS_UART3] = { 0xe0c, BIT(16) }, > + [RST_BUS_UART4] = { 0xe10, BIT(16) }, > + [RST_BUS_UART5] = { 0xe14, BIT(16) }, > + [RST_BUS_UART6] = { 0xe18, BIT(16) }, > + [RST_BUS_I2C0] = { 0xe80, BIT(16) }, > + [RST_BUS_I2C1] = { 0xe84, BIT(16) }, > + [RST_BUS_I2C2] = { 0xe88, BIT(16) }, > + [RST_BUS_I2C3] = { 0xe8c, BIT(16) }, > + [RST_BUS_I2C4] = { 0xe90, BIT(16) }, > + [RST_BUS_I2C5] = { 0xe94, BIT(16) }, > + [RST_BUS_I2C6] = { 0xe98, BIT(16) }, > + [RST_BUS_I2C7] = { 0xe9c, BIT(16) }, > + [RST_BUS_I2C8] = { 0xea0, BIT(16) }, > + [RST_BUS_I2C9] = { 0xea4, BIT(16) }, > + [RST_BUS_I2C10] = { 0xea8, BIT(16) }, > + [RST_BUS_I2C11] = { 0xeac, BIT(16) }, > + [RST_BUS_I2C12] = { 0xeb0, BIT(16) }, > + [RST_BUS_SPI0] = { 0xf04, BIT(16) }, > + [RST_BUS_SPI1] = { 0xf0c, BIT(16) }, > + [RST_BUS_SPI2] = { 0xf14, BIT(16) }, > + [RST_BUS_SPIF] = { 0xf1c, BIT(16) }, > + [RST_BUS_SPI3] = { 0xf24, BIT(16) }, > + [RST_BUS_SPI4] = { 0xf2c, BIT(16) }, SPI4 isn't mentioned in my version of the manual. > + [RST_BUS_GPADC] = { 0xfc4, BIT(16) }, > + [RST_BUS_THS] = { 0xfe4, BIT(16) }, > + [RST_BUS_IRRX] = { 0x1004, BIT(16) }, > + [RST_BUS_IRTX] = { 0x100c, BIT(16) }, > + [RST_BUS_LRADC] = { 0x1024, BIT(16) }, > + [RST_BUS_SGPIO] = { 0x1064, BIT(16) }, > + [RST_BUS_LPC] = { 0x1084, BIT(16) }, Where do those two come from? There are not in my version of the manual. > + [RST_BUS_I2SPCM0] = { 0x120c, BIT(16) }, > + [RST_BUS_I2SPCM1] = { 0x121c, BIT(16) }, > + [RST_BUS_I2SPCM2] = { 0x122c, BIT(16) }, > + [RST_BUS_I2SPCM3] = { 0x123c, BIT(16) }, > + [RST_BUS_I2SPCM4] = { 0x124c, BIT(16) }, > + [RST_BUS_OWA] = { 0x128c, BIT(16) }, > + [RST_BUS_DMIC] = { 0x12cc, BIT(16) }, > + [RST_USB_PHY0] = { 0x1300, BIT(30) }, > + [RST_BUS_OHCI0] = { 0x1304, BIT(16) }, > + [RST_BUS_EHCI0] = { 0x1304, BIT(20) }, > + [RST_BUS_OTG] = { 0x1304, BIT(24) }, > + [RST_USB_PHY1] = { 0x1308, BIT(30) }, > + [RST_BUS_OHCI1] = { 0x130c, BIT(16) }, > + [RST_BUS_EHCI1] = { 0x130c, BIT(20) }, > + [RST_BUS_USB2] = { 0x135c, BIT(16) }, > + [RST_BUS_PCIE] = { 0x138c, BIT(17) }, > + [RST_BUS_PCIE_PWRUP] = { 0x138c, BIT(16) }, Just a nit, but those two are ordered wrongly. > + [RST_BUS_SERDES] = { 0x13c4, BIT(16) }, > + [RST_BUS_GMAC0] = { 0x141c, BIT(16) }, > + [RST_BUS_GMAC0_AXI] = { 0x141c, BIT(17) }, > + [RST_BUS_GMAC1] = { 0x142c, BIT(16) }, > + [RST_BUS_GMAC1_AXI] = { 0x142c, BIT(17) }, GMAC1 is not listed in my manual, where does this come from? > + [RST_BUS_TCON_LCD0] = { 0x1504, BIT(16) }, > + [RST_BUS_TCON_LCD1] = { 0x150c, BIT(16) }, > + [RST_BUS_TCON_LCD2] = { 0x1514, BIT(16) }, No LCD2 in my manual. The rest looks alright. Cheers, Andre > + [RST_BUS_LVDS0] = { 0x1544, BIT(16) }, > + [RST_BUS_LVDS1] = { 0x154c, BIT(16) }, > + [RST_BUS_DSI0] = { 0x1584, BIT(16) }, > + [RST_BUS_DSI1] = { 0x158c, BIT(16) }, > + [RST_BUS_TCON_TV0] = { 0x1604, BIT(16) }, > + [RST_BUS_TCON_TV1] = { 0x160c, BIT(16) }, > + [RST_BUS_EDP] = { 0x164c, BIT(16) }, > + [RST_BUS_HDMI_MAIN] = { 0x168c, BIT(16) }, > + [RST_BUS_HDMI_SUB] = { 0x168c, BIT(17) }, > + [RST_BUS_HDMI_HDCP] = { 0x168c, BIT(18) }, > + [RST_BUS_DPSS_TOP0] = { 0x16c4, BIT(16) }, > + [RST_BUS_DPSS_TOP1] = { 0x16cc, BIT(16) }, > + [RST_BUS_VIDEO_OUT0] = { 0x16e4, BIT(16) }, > + [RST_BUS_VIDEO_OUT1] = { 0x16ec, BIT(16) }, > + [RST_BUS_LEDC] = { 0x1704, BIT(16) }, > + [RST_BUS_DSC] = { 0x1744, BIT(16) }, > + [RST_BUS_CSI] = { 0x1844, BIT(16) }, > + [RST_BUS_VIDEO_IN] = { 0x1884, BIT(16) }, > + [RST_BUS_APB2JTAG] = { 0x1c04, BIT(16) }, > +}; > + > static const struct sunxi_ccu_desc sun60i_a733_ccu_desc = { > .ccu_clks = sun60i_a733_ccu_clks, > .num_ccu_clks = ARRAY_SIZE(sun60i_a733_ccu_clks), > > .hw_clks = &sun60i_a733_hw_clks, > + > + .resets = sun60i_a733_ccu_resets, > + .num_resets = ARRAY_SIZE(sun60i_a733_ccu_resets), > }; > > static const u32 pll_regs[] = { > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH RFC 8/8] clk: sunxi-ng: a733: Add reset lines 2026-05-13 23:22 ` [PATCH RFC 8/8] clk: sunxi-ng: a733: Add reset lines Andre Przywara @ 2026-05-14 2:41 ` Junhui Liu 0 siblings, 0 replies; 6+ messages in thread From: Junhui Liu @ 2026-05-14 2:41 UTC (permalink / raw) To: Andre Przywara, Junhui Liu Cc: Michael Turquette, Stephen Boyd, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec, Samuel Holland, Philipp Zabel, Paul Walmsley, Palmer Dabbelt, Albert Ou, Alexandre Ghiti, Richard Cochran, linux-clk, devicetree, linux-arm-kernel, linux-sunxi, linux-kernel, linux-riscv, netdev Hi Andre, Thanks for your review. On Thu May 14, 2026 at 7:22 AM CST, Andre Przywara wrote: > On Tue, 10 Mar 2026 16:34:01 +0800 > Junhui Liu <junhui.liu@pigmoral.tech> wrote: > > Hi, > > compare the list below against my version of the manual. You list more > than shown there, can you say where those extra reset bits come from? They are from the vendor BSP, I will add comments to explain them in the next version. > >> Add the reset lines for the Allwinner A733 SoC. These reset control bits >> are integrated into the Bus Gate Reset (BGR) registers, typically >> sharing the same register address with their corresponding bus clock >> gates. Integrate them into the main CCU driver using the existing >> sunxi-ng ccu_reset framework, allowing the CCU to also function as a >> reset controller for the SoC. >> >> Signed-off-by: Junhui Liu <junhui.liu@pigmoral.tech> >> --- >> drivers/clk/sunxi-ng/ccu-sun60i-a733.c | 128 +++++++++++++++++++++++++++++++++ >> 1 file changed, 128 insertions(+) >> >> diff --git a/drivers/clk/sunxi-ng/ccu-sun60i-a733.c b/drivers/clk/sunxi-ng/ccu-sun60i-a733.c >> index c0b09f9197d1..7d1ee9235436 100644 >> --- a/drivers/clk/sunxi-ng/ccu-sun60i-a733.c >> +++ b/drivers/clk/sunxi-ng/ccu-sun60i-a733.c >> @@ -17,6 +17,7 @@ >> #include "../clk.h" >> >> #include "ccu_common.h" >> +#include "ccu_reset.h" >> >> #include "ccu_div.h" >> #include "ccu_gate.h" >> @@ -2169,11 +2170,138 @@ static struct clk_hw_onecell_data sun60i_a733_hw_clks = { >> .num = CLK_FANOUT3 + 1, >> }; >> >> +static struct ccu_reset_map sun60i_a733_ccu_resets[] = { >> + [RST_BUS_ITS_PCIE] = { 0x574, BIT(16) }, >> + [RST_BUS_NSI] = { 0x580, BIT(30) }, > > What is this NSI device? Some interconnect? Do we really want to handle > this reset and clock? Is there some device referencing this? Otherwise > the kernel will turn at least the clock off, which is probably fatal. > Also the manual says this is a secure register, so I feel like the > kernel must not mess with this. Yes, NSI appears to be a high-speed interconnect. The vendor kernel provides a sunxi-nsi driver for it accross sun8i, sun55i, and sun60i. Since the mainline kernel doesn't manage this interconnect for the already mainlined sun8i and sun55i platforms, I will drop the NSI clocks and resets in the next version. > >> + [RST_BUS_NSI_CFG] = { 0x584, BIT(16) }, > > Similar here, I guess, though this might not be secure only. > >> + [RST_BUS_IOMMU0_SYS] = { 0x58c, BIT(16) }, >> + [RST_BUS_MSI_LITE0_AHB] = { 0x594, BIT(16) }, >> + [RST_BUS_MSI_LITE0_MBUS] = { 0x594, BIT(17) }, >> + [RST_BUS_MSI_LITE1_AHB] = { 0x59c, BIT(16) }, >> + [RST_BUS_MSI_LITE1_MBUS] = { 0x59c, BIT(17) }, >> + [RST_BUS_MSI_LITE2_AHB] = { 0x5a4, BIT(16) }, >> + [RST_BUS_MSI_LITE2_MBUS] = { 0x5a4, BIT(17) }, >> + [RST_BUS_IOMMU1_SYS] = { 0x5b4, BIT(16) }, >> + [RST_BUS_DMA0] = { 0x704, BIT(16) }, >> + [RST_BUS_DMA1] = { 0x70c, BIT(16) }, >> + [RST_BUS_SPINLOCK] = { 0x724, BIT(16) }, >> + [RST_BUS_MSGBOX] = { 0x744, BIT(16) }, >> + [RST_BUS_PWM0] = { 0x784, BIT(16) }, >> + [RST_BUS_PWM1] = { 0x78c, BIT(16) }, >> + [RST_BUS_DBG] = { 0x7a4, BIT(16) }, >> + [RST_BUS_SYSDAP] = { 0x7ac, BIT(16) }, >> + [RST_BUS_TIMER0] = { 0x850, BIT(16) }, >> + [RST_BUS_DE] = { 0xa04, BIT(16) }, >> + [RST_BUS_DI] = { 0xa24, BIT(16) }, >> + [RST_BUS_G2D] = { 0xa44, BIT(16) }, >> + [RST_BUS_EINK] = { 0xa6c, BIT(16) }, >> + [RST_BUS_DE_SYS] = { 0xa74, BIT(16) }, >> + [RST_BUS_VE_ENC] = { 0xa8c, BIT(16) }, > > The manual calls this ENC0, and since bit 17 is not documented, I > wonder if there is an ENC1 used with some other packaging, maybe? So > maybe calling it ENC0 would be safer here. Okay, I will rename it to ENC0. > >> + [RST_BUS_VE_DEC] = { 0xa8c, BIT(18) }, >> + [RST_BUS_CE] = { 0xac4, BIT(16) }, >> + [RST_BUS_CE_SYS] = { 0xac4, BIT(17) }, >> + [RST_BUS_NPU_CORE] = { 0xb04, BIT(16) }, >> + [RST_BUS_NPU_AXI] = { 0xb04, BIT(17) }, >> + [RST_BUS_NPU_AHB] = { 0xb04, BIT(18) }, >> + [RST_BUS_NPU_SRAM] = { 0xb04, BIT(19) }, >> + [RST_BUS_GPU] = { 0xb24, BIT(16) }, >> + [RST_BUS_DRAM] = { 0xc0c, BIT(16) }, >> + [RST_BUS_NAND] = { 0xc8c, BIT(16) }, >> + [RST_BUS_MMC0] = { 0xd0c, BIT(16) }, >> + [RST_BUS_MMC1] = { 0xd1c, BIT(16) }, >> + [RST_BUS_MMC2] = { 0xd2c, BIT(16) }, >> + [RST_BUS_MMC3] = { 0xd3c, BIT(16) }, >> + [RST_BUS_UFS_AHB] = { 0xd8c, BIT(16) }, >> + [RST_BUS_UFS_AXI] = { 0xd8c, BIT(17) }, >> + [RST_BUS_UFS_PHY] = { 0xd8c, BIT(18) }, >> + [RST_BUS_UFS_CORE] = { 0xd8c, BIT(19) }, >> + [RST_BUS_UART0] = { 0xe00, BIT(16) }, >> + [RST_BUS_UART1] = { 0xe04, BIT(16) }, >> + [RST_BUS_UART2] = { 0xe08, BIT(16) }, >> + [RST_BUS_UART3] = { 0xe0c, BIT(16) }, >> + [RST_BUS_UART4] = { 0xe10, BIT(16) }, >> + [RST_BUS_UART5] = { 0xe14, BIT(16) }, >> + [RST_BUS_UART6] = { 0xe18, BIT(16) }, >> + [RST_BUS_I2C0] = { 0xe80, BIT(16) }, >> + [RST_BUS_I2C1] = { 0xe84, BIT(16) }, >> + [RST_BUS_I2C2] = { 0xe88, BIT(16) }, >> + [RST_BUS_I2C3] = { 0xe8c, BIT(16) }, >> + [RST_BUS_I2C4] = { 0xe90, BIT(16) }, >> + [RST_BUS_I2C5] = { 0xe94, BIT(16) }, >> + [RST_BUS_I2C6] = { 0xe98, BIT(16) }, >> + [RST_BUS_I2C7] = { 0xe9c, BIT(16) }, >> + [RST_BUS_I2C8] = { 0xea0, BIT(16) }, >> + [RST_BUS_I2C9] = { 0xea4, BIT(16) }, >> + [RST_BUS_I2C10] = { 0xea8, BIT(16) }, >> + [RST_BUS_I2C11] = { 0xeac, BIT(16) }, >> + [RST_BUS_I2C12] = { 0xeb0, BIT(16) }, >> + [RST_BUS_SPI0] = { 0xf04, BIT(16) }, >> + [RST_BUS_SPI1] = { 0xf0c, BIT(16) }, >> + [RST_BUS_SPI2] = { 0xf14, BIT(16) }, >> + [RST_BUS_SPIF] = { 0xf1c, BIT(16) }, >> + [RST_BUS_SPI3] = { 0xf24, BIT(16) }, >> + [RST_BUS_SPI4] = { 0xf2c, BIT(16) }, > > SPI4 isn't mentioned in my version of the manual. > >> + [RST_BUS_GPADC] = { 0xfc4, BIT(16) }, >> + [RST_BUS_THS] = { 0xfe4, BIT(16) }, >> + [RST_BUS_IRRX] = { 0x1004, BIT(16) }, >> + [RST_BUS_IRTX] = { 0x100c, BIT(16) }, >> + [RST_BUS_LRADC] = { 0x1024, BIT(16) }, >> + [RST_BUS_SGPIO] = { 0x1064, BIT(16) }, >> + [RST_BUS_LPC] = { 0x1084, BIT(16) }, > > Where do those two come from? There are not in my version of the manual. > >> + [RST_BUS_I2SPCM0] = { 0x120c, BIT(16) }, >> + [RST_BUS_I2SPCM1] = { 0x121c, BIT(16) }, >> + [RST_BUS_I2SPCM2] = { 0x122c, BIT(16) }, >> + [RST_BUS_I2SPCM3] = { 0x123c, BIT(16) }, >> + [RST_BUS_I2SPCM4] = { 0x124c, BIT(16) }, >> + [RST_BUS_OWA] = { 0x128c, BIT(16) }, >> + [RST_BUS_DMIC] = { 0x12cc, BIT(16) }, >> + [RST_USB_PHY0] = { 0x1300, BIT(30) }, >> + [RST_BUS_OHCI0] = { 0x1304, BIT(16) }, >> + [RST_BUS_EHCI0] = { 0x1304, BIT(20) }, >> + [RST_BUS_OTG] = { 0x1304, BIT(24) }, >> + [RST_USB_PHY1] = { 0x1308, BIT(30) }, >> + [RST_BUS_OHCI1] = { 0x130c, BIT(16) }, >> + [RST_BUS_EHCI1] = { 0x130c, BIT(20) }, >> + [RST_BUS_USB2] = { 0x135c, BIT(16) }, >> + [RST_BUS_PCIE] = { 0x138c, BIT(17) }, >> + [RST_BUS_PCIE_PWRUP] = { 0x138c, BIT(16) }, > > Just a nit, but those two are ordered wrongly. Will do. > >> + [RST_BUS_SERDES] = { 0x13c4, BIT(16) }, >> + [RST_BUS_GMAC0] = { 0x141c, BIT(16) }, >> + [RST_BUS_GMAC0_AXI] = { 0x141c, BIT(17) }, >> + [RST_BUS_GMAC1] = { 0x142c, BIT(16) }, >> + [RST_BUS_GMAC1_AXI] = { 0x142c, BIT(17) }, > > GMAC1 is not listed in my manual, where does this come from? > >> + [RST_BUS_TCON_LCD0] = { 0x1504, BIT(16) }, >> + [RST_BUS_TCON_LCD1] = { 0x150c, BIT(16) }, >> + [RST_BUS_TCON_LCD2] = { 0x1514, BIT(16) }, > > No LCD2 in my manual. > > The rest looks alright. > > Cheers, > Andre > >> + [RST_BUS_LVDS0] = { 0x1544, BIT(16) }, >> + [RST_BUS_LVDS1] = { 0x154c, BIT(16) }, >> + [RST_BUS_DSI0] = { 0x1584, BIT(16) }, >> + [RST_BUS_DSI1] = { 0x158c, BIT(16) }, >> + [RST_BUS_TCON_TV0] = { 0x1604, BIT(16) }, >> + [RST_BUS_TCON_TV1] = { 0x160c, BIT(16) }, >> + [RST_BUS_EDP] = { 0x164c, BIT(16) }, >> + [RST_BUS_HDMI_MAIN] = { 0x168c, BIT(16) }, >> + [RST_BUS_HDMI_SUB] = { 0x168c, BIT(17) }, >> + [RST_BUS_HDMI_HDCP] = { 0x168c, BIT(18) }, >> + [RST_BUS_DPSS_TOP0] = { 0x16c4, BIT(16) }, >> + [RST_BUS_DPSS_TOP1] = { 0x16cc, BIT(16) }, >> + [RST_BUS_VIDEO_OUT0] = { 0x16e4, BIT(16) }, >> + [RST_BUS_VIDEO_OUT1] = { 0x16ec, BIT(16) }, >> + [RST_BUS_LEDC] = { 0x1704, BIT(16) }, >> + [RST_BUS_DSC] = { 0x1744, BIT(16) }, >> + [RST_BUS_CSI] = { 0x1844, BIT(16) }, >> + [RST_BUS_VIDEO_IN] = { 0x1884, BIT(16) }, >> + [RST_BUS_APB2JTAG] = { 0x1c04, BIT(16) }, >> +}; >> + >> static const struct sunxi_ccu_desc sun60i_a733_ccu_desc = { >> .ccu_clks = sun60i_a733_ccu_clks, >> .num_ccu_clks = ARRAY_SIZE(sun60i_a733_ccu_clks), >> >> .hw_clks = &sun60i_a733_hw_clks, >> + >> + .resets = sun60i_a733_ccu_resets, >> + .num_resets = ARRAY_SIZE(sun60i_a733_ccu_resets), >> }; >> >> static const u32 pll_regs[] = { >> -- Best regards, Junhui Liu ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2026-05-14 2:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20260310-a733-clk-v1-0-36b4e9b24457@pigmoral.tech>
[not found] ` <20260310-a733-clk-v1-1-36b4e9b24457@pigmoral.tech>
2026-03-28 12:07 ` [PATCH RFC 1/8] dt-bindings: clk: sun60i-a733-ccu: Add allwinner A733 support Chen-Yu Tsai
[not found] ` <20260310-a733-clk-v1-3-36b4e9b24457@pigmoral.tech>
2026-03-28 15:04 ` [PATCH RFC 3/8] clk: sunxi-ng: a733: Add PRCM CCU Chen-Yu Tsai
[not found] ` <20260310-a733-clk-v1-2-36b4e9b24457@pigmoral.tech>
2026-03-29 7:56 ` [PATCH RFC 2/8] clk: sunxi-ng: sdm: Add dual patterns support Chen-Yu Tsai
[not found] ` <20260310-a733-clk-v1-7-36b4e9b24457@pigmoral.tech>
2026-04-15 22:14 ` [PATCH RFC 7/8] clk: sunxi-ng: a733: Add bus clock gates Andre Przywara
[not found] ` <20260310-a733-clk-v1-8-36b4e9b24457@pigmoral.tech>
2026-05-13 23:22 ` [PATCH RFC 8/8] clk: sunxi-ng: a733: Add reset lines Andre Przywara
2026-05-14 2:41 ` Junhui Liu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox