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

Commit 1d0397d6 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

Merge tag 'mmio-clk-config' of... 

Merge tag 'mmio-clk-config' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

 into drm-misc-next

regmap: MMIO regmap clock configuration

This patch provides a mechanism for specifying a different clock to be
used with the regmap clock integration.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180226131207.GB6681@sirena.org.uk
parents c9fea6f4 31895662

drivers/base/regmap/regmap-mmio.c

+24 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
struct regmap_mmio_context {

	void __iomem *regs;

	unsigned val_bytes;



	bool attached_clk;

	struct clk *clk;



	void (*reg_write)(struct regmap_mmio_context *ctx,
@@ -363,4 +365,26 @@ struct regmap *__devm_regmap_init_mmio_clk(struct device *dev, 
}

EXPORT_SYMBOL_GPL(__devm_regmap_init_mmio_clk);



int regmap_mmio_attach_clk(struct regmap *map, struct clk *clk)

{

	struct regmap_mmio_context *ctx = map->bus_context;



	ctx->clk = clk;

	ctx->attached_clk = true;



	return clk_prepare(ctx->clk);

}

EXPORT_SYMBOL_GPL(regmap_mmio_attach_clk);



void regmap_mmio_detach_clk(struct regmap *map)

{

	struct regmap_mmio_context *ctx = map->bus_context;



	clk_unprepare(ctx->clk);



	ctx->attached_clk = false;

	ctx->clk = NULL;

}

EXPORT_SYMBOL_GPL(regmap_mmio_detach_clk);



MODULE_LICENSE("GPL v2");

include/linux/regmap.h

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/lockdep.h>



struct module;

struct clk;

struct device;

struct i2c_client;

struct irq_domain;
@@ -905,6 +906,8 @@ bool regmap_ac97_default_volatile(struct device *dev, unsigned int reg); 
	__regmap_lockdep_wrapper(__devm_regmap_init_sdw, #config,	\

				sdw, config)



int regmap_mmio_attach_clk(struct regmap *map, struct clk *clk);

void regmap_mmio_detach_clk(struct regmap *map);

void regmap_exit(struct regmap *map);

int regmap_reinit_cache(struct regmap *map,

			const struct regmap_config *config);