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

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

Merge "clock-plutonium: Fix gcc_debug_mux registration location"

parents bf132b4f bf091b7a

drivers/clk/qcom/clock-gcc-plutonium.c

+0 −1
Original line number Diff line number Diff line
@@ -2602,7 +2602,6 @@ static struct clk_lookup msm_clocks_gcc_plutonium[] = { 
	CLK_LIST(gcc_usb_hs_ahb_clk),

	CLK_LIST(gcc_usb_hs_system_clk),

	CLK_LIST(gcc_usb_phy_cfg_ahb2phy_clk),

	CLK_LIST(gcc_debug_mux),

};



static int msm_gcc_plutonium_probe(struct platform_device *pdev)

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

+3 −1
Original line number Diff line number Diff line
@@ -248,7 +248,6 @@ 
#define clk_gcc_usb_hs_ahb_clk 0x72ce8032

#define clk_gcc_usb_hs_system_clk 0xa11972e5

#define clk_gcc_usb_phy_cfg_ahb2phy_clk 0xd1231a0e

#define clk_gcc_debug_mux 0x8121ac15



/* clock_mmss controlled clocks */

#define clk_mmsscc_xo 0x05e63704
@@ -371,4 +370,7 @@ 
#define clk_venus0_core2_vcodec_clk 0x24fa20a3

#define clk_mmss_debug_mux 0xe646ffda



/* clock_debug controlled clocks */

#define clk_gcc_debug_mux 0x8121ac15



#endif