tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

Pull clk fixes from Stephen Boyd:
"A small collection of fixes. I'll make another sweep soon to look for
more fixes for this -rc series.

- Mark device node const in of_clk_get_parent APIs to ease landing
changes in users later

- Fix flag for Qualcomm SC7180 video clocks where we thought it would
never turn off but actually hardware takes care of it

- Remove disp_cc_mdss_rscc_ahb_clk on Qualcomm SC7180 SoCs because
this clk is always on anyway

- Correct some bad dt-binding numbers for i.MX8MN SoCs"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
clk: imx8mn: Fix incorrect clock defines
clk: qcom: dispcc: Remove support of disp_cc_mdss_rscc_ahb_clk
clk: qcom: videocc: Update the clock flag for video_cc_vcodec0_core_clk
of: clk: Make of_clk_get_parent_{count,name}() parameter const

Linus Torvalds 69a4d0ba fffb08b3

+9 -28
+2 -2
drivers/clk/clk.c
··· 4713 4713 * 4714 4714 * Returns: The number of clocks that are possible parents of this node 4715 4715 */ 4716 - unsigned int of_clk_get_parent_count(struct device_node *np) 4716 + unsigned int of_clk_get_parent_count(const struct device_node *np) 4717 4717 { 4718 4718 int count; 4719 4719 ··· 4725 4725 } 4726 4726 EXPORT_SYMBOL_GPL(of_clk_get_parent_count); 4727 4727 4728 - const char *of_clk_get_parent_name(struct device_node *np, int index) 4728 + const char *of_clk_get_parent_name(const struct device_node *np, int index) 4729 4729 { 4730 4730 struct of_phandle_args clkspec; 4731 4731 struct property *prop;
-19
drivers/clk/qcom/dispcc-sc7180.c
··· 592 592 }, 593 593 }; 594 594 595 - static struct clk_branch disp_cc_mdss_rscc_ahb_clk = { 596 - .halt_reg = 0x400c, 597 - .halt_check = BRANCH_HALT, 598 - .clkr = { 599 - .enable_reg = 0x400c, 600 - .enable_mask = BIT(0), 601 - .hw.init = &(struct clk_init_data){ 602 - .name = "disp_cc_mdss_rscc_ahb_clk", 603 - .parent_data = &(const struct clk_parent_data){ 604 - .hw = &disp_cc_mdss_ahb_clk_src.clkr.hw, 605 - }, 606 - .num_parents = 1, 607 - .flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT, 608 - .ops = &clk_branch2_ops, 609 - }, 610 - }, 611 - }; 612 - 613 595 static struct clk_branch disp_cc_mdss_rscc_vsync_clk = { 614 596 .halt_reg = 0x4008, 615 597 .halt_check = BRANCH_HALT, ··· 669 687 [DISP_CC_MDSS_PCLK0_CLK_SRC] = &disp_cc_mdss_pclk0_clk_src.clkr, 670 688 [DISP_CC_MDSS_ROT_CLK] = &disp_cc_mdss_rot_clk.clkr, 671 689 [DISP_CC_MDSS_ROT_CLK_SRC] = &disp_cc_mdss_rot_clk_src.clkr, 672 - [DISP_CC_MDSS_RSCC_AHB_CLK] = &disp_cc_mdss_rscc_ahb_clk.clkr, 673 690 [DISP_CC_MDSS_RSCC_VSYNC_CLK] = &disp_cc_mdss_rscc_vsync_clk.clkr, 674 691 [DISP_CC_MDSS_VSYNC_CLK] = &disp_cc_mdss_vsync_clk.clkr, 675 692 [DISP_CC_MDSS_VSYNC_CLK_SRC] = &disp_cc_mdss_vsync_clk_src.clkr,
+1 -1
drivers/clk/qcom/videocc-sc7180.c
··· 97 97 98 98 static struct clk_branch video_cc_vcodec0_core_clk = { 99 99 .halt_reg = 0x890, 100 - .halt_check = BRANCH_HALT, 100 + .halt_check = BRANCH_HALT_VOTED, 101 101 .clkr = { 102 102 .enable_reg = 0x890, 103 103 .enable_mask = BIT(0),
+2 -2
include/dt-bindings/clock/imx8mn-clock.h
··· 122 122 #define IMX8MN_CLK_I2C1 105 123 123 #define IMX8MN_CLK_I2C2 106 124 124 #define IMX8MN_CLK_I2C3 107 125 - #define IMX8MN_CLK_I2C4 118 126 - #define IMX8MN_CLK_UART1 119 125 + #define IMX8MN_CLK_I2C4 108 126 + #define IMX8MN_CLK_UART1 109 127 127 #define IMX8MN_CLK_UART2 110 128 128 #define IMX8MN_CLK_UART3 111 129 129 #define IMX8MN_CLK_UART4 112
+4 -4
include/linux/of_clk.h
··· 11 11 12 12 #if defined(CONFIG_COMMON_CLK) && defined(CONFIG_OF) 13 13 14 - unsigned int of_clk_get_parent_count(struct device_node *np); 15 - const char *of_clk_get_parent_name(struct device_node *np, int index); 14 + unsigned int of_clk_get_parent_count(const struct device_node *np); 15 + const char *of_clk_get_parent_name(const struct device_node *np, int index); 16 16 void of_clk_init(const struct of_device_id *matches); 17 17 18 18 #else /* !CONFIG_COMMON_CLK || !CONFIG_OF */ 19 19 20 - static inline unsigned int of_clk_get_parent_count(struct device_node *np) 20 + static inline unsigned int of_clk_get_parent_count(const struct device_node *np) 21 21 { 22 22 return 0; 23 23 } 24 - static inline const char *of_clk_get_parent_name(struct device_node *np, 24 + static inline const char *of_clk_get_parent_name(const struct device_node *np, 25 25 int index) 26 26 { 27 27 return NULL;