add CSR SiRFSoC power control module MFD driver
cover add CSR SiRFSoC power control module MFD driver
From: Barry Song <[email protected]>
the first two regmap patches provide regmap_irq support for CSR chips, in which unmask is separated and ack is inverted. the last one is adding pwrc driver, in which we use the separate unmaks and inverted_ack.
Guo Zeng (3):
regmap: irq: add support for chips who have separate unmask registers
regmap: irq: add ack_invert flag for chips using cleared bits as ack
mfd: add CSR SiRFSoC on-chip power management module driver
.../devicetree/bindings/mfd/sirf-pwrc.txt | 38 ++++ drivers/base/regmap/regmap-irq.c | 40 +++- drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 2 + drivers/mfd/sirfsoc_pwrc.c | 239 +++++++++++++++++++++ include/linux/mfd/sirfsoc_pwrc.h | 98 +++++++++ include/linux/regmap.h | 7 + 7 files changed, 431 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/mfd/sirf-pwrc.txt create mode 100644 drivers/mfd/sirfsoc_pwrc.c create mode 100644 include/linux/mfd/sirfsoc_pwrc.h
Signature · 1 line
1.9.1
PATCH 1/3 regmap: irq: add support for chips who have separate unmask registers
From: Guo Zeng <[email protected]>
Some chips have separate unmask registers from mask registers for some consideration of concurrency SMP write performance. And this patch adds a flag for it.
An user will be CSR SiRFSoC ARM chips.
--- drivers/base/regmap/regmap-irq.c | 28 ++++++++++++++++++++++++++-- include/linux/regmap.h | 5 +++++ 2 files changed, 31 insertions(+), 2 deletions(-)
drivers/base/regmap/regmap-irq.c +26 -2
@@ -63,6 +63,7 @@ static void regmap_irq_sync_unlock(struct irq_data *data)struct regmap *map = d->map;int i, ret;u32 reg; +u32 unmask_offset;if (d->chip->runtime_pm) { ret =pm_runtime_get_sync (map->dev);
@@ -82,7 +83,22 @@ static void regmap_irq_sync_unlock(struct irq_data *data)if (d->chip->mask_invert) ret =regmap_update_bits (d->map, reg, d->mask_buf_def[i], ~d->mask_buf[i]); -else +else if (d->chip->unmask_separate) { +/* set mask with mask_base register */ + ret =regmap_update_bits (d->map, reg, + d->mask_buf_def[i], ~d->mask_buf[i]); +if (ret <0 ) +dev_err (d->map->dev, +"Failed to sync unmasks in %x\n" , + reg); + unmask_offset = d->chip->unmask_base - + d->chip->mask_base; +/* clear mask with unmask_base register */ + ret =regmap_update_bits (d->map, + reg + unmask_offset, + d->mask_buf_def[i], + d->mask_buf[i]); + }else ret =regmap_update_bits (d->map, reg, d->mask_buf_def[i], d->mask_buf[i]);if (ret !=0 )
@@ -339,6 +355,7 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,int i;int ret = -ENOMEM ;u32 reg; +u32 unmask_offset;if (chip->num_regs <=0 )return -EINVAL ;
@@ -420,7 +437,14 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,if (chip->mask_invert) ret =regmap_update_bits (map, reg, d->mask_buf[i], ~d->mask_buf[i]); -else +else if (d->chip->unmask_separate) { + unmask_offset = d->chip->unmask_base - + d->chip->mask_base; + ret =regmap_update_bits (d->map, + reg + unmask_offset, + d->mask_buf[i], + d->mask_buf[i]); + }else ret =regmap_update_bits (map, reg, d->mask_buf[i], d->mask_buf[i]);if (ret !=0 ) {
include/linux/regmap.h +5 -0
@@ -800,12 +800,15 @@ struct regmap_irq {* * @status_base: Base status register address. * @mask_base: Base mask register address. +* @unmask_base: Base unmask register address. for chips who have +* separate mask and unmask registers * @ack_base: Base ack address. If zero then the chip is clear on read. * Using zero value is possible with @use_ack bit. * @wake_base: Base address for wake enables. If zero unsupported. * @irq_reg_stride: Stride to use for chips where registers are not contiguous. * @init_ack_masked: Ack all masked interrupts once during initalization. * @mask_invert: Inverted mask register: cleared bits are masked out. +* @unmask_separate: unmask is separate register from mask. * @use_ack: Use @ack register even if it is zero. * @wake_invert: Inverted wake register: cleared bits are wake enabled. * @runtime_pm: Hold a runtime PM lock on the device when accessing it.
@@ -820,11 +823,13 @@ struct regmap_irq_chip {unsigned int status_base;unsigned int mask_base; +unsigned int unmask_base;unsigned int ack_base;unsigned int wake_base;unsigned int irq_reg_stride; bool init_ack_masked:1; bool mask_invert:1; + bool unmask_separate:1; bool use_ack:1; bool wake_invert:1; bool runtime_pm:1;
Signature · 1 line
1.9.1
Mark Brown
maintainerRe: [PATCH 1/3] regmap: irq: add support for chips who have separate unmask registers
Quoted 5 lines · Barry Song
include/linux/regmap.h +0
-0@@ -800,12 +800,15 @@ struct regmap_irq {* * @status_base: Base status register address.
include/linux/regmap.h struct regmap_irq { · line 811
Quoted 10 lines
include/linux/regmap.h +3
-0* @mask_base: Base mask register address. +* @unmask_base: Base unmask register address. for chips who have +* separate mask and unmask registers * @ack_base: Base ack address. If zero then the chip is clear on read. * Using zero value is possible with @use_ack bit. * @wake_base: Base address for wake enables. If zero unsupported. * @irq_reg_stride: Stride to use for chips where registers are not contiguous. * @init_ack_masked: Ack all masked interrupts once during initalization. * @mask_invert: Inverted mask register: cleared bits are masked out. +* @unmask_separate: unmask is separate register from mask.
We shouldn't need this - we should just be able to check if there's an unmask_base set and use that.
PATCH 2/3 regmap: irq: add ack_invert flag for chips using cleared bits as ack
In reply to Barry SongFrom: Guo Zeng <[email protected]>
An user will be CSR SiRFSoC ARM chips.
--- drivers/base/regmap/regmap-irq.c | 12 ++++++++++-- include/linux/regmap.h | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-)
drivers/base/regmap/regmap-irq.c +10 -2
@@ -132,7 +132,11 @@ static void regmap_irq_sync_unlock(struct irq_data *data)if (d->mask_buf[i] && (d->chip->ack_base || d->chip->use_ack)) { reg = d->chip->ack_base + (i * map->reg_stride * d->irq_reg_stride); - ret =regmap_write (map, reg, d->mask_buf[i]); +/* some chips ack by write 0 */ +if (d->chip->ack_invert) + ret =regmap_write (map, reg, ~d->mask_buf[i]); +else + ret =regmap_write (map, reg, d->mask_buf[i]);if (ret !=0 )dev_err (d->map->dev,"Failed to ack 0x%x: %d\n" , reg, ret);
@@ -469,7 +473,11 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,if (d->status_buf[i] && (chip->ack_base || chip->use_ack)) { reg = chip->ack_base + (i * map->reg_stride * d->irq_reg_stride); - ret =regmap_write (map, reg, +if (chip->ack_invert) + ret =regmap_write (map, reg, + ~(d->status_buf[i] & d->mask_buf[i])); +else + ret =regmap_write (map, reg, d->status_buf[i] & d->mask_buf[i]);if (ret !=0 ) { dev_err(map->dev, "Failed to ack 0x%x: %d\n",
include/linux/regmap.h +2 -0
@@ -810,6 +810,7 @@ struct regmap_irq {* @mask_invert: Inverted mask register: cleared bits are masked out. * @unmask_separate: unmask is separate register from mask. * @use_ack: Use @ack register even if it is zero. +* @ack_invert: Inverted ack register: cleared bits for ack. * @wake_invert: Inverted wake register: cleared bits are wake enabled. * @runtime_pm: Hold a runtime PM lock on the device when accessing it. *
@@ -831,6 +832,7 @@ struct regmap_irq_chip { bool mask_invert:1; bool unmask_separate:1; bool use_ack:1; + bool ack_invert:1; bool wake_invert:1; bool runtime_pm:1;
Signature · 1 line
1.9.1
Mark Brown
maintainerRe: [PATCH 2/3] regmap: irq: add ack_invert flag for chips using cleared bits as ack
Quoted 3 lines · Barry Song
From: Guo Zeng <[email protected]>
An user will be CSR SiRFSoC ARM chips.
This is fine but appears to depend on the previous patch.
PATCH 3/3 mfd: add CSR SiRFSoC on-chip power management module driver
In reply to Barry SongFrom: Guo Zeng <[email protected]>
CSR SiRFSoC Power Control Module includes power on or power off for sysctl power and gnss, it also includes onkey, RTC domain clock controllers and interrupt controller for power events.
--- .../devicetree/bindings/mfd/sirf-pwrc.txt | 38 ++++ drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 2 + drivers/mfd/sirfsoc_pwrc.c | 239 +++++++++++++++++++++ include/linux/mfd/sirfsoc_pwrc.h | 98 +++++++++ 5 files changed, 388 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/sirf-pwrc.txt create mode 100644 drivers/mfd/sirfsoc_pwrc.c create mode 100644 include/linux/mfd/sirfsoc_pwrc.h
Documentation/devicetree/bindings/mfd/sirf-pwrc.txt new file +38 -0
@@ -0,0 +1,38 @@ +SiRFSoC Power Controller (PWRC) module + +Power Controller is used to control the whole SoC power process. +The power controller controls the process of Power-On sequence, +Power-Off sequence, different power modes switching and power +status configuration. the pwrc is access by io bridge, so the +node's parent should be io bridge. + +Required properties: +- compatible: "sirf,prima2-pwrc", or "sirf,atlas7-pwrc" +- reg: Address range of pwrc register set +- sysctl:mfd cell device of pwrc +- rtcm-clk:mfd cell device of pwrc +- onkey:mfd cell device of pwrc + +Example: + +pwrc@3000 { + compatible = "sirf,atlas7-pwrc"; + reg = <0x3000 0x100>; + sysctl { + compatible = "sirf,sirf-sysctl"; + }; + + rtcm-clk { + compatible = "sirf,atlas7-rtcmclk"; + }; + + onkey { + compatible = "sirf,prima2-onkey"; + }; +}; + +pwrc@3000 { + compatible = "sirf,prima2-pwrc"; + reg = <0x3000 0x100>; +}; +
drivers/mfd/Kconfig +11 -0
@@ -1515,5 +1515,16 @@ config MFD_VEXPRESS_SYSREG System Registers are the platform configuration block on the ARM Ltd. Versatile Express board. +config MFD_SIRFSOC_PWRC + bool "CSR SiRFSoC on-chip Power Control Module" + depends on ARCH_SIRF + select MFD_CORE + select REGMAP_IRQ + help + CSR SiRFSoC Power Control Module includes power on or power + off for sysctl power and gnss, it also includes onkey, RTC + domain clock controllers and interrupt controller for power + events. + endmenu endif
drivers/mfd/Makefile +2 -0
@@ -192,3 +192,5 @@ obj-$(CONFIG_MFD_SKY81452) += sky81452.o intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o obj-$(CONFIG_MFD_MT6397) += mt6397-core.o + +obj-$(CONFIG_MFD_SIRFSOC_PWRC) += sirfsoc_pwrc.o
drivers/mfd/sirfsoc_pwrc.c new file +239 -0
239 lines not on this page · raw message
include/linux/mfd/sirfsoc_pwrc.h new file +98 -0
98 lines not on this page · raw message
Signature · 1 line
1.9.1