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

Commit 22fcc4eb authored by Veera Vegivada's avatar Veera Vegivada
Browse files

clk: qcom: common: Add set_flags op in clk_regmap_ops 



Add set_flags op in clk_regmap_ops and update the
set_flags op for branch's clk_regmap_ops.
Update qcom_clk_set_flags to use clk_regmap_ops
for invoking the set_flags op.

Change-Id: I82b699e04854e5d9dcc0e82caccf33fe3dd85315
Signed-off-by: default avatarVeera Vegivada <vvegivad@codeaurora.org>
parent 44c3d4ae

drivers/clk/qcom/clk-branch.c

+41 −53
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2013, 2016-2020, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013, 2016-2021, The Linux Foundation. All rights reserved.

 */



#include <linux/kernel.h>
@@ -207,8 +207,48 @@ static void clk_branch2_list_registers(struct seq_file *f, struct clk_hw *hw) 
	}

}



static int clk_branch2_set_flags(struct clk_hw *hw, unsigned long flags)

{

	struct clk_branch *br = to_clk_branch(hw);

	u32 cbcr_val = 0, cbcr_mask;

	int ret;



	switch (flags) {

	case CLKFLAG_PERIPH_OFF_SET:

		cbcr_val = cbcr_mask = BIT(12);

		break;

	case CLKFLAG_PERIPH_OFF_CLEAR:

		cbcr_mask = BIT(12);

		break;

	case CLKFLAG_RETAIN_PERIPH:

		cbcr_val = cbcr_mask = BIT(13);

		break;

	case CLKFLAG_NORETAIN_PERIPH:

		cbcr_mask = BIT(13);

		break;

	case CLKFLAG_RETAIN_MEM:

		cbcr_val = cbcr_mask = BIT(14);

		break;

	case CLKFLAG_NORETAIN_MEM:

		cbcr_mask = BIT(14);

		break;

	default:

		return -EINVAL;

	}



	ret = regmap_update_bits(br->clkr.regmap, br->halt_reg, cbcr_mask,

								cbcr_val);

	/* Make sure power is enabled/disabled before returning. */

	mb();



	udelay(1);



	return ret;

}



static struct clk_regmap_ops clk_branch2_regmap_ops = {

	.list_registers = clk_branch2_list_registers,

	.set_flags = clk_branch2_set_flags,

};



static void clk_branch2_init(struct clk_hw *hw)
@@ -306,55 +346,3 @@ const struct clk_ops clk_branch_simple_ops = { 
	.is_enabled = clk_is_enabled_regmap,

};

EXPORT_SYMBOL_GPL(clk_branch_simple_ops);
 


int qcom_clk_set_flags(struct clk *clk, unsigned long flags)

{

	struct clk_hw *hw;

	struct clk_branch *br;

	u32 cbcr_val = 0, cbcr_mask;

	int ret;



	if (IS_ERR_OR_NULL(clk))

		return 0;



	hw = __clk_get_hw(clk);

	if (IS_ERR_OR_NULL(hw))

		return -EINVAL;



	switch (flags) {

	case CLKFLAG_PERIPH_OFF_SET:

		cbcr_val = cbcr_mask = BIT(12);

		break;

	case CLKFLAG_PERIPH_OFF_CLEAR:

		cbcr_mask = BIT(12);

		break;

	case CLKFLAG_RETAIN_PERIPH:

		cbcr_val = cbcr_mask = BIT(13);

		break;

	case CLKFLAG_NORETAIN_PERIPH:

		cbcr_mask = BIT(13);

		break;

	case CLKFLAG_RETAIN_MEM:

		cbcr_val = cbcr_mask = BIT(14);

		break;

	case CLKFLAG_NORETAIN_MEM:

		cbcr_mask = BIT(14);

		break;

	default:

		return -EINVAL;

	}



	br = to_clk_branch(hw);

	ret = regmap_update_bits(br->clkr.regmap, br->halt_reg, cbcr_mask,

								cbcr_val);

	if (ret)

		return ret;



	/* Make sure power is enabled/disabled before returning. */

	mb();



	udelay(1);



	return 0;

}

EXPORT_SYMBOL(qcom_clk_set_flags);

drivers/clk/qcom/clk-regmap.h

+5 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/* Copyright (c) 2014, 2016-2020, The Linux Foundation. All rights reserved. */

/* Copyright (c) 2014, 2016-2021, The Linux Foundation. All rights reserved. */



#ifndef __QCOM_CLK_REGMAP_H__

#define __QCOM_CLK_REGMAP_H__
@@ -19,12 +19,16 @@ struct regmap; 
 * @list_rate:  On success, return the nth supported frequency for a given

 *		clock that is below rate_max. Return -ENXIO in case there is

 *		no frequency table.

 *

 * @set_flags: Set custom flags which deal with hardware specifics. Returns 0

 *		on success, error otherwise.

 */

struct clk_regmap_ops {

	void	(*list_registers)(struct seq_file *f,

				  struct clk_hw *hw);

	long	(*list_rate)(struct clk_hw *hw, unsigned int n,

			     unsigned long rate_max);

	int	(*set_flags)(struct clk_hw *clk, unsigned long flags);

};



/**

drivers/clk/qcom/common.c

+23 −0
Original line number Diff line number Diff line
@@ -398,6 +398,29 @@ int qcom_clk_get_voltage(struct clk *clk, unsigned long rate) 
}

EXPORT_SYMBOL(qcom_clk_get_voltage);



int qcom_clk_set_flags(struct clk *clk, unsigned long flags)

{

	struct clk_regmap *rclk;

	struct clk_hw *hw;



	if (IS_ERR_OR_NULL(clk))

		return 0;



	hw = __clk_get_hw(clk);

	if (IS_ERR_OR_NULL(hw))

		return -EINVAL;



	if (!clk_is_regmap_clk(hw))

		return -EINVAL;



	rclk = to_clk_regmap(hw);

	if (rclk->ops && rclk->ops->set_flags)

		return rclk->ops->set_flags(hw, flags);



	return 0;

}

EXPORT_SYMBOL(qcom_clk_set_flags);



int qcom_cc_runtime_init(struct platform_device *pdev,

			 struct qcom_cc_desc *desc)

{