openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pinctrl: mvebu: dove: request syscon regmap for global registers 

Dove pinctrl uses some global config registers to control pins.
This patch requests a syscon regmap for those registers. As this
changes DT to driver requirements, fallback to a self-registered
regmap with hardcoded resources, if the corresponding syscon DT
node is missing. Also, WARN about old DT binding usage to encourage
users to update their DTBs.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Sebastian Hesselbarth 2014-01-25 00:09:05 +01:00
parent 4d73fc7728
commit e91f7916ea
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pinctrl/mvebu/Kconfig
View File

@ -8,6 +8,7 @@ config PINCTRL_MVEBU
config PINCTRL_DOVE config PINCTRL_DOVE
bool bool
select PINCTRL_MVEBU select PINCTRL_MVEBU
select MFD_SYSCON
config PINCTRL_KIRKWOOD config PINCTRL_KIRKWOOD
bool bool

27
drivers/pinctrl/mvebu/pinctrl-dove.c
View File

@ -18,7 +18,9 @@
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/mfd/syscon.h>
#include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinctrl.h>
#include <linux/regmap.h>
#include "pinctrl-mvebu.h" #include "pinctrl-mvebu.h"
@ -26,6 +28,7 @@
#define INT_REGS_MASK ~(SZ_1M - 1) #define INT_REGS_MASK ~(SZ_1M - 1)
#define MPP4_REGS_OFFS 0xd0440 #define MPP4_REGS_OFFS 0xd0440
#define PMU_REGS_OFFS 0xd802c #define PMU_REGS_OFFS 0xd802c
#define GC_REGS_OFFS 0xe802c
#define DOVE_SB_REGS_VIRT_BASE IOMEM(0xfde00000) #define DOVE_SB_REGS_VIRT_BASE IOMEM(0xfde00000)
#define DOVE_MPP_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE + 0xd0200) #define DOVE_MPP_VIRT_BASE (DOVE_SB_REGS_VIRT_BASE + 0xd0200)
@ -59,6 +62,7 @@
static void __iomem *mpp_base; static void __iomem *mpp_base;
static void __iomem *mpp4_base; static void __iomem *mpp4_base;
static void __iomem *pmu_base; static void __iomem *pmu_base;
static struct regmap *gconfmap;
static int dove_mpp_ctrl_get(unsigned pid, unsigned long *config) static int dove_mpp_ctrl_get(unsigned pid, unsigned long *config)
{ {
@ -756,6 +760,13 @@ static struct of_device_id dove_pinctrl_of_match[] = {
{ } { }
}; };
static struct regmap_config gc_regmap_config = {
.reg_bits = 32,
.val_bits = 32,
.reg_stride = 4,
.max_register = 5,
};
static int dove_pinctrl_probe(struct platform_device *pdev) static int dove_pinctrl_probe(struct platform_device *pdev)
{ {
struct resource *res, *mpp_res; struct resource *res, *mpp_res;
@ -808,6 +819,22 @@ static int dove_pinctrl_probe(struct platform_device *pdev)
if (IS_ERR(pmu_base)) if (IS_ERR(pmu_base))
return PTR_ERR(pmu_base); return PTR_ERR(pmu_base);
gconfmap = syscon_regmap_lookup_by_compatible("marvell,dove-global-config");
if (IS_ERR(gconfmap)) {
void __iomem *gc_base;
dev_warn(&pdev->dev, "falling back to hardcoded global registers\n");
adjust_resource(&fb_res,
(mpp_res->start & INT_REGS_MASK) + GC_REGS_OFFS, 0x14);
gc_base = devm_ioremap_resource(&pdev->dev, &fb_res);
if (IS_ERR(gc_base))
return PTR_ERR(gc_base);
gconfmap = devm_regmap_init_mmio(&pdev->dev,
gc_base, &gc_regmap_config);
if (IS_ERR(gconfmap))
return PTR_ERR(gconfmap);
}
/* Warn on any missing DT resource */ /* Warn on any missing DT resource */
WARN(fb_res.start, FW_BUG "Missing pinctrl regs in DTB. Please update your firmware.\n"); WARN(fb_res.start, FW_BUG "Missing pinctrl regs in DTB. Please update your firmware.\n");