Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-16 16:23:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/arch/arm/include/asm/arch-sunxi/clock_sun50i_h6.h

350 lines
12 KiB
C
Raw Normal View History

sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
/*
* Allwinner H6 clock register definitions
*
* (C) Copyright 2017 Icenowy Zheng <icenowy@aosc.io>
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _SUNXI_CLOCK_SUN50I_H6_H
#define _SUNXI_CLOCK_SUN50I_H6_H
common: Drop linux/bitops.h from common header Move this uncommon header out of the common header. Signed-off-by: Simon Glass <sjg@chromium.org>
2020-05-10 17:40:13 +00:00
#ifndef __ASSEMBLY__
#include <linux/bitops.h>
#endif
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
struct sunxi_ccm_reg {
u32 pll1_cfg; /* 0x000 pll1 (cpux) control */
u8 reserved_0x004[12];
u32 pll5_cfg; /* 0x010 pll5 (ddr) control */
u8 reserved_0x014[12];
u32 pll6_cfg; /* 0x020 pll6 (periph0) control */
u8 reserved_0x020[4];
u32 pll_periph1_cfg; /* 0x028 pll periph1 control */
u8 reserved_0x028[4];
u32 pll7_cfg; /* 0x030 pll7 (gpu) control */
u8 reserved_0x034[12];
u32 pll3_cfg; /* 0x040 pll3 (video0) control */
u8 reserved_0x044[4];
u32 pll_video1_cfg; /* 0x048 pll video1 control */
u8 reserved_0x04c[12];
u32 pll4_cfg; /* 0x058 pll4 (ve) control */
u8 reserved_0x05c[4];
u32 pll10_cfg; /* 0x060 pll10 (de) control */
u8 reserved_0x064[12];
u32 pll9_cfg; /* 0x070 pll9 (hsic) control */
u8 reserved_0x074[4];
u32 pll2_cfg; /* 0x078 pll2 (audio) control */
u8 reserved_0x07c[148];
u32 pll5_pat; /* 0x110 pll5 (ddr) pattern */
u8 reserved_0x114[20];
u32 pll_periph1_pat0; /* 0x128 pll periph1 pattern0 */
u32 pll_periph1_pat1; /* 0x12c pll periph1 pattern1 */
u32 pll7_pat0; /* 0x130 pll7 (gpu) pattern0 */
u32 pll7_pat1; /* 0x134 pll7 (gpu) pattern1 */
u8 reserved_0x138[8];
u32 pll3_pat0; /* 0x140 pll3 (video0) pattern0 */
u32 pll3_pat1; /* 0x144 pll3 (video0) pattern1 */
u32 pll_video1_pat0; /* 0x148 pll video1 pattern0 */
u32 pll_video1_pat1; /* 0x14c pll video1 pattern1 */
u8 reserved_0x150[8];
u32 pll4_pat0; /* 0x158 pll4 (ve) pattern0 */
u32 pll4_pat1; /* 0x15c pll4 (ve) pattern1 */
u32 pll10_pat0; /* 0x160 pll10 (de) pattern0 */
u32 pll10_pat1; /* 0x164 pll10 (de) pattern1 */
u8 reserved_0x168[8];
u32 pll9_pat0; /* 0x170 pll9 (hsic) pattern0 */
u32 pll9_pat1; /* 0x174 pll9 (hsic) pattern1 */
u32 pll2_pat0; /* 0x178 pll2 (audio) pattern0 */
u32 pll2_pat1; /* 0x17c pll2 (audio) pattern1 */
u8 reserved_0x180[384];
u32 pll1_bias; /* 0x300 pll1 (cpux) bias */
u8 reserved_0x304[12];
u32 pll5_bias; /* 0x310 pll5 (ddr) bias */
u8 reserved_0x314[12];
u32 pll6_bias; /* 0x320 pll6 (periph0) bias */
u8 reserved_0x324[4];
u32 pll_periph1_bias; /* 0x328 pll periph1 bias */
u8 reserved_0x32c[4];
u32 pll7_bias; /* 0x330 pll7 (gpu) bias */
u8 reserved_0x334[12];
u32 pll3_bias; /* 0x340 pll3 (video0) bias */
u8 reserved_0x344[4];
u32 pll_video1_bias; /* 0x348 pll video1 bias */
u8 reserved_0x34c[12];
u32 pll4_bias; /* 0x358 pll4 (ve) bias */
u8 reserved_0x35c[4];
u32 pll10_bias; /* 0x360 pll10 (de) bias */
u8 reserved_0x364[12];
u32 pll9_bias; /* 0x370 pll9 (hsic) bias */
u8 reserved_0x374[4];
u32 pll2_bias; /* 0x378 pll2 (audio) bias */
u8 reserved_0x37c[132];
u32 pll1_tun; /* 0x400 pll1 (cpux) tunning */
u8 reserved_0x404[252];
u32 cpu_axi_cfg; /* 0x500 CPUX/AXI clock control*/
u8 reserved_0x504[12];
u32 psi_ahb1_ahb2_cfg; /* 0x510 PSI/AHB1/AHB2 clock control */
u8 reserved_0x514[8];
u32 ahb3_cfg; /* 0x51c AHB3 clock control */
u32 apb1_cfg; /* 0x520 APB1 clock control */
u32 apb2_cfg; /* 0x524 APB2 clock control */
u8 reserved_0x528[24];
u32 mbus_cfg; /* 0x540 MBUS clock control */
u8 reserved_0x544[188];
u32 de_clk_cfg; /* 0x600 DE clock control */
u8 reserved_0x604[8];
u32 de_gate_reset; /* 0x60c DE gate/reset control */
u8 reserved_0x610[16];
u32 di_clk_cfg; /* 0x620 DI clock control */
u8 reserved_0x024[8];
u32 di_gate_reset; /* 0x62c DI gate/reset control */
u8 reserved_0x630[64];
u32 gpu_clk_cfg; /* 0x670 GPU clock control */
u8 reserved_0x674[8];
u32 gpu_gate_reset; /* 0x67c GPU gate/reset control */
u32 ce_clk_cfg; /* 0x680 CE clock control */
u8 reserved_0x684[8];
u32 ce_gate_reset; /* 0x68c CE gate/reset control */
u32 ve_clk_cfg; /* 0x690 VE clock control */
u8 reserved_0x694[8];
u32 ve_gate_reset; /* 0x69c VE gate/reset control */
u8 reserved_0x6a0[16];
u32 emce_clk_cfg; /* 0x6b0 EMCE clock control */
u8 reserved_0x6b4[8];
u32 emce_gate_reset; /* 0x6bc EMCE gate/reset control */
u32 vp9_clk_cfg; /* 0x6c0 VP9 clock control */
u8 reserved_0x6c4[8];
u32 vp9_gate_reset; /* 0x6cc VP9 gate/reset control */
u8 reserved_0x6d0[60];
u32 dma_gate_reset; /* 0x70c DMA gate/reset control */
u8 reserved_0x710[12];
u32 msgbox_gate_reset; /* 0x71c Message Box gate/reset control */
u8 reserved_0x720[12];
u32 spinlock_gate_reset;/* 0x72c Spinlock gate/reset control */
u8 reserved_0x730[12];
u32 hstimer_gate_reset; /* 0x73c HS Timer gate/reset control */
u32 avs_gate_reset; /* 0x740 AVS gate/reset control */
u8 reserved_0x744[72];
u32 dbgsys_gate_reset; /* 0x78c Debugging system gate/reset control */
u8 reserved_0x790[12];
u32 psi_gate_reset; /* 0x79c PSI gate/reset control */
u8 reserved_0x7a0[12];
u32 pwm_gate_reset; /* 0x7ac PWM gate/reset control */
u8 reserved_0x7b0[12];
u32 iommu_gate_reset; /* 0x7bc IOMMU gate/reset control */
u8 reserved_0x7c0[64];
u32 dram_clk_cfg; /* 0x800 DRAM clock control */
u32 mbus_gate; /* 0x804 MBUS gate control */
u8 reserved_0x808[4];
u32 dram_gate_reset; /* 0x80c DRAM gate/reset control */
u32 nand0_clk_cfg; /* 0x810 NAND0 clock control */
u32 nand1_clk_cfg; /* 0x814 NAND1 clock control */
u8 reserved_0x818[20];
u32 nand_gate_reset; /* 0x82c NAND gate/reset control */
u32 sd0_clk_cfg; /* 0x830 MMC0 clock control */
u32 sd1_clk_cfg; /* 0x834 MMC1 clock control */
u32 sd2_clk_cfg; /* 0x838 MMC2 clock control */
u8 reserved_0x83c[16];
u32 sd_gate_reset; /* 0x84c MMC gate/reset control */
u8 reserved_0x850[188];
u32 uart_gate_reset; /* 0x90c UART gate/reset control */
u8 reserved_0x910[12];
u32 twi_gate_reset; /* 0x91c I2C gate/reset control */
u8 reserved_0x920[28];
u32 scr_gate_reset; /* 0x93c SCR gate/reset control */
u32 spi0_clk_cfg; /* 0x940 SPI0 clock control */
u32 spi1_clk_cfg; /* 0x944 SPI1 clock control */
u8 reserved_0x948[36];
u32 spi_gate_reset; /* 0x96c SPI gate/reset control */
u8 reserved_0x970[12];
u32 emac_gate_reset; /* 0x97c EMAC gate/reset control */
u8 reserved_0x980[48];
u32 ts_clk_cfg; /* 0x9b0 TS clock control */
u8 reserved_0x9b4[8];
u32 ts_gate_reset; /* 0x9bc TS gate/reset control */
u32 irtx_clk_cfg; /* 0x9c0 IR TX clock control */
u8 reserved_0x9c4[8];
u32 irtx_gate_reset; /* 0x9cc IR TX gate/reset control */
u8 reserved_0x9d0[44];
u32 ths_gate_reset; /* 0x9fc THS gate/reset control */
u8 reserved_0xa00[12];
u32 i2s3_clk_cfg; /* 0xa0c I2S3 clock control */
u32 i2s0_clk_cfg; /* 0xa10 I2S0 clock control */
u32 i2s1_clk_cfg; /* 0xa14 I2S1 clock control */
u32 i2s2_clk_cfg; /* 0xa18 I2S2 clock control */
u32 i2s_gate_reset; /* 0xa1c I2S gate/reset control */
u32 spdif_clk_cfg; /* 0xa20 SPDIF clock control */
u8 reserved_0xa24[8];
u32 spdif_gate_reset; /* 0xa2c SPDIF gate/reset control */
u8 reserved_0xa30[16];
u32 dmic_clk_cfg; /* 0xa40 DMIC clock control */
u8 reserved_0xa44[8];
u32 dmic_gate_reset; /* 0xa4c DMIC gate/reset control */
u8 reserved_0xa50[16];
u32 ahub_clk_cfg; /* 0xa60 Audio HUB clock control */
u8 reserved_0xa64[8];
u32 ahub_gate_reset; /* 0xa6c Audio HUB gate/reset control */
u32 usb0_clk_cfg; /* 0xa70 USB0(OTG) clock control */
u32 usb1_clk_cfg; /* 0xa74 USB1(XHCI) clock control */
u8 reserved_0xa78[4];
u32 usb3_clk_cfg; /* 0xa78 USB3 clock control */
u8 reserved_0xa80[12];
u32 usb_gate_reset; /* 0xa8c USB gate/reset control */
u8 reserved_0xa90[32];
u32 pcie_ref_clk_cfg; /* 0xab0 PCIE REF clock control */
u32 pcie_axi_clk_cfg; /* 0xab4 PCIE AXI clock control */
u32 pcie_aux_clk_cfg; /* 0xab8 PCIE AUX clock control */
u32 pcie_gate_reset; /* 0xabc PCIE gate/reset control */
u8 reserved_0xac0[64];
u32 hdmi_clk_cfg; /* 0xb00 HDMI clock control */
u32 hdmi_slow_clk_cfg; /* 0xb04 HDMI slow clock control */
u8 reserved_0xb08[8];
u32 hdmi_cec_clk_cfg; /* 0xb10 HDMI CEC clock control */
u8 reserved_0xb14[8];
u32 hdmi_gate_reset; /* 0xb1c HDMI gate/reset control */
u8 reserved_0xb20[60];
u32 tcon_top_gate_reset;/* 0xb5c TCON TOP gate/reset control */
u32 tcon_lcd0_clk_cfg; /* 0xb60 TCON LCD0 clock control */
u8 reserved_0xb64[24];
u32 tcon_lcd_gate_reset;/* 0xb7c TCON LCD gate/reset control */
u32 tcon_tv0_clk_cfg; /* 0xb80 TCON TV0 clock control */
u8 reserved_0xb84[24];
u32 tcon_tv_gate_reset; /* 0xb9c TCON TV gate/reset control */
u8 reserved_0xba0[96];
u32 csi_misc_clk_cfg; /* 0xc00 CSI MISC clock control */
u32 csi_top_clk_cfg; /* 0xc04 CSI TOP clock control */
u32 csi_mclk_cfg; /* 0xc08 CSI Master clock control */
u8 reserved_0xc0c[32];
u32 csi_gate_reset; /* 0xc2c CSI gate/reset control */
u8 reserved_0xc30[16];
u32 hdcp_clk_cfg; /* 0xc40 HDCP clock control */
u8 reserved_0xc44[8];
u32 hdcp_gate_reset; /* 0xc4c HDCP gate/reset control */
u8 reserved_0xc50[688];
u32 ccu_sec_switch; /* 0xf00 CCU security switch */
u32 pll_lock_dbg_ctrl; /* 0xf04 PLL lock debugging control */
};
/* pll1 bit field */
#define CCM_PLL1_CTRL_EN BIT(31)
sunxi: clock: D1/R528: Enable PLL LDO during PLL1 setup The D1/R528/T113s SoCs introduce a new "LDO enable" bit in the CPUX_PLL. Just enable that when we program that PLL. Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2022-12-02 20:30:40 +00:00
#define CCM_PLL1_LDO_EN BIT(30)
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
#define CCM_PLL1_LOCK_EN BIT(29)
#define CCM_PLL1_LOCK BIT(28)
sunxi: introduce support for H616 clocks H616 has mostly the same clocks as H6 with some small differences. Just reuse H6 clocks for H616 and handle differences with macros. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2021-01-11 20:11:40 +00:00
#define CCM_PLL1_OUT_EN BIT(27)
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
#define CCM_PLL1_CLOCK_TIME_2 (2 << 24)
#define CCM_PLL1_CTRL_P(p) ((p) << 16)
sunxi: clock: H6/H616: Fix PLL clock factor encodings Most clock factors and dividers in the H6 PLLs use a "+1 encoding", which we were missing on two occasions. This fixes the MMC clock setup on the H6, which could be slightly off due to the wrong parent frequency: mmc 2 set mod-clk req 52000000 parent 1176000000 n 2 m 12 rate 49000000 Also the CPU frequency (PLL1) was a tad too high before. For PLL5 (DRAM) we already accounted for this +1, but in the DRAM code itself, not in the bit field macro. Move this there to be aligned with what the other SoCs and other PLLs do. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
2021-05-05 12:53:05 +00:00
#define CCM_PLL1_CTRL_N(n) (((n) - 1) << 8)
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
/* pll5 bit field */
#define CCM_PLL5_CTRL_EN BIT(31)
#define CCM_PLL5_LOCK_EN BIT(29)
#define CCM_PLL5_LOCK BIT(28)
sunxi: introduce support for H616 clocks H616 has mostly the same clocks as H6 with some small differences. Just reuse H6 clocks for H616 and handle differences with macros. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2021-01-11 20:11:40 +00:00
#define CCM_PLL5_OUT_EN BIT(27)
sunxi: clock: H6/H616: Fix PLL clock factor encodings Most clock factors and dividers in the H6 PLLs use a "+1 encoding", which we were missing on two occasions. This fixes the MMC clock setup on the H6, which could be slightly off due to the wrong parent frequency: mmc 2 set mod-clk req 52000000 parent 1176000000 n 2 m 12 rate 49000000 Also the CPU frequency (PLL1) was a tad too high before. For PLL5 (DRAM) we already accounted for this +1, but in the DRAM code itself, not in the bit field macro. Move this there to be aligned with what the other SoCs and other PLLs do. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>
2021-05-05 12:53:05 +00:00
#define CCM_PLL5_CTRL_N(n) (((n) - 1) << 8)
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
#define CCM_PLL5_CTRL_DIV1(div1) ((div1) << 0)
#define CCM_PLL5_CTRL_DIV2(div0) ((div0) << 1)
/* pll6 bit field */
#define CCM_PLL6_CTRL_EN BIT(31)
#define CCM_PLL6_LOCK_EN BIT(29)
#define CCM_PLL6_LOCK BIT(28)
sunxi: clock: support D1/R528 PLL6 clock The PLL_PERIPH0 clock changed a bit in the D1/R528/T113s SoCs: there is new P0 divider at bits [18:16], and the M divider is 1. Add code to support this version of "PLL6". Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2022-12-02 21:48:19 +00:00
#define CCM_PLL6_CTRL_P0_SHIFT 16
#define CCM_PLL6_CTRL_P0_MASK (0x7 << CCM_PLL6_CTRL_P0_SHIFT)
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
#define CCM_PLL6_CTRL_N_SHIFT 8
#define CCM_PLL6_CTRL_N_MASK (0xff << CCM_PLL6_CTRL_N_SHIFT)
#define CCM_PLL6_CTRL_DIV1_SHIFT 0
#define CCM_PLL6_CTRL_DIV1_MASK (0x1 << CCM_PLL6_CTRL_DIV1_SHIFT)
#define CCM_PLL6_CTRL_DIV2_SHIFT 1
#define CCM_PLL6_CTRL_DIV2_MASK (0x1 << CCM_PLL6_CTRL_DIV2_SHIFT)
/* cpu_axi bit field*/
#define CCM_CPU_AXI_MUX_MASK (0x3 << 24)
#define CCM_CPU_AXI_MUX_OSC24M (0x0 << 24)
#define CCM_CPU_AXI_MUX_PLL_CPUX (0x3 << 24)
#define CCM_CPU_AXI_APB_MASK 0x300
#define CCM_CPU_AXI_AXI_MASK 0x3
#define CCM_CPU_AXI_DEFAULT_FACTORS 0x301
sunxi: add Allwinner R528/T113 SoC support This adds the remaining code bits to teach U-Boot about Allwinner's newest SoC generation. This was introduced with the RISC-V based Allwinner D1 SoC, which actually shares a die with the ARM cores versions called R528 (BGA, without DRAM) and T113s (QFP, with embedded DRAM). This adds the new Kconfig stanza, using the two newly introduced symbols for the new SoC generation and pincontroller. It also adds the new symbols to the relavent code places, to set all the hardcoded bits directly. We need one DT override: The ARM core version of the DT specifies the CPUX watchdog as "reserved", which means it won't be recognised by U-Boot. Override this in our generic sunxi-u-boot.dtsi, to let U-Boot pick up this watchdog, so that the generic reset driver will work. Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2022-09-06 14:59:57 +00:00
#ifdef CONFIG_MACH_SUN50I_H6 /* H6 */
sunxi: introduce support for H616 clocks H616 has mostly the same clocks as H6 with some small differences. Just reuse H6 clocks for H616 and handle differences with macros. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2021-01-11 20:11:40 +00:00
#define CCM_PLL6_DEFAULT 0xa0006300
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
/* psi_ahb1_ahb2 bit field */
#define CCM_PSI_AHB1_AHB2_DEFAULT 0x03000102
/* ahb3 bit field */
#define CCM_AHB3_DEFAULT 0x03000002
/* apb1 bit field */
#define CCM_APB1_DEFAULT 0x03000102
sunxi: add Allwinner R528/T113 SoC support This adds the remaining code bits to teach U-Boot about Allwinner's newest SoC generation. This was introduced with the RISC-V based Allwinner D1 SoC, which actually shares a die with the ARM cores versions called R528 (BGA, without DRAM) and T113s (QFP, with embedded DRAM). This adds the new Kconfig stanza, using the two newly introduced symbols for the new SoC generation and pincontroller. It also adds the new symbols to the relavent code places, to set all the hardcoded bits directly. We need one DT override: The ARM core version of the DT specifies the CPUX watchdog as "reserved", which means it won't be recognised by U-Boot. Override this in our generic sunxi-u-boot.dtsi, to let U-Boot pick up this watchdog, so that the generic reset driver will work. Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2022-09-06 14:59:57 +00:00
#elif CONFIG_MACH_SUN50I_H616 /* H616 */
sunxi: introduce support for H616 clocks H616 has mostly the same clocks as H6 with some small differences. Just reuse H6 clocks for H616 and handle differences with macros. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2021-01-11 20:11:40 +00:00
#define CCM_PLL6_DEFAULT 0xa8003100
/* psi_ahb1_ahb2 bit field */
#define CCM_PSI_AHB1_AHB2_DEFAULT 0x03000002
/* ahb3 bit field */
#define CCM_AHB3_DEFAULT 0x03000002
/* apb1 bit field */
#define CCM_APB1_DEFAULT 0x03000102
sunxi: add Allwinner R528/T113 SoC support This adds the remaining code bits to teach U-Boot about Allwinner's newest SoC generation. This was introduced with the RISC-V based Allwinner D1 SoC, which actually shares a die with the ARM cores versions called R528 (BGA, without DRAM) and T113s (QFP, with embedded DRAM). This adds the new Kconfig stanza, using the two newly introduced symbols for the new SoC generation and pincontroller. It also adds the new symbols to the relavent code places, to set all the hardcoded bits directly. We need one DT override: The ARM core version of the DT specifies the CPUX watchdog as "reserved", which means it won't be recognised by U-Boot. Override this in our generic sunxi-u-boot.dtsi, to let U-Boot pick up this watchdog, so that the generic reset driver will work. Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2022-09-06 14:59:57 +00:00
#elif CONFIG_MACH_SUN8I_R528 /* R528 */
#define CCM_PLL6_DEFAULT 0xe8216300
#define CCM_PSI_AHB1_AHB2_DEFAULT 0x03000002
//#define CCM_AHB3_DEFAULT 0x03000002
#define CCM_APB1_DEFAULT 0x03000102
sunxi: introduce support for H616 clocks H616 has mostly the same clocks as H6 with some small differences. Just reuse H6 clocks for H616 and handle differences with macros. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2021-01-11 20:11:40 +00:00
#endif
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
/* apb2 bit field */
#define APB2_CLK_SRC_OSC24M (0x0 << 24)
#define APB2_CLK_SRC_OSC32K (0x1 << 24)
#define APB2_CLK_SRC_PSI (0x2 << 24)
#define APB2_CLK_SRC_PLL6 (0x3 << 24)
#define APB2_CLK_SRC_MASK (0x3 << 24)
#define APB2_CLK_RATE_N_1 (0x0 << 8)
#define APB2_CLK_RATE_N_2 (0x1 << 8)
#define APB2_CLK_RATE_N_4 (0x2 << 8)
#define APB2_CLK_RATE_N_8 (0x3 << 8)
#define APB2_CLK_RATE_N_MASK (3 << 8)
#define APB2_CLK_RATE_M(m) (((m)-1) << 0)
#define APB2_CLK_RATE_M_MASK (3 << 0)
/* MBUS clock bit field */
#define MBUS_ENABLE BIT(31)
#define MBUS_RESET BIT(30)
#define MBUS_CLK_SRC_MASK GENMASK(25, 24)
#define MBUS_CLK_SRC_OSCM24 (0 << 24)
#define MBUS_CLK_SRC_PLL6X2 (1 << 24)
#define MBUS_CLK_SRC_PLL5 (2 << 24)
#define MBUS_CLK_SRC_PLL6X4 (3 << 24)
#define MBUS_CLK_M(m) (((m)-1) << 0)
/* Module gate/reset shift*/
#define RESET_SHIFT (16)
sunxi: Add support for I2C on H6 like SoCs I2C support, especially R_I2C port, will be needed in future. Upcoming support for H616 will need R_I2C to adjust DRAM voltage. Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net> Reviewed-by: Samuel Holland <samuel@sholland.org> Reviewed-by: Andre Przywara <andre.przywara@arm.com> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2021-01-11 20:11:38 +00:00
#define GATE_SHIFT (0)
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
/* DRAM clock bit field */
#define DRAM_MOD_RESET BIT(30)
#define DRAM_CLK_UPDATE BIT(27)
#define DRAM_CLK_SRC_MASK GENMASK(25, 24)
#define DRAM_CLK_SRC_PLL5 (0 << 24)
#define DRAM_CLK_M(m) (((m)-1) << 0)
/* MMC clock bit field */
#define CCM_MMC_CTRL_M(x) ((x) - 1)
#define CCM_MMC_CTRL_N(x) ((x) << 8)
#define CCM_MMC_CTRL_OSCM24 (0x0 << 24)
mmc: sunxi: Fix MMC clock parent selection Most Allwinner SoCs which use the so called "new timing mode" in their MMC controllers actually use the double-rate PLL6/PERIPH0 clock as their parent input clock. This is interestingly enough compensated by a hidden "by 2" post-divider in the mod clock, so the divider and actual output rate stay the same. Even though for the H6 and H616 (but only for them!) we use the doubled input clock for the divider computation, we never accounted for the implicit post-divider, so the clock was only half the speed on those SoCs. This didn't really matter so far, as our slow MMIO routine limits the transfer speed anyway, but we will fix this soon. Clean up the code around that selection, to always use the normal PLL6 (PERIPH0(1x)) clock as an input. As the rate and divider are the same, that makes no difference. Explain the hardware differences in a comment. Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2021-05-05 08:57:47 +00:00
#define CCM_MMC_CTRL_PLL6 (0x1 << 24)
sunxi: add clock code for H6 The new Allwinner H6 SoC has a brand new CCU layout. Add clock code for it. Signed-off-by: Icenowy Zheng <icenowy@aosc.io> Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> Reviewed-by: Jagan Teki <jagan@openedev.com> Tested-by: Jagan Teki <jagan@amarulasolutions.com>
2018-07-21 08:20:26 +00:00
#define CCM_MMC_CTRL_PLL_PERIPH2X2 (0x2 << 24)
#define CCM_MMC_CTRL_ENABLE (0x1 << 31)
/* H6 doesn't have these delays */
#define CCM_MMC_CTRL_OCLK_DLY(a) ((void) (a), 0)
#define CCM_MMC_CTRL_SCLK_DLY(a) ((void) (a), 0)
#ifndef __ASSEMBLY__
void clock_set_pll1(unsigned int hz);
unsigned int clock_get_pll6(void);
#endif
#endif /* _SUNXI_CLOCK_SUN50I_H6_H */
Reference in a new issue Copy permalink