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

Commit ecd661a6 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: clk-dummy: Move the dummy clock definition to common header" into msm-4.8

parents c544a4a9 88c266f0

drivers/clk/qcom/clk-dummy.c

+1 −6
Original line number Diff line number Diff line
@@ -15,13 +15,8 @@ 
#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/reset-controller.h>



struct clk_dummy {

	struct clk_hw hw;

	struct reset_controller_dev reset;

	unsigned long rrate;

};

#include "common.h"



#define to_clk_dummy(_hw)	container_of(_hw, struct clk_dummy, hw)

drivers/clk/qcom/common.h

+8 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#ifndef __QCOM_CLK_COMMON_H__

#define __QCOM_CLK_COMMON_H__



#include <linux/reset-controller.h>



struct platform_device;

struct regmap_config;

struct clk_regmap;
@@ -32,6 +34,12 @@ struct qcom_cc_desc { 
	size_t num_gdscs;

};



struct clk_dummy {

	struct clk_hw hw;

	struct reset_controller_dev reset;

	unsigned long rrate;

};



extern const struct freq_tbl *qcom_find_freq(const struct freq_tbl *f,

					     unsigned long rate);

extern int qcom_find_src_index(struct clk_hw *hw, const struct parent_map *map,