move CSR rtc iobrg read/write API to be regmap
this moves to general APIs, and all drivers will be changed based on it. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJVd+OkAAoJEDIv4aC191RhuWkP/2LzJBRoBP1WJmTOvR0Kofl7 4PG5Xi/+1NtSHubvTSJJX2kZ9I9FHemQAJba8pqZ0pgZkb+7t0dA2+G1mDi8SOr8 VyWlMotI8Im0PoUHXmt5GPHEI4E6WqyX1TQFUD4JM/Ln07mevH/ocjd94LN79eO6 tc1z8AEw1/d5MCcEI34FP+vNXyLOE/9hM7IsmBtf4Niq7VrO8SWS5y1tJBOz+d2v HmZZYEP/WS2mX8E77cz89pf0+BkmhF6nj1zoFCmlLVxCXrlKncs+Uvnsb+n/k1BI gA4UNOfSoA+k+h+1F/7BhyEABqYkEuBDYs9m5NsypL+WITaVnI9pmNWNAA7IZNTg dEYoVKqpJX3lVPWJ0i0hvgK1xXNMKlbwFb6iV80upvUVNfzZs9JveSL97Iiy9WjI LlRdCTlteBvgsNBJyVG//788VU5+dr8HXV1UCfm+drs3H43TudCnJ8AhF3JaToO+ wv045McJTUL/CI+WQiXGNlAoXDjprgjLSiXRyEKF1xNsem3u78Z5bpjGX5crpzgC HIdnsxb39jCHCNVJLuK/eCJ9Oocpo9LdKU0wSqIx0GNAx+xdoPo5H8jmlE4bnSWo 9f/9784A1SI/tpc0mKRz/z3FEKiP0i3CTJfcmC9EAd4LWFYk54WgtlzPztRkE625 YQMHjM+cavYWpzzgnQ+B =Beg0 -----END PGP SIGNATURE----- Merge tag 'sirf-iobrg2regmap-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into fixes Merge "CSR SiRFSoC rtc iobrg move to regmap for 4.2" from Barry Song: move CSR rtc iobrg read/write API to be regmap this moves to general APIs, and all drivers will be changed based on it. * tag 'sirf-iobrg2regmap-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux: ARM: prima2: move to use REGMAP APIs for rtciobrg
This commit is contained in:
commit
8dfaf05682
|
@ -4,6 +4,7 @@ menuconfig ARCH_SIRF
|
||||||
select ARCH_REQUIRE_GPIOLIB
|
select ARCH_REQUIRE_GPIOLIB
|
||||||
select GENERIC_IRQ_CHIP
|
select GENERIC_IRQ_CHIP
|
||||||
select NO_IOPORT_MAP
|
select NO_IOPORT_MAP
|
||||||
|
select REGMAP
|
||||||
select PINCTRL
|
select PINCTRL
|
||||||
select PINCTRL_SIRF
|
select PINCTRL_SIRF
|
||||||
help
|
help
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* RTC I/O Bridge interfaces for CSR SiRFprimaII
|
* RTC I/O Bridge interfaces for CSR SiRFprimaII/atlas7
|
||||||
* ARM access the registers of SYSRTC, GPSRTC and PWRC through this module
|
* ARM access the registers of SYSRTC, GPSRTC and PWRC through this module
|
||||||
*
|
*
|
||||||
* Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
|
* Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company.
|
||||||
|
@ -10,6 +10,7 @@
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
|
#include <linux/regmap.h>
|
||||||
#include <linux/of.h>
|
#include <linux/of.h>
|
||||||
#include <linux/of_address.h>
|
#include <linux/of_address.h>
|
||||||
#include <linux/of_device.h>
|
#include <linux/of_device.h>
|
||||||
|
@ -66,6 +67,7 @@ u32 sirfsoc_rtc_iobrg_readl(u32 addr)
|
||||||
{
|
{
|
||||||
unsigned long flags, val;
|
unsigned long flags, val;
|
||||||
|
|
||||||
|
/* TODO: add hwspinlock to sync with M3 */
|
||||||
spin_lock_irqsave(&rtciobrg_lock, flags);
|
spin_lock_irqsave(&rtciobrg_lock, flags);
|
||||||
|
|
||||||
val = __sirfsoc_rtc_iobrg_readl(addr);
|
val = __sirfsoc_rtc_iobrg_readl(addr);
|
||||||
|
@ -90,6 +92,7 @@ void sirfsoc_rtc_iobrg_writel(u32 val, u32 addr)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
|
/* TODO: add hwspinlock to sync with M3 */
|
||||||
spin_lock_irqsave(&rtciobrg_lock, flags);
|
spin_lock_irqsave(&rtciobrg_lock, flags);
|
||||||
|
|
||||||
sirfsoc_rtc_iobrg_pre_writel(val, addr);
|
sirfsoc_rtc_iobrg_pre_writel(val, addr);
|
||||||
|
@ -102,6 +105,45 @@ void sirfsoc_rtc_iobrg_writel(u32 val, u32 addr)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(sirfsoc_rtc_iobrg_writel);
|
EXPORT_SYMBOL_GPL(sirfsoc_rtc_iobrg_writel);
|
||||||
|
|
||||||
|
|
||||||
|
static int regmap_iobg_regwrite(void *context, unsigned int reg,
|
||||||
|
unsigned int val)
|
||||||
|
{
|
||||||
|
sirfsoc_rtc_iobrg_writel(val, reg);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int regmap_iobg_regread(void *context, unsigned int reg,
|
||||||
|
unsigned int *val)
|
||||||
|
{
|
||||||
|
*val = (u32)sirfsoc_rtc_iobrg_readl(reg);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct regmap_bus regmap_iobg = {
|
||||||
|
.reg_write = regmap_iobg_regwrite,
|
||||||
|
.reg_read = regmap_iobg_regread,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* devm_regmap_init_iobg(): Initialise managed register map
|
||||||
|
*
|
||||||
|
* @iobg: Device that will be interacted with
|
||||||
|
* @config: Configuration for register map
|
||||||
|
*
|
||||||
|
* The return value will be an ERR_PTR() on error or a valid pointer
|
||||||
|
* to a struct regmap. The regmap will be automatically freed by the
|
||||||
|
* device management code.
|
||||||
|
*/
|
||||||
|
struct regmap *devm_regmap_init_iobg(struct device *dev,
|
||||||
|
const struct regmap_config *config)
|
||||||
|
{
|
||||||
|
const struct regmap_bus *bus = ®map_iobg;
|
||||||
|
|
||||||
|
return devm_regmap_init(dev, bus, dev, config);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(devm_regmap_init_iobg);
|
||||||
|
|
||||||
static const struct of_device_id rtciobrg_ids[] = {
|
static const struct of_device_id rtciobrg_ids[] = {
|
||||||
{ .compatible = "sirf,prima2-rtciobg" },
|
{ .compatible = "sirf,prima2-rtciobg" },
|
||||||
{}
|
{}
|
||||||
|
@ -132,7 +174,7 @@ static int __init sirfsoc_rtciobrg_init(void)
|
||||||
}
|
}
|
||||||
postcore_initcall(sirfsoc_rtciobrg_init);
|
postcore_initcall(sirfsoc_rtciobrg_init);
|
||||||
|
|
||||||
MODULE_AUTHOR("Zhiwu Song <zhiwu.song@csr.com>, "
|
MODULE_AUTHOR("Zhiwu Song <zhiwu.song@csr.com>");
|
||||||
"Barry Song <baohua.song@csr.com>");
|
MODULE_AUTHOR("Barry Song <baohua.song@csr.com>");
|
||||||
MODULE_DESCRIPTION("CSR SiRFprimaII rtc io bridge");
|
MODULE_DESCRIPTION("CSR SiRFprimaII rtc io bridge");
|
||||||
MODULE_LICENSE("GPL v2");
|
MODULE_LICENSE("GPL v2");
|
||||||
|
|
|
@ -9,10 +9,14 @@
|
||||||
#ifndef _SIRFSOC_RTC_IOBRG_H_
|
#ifndef _SIRFSOC_RTC_IOBRG_H_
|
||||||
#define _SIRFSOC_RTC_IOBRG_H_
|
#define _SIRFSOC_RTC_IOBRG_H_
|
||||||
|
|
||||||
|
struct regmap_config;
|
||||||
|
|
||||||
extern void sirfsoc_rtc_iobrg_besyncing(void);
|
extern void sirfsoc_rtc_iobrg_besyncing(void);
|
||||||
|
|
||||||
extern u32 sirfsoc_rtc_iobrg_readl(u32 addr);
|
extern u32 sirfsoc_rtc_iobrg_readl(u32 addr);
|
||||||
|
|
||||||
extern void sirfsoc_rtc_iobrg_writel(u32 val, u32 addr);
|
extern void sirfsoc_rtc_iobrg_writel(u32 val, u32 addr);
|
||||||
|
struct regmap *devm_regmap_init_iobg(struct device *dev,
|
||||||
|
const struct regmap_config *config);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue