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

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

Merge "clk: qcom: Add header file for branch clock memory flags" into msm-4.8

parents ab69260a 7759878a

drivers/clk/qcom/clk-branch.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/export.h>

#include <linux/clk-provider.h>

#include <linux/regmap.h>

#include <linux/clk/qcom.h>



#include "clk-branch.h"

drivers/clk/qcom/clk-branch.h

+0 −9
Original line number Diff line number Diff line
@@ -69,13 +69,4 @@ extern const struct clk_ops clk_branch_simple_ops; 
#define to_clk_gate2(_hw) \

	container_of(to_clk_regmap(_hw), struct clk_gate2, clkr)



enum branch_mem_flags {

	CLKFLAG_RETAIN_PERIPH,

	CLKFLAG_NORETAIN_PERIPH,

	CLKFLAG_RETAIN_MEM,

	CLKFLAG_NORETAIN_MEM,

	CLKFLAG_PERIPH_OFF_SET,

	CLKFLAG_PERIPH_OFF_CLEAR,

};



#endif

drivers/clk/qcom/gdsc-regulator.c

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
#include <linux/regmap.h>

#include <linux/reset.h>

#include <linux/mfd/syscon.h>



#include "clk-branch.h"

#include <linux/clk/qcom.h>



/* GDSCR */

#define PWR_ON_MASK		BIT(31)

include/linux/clk/qcom.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

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

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#ifndef __LINUX_CLK_QCOM_H_

#define __LINUX_CLK_QCOM_H_



enum branch_mem_flags {

	CLKFLAG_RETAIN_PERIPH,

	CLKFLAG_NORETAIN_PERIPH,

	CLKFLAG_RETAIN_MEM,

	CLKFLAG_NORETAIN_MEM,

	CLKFLAG_PERIPH_OFF_SET,

	CLKFLAG_PERIPH_OFF_CLEAR,

};



#endif  /* __LINUX_CLK_QCOM_H_ */