arm64: Add initial support for Odroid-N2
Subsystems (4)
cover arm64: Add initial support for Odroid-N2
This patchset adds basic support for :
- Amlogic G12B, which is very similar to G12A
- The HardKernel Odroid-N2 based on the S922X SoC
The Amlogic G12B SoC is very similar with the G12A SoC, sharing most of the features and architecture, but with these differences :
- The first CPU cluster only has 2xCortex-A53 instead of 4
- G12B has a second cluster of 4xCortex-A73
- Both cluster can achieve 2GHz instead of 1,8GHz for G12A
- CPU Clock architecture is difference, thus needing a different compatible to handle this slight difference
- Supports a MIPI CSI input
- Embeds a Mali-G52 instead of a Mali-G31, but integration is the same
Actual support is done in the same way as for the GXM support, including the G12A dtsi and redefining the CPU clusters.
Unlike GXM, the first cluster is different, thus needing to remove the last 2 cpu nodes of the first cluster.
G12B clock driver is very close, the main differences are :
- the clock tree is duplicated for the both clusters, and the SYS_PLL are swapped between the clusters
- G12A has additional clocks like for CSI an other components
Neil Armstrong (6):
dt-bindings: clk: meson: add g12b periph clock controller bindings
clk: meson: g12a: Add support for G12B CPUB clocks
clk: meson: g12a: mark fclk_div3 as critical
dt-bindings: arm: amlogic: add G12B bindings
dt-bindings: arm: amlogic: add Odroid-N2 binding
arm64: dts: meson: Add minimal support for Odroid-N2
.../devicetree/bindings/arm/amlogic.txt | 6 + .../bindings/clock/amlogic,gxbb-clkc.txt | 1 + arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 178 +++++++ arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 82 +++ drivers/clk/meson/g12a.c | 466 ++++++++++++++++++ drivers/clk/meson/g12a.h | 20 +- 7 files changed, 753 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
Signature · 1 line
2.21.0
RFC PATCH 1/6 dt-bindings: clk: meson: add g12b periph clock controller bindings
This patch adds the specific Amlogic G12B clock driver compatible.
G12B clock driver is very close, the main differences are :
- the clock tree is duplicated for the both clusters, and the SYS_PLL are swapped between the clusters
- G12A has additional clocks like for CSI an other components
--- Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt +1 -0
@@ -10,6 +10,7 @@ Required Properties: "amlogic,gxl-clkc" for GXL and GXM SoC, "amlogic,axg-clkc" for AXG SoC. "amlogic,g12a-clkc" for G12A SoC. + "amlogic,g12b-clkc" for G12B SoC. - clocks : list of clock phandle, one for each entry clock-names. - clock-names : should contain the following: * "xtal": the platform xtal
Signature · 1 line
2.21.0
Re: [PATCH RFC 1/6] dt-bindings: clk: meson: add g12b periph clock controller bindings
Quoted 7 lines · Neil Armstrong
This patch adds the specific Amlogic G12B clock driver compatible.
G12B clock driver is very close, the main differences are :
- the clock tree is duplicated for the both clusters, and theSYS_PLLare swapped between the clusters
- G12A has additional clocks like for CSI an other components
Quoted 5 lines
Signed-off-by Neil Armstrong <[email protected]>--- Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt | 1 + 1 file changed, 1 insertion(+)
RFC PATCH 2/6 clk: meson: g12a: Add support for G12B CPUB clocks
In reply to Neil ArmstrongThis patch support for the specific Amlogic G12B clocks.
G12B clock driver is very close, the main differences are :
- the clock tree is duplicated for the both clusters, and the SYS_PLL are swapped between the clusters
- G12A has additional clocks like for CSI an other components
Here only the cpu clock tree is handled.
--- drivers/clk/meson/g12a.c | 456 +++++++++++++++++++++++++++++++++++++++ drivers/clk/meson/g12a.h | 20 +- 2 files changed, 475 insertions(+), 1 deletion(-)
drivers/clk/meson/g12a.c +456 -0
@@ -150,6 +150,57 @@ static struct clk_regmap g12a_sys_pll = { }, }; +static struct clk_regmap g12b_sys1_pll_dco = { + .data = &(struct meson_clk_pll_data ){ + .en = { + .reg_off =HHI_SYS1_PLL_CNTL0 , + .shift =28 , + .width =1 , + }, + .m = { + .reg_off =HHI_SYS1_PLL_CNTL0 , + .shift =0 , + .width =8 , + }, + .n = { + .reg_off =HHI_SYS1_PLL_CNTL0 , + .shift =10 , + .width =5 , + }, + .l = { + .reg_off =HHI_SYS1_PLL_CNTL0 , + .shift =31 , + .width =1 , + }, + .rst = { + .reg_off =HHI_SYS1_PLL_CNTL0 , + .shift =29 , + .width =1 , + }, + }, + .hw.init = &(struct clk_init_data ){ + .name ="sys1_pll_dco" , + .ops = &meson_clk_pll_ro_ops, + .parent_names = (const char *[]){IN_PREFIX "xtal" }, + .num_parents =1 , + }, +}; + +static struct clk_regmap g12b_sys1_pll = { + .data = &(struct clk_regmap_div_data ){ + .offset =HHI_SYS1_PLL_CNTL0 , + .shift =16 , + .width =3 , + .flags =CLK_DIVIDER_POWER_OF_TWO , + }, + .hw.init = &(struct clk_init_data ){ + .name ="sys1_pll" , + .ops = &clk_regmap_divider_ro_ops, + .parent_names = (const char *[]){"sys1_pll_dco" }, + .num_parents =1 , + }, +}; +static struct clk_regmap g12a_sys_pll_div16_en = { .data = &(struct clk_regmap_gate_data ){ .offset =HHI_SYS_CPU_CLK_CNTL1 ,
@@ -303,6 +354,165 @@ static struct clk_regmap g12a_cpu_clk = { .parent_names = (const char *[]){ "cpu_clk_dyn", "sys_pll" }, .num_parents = 2, +/* +* Until we add support for DVFS, this clock tree feeds +* the second CPU cluster and should not be disabled +*/ + .flags = CLK_IS_CRITICAL, + }, +}; + +/* Datasheet names this field as "Final_mux_sel" */ +static struct clk_regmap g12b_cpu_clk = { + .data = &(struct clk_regmap_mux_data ){ + .offset =HHI_SYS_CPU_CLK_CNTL0 , + .mask =0x1 , + .shift =11 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="cpu_clk" , + .ops = &clk_regmap_mux_ro_ops, + .parent_names = (const char *[]){"cpu_clk_dyn" , +"sys1_pll" }, + .num_parents =2 , +/* +* Until we add support for DVFS, this clock tree feeds +* the second CPU cluster and should not be disabled +*/ + .flags =CLK_IS_CRITICAL , + }, +}; + +/* Datasheet names this field as "premux0" */ +static struct clk_regmap g12b_cpub_clk_dyn0_sel = { + .data = &(struct clk_regmap_mux_data ){ + .offset =HHI_SYS_CPUB_CLK_CNTL , + .mask =0x3 , + .shift =0 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="cpub_clk_dyn0_sel" , + .ops = &clk_regmap_mux_ro_ops, + .parent_names = (const char *[]){IN_PREFIX "xtal" , +"fclk_div2" , +"fclk_div3" }, + .num_parents =3 , + }, +}; + +/* Datasheet names this field as "mux0_divn_tcnt" */ +static struct clk_regmap g12b_cpub_clk_dyn0_div = { + .data = &(struct clk_regmap_div_data ){ + .offset =HHI_SYS_CPUB_CLK_CNTL , + .shift =4 , + .width =6 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="cpub_clk_dyn0_div" , + .ops = &clk_regmap_divider_ro_ops, + .parent_names = (const char *[]){"cpub_clk_dyn0_sel" }, + .num_parents =1 , + }, +}; + +/* Datasheet names this field as "postmux0" */ +static struct clk_regmap g12b_cpub_clk_dyn0 = { + .data = &(struct clk_regmap_mux_data ){ + .offset =HHI_SYS_CPUB_CLK_CNTL , + .mask =0x1 , + .shift =2 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="cpub_clk_dyn0" , + .ops = &clk_regmap_mux_ro_ops, + .parent_names = (const char *[]){"cpub_clk_dyn0_sel" , +"cpub_clk_dyn0_div" }, + .num_parents =2 , + }, +}; + +/* Datasheet names this field as "premux1" */ +static struct clk_regmap g12b_cpub_clk_dyn1_sel = { + .data = &(struct clk_regmap_mux_data ){ + .offset =HHI_SYS_CPUB_CLK_CNTL , + .mask =0x3 , + .shift =16 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="cpub_clk_dyn1_sel" , + .ops = &clk_regmap_mux_ro_ops, + .parent_names = (const char *[]){IN_PREFIX "xtal" , +"fclk_div2" , +"fclk_div3" }, + .num_parents =3 , + }, +}; + +/* Datasheet names this field as "Mux1_divn_tcnt" */ +static struct clk_regmap g12b_cpub_clk_dyn1_div = { + .data = &(struct clk_regmap_div_data ){ + .offset =HHI_SYS_CPUB_CLK_CNTL , + .shift =20 , + .width =6 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="cpub_clk_dyn1_div" , + .ops = &clk_regmap_divider_ro_ops, + .parent_names = (const char *[]){"cpub_clk_dyn1_sel" }, + .num_parents =1 , + }, +}; + +/* Datasheet names this field as "postmux1" */ +static struct clk_regmap g12b_cpub_clk_dyn1 = { + .data = &(struct clk_regmap_mux_data ){ + .offset =HHI_SYS_CPUB_CLK_CNTL , + .mask =0x1 , + .shift =18 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="cpub_clk_dyn1" , + .ops = &clk_regmap_mux_ro_ops, + .parent_names = (const char *[]){"cpub_clk_dyn1_sel" , +"cpub_clk_dyn1_div" }, + .num_parents =2 , + }, +}; + +/* Datasheet names this field as "Final_dyn_mux_sel" */ +static struct clk_regmap g12b_cpub_clk_dyn = { + .data = &(struct clk_regmap_mux_data ){ + .offset =HHI_SYS_CPUB_CLK_CNTL , + .mask =0x1 , + .shift =10 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="cpub_clk_dyn" , + .ops = &clk_regmap_mux_ro_ops, + .parent_names = (const char *[]){"cpub_clk_dyn0" , +"cpub_clk_dyn1" }, + .num_parents =2 , + }, +}; + +/* Datasheet names this field as "Final_mux_sel" */ +static struct clk_regmap g12b_cpub_clk = { + .data = &(struct clk_regmap_mux_data ){ + .offset =HHI_SYS_CPUB_CLK_CNTL , + .mask =0x1 , + .shift =11 , + }, + .hw.init = &(struct clk_init_data ){ + .name ="cpub_clk" , + .ops = &clk_regmap_mux_ro_ops, + .parent_names = (const char *[]){"cpub_clk_dyn" , +"sys_pll" }, + .num_parents =2 , +/* +* Until we add support for DVFS, this clock tree feeds +* the second CPU cluster and should not be disabled +*/ + .flags =CLK_IS_CRITICAL , }, };
@@ -2774,6 +2984,234 @@ static struct clk_hw_onecell_data g12a_hw_onecell_data = { .num = NR_CLKS, }; +static struct clk_hw_onecell_data g12b_hw_onecell_data = { + .hws = { + [CLKID_SYS_PLL ] = &g12a_sys_pll.hw, + [CLKID_FIXED_PLL ] = &g12a_fixed_pll.hw, + [CLKID_FCLK_DIV2 ] = &g12a_fclk_div2.hw, + [CLKID_FCLK_DIV3 ] = &g12a_fclk_div3.hw, + [CLKID_FCLK_DIV4 ] = &g12a_fclk_div4.hw, + [CLKID_FCLK_DIV5 ] = &g12a_fclk_div5.hw, + [CLKID_FCLK_DIV7 ] = &g12a_fclk_div7.hw, + [CLKID_FCLK_DIV2P5 ] = &g12a_fclk_div2p5.hw, + [CLKID_GP0_PLL ] = &g12a_gp0_pll.hw, + [CLKID_MPEG_SEL ] = &g12a_mpeg_clk_sel.hw, + [CLKID_MPEG_DIV ] = &g12a_mpeg_clk_div.hw, + [CLKID_CLK81 ] = &g12a_clk81.hw, + [CLKID_MPLL0 ] = &g12a_mpll0.hw, + [CLKID_MPLL1 ] = &g12a_mpll1.hw, + [CLKID_MPLL2 ] = &g12a_mpll2.hw, + [CLKID_MPLL3 ] = &g12a_mpll3.hw, + [CLKID_DDR ] = &g12a_ddr.hw, + [CLKID_DOS ] = &g12a_dos.hw, + [CLKID_AUDIO_LOCKER ] = &g12a_audio_locker.hw, + [CLKID_MIPI_DSI_HOST ] = &g12a_mipi_dsi_host.hw, + [CLKID_ETH_PHY ] = &g12a_eth_phy.hw, + [CLKID_ISA ] = &g12a_isa.hw, + [CLKID_PL301 ] = &g12a_pl301.hw, + [CLKID_PERIPHS ] = &g12a_periphs.hw, + [CLKID_SPICC0 ] = &g12a_spicc_0.hw, + [CLKID_I2C ] = &g12a_i2c.hw, + [CLKID_SANA ] = &g12a_sana.hw, + [CLKID_SD ] = &g12a_sd.hw, + [CLKID_RNG0 ] = &g12a_rng0.hw, + [CLKID_UART0 ] = &g12a_uart0.hw, + [CLKID_SPICC1 ] = &g12a_spicc_1.hw, + [CLKID_HIU_IFACE ] = &g12a_hiu_reg.hw, + [CLKID_MIPI_DSI_PHY ] = &g12a_mipi_dsi_phy.hw, + [CLKID_ASSIST_MISC ] = &g12a_assist_misc.hw, + [CLKID_SD_EMMC_A ] = &g12a_emmc_a.hw, + [CLKID_SD_EMMC_B ] = &g12a_emmc_b.hw, + [CLKID_SD_EMMC_C ] = &g12a_emmc_c.hw, + [CLKID_AUDIO_CODEC ] = &g12a_audio_codec.hw, + [CLKID_AUDIO ] = &g12a_audio.hw, + [CLKID_ETH ] = &g12a_eth_core.hw, + [CLKID_DEMUX ] = &g12a_demux.hw, + [CLKID_AUDIO_IFIFO ] = &g12a_audio_ififo.hw, + [CLKID_ADC ] = &g12a_adc.hw, + [CLKID_UART1 ] = &g12a_uart1.hw, + [CLKID_G2D ] = &g12a_g2d.hw, + [CLKID_RESET ] = &g12a_reset.hw, + [CLKID_PCIE_COMB ] = &g12a_pcie_comb.hw, + [CLKID_PARSER ] = &g12a_parser.hw, + [CLKID_USB ] = &g12a_usb_general.hw, + [CLKID_PCIE_PHY ] = &g12a_pcie_phy.hw, + [CLKID_AHB_ARB0 ] = &g12a_ahb_arb0.hw, + [CLKID_AHB_DATA_BUS ] = &g12a_ahb_data_bus.hw, + [CLKID_AHB_CTRL_BUS ] = &g12a_ahb_ctrl_bus.hw, + [CLKID_HTX_HDCP22 ] = &g12a_htx_hdcp22.hw, + [CLKID_HTX_PCLK ] = &g12a_htx_pclk.hw, + [CLKID_BT656 ] = &g12a_bt656.hw, + [CLKID_USB1_DDR_BRIDGE ] = &g12a_usb1_to_ddr.hw, + [CLKID_MMC_PCLK ] = &g12a_mmc_pclk.hw, + [CLKID_UART2 ] = &g12a_uart2.hw, + [CLKID_VPU_INTR ] = &g12a_vpu_intr.hw, + [CLKID_GIC ] = &g12a_gic.hw, + [CLKID_SD_EMMC_A_CLK0_SEL ] = &g12a_sd_emmc_a_clk0_sel.hw, + [CLKID_SD_EMMC_A_CLK0_DIV ] = &g12a_sd_emmc_a_clk0_div.hw, + [CLKID_SD_EMMC_A_CLK0 ] = &g12a_sd_emmc_a_clk0.hw, + [CLKID_SD_EMMC_B_CLK0_SEL ] = &g12a_sd_emmc_b_clk0_sel.hw, + [CLKID_SD_EMMC_B_CLK0_DIV ] = &g12a_sd_emmc_b_clk0_div.hw, + [CLKID_SD_EMMC_B_CLK0 ] = &g12a_sd_emmc_b_clk0.hw, + [CLKID_SD_EMMC_C_CLK0_SEL ] = &g12a_sd_emmc_c_clk0_sel.hw, + [CLKID_SD_EMMC_C_CLK0_DIV ] = &g12a_sd_emmc_c_clk0_div.hw, + [CLKID_SD_EMMC_C_CLK0 ] = &g12a_sd_emmc_c_clk0.hw, + [CLKID_MPLL0_DIV ] = &g12a_mpll0_div.hw, + [CLKID_MPLL1_DIV ] = &g12a_mpll1_div.hw, + [CLKID_MPLL2_DIV ] = &g12a_mpll2_div.hw, + [CLKID_MPLL3_DIV ] = &g12a_mpll3_div.hw, + [CLKID_FCLK_DIV2_DIV ] = &g12a_fclk_div2_div.hw, + [CLKID_FCLK_DIV3_DIV ] = &g12a_fclk_div3_div.hw, + [CLKID_FCLK_DIV4_DIV ] = &g12a_fclk_div4_div.hw, + [CLKID_FCLK_DIV5_DIV ] = &g12a_fclk_div5_div.hw, + [CLKID_FCLK_DIV7_DIV ] = &g12a_fclk_div7_div.hw, + [CLKID_FCLK_DIV2P5_DIV ] = &g12a_fclk_div2p5_div.hw, + [CLKID_HIFI_PLL ] = &g12a_hifi_pll.hw, + [CLKID_VCLK2_VENCI0 ] = &g12a_vclk2_venci0.hw, + [CLKID_VCLK2_VENCI1 ] = &g12a_vclk2_venci1.hw, + [CLKID_VCLK2_VENCP0 ] = &g12a_vclk2_vencp0.hw, + [CLKID_VCLK2_VENCP1 ] = &g12a_vclk2_vencp1.hw, + [CLKID_VCLK2_VENCT0 ] = &g12a_vclk2_venct0.hw, + [CLKID_VCLK2_VENCT1 ] = &g12a_vclk2_venct1.hw, + [CLKID_VCLK2_OTHER ] = &g12a_vclk2_other.hw, + [CLKID_VCLK2_ENCI ] = &g12a_vclk2_enci.hw, + [CLKID_VCLK2_ENCP ] = &g12a_vclk2_encp.hw, + [CLKID_DAC_CLK ] = &g12a_dac_clk.hw, + [CLKID_AOCLK ] = &g12a_aoclk_gate.hw, + [CLKID_IEC958 ] = &g12a_iec958_gate.hw, + [CLKID_ENC480P ] = &g12a_enc480p.hw, + [CLKID_RNG1 ] = &g12a_rng1.hw, + [CLKID_VCLK2_ENCT ] = &g12a_vclk2_enct.hw, + [CLKID_VCLK2_ENCL ] = &g12a_vclk2_encl.hw, + [CLKID_VCLK2_VENCLMMC ] = &g12a_vclk2_venclmmc.hw, + [CLKID_VCLK2_VENCL ] = &g12a_vclk2_vencl.hw, + [CLKID_VCLK2_OTHER1 ] = &g12a_vclk2_other1.hw, + [CLKID_FIXED_PLL_DCO ] = &g12a_fixed_pll_dco.hw, + [CLKID_SYS_PLL_DCO ] = &g12a_sys_pll_dco.hw, + [CLKID_GP0_PLL_DCO ] = &g12a_gp0_pll_dco.hw, + [CLKID_HIFI_PLL_DCO ] = &g12a_hifi_pll_dco.hw, + [CLKID_DMA ] = &g12a_dma.hw, + [CLKID_EFUSE ] = &g12a_efuse.hw, + [CLKID_ROM_BOOT ] = &g12a_rom_boot.hw, + [CLKID_RESET_SEC ] = &g12a_reset_sec.hw, + [CLKID_SEC_AHB_APB3 ] = &g12a_sec_ahb_apb3.hw, + [CLKID_MPLL_PREDIV ] = &g12a_mpll_prediv.hw, + [CLKID_VPU_0_SEL ] = &g12a_vpu_0_sel.hw, + [CLKID_VPU_0_DIV ] = &g12a_vpu_0_div.hw, + [CLKID_VPU_0 ] = &g12a_vpu_0.hw, + [CLKID_VPU_1_SEL ] = &g12a_vpu_1_sel.hw, + [CLKID_VPU_1_DIV ] = &g12a_vpu_1_div.hw, + [CLKID_VPU_1 ] = &g12a_vpu_1.hw, + [CLKID_VPU ] = &g12a_vpu.hw, + [CLKID_VAPB_0_SEL ] = &g12a_vapb_0_sel.hw, + [CLKID_VAPB_0_DIV ] = &g12a_vapb_0_div.hw, + [CLKID_VAPB_0 ] = &g12a_vapb_0.hw, + [CLKID_VAPB_1_SEL ] = &g12a_vapb_1_sel.hw, + [CLKID_VAPB_1_DIV ] = &g12a_vapb_1_div.hw, + [CLKID_VAPB_1 ] = &g12a_vapb_1.hw, + [CLKID_VAPB_SEL ] = &g12a_vapb_sel.hw, + [CLKID_VAPB ] = &g12a_vapb.hw, + [CLKID_HDMI_PLL_DCO ] = &g12a_hdmi_pll_dco.hw, + [CLKID_HDMI_PLL_OD ] = &g12a_hdmi_pll_od.hw, + [CLKID_HDMI_PLL_OD2 ] = &g12a_hdmi_pll_od2.hw, + [CLKID_HDMI_PLL ] = &g12a_hdmi_pll.hw, + [CLKID_VID_PLL ] = &g12a_vid_pll_div.hw, + [CLKID_VID_PLL_SEL ] = &g12a_vid_pll_sel.hw, + [CLKID_VID_PLL_DIV ] = &g12a_vid_pll.hw, + [CLKID_VCLK_SEL ] = &g12a_vclk_sel.hw, + [CLKID_VCLK2_SEL ] = &g12a_vclk2_sel.hw, + [CLKID_VCLK_INPUT ] = &g12a_vclk_input.hw, + [CLKID_VCLK2_INPUT ] = &g12a_vclk2_input.hw, + [CLKID_VCLK_DIV ] = &g12a_vclk_div.hw, + [CLKID_VCLK2_DIV ] = &g12a_vclk2_div.hw, + [CLKID_VCLK ] = &g12a_vclk.hw, + [CLKID_VCLK2 ] = &g12a_vclk2.hw, + [CLKID_VCLK_DIV1 ] = &g12a_vclk_div1.hw, + [CLKID_VCLK_DIV2_EN ] = &g12a_vclk_div2_en.hw, + [CLKID_VCLK_DIV4_EN ] = &g12a_vclk_div4_en.hw, + [CLKID_VCLK_DIV6_EN ] = &g12a_vclk_div6_en.hw, + [CLKID_VCLK_DIV12_EN ] = &g12a_vclk_div12_en.hw, + [CLKID_VCLK2_DIV1 ] = &g12a_vclk2_div1.hw, + [CLKID_VCLK2_DIV2_EN ] = &g12a_vclk2_div2_en.hw, + [CLKID_VCLK2_DIV4_EN ] = &g12a_vclk2_div4_en.hw, + [CLKID_VCLK2_DIV6_EN ] = &g12a_vclk2_div6_en.hw, + [CLKID_VCLK2_DIV12_EN ] = &g12a_vclk2_div12_en.hw, + [CLKID_VCLK_DIV2 ] = &g12a_vclk_div2.hw, + [CLKID_VCLK_DIV4 ] = &g12a_vclk_div4.hw, + [CLKID_VCLK_DIV6 ] = &g12a_vclk_div6.hw, + [CLKID_VCLK_DIV12 ] = &g12a_vclk_div12.hw, + [CLKID_VCLK2_DIV2 ] = &g12a_vclk2_div2.hw, + [CLKID_VCLK2_DIV4 ] = &g12a_vclk2_div4.hw, + [CLKID_VCLK2_DIV6 ] = &g12a_vclk2_div6.hw, + [CLKID_VCLK2_DIV12 ] = &g12a_vclk2_div12.hw, + [CLKID_CTS_ENCI_SEL ] = &g12a_cts_enci_sel.hw, + [CLKID_CTS_ENCP_SEL ] = &g12a_cts_encp_sel.hw, + [CLKID_CTS_VDAC_SEL ] = &g12a_cts_vdac_sel.hw, + [CLKID_HDMI_TX_SEL ] = &g12a_hdmi_tx_sel.hw, + [CLKID_CTS_ENCI ] = &g12a_cts_enci.hw, + [CLKID_CTS_ENCP ] = &g12a_cts_encp.hw, + [CLKID_CTS_VDAC ] = &g12a_cts_vdac.hw, + [CLKID_HDMI_TX ] = &g12a_hdmi_tx.hw, + [CLKID_HDMI_SEL ] = &g12a_hdmi_sel.hw, + [CLKID_HDMI_DIV ] = &g12a_hdmi_div.hw, + [CLKID_HDMI ] = &g12a_hdmi.hw, + [CLKID_MALI_0_SEL ] = &g12a_mali_0_sel.hw, + [CLKID_MALI_0_DIV ] = &g12a_mali_0_div.hw, + [CLKID_MALI_0 ] = &g12a_mali_0.hw, + [CLKID_MALI_1_SEL ] = &g12a_mali_1_sel.hw, + [CLKID_MALI_1_DIV ] = &g12a_mali_1_div.hw, + [CLKID_MALI_1 ] = &g12a_mali_1.hw, + [CLKID_MALI ] = &g12a_mali.hw, + [CLKID_MPLL_5OM_DIV ] = &g12a_mpll_50m_div.hw, + [CLKID_MPLL_5OM ] = &g12a_mpll_50m.hw, + [CLKID_SYS_PLL_DIV16_EN ] = &g12a_sys_pll_div16_en.hw, + [CLKID_SYS_PLL_DIV16 ] = &g12a_sys_pll_div16.hw, + [CLKID_CPU_CLK_DYN0_SEL ] = &g12a_cpu_clk_dyn0_sel.hw, + [CLKID_CPU_CLK_DYN0_DIV ] = &g12a_cpu_clk_dyn0_div.hw, + [CLKID_CPU_CLK_DYN0 ] = &g12a_cpu_clk_dyn0.hw, + [CLKID_CPU_CLK_DYN1_SEL ] = &g12a_cpu_clk_dyn1_sel.hw, + [CLKID_CPU_CLK_DYN1_DIV ] = &g12a_cpu_clk_dyn1_div.hw, + [CLKID_CPU_CLK_DYN1 ] = &g12a_cpu_clk_dyn1.hw, + [CLKID_CPU_CLK_DYN ] = &g12a_cpu_clk_dyn.hw, + [CLKID_CPU_CLK ] = &g12b_cpu_clk.hw, + [CLKID_CPU_CLK_DIV16_EN ] = &g12a_cpu_clk_div16_en.hw, + [CLKID_CPU_CLK_DIV16 ] = &g12a_cpu_clk_div16.hw, + [CLKID_CPU_CLK_APB_DIV ] = &g12a_cpu_clk_apb_div.hw, + [CLKID_CPU_CLK_APB ] = &g12a_cpu_clk_apb.hw, + [CLKID_CPU_CLK_ATB_DIV ] = &g12a_cpu_clk_atb_div.hw, + [CLKID_CPU_CLK_ATB ] = &g12a_cpu_clk_atb.hw, + [CLKID_CPU_CLK_AXI_DIV ] = &g12a_cpu_clk_axi_div.hw, + [CLKID_CPU_CLK_AXI ] = &g12a_cpu_clk_axi.hw, + [CLKID_CPU_CLK_TRACE_DIV ] = &g12a_cpu_clk_trace_div.hw, + [CLKID_CPU_CLK_TRACE ] = &g12a_cpu_clk_trace.hw, + [CLKID_PCIE_PLL_DCO ] = &g12a_pcie_pll_dco.hw, + [CLKID_PCIE_PLL_DCO_DIV2 ] = &g12a_pcie_pll_dco_div2.hw, + [CLKID_PCIE_PLL_OD ] = &g12a_pcie_pll_od.hw, + [CLKID_PCIE_PLL ] = &g12a_pcie_pll.hw, + [CLKID_VDEC_1_SEL ] = &g12a_vdec_1_sel.hw, + [CLKID_VDEC_1_DIV ] = &g12a_vdec_1_div.hw, + [CLKID_VDEC_1 ] = &g12a_vdec_1.hw, + [CLKID_VDEC_HEVC_SEL ] = &g12a_vdec_hevc_sel.hw, + [CLKID_VDEC_HEVC_DIV ] = &g12a_vdec_hevc_div.hw, + [CLKID_VDEC_HEVC ] = &g12a_vdec_hevc.hw, + [CLKID_VDEC_HEVCF_SEL ] = &g12a_vdec_hevcf_sel.hw, + [CLKID_VDEC_HEVCF_DIV ] = &g12a_vdec_hevcf_div.hw, + [CLKID_VDEC_HEVCF ] = &g12a_vdec_hevcf.hw, + [CLKID_SYS1_PLL_DCO ] = &g12b_sys1_pll_dco.hw, + [CLKID_SYS1_PLL ] = &g12b_sys1_pll.hw, + [CLKID_CPUB_CLK_DYN0_SEL ] = &g12b_cpub_clk_dyn0_sel.hw, + [CLKID_CPUB_CLK_DYN0_DIV ] = &g12b_cpub_clk_dyn0_div.hw, + [CLKID_CPUB_CLK_DYN0 ] = &g12b_cpub_clk_dyn0.hw, + [CLKID_CPUB_CLK_DYN1_SEL ] = &g12b_cpub_clk_dyn1_sel.hw, + [CLKID_CPUB_CLK_DYN1_DIV ] = &g12b_cpub_clk_dyn1_div.hw, + [CLKID_CPUB_CLK_DYN1 ] = &g12b_cpub_clk_dyn1.hw, + [CLKID_CPUB_CLK_DYN ] = &g12b_cpub_clk_dyn.hw, + [CLKID_CPUB_CLK ] = &g12b_cpub_clk.hw, + [NR_CLKS ] =NULL , + }, + .num =NR_CLKS , +}; +/* Convenience table to populate regmap in .probe */ static struct clk_regmap *const g12a_clk_regmaps[] = { &g12a_clk81,
@@ -2966,6 +3404,17 @@ static struct clk_regmap *const g12a_clk_regmaps[] = { &g12a_vdec_hevcf_sel, &g12a_vdec_hevcf_div, &g12a_vdec_hevcf, + &g12b_cpu_clk, + &g12b_sys1_pll_dco, + &g12b_sys1_pll, + &g12b_cpub_clk_dyn0_sel, + &g12b_cpub_clk_dyn0_div, + &g12b_cpub_clk_dyn0, + &g12b_cpub_clk_dyn1_sel, + &g12b_cpub_clk_dyn1_div, + &g12b_cpub_clk_dyn1, + &g12b_cpub_clk_dyn, + &g12b_cpub_clk, }; static const struct meson_eeclkc_data g12a_clkc_data = {
@@ -2974,8 +3423,15 @@ static const struct meson_eeclkc_data g12a_clkc_data = { .hw_onecell_data = &g12a_hw_onecell_data }; +static const struct meson_eeclkc_data g12b_clkc_data = { + .regmap_clks = g12a_clk_regmaps, + .regmap_clk_num =ARRAY_SIZE (g12a_clk_regmaps), + .hw_onecell_data = &g12b_hw_onecell_data +}; +static const struct of_device_id clkc_match_table[] = { { .compatible ="amlogic,g12a-clkc" , .data = &g12a_clkc_data }, + { .compatible ="amlogic,g12b-clkc" , .data = &g12b_clkc_data }, {} };
drivers/clk/meson/g12a.h +19 -1
@@ -69,6 +69,7 @@#define HHI_VDEC4_CLK_CNTL 0x1EC#define HHI_HDCP22_CLK_CNTL 0x1F0#define HHI_VAPBCLK_CNTL 0x1F4 +#define HHI_SYS_CPUB_CLK_CNTL 0x208#define HHI_VPU_CLKB_CNTL 0x20C#define HHI_GEN_CLK_CNTL 0x228#define HHI_VDIN_MEAS_CLK_CNTL 0x250
@@ -102,6 +103,13 @@#define HHI_HDMI_PLL_CNTL5 0x334#define HHI_HDMI_PLL_CNTL6 0x338#define HHI_SPICC_CLK_CNTL 0x3dc +#define HHI_SYS1_PLL_CNTL0 0x380 +#define HHI_SYS1_PLL_CNTL1 0x384 +#define HHI_SYS1_PLL_CNTL2 0x388 +#define HHI_SYS1_PLL_CNTL3 0x38c +#define HHI_SYS1_PLL_CNTL4 0x390 +#define HHI_SYS1_PLL_CNTL5 0x394 +#define HHI_SYS1_PLL_CNTL6 0x398/* * CLKID index values
@@ -195,8 +203,18 @@#define CLKID_VDEC_HEVC_DIV 206#define CLKID_VDEC_HEVCF_SEL 208#define CLKID_VDEC_HEVCF_DIV 209 +#define CLKID_SYS1_PLL_DCO 211 +#define CLKID_SYS1_PLL 212 +#define CLKID_CPUB_CLK_DYN0_SEL 213 +#define CLKID_CPUB_CLK_DYN0_DIV 214 +#define CLKID_CPUB_CLK_DYN0 215 +#define CLKID_CPUB_CLK_DYN1_SEL 216 +#define CLKID_CPUB_CLK_DYN1_DIV 217 +#define CLKID_CPUB_CLK_DYN1 218 +#define CLKID_CPUB_CLK_DYN 219 +#define CLKID_CPUB_CLK 220 -#define NR_CLKS 211 +#define NR_CLKS 221/* include the CLKIDs that have been made part of the DT binding */ #include <dt-bindings/clock/g12a-clkc.h>
Signature · 1 line
2.21.0
RFC PATCH 3/6 clk: meson: g12a: mark fclk_div3 as critical
In reply to Neil ArmstrongOn Amlogic Meson G12b platform, the fclk_div3 seems to be necessary for the system to operate correctly.
Disabling it cause the entire system to freeze, including peripherals.
This patch patch marks this clock as critical, fixing boot on G12b platforms.
--- drivers/clk/meson/g12a.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/clk/meson/g12a.c +10 -0
@@ -1062,6 +1062,16 @@ static struct clk_fixed_factor g12a_fclk_div3_div = { .ops = &clk_fixed_factor_ops, .parent_names = (const char *[]){ "fixed_pll" }, .num_parents = 1, +/* +* This clock is used by the resident firmware and is required +* by the platform to operate correctly. +* Until the following condition are met, we need this clock to +* be marked as critical: +* a) Mark the clock used by a firmware resource, if possible +* b) CCF has a clock hand-off mechanism to make the sure the +* clock stays on until the proper driver comes along +*/ + .flags = CLK_IS_CRITICAL, }, };
Signature · 1 line
2.21.0
Jerome Brunet
maintainerRe: [PATCH RFC 3/6] clk: meson: g12a: mark fclk_div3 as critical
Quoted 20 lines · Neil Armstrong
On Amlogic Meson G12b platform, the
fclk_div3seems to be necessary for the system to operate correctly.Disabling it cause the entire system to freeze, including peripherals.
This patch patch marks this clock as critical, fixing boot on G12b platforms.
Signed-off-by Neil Armstrong <[email protected]>--- drivers/clk/meson/g12a.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/clk/meson/g12a.c +0
-0@@ -1062,6 +1062,16 @@ static struct clk_fixed_factor g12a_fclk_div3_div = { .ops = &clk_fixed_factor_ops, .parent_names = (const char *[]){ "fixed_pll" }, .num_parents = 1,
drivers/clk/meson/g12a.c static struct clk_fixed_factor g12a_fclk_div3_div = { · line 1074
Quoted 10 lines
drivers/clk/meson/g12a.c +10
-0+/* +* This clock is used by the resident firmware and is required +* by the platform to operate correctly. +* Until the following condition are met, we need this clock to +* be marked as critical: +* a) Mark the clock used by a firmware resource, if possible +* b) CCF has a clock hand-off mechanism to make the sure the +* clock stays on until the proper driver comes along +*/ + .flags = CLK_IS_CRITICAL,
The gate should be critical then, not the fixed_divider clock. the fdiv3 gate is a child of this clock, so fdiv3 should still be able to gate with this
drivers/clk/meson/g12a.c static struct clk_fixed_factor g12a_fclk_div3_div = { · line 1077
Quoted 4 lines
drivers/clk/meson/g12a.c +0
-0}, };
Could you CC me of the whole series next time, I prefer getting the all context.
Re: [PATCH RFC 3/6] clk: meson: g12a: mark fclk_div3 as critical
Quoted 27 lines · Jerome Brunet
Quoted 26 lines · Neil Armstrong
On Amlogic Meson G12b platform, the
fclk_div3seems to be necessary for the system to operate correctly.Disabling it cause the entire system to freeze, including peripherals.
This patch patch marks this clock as critical, fixing boot on G12b platforms.
Signed-off-by Neil Armstrong <[email protected]>--- drivers/clk/meson/g12a.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/clk/meson/g12a.c +6
-0@@ -1062,6 +1062,16 @@ static struct clk_fixed_factor g12a_fclk_div3_div = { .ops = &clk_fixed_factor_ops, .parent_names = (const char *[]){ "fixed_pll" }, .num_parents = 1, +/* +* This clock is used by the resident firmware and is required +* by the platform to operate correctly. +* Until the following condition are met, we need this clock to +* be marked as critical: +* a) Mark the clock used by a firmware resource, if possible
Quoted 8 lines
drivers/clk/meson/g12a.c static struct clk_fixed_factor g12a_fclk_div3_div = { · line 1074
Quoted 4 lines
drivers/clk/meson/g12a.c +4
-0+* b) CCF has a clock hand-off mechanism to make the sure the +* clock stays on until the proper driver comes along +*/ + .flags = CLK_IS_CRITICAL,The gate should be critical then, not the
fixed_dividerclock. the fdiv3 gate is a child of this clock, so fdiv3 should still be able to gate with this
Weird, because with this, it's removed from the unused clocks list... will move to the gate.
Quoted 10 lines
drivers/clk/meson/g12a.c static struct clk_fixed_factor g12a_fclk_div3_div = { · line 1077
Quoted 6 lines
drivers/clk/meson/g12a.c +0
-0}, };Could you CC me of the whole series next time, I prefer getting the all context.
Sure
RFC PATCH 4/6 dt-bindings: arm: amlogic: add G12B bindings
In reply to Neil ArmstrongAdd compatible for the Amlogic G12B SoC, sharing most of the features and architecture with the G12A SoC.
--- Documentation/devicetree/bindings/arm/amlogic.txt | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/arm/amlogic.txt +4 -0
@@ -61,6 +61,10 @@ Boards with the Amlogic Meson G12A S905D2 SoC shall have the following propertie Required root node property: compatible: "amlogic,g12a"; +Boards with the Amlogic Meson G12B S922X SoC shall have the following properties: + Required root node property: + compatible: "amlogic,g12b"; + Board compatible values (alphabetically, grouped by SoC): - "geniatech,atv1200" (Meson6)
Signature · 1 line
2.21.0
Re: [PATCH RFC 4/6] dt-bindings: arm: amlogic: add G12B bindings
Quoted 8 lines · Neil Armstrong
Add compatible for the Amlogic G12B SoC, sharing most of the features and architecture with the G12A SoC.
Signed-off-by Neil Armstrong <[email protected]>--- Documentation/devicetree/bindings/arm/amlogic.txt | 4 ++++ 1 file changed, 4 insertions(+)
RFC PATCH 5/6 dt-bindings: arm: amlogic: add Odroid-N2 binding
In reply to Neil ArmstrongAdd compatible for the Amlogic G12B (S922X) SoC based Odroid-N2 SBC from HardKernel.
--- Documentation/devicetree/bindings/arm/amlogic.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/arm/amlogic.txt +2 -0
@@ -116,6 +116,8 @@ Board compatible values (alphabetically, grouped by SoC): - "amediatech,x96-max" (Meson g12a s905x2) - "seirobotics,sei510" (Meson g12a s905x2) + - "hardkernel,odroid-n2" (Meson g12b s922x) + Amlogic Meson Firmware registers Interface ------------------------------------------
Signature · 1 line
2.21.0
Re: [PATCH RFC 5/6] dt-bindings: arm: amlogic: add Odroid-N2 binding
Quoted 8 lines · Neil Armstrong
Add compatible for the Amlogic G12B (S922X) SoC based Odroid-N2 SBC from HardKernel.
Signed-off-by Neil Armstrong <[email protected]>--- Documentation/devicetree/bindings/arm/amlogic.txt | 2 ++ 1 file changed, 2 insertions(+)
RFC PATCH 6/6 arm64: dts: meson: Add minimal support for Odroid-N2
In reply to Neil ArmstrongThis patch adds basic support for :
- Amlogic G12B, which is very similar to G12A
- The HardKernel Odroid-N2 based on the S922X SoC
The Amlogic G12B SoC is very similar with the G12A SoC, sharing most of the features and architecture, but with these differences :
- The first CPU cluster only has 2xCortex-A53 instead of 4
- G12B has a second cluster of 4xCortex-A73
- Both cluster can achieve 2GHz instead of 1,8GHz for G12A
- CPU Clock architecture is difference, thus needing a different compatible to handle this slight difference
- Supports a MIPI CSI input
- Embeds a Mali-G52 instead of a Mali-G31, but integration is the same
Actual support is done in the same way as for the GXM support, including the G12A dtsi and redefining the CPU clusters.
Unlike GXM, the first cluster is different, thus needing to remove the last 2 cpu nodes of the first cluster.
--- arch/arm64/boot/dts/amlogic/Makefile | 1 + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 178 ++++++++++++++++++ arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 82 ++++++++ 3 files changed, 261 insertions(+) create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b.dtsi
arch/arm64/boot/dts/amlogic/Makefile +1 -0
@@ -3,6 +3,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-u200.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nanopi-k2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-nexbox-a95x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-odroidc2.dtb
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts new file +178 -0
178 lines not on this page · raw message
arch/arm64/boot/dts/amlogic/meson-g12b.dtsi new file +82 -0
82 lines not on this page · raw message
Signature · 1 line
2.21.0