Merge "clk: qcom: gcc-sdxlemur: Add PCIe and USB3 clock muxes" (13fe355d) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/clk/qcom/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -62,8 +62,8 @@ obj-$(CONFIG_SDM_GCC_845) += gcc-sdm845.o
		obj-$(CONFIG_SDM_GPUCC_845) += gpucc-sdm845.o
		obj-$(CONFIG_SDM_LPASSCC_845) += lpasscc-sdm845.o
		obj-$(CONFIG_SDM_VIDEOCC_845) += videocc-sdm845.o
		obj-$(CONFIG_SDX_DEBUGCC_SDXLEMUR) += debugcc-sdxlemur.o
		obj-$(CONFIG_SDX_GCC_SDXLEMUR) += gcc-sdxlemur.o
		obj-$(CONFIG_SDX_DEBUGCC_LEMUR) += debugcc-sdxlemur.o
		obj-$(CONFIG_SDX_GCC_LEMUR) += gcc-sdxlemur.o
		obj-$(CONFIG_SM_CAMCC_SHIMA) += camcc-shima.o
		obj-$(CONFIG_SM_DEBUGCC_HOLI) += debugcc-holi.o
		obj-$(CONFIG_SM_DEBUGCC_SHIMA) += debugcc-shima.o

drivers/clk/qcom/gcc-sdxlemur.c

+86 −0

Original line number	Diff line number	Diff line
		@@ -36,7 +36,9 @@ enum {
		P_CORE_BI_PLL_TEST_SE,
		P_GPLL0_OUT_EVEN,
		P_GPLL0_OUT_MAIN,
		P_PCIE_PIPE_CLK,
		P_SLEEP_CLK,
		P_USB3_PHY_WRAPPER_GCC_USB30_PIPE_CLK,
		};

		static struct clk_alpha_pll gpll0 = {
		@@ -147,6 +149,77 @@ static const struct clk_parent_data gcc_parent_data_3[] = {
		{ .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" },
		};

		static const struct parent_map gcc_parent_map_4[] = {
		{ P_BI_TCXO, 2 },
		};

		static const struct parent_map gcc_parent_map_5[] = {
		{ P_PCIE_PIPE_CLK, 0 },
		{ P_BI_TCXO, 2 },
		};

		static const struct clk_parent_data gcc_parent_data_5[] = {
		{ .fw_name = "pcie_pipe_clk"},
		{ .fw_name = "bi_tcxo"},
		};

		static const struct parent_map gcc_parent_map_6[] = {
		{ P_USB3_PHY_WRAPPER_GCC_USB30_PIPE_CLK, 0 },
		{ P_BI_TCXO, 2 },
		};

		static const struct clk_parent_data gcc_parent_data_6[] = {
		{ .fw_name = "usb3_phy_wrapper_gcc_usb30_pipe_clk"},
		{ .fw_name = "bi_tcxo"},
		};

		static struct clk_regmap_mux gcc_pcie_aux_clk_src = {
		.reg = 0x43060,
		.shift = 0,
		.width = 2,
		.parent_map = gcc_parent_map_4,
		.clkr = {
		.hw.init = &(struct clk_init_data){
		.name = "gcc_pcie_aux_clk_src",
		.parent_data = &(const struct clk_parent_data){
		.fw_name = "bi_tcxo",
		},
		.num_parents = 1,
		.ops = &clk_regmap_mux_closest_ops,
		},
		},
		};

		static struct clk_regmap_mux gcc_pcie_pipe_clk_src = {
		.reg = 0x43044,
		.shift = 0,
		.width = 2,
		.parent_map = gcc_parent_map_5,
		.clkr = {
		.hw.init = &(struct clk_init_data){
		.name = "gcc_pcie_pipe_clk_src",
		.parent_data = gcc_parent_data_5,
		.num_parents = 2,
		.ops = &clk_regmap_mux_closest_ops,
		},
		},
		};

		static struct clk_regmap_mux gcc_usb3_phy_pipe_clk_src = {
		.reg = 0x1706c,
		.shift = 0,
		.width = 2,
		.parent_map = gcc_parent_map_6,
		.clkr = {
		.hw.init = &(struct clk_init_data){
		.name = "gcc_usb3_phy_pipe_clk_src",
		.parent_data = gcc_parent_data_6,
		.num_parents = 2,
		.ops = &clk_regmap_mux_closest_ops,
		},
		},
		};

		static const struct freq_tbl ftbl_gcc_blsp1_qup1_i2c_apps_clk_src[] = {
		F(9600000, P_BI_TCXO, 2, 0, 0),
		F(19200000, P_BI_TCXO, 1, 0, 0),
		@@ -1214,6 +1287,11 @@ static struct clk_branch gcc_pcie_aux_clk = {
		.enable_mask = BIT(3),
		.hw.init = &(struct clk_init_data){
		.name = "gcc_pcie_aux_clk",
		.parent_data = &(const struct clk_parent_data){
		.hw = &gcc_pcie_aux_clk_src.clkr.hw,
		},
		.num_parents = 1,
		.flags = CLK_SET_RATE_PARENT,
		.ops = &clk_branch2_ops,
		},
		},
		@@ -1259,6 +1337,11 @@ static struct clk_branch gcc_pcie_pipe_clk = {
		.enable_mask = BIT(4),
		.hw.init = &(struct clk_init_data){
		.name = "gcc_pcie_pipe_clk",
		.parent_data = &(const struct clk_parent_data){
		.hw = &gcc_pcie_pipe_clk_src.clkr.hw,
		},
		.num_parents = 1,
		.flags = CLK_SET_RATE_PARENT,
		.ops = &clk_branch2_ops,
		},
		},
		@@ -1659,10 +1742,12 @@ static struct clk_regmap *gcc_sdxlemur_clocks[] = {
		[GCC_GP3_CLK_SRC] = &gcc_gp3_clk_src.clkr,
		[GCC_PCIE_0_CLKREF_EN] = &gcc_pcie_0_clkref_en.clkr,
		[GCC_PCIE_AUX_CLK] = &gcc_pcie_aux_clk.clkr,
		[GCC_PCIE_AUX_CLK_SRC] = &gcc_pcie_aux_clk_src.clkr,
		[GCC_PCIE_AUX_PHY_CLK_SRC] = &gcc_pcie_aux_phy_clk_src.clkr,
		[GCC_PCIE_CFG_AHB_CLK] = &gcc_pcie_cfg_ahb_clk.clkr,
		[GCC_PCIE_MSTR_AXI_CLK] = &gcc_pcie_mstr_axi_clk.clkr,
		[GCC_PCIE_PIPE_CLK] = &gcc_pcie_pipe_clk.clkr,
		[GCC_PCIE_PIPE_CLK_SRC] = &gcc_pcie_pipe_clk_src.clkr,
		[GCC_PCIE_RCHNG_PHY_CLK] = &gcc_pcie_rchng_phy_clk.clkr,
		[GCC_PCIE_RCHNG_PHY_CLK_SRC] = &gcc_pcie_rchng_phy_clk_src.clkr,
		[GCC_PCIE_SLEEP_CLK] = &gcc_pcie_sleep_clk.clkr,
		@@ -1689,6 +1774,7 @@ static struct clk_regmap *gcc_sdxlemur_clocks[] = {
		[GCC_USB3_PHY_AUX_CLK] = &gcc_usb3_phy_aux_clk.clkr,
		[GCC_USB3_PHY_AUX_CLK_SRC] = &gcc_usb3_phy_aux_clk_src.clkr,
		[GCC_USB3_PHY_PIPE_CLK] = &gcc_usb3_phy_pipe_clk.clkr,
		[GCC_USB3_PHY_PIPE_CLK_SRC] = &gcc_usb3_phy_pipe_clk_src.clkr,
		[GCC_USB3_PRIM_CLKREF_EN] = &gcc_usb3_prim_clkref_en.clkr,
		[GCC_USB_PHY_CFG_AHB2PHY_CLK] = &gcc_usb_phy_cfg_ahb2phy_clk.clkr,
		[GCC_XO_DIV4_CLK] = &gcc_xo_div4_clk.clkr,

include/dt-bindings/clock/qcom,gcc-sdxlemur.h

+39 −36

Original line number	Diff line number	Diff line
		@@ -49,42 +49,45 @@
		#define GCC_GP3_CLK_SRC 39
		#define GCC_PCIE_0_CLKREF_EN 40
		#define GCC_PCIE_AUX_CLK 41
		#define GCC_PCIE_AUX_PHY_CLK_SRC 42
		#define GCC_PCIE_CFG_AHB_CLK 43
		#define GCC_PCIE_MSTR_AXI_CLK 44
		#define GCC_PCIE_PIPE_CLK 45
		#define GCC_PCIE_RCHNG_PHY_CLK 46
		#define GCC_PCIE_RCHNG_PHY_CLK_SRC 47
		#define GCC_PCIE_SLEEP_CLK 48
		#define GCC_PCIE_SLV_AXI_CLK 49
		#define GCC_PCIE_SLV_Q2A_AXI_CLK 50
		#define GCC_PDM2_CLK 51
		#define GCC_PDM2_CLK_SRC 52
		#define GCC_PDM_AHB_CLK 53
		#define GCC_PDM_XO4_CLK 54
		#define GCC_RX1_USB2_CLKREF_EN 55
		#define GCC_SDCC1_AHB_CLK 56
		#define GCC_SDCC1_APPS_CLK 57
		#define GCC_SDCC1_APPS_CLK_SRC 58
		#define GCC_SPMI_FETCHER_AHB_CLK 59
		#define GCC_SPMI_FETCHER_CLK 60
		#define GCC_SPMI_FETCHER_CLK_SRC 61
		#define GCC_SYS_NOC_CPUSS_AHB_CLK 62
		#define GCC_USB30_MASTER_CLK 63
		#define GCC_USB30_MASTER_CLK_SRC 64
		#define GCC_USB30_MOCK_UTMI_CLK 65
		#define GCC_USB30_MOCK_UTMI_CLK_SRC 66
		#define GCC_USB30_MOCK_UTMI_POSTDIV_CLK_SRC 67
		#define GCC_USB30_MSTR_AXI_CLK 68
		#define GCC_USB30_SLEEP_CLK 69
		#define GCC_USB30_SLV_AHB_CLK 70
		#define GCC_USB3_PHY_AUX_CLK 71
		#define GCC_USB3_PHY_AUX_CLK_SRC 72
		#define GCC_USB3_PHY_PIPE_CLK 73
		#define GCC_USB3_PRIM_CLKREF_EN 74
		#define GCC_USB_PHY_CFG_AHB2PHY_CLK 75
		#define GCC_XO_DIV4_CLK 76
		#define GCC_XO_PCIE_LINK_CLK 77
		#define GCC_PCIE_AUX_CLK_SRC 42
		#define GCC_PCIE_AUX_PHY_CLK_SRC 43
		#define GCC_PCIE_CFG_AHB_CLK 44
		#define GCC_PCIE_MSTR_AXI_CLK 45
		#define GCC_PCIE_PIPE_CLK 46
		#define GCC_PCIE_PIPE_CLK_SRC 47
		#define GCC_PCIE_RCHNG_PHY_CLK 48
		#define GCC_PCIE_RCHNG_PHY_CLK_SRC 49
		#define GCC_PCIE_SLEEP_CLK 50
		#define GCC_PCIE_SLV_AXI_CLK 51
		#define GCC_PCIE_SLV_Q2A_AXI_CLK 52
		#define GCC_PDM2_CLK 53
		#define GCC_PDM2_CLK_SRC 54
		#define GCC_PDM_AHB_CLK 55
		#define GCC_PDM_XO4_CLK 56
		#define GCC_RX1_USB2_CLKREF_EN 57
		#define GCC_SDCC1_AHB_CLK 58
		#define GCC_SDCC1_APPS_CLK 59
		#define GCC_SDCC1_APPS_CLK_SRC 60
		#define GCC_SPMI_FETCHER_AHB_CLK 61
		#define GCC_SPMI_FETCHER_CLK 62
		#define GCC_SPMI_FETCHER_CLK_SRC 63
		#define GCC_SYS_NOC_CPUSS_AHB_CLK 64
		#define GCC_USB30_MASTER_CLK 65
		#define GCC_USB30_MASTER_CLK_SRC 66
		#define GCC_USB30_MOCK_UTMI_CLK 67
		#define GCC_USB30_MOCK_UTMI_CLK_SRC 68
		#define GCC_USB30_MOCK_UTMI_POSTDIV_CLK_SRC 69
		#define GCC_USB30_MSTR_AXI_CLK 70
		#define GCC_USB30_SLEEP_CLK 71
		#define GCC_USB30_SLV_AHB_CLK 72
		#define GCC_USB3_PHY_AUX_CLK 73
		#define GCC_USB3_PHY_AUX_CLK_SRC 74
		#define GCC_USB3_PHY_PIPE_CLK 75
		#define GCC_USB3_PHY_PIPE_CLK_SRC 76
		#define GCC_USB3_PRIM_CLKREF_EN 77
		#define GCC_USB_PHY_CFG_AHB2PHY_CLK 78
		#define GCC_XO_DIV4_CLK 79
		#define GCC_XO_PCIE_LINK_CLK 80

		/* GCC resets */
		#define GCC_BLSP1_QUP1_BCR 0