Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea408564 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: msm: clock: Remove support for the USB cfg_ahb2phy clock from HLOS"

parents 69493c17 b20d7ec1

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+3 −7
Original line number Diff line number Diff line
@@ -1727,11 +1727,10 @@ 
			<&clock_gcc clk_gcc_aggre1_usb3_axi_clk>,

			<&clock_gcc clk_gcc_usb30_mock_utmi_clk>,

			<&clock_gcc clk_gcc_usb30_sleep_clk>,

			<&clock_gcc clk_gcc_usb_phy_cfg_ahb2phy_clk>,

			<&clock_gcc clk_cxo_dwc3_clk>;



		clock-names = "core_clk", "iface_clk", "bus_aggr_clk",

				"utmi_clk", "sleep_clk", "cfg_ahb_clk", "xo";

				"utmi_clk", "sleep_clk", "xo";



		dwc3@a800000 {

			compatible = "snps,dwc3";
@@ -1799,11 +1798,9 @@ 


		clocks = <&clock_gcc clk_ln_bb_clk1>,

			 <&clock_gcc clk_gcc_rx1_usb2_clkref_clk>,

			 <&clock_gcc clk_gcc_usb_phy_cfg_ahb2phy_clk>,

			 <&clock_gcc clk_gcc_qusb2phy_prim_reset>;



		clock-names = "ref_clk_src", "ref_clk", "cfg_ahb_clk",

			      "phy_reset";

		clock-names = "ref_clk_src", "ref_clk", "phy_reset";

	};



	ssphy: ssphy@c010000 {
@@ -1951,13 +1948,12 @@ 


		clocks = <&clock_gcc clk_gcc_usb3_phy_aux_clk>,

			 <&clock_gcc clk_gcc_usb3_phy_pipe_clk>,

			 <&clock_gcc clk_gcc_usb_phy_cfg_ahb2phy_clk>,

			 <&clock_gcc clk_gcc_usb3_phy_reset>,

			 <&clock_gcc clk_gcc_usb3phy_phy_reset>,

			 <&clock_gcc clk_ln_bb_clk1>,

			 <&clock_gcc clk_gcc_usb3_clkref_clk>;



		clock-names = "aux_clk", "pipe_clk", "cfg_ahb_clk", "phy_reset",

		clock-names = "aux_clk", "pipe_clk", "phy_reset",

			      "phy_phy_reset", "ref_clk_src", "ref_clk";

	};

drivers/clk/msm/clock-gcc-cobalt.c

+0 −13
Original line number Diff line number Diff line
@@ -2185,17 +2185,6 @@ static struct reset_clk gcc_qusb2phy_sec_reset = { 
	},

};



static struct branch_clk gcc_usb_phy_cfg_ahb2phy_clk = {

	.cbcr_reg = GCC_USB_PHY_CFG_AHB2PHY_CBCR,

	.has_sibling = 1,

	.base = &virt_base,

	.c = {

		.dbg_name = "gcc_usb_phy_cfg_ahb2phy_clk",

		.ops = &clk_ops_branch,

		CLK_INIT(gcc_usb_phy_cfg_ahb2phy_clk.c),

	},

};



static struct branch_clk gcc_wcss_ahb_s0_clk = {

	.cbcr_reg = GCC_WCSS_AHB_S0_CBCR,

	.has_sibling = 1,
@@ -2381,7 +2370,6 @@ static struct mux_clk gcc_debug_mux = { 
		{ &gcc_usb30_mock_utmi_clk.c, 0x0040 },

		{ &gcc_usb3_phy_aux_clk.c, 0x0041 },

		{ &gcc_usb3_phy_pipe_clk.c, 0x0042 },

		{ &gcc_usb_phy_cfg_ahb2phy_clk.c, 0x0045 },

		{ &gcc_sdcc2_apps_clk.c, 0x0046 },

		{ &gcc_sdcc2_ahb_clk.c, 0x0047 },

		{ &gcc_sdcc4_apps_clk.c, 0x0048 },
@@ -2688,7 +2676,6 @@ static struct clk_lookup msm_clocks_gcc_cobalt[] = { 
	CLK_LIST(gcc_usb30_sleep_clk),

	CLK_LIST(gcc_usb3_phy_aux_clk),

	CLK_LIST(gcc_usb3_phy_pipe_clk),

	CLK_LIST(gcc_usb_phy_cfg_ahb2phy_clk),

	CLK_LIST(gcc_prng_ahb_clk),

	CLK_LIST(gcc_boot_rom_ahb_clk),

	CLK_LIST(gcc_wcss_ahb_s0_clk),

include/dt-bindings/clock/msm-clocks-cobalt.h

+0 −1
Original line number Diff line number Diff line
@@ -241,7 +241,6 @@ 
#define clk_gcc_usb30_sleep_clk			0xd0b65c92

#define clk_gcc_usb3_phy_aux_clk		0x0d9a36e0

#define clk_gcc_usb3_phy_pipe_clk		0xf279aff2

#define clk_gcc_usb_phy_cfg_ahb2phy_clk		0xd1231a0e

#define clk_gcc_wcss_ahb_s0_clk			0x639a01c4

#define clk_gcc_wcss_axi_m_clk			0xabc48ebd

#define clk_gcc_wcss_ecahb_clk			0xf1815ce9

include/dt-bindings/clock/msm-clocks-hwio-cobalt.h

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ 
#define GCC_USB3_PHY_AUX_CBCR					0x50000

#define GCC_USB3_PHY_PIPE_CBCR					0x50004

#define GCC_USB3PHY_PHY_BCR					0x50024

#define GCC_USB_PHY_CFG_AHB2PHY_CBCR				0x6A004

#define GCC_WCSS_AHB_S0_CBCR					0x11004

#define GCC_WCSS_AXI_M_CBCR					0x11008

#define GCC_WCSS_ECAHB_CBCR					0x1100C