Messages in this thread Patch in this message | | | Date | Mon, 17 Dec 2018 10:30:35 +0200 | From | Matti Vaittinen <> | Subject | Re: [RFC] regmap-irq: add "main register" and level-irq support |
| |
On Mon, Dec 17, 2018 at 10:19:12AM +0200, Matti Vaittinen wrote: > Hello Mark & All, > > On Fri, Dec 14, 2018 at 05:26:19PM +0000, Mark Brown wrote: > > On Fri, Dec 14, 2018 at 03:58:19PM +0200, Matti Vaittinen wrote: > > > On Fri, Dec 07, 2018 at 01:14:18PM +0000, Mark Brown wrote: > > > > > I could send an example on how the driver utilizing the original RFC > > > interface would look like. I am starting to think it was not *that* bad > > > after all... > > > > That might help, yes. > > > This is what I came up with. I think having the simple mapping arrays > (bitX_offsets) and REGMAP_IRQ_MAIN_REG_OFFSET macro makes this > not-so-bad :) I will also send an example on how this would look like > with the RFC v2 interface.
I decided to go with diff between RFC v1 and RFC v2 driver interfaces:
diff --git a/drivers/mfd/rohm-bd70528.c b/drivers/mfd/rohm-bd70528.c index b270cdad1db6..abb0cff8d1c2 100644 --- a/drivers/mfd/rohm-bd70528.c +++ b/drivers/mfd/rohm-bd70528.c @@ -41,92 +41,114 @@ static struct regmap_config bd70528_regmap = { .max_register = BD70528_MAX_REGISTER, .cache_type = REGCACHE_RBTREE, }; -/* bit [0] - Shutdown register */ -unsigned int bit0_offsets[] = {0}; -/* bit [1] - Power failure register */ -unsigned int bit1_offsets[] = {1}; -/* bit [2] - VR FAULT register */ -unsigned int bit2_offsets[] = {2}; -/* bit [3] - PMU register interrupts */ -unsigned int bit3_offsets[] = {3}; -/* bit [4] - Charger 1 and Charger 2 registers */ -unsigned int bit4_offsets[] = {4,5}; -/* bit [5] - RTC register */ -unsigned int bit5_offsets[] = {6}; -/* bit [6] - GPIO register */ -unsigned int bit6_offsets[] = {7}; -/* bit [7] - Invalid operation register */ -unsigned int bit7_offsets[] = {8}; - -static struct regmap_irq_sub_irq_map bd70528_sub_irq_offsets[] = { - REGMAP_IRQ_MAIN_REG_OFFSET(bit0_offsets), - REGMAP_IRQ_MAIN_REG_OFFSET(bit1_offsets), - REGMAP_IRQ_MAIN_REG_OFFSET(bit2_offsets), - REGMAP_IRQ_MAIN_REG_OFFSET(bit3_offsets), - REGMAP_IRQ_MAIN_REG_OFFSET(bit4_offsets), - REGMAP_IRQ_MAIN_REG_OFFSET(bit5_offsets), - REGMAP_IRQ_MAIN_REG_OFFSET(bit6_offsets), - REGMAP_IRQ_MAIN_REG_OFFSET(bit7_offsets), -}; static struct regmap_irq bd70528_irqs[] = { - REGMAP_IRQ_REG(BD70528_INT_LONGPUSH, 0, BD70528_INT_LONGPUSH_MASK), - REGMAP_IRQ_REG(BD70528_INT_WDT, 0, BD70528_INT_WDT_MASK), - REGMAP_IRQ_REG(BD70528_INT_HWRESET, 0, BD70528_INT_HWRESET_MASK), - REGMAP_IRQ_REG(BD70528_INT_RSTB_FAULT, 0, BD70528_INT_RSTB_FAULT_MASK), - REGMAP_IRQ_REG(BD70528_INT_VBAT_UVLO, 0, BD70528_INT_VBAT_UVLO_MASK), - REGMAP_IRQ_REG(BD70528_INT_TSD, 0, BD70528_INT_TSD_MASK), - REGMAP_IRQ_REG(BD70528_INT_RSTIN, 0, BD70528_INT_RSTIN_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK1_FAULT, 1, BD70528_INT_BUCK1_FAULT_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK2_FAULT, 1, BD70528_INT_BUCK2_FAULT_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK3_FAULT, 1, BD70528_INT_BUCK3_FAULT_MASK), - REGMAP_IRQ_REG(BD70528_INT_LDO1_FAULT, 1, BD70528_INT_LDO1_FAULT_MASK), - REGMAP_IRQ_REG(BD70528_INT_LDO2_FAULT, 1, BD70528_INT_LDO2_FAULT_MASK), - REGMAP_IRQ_REG(BD70528_INT_LDO3_FAULT, 1, BD70528_INT_LDO3_FAULT_MASK), - REGMAP_IRQ_REG(BD70528_INT_LED1_FAULT, 1, BD70528_INT_LED1_FAULT_MASK), - REGMAP_IRQ_REG(BD70528_INT_LED2_FAULT, 1, BD70528_INT_LED2_FAULT_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK1_OCP, 2, BD70528_INT_BUCK1_OCP_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK2_OCP, 2, BD70528_INT_BUCK2_OCP_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK3_OCP, 2, BD70528_INT_BUCK3_OCP_MASK), - REGMAP_IRQ_REG(BD70528_INT_LED1_OCP, 2, BD70528_INT_LED1_OCP_MASK), - REGMAP_IRQ_REG(BD70528_INT_LED2_OCP, 2, BD70528_INT_LED2_OCP_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK1_FULLON, 2, BD70528_INT_BUCK1_FULLON_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK2_FULLON, 2, BD70528_INT_BUCK2_FULLON_MASK), - REGMAP_IRQ_REG(BD70528_INT_SHORTPUSH, 3, BD70528_INT_SHORTPUSH_MASK), - REGMAP_IRQ_REG(BD70528_INT_AUTO_WAKEUP, 3, BD70528_INT_AUTO_WAKEUP_MASK), - REGMAP_IRQ_REG(BD70528_INT_STATE_CHANGE, 3, BD70528_INT_STATE_CHANGE_MASK), - REGMAP_IRQ_REG(BD70528_INT_BAT_OV_RES, 4, BD70528_INT_BAT_OV_RES_MASK), - REGMAP_IRQ_REG(BD70528_INT_BAT_OV_DET, 4, BD70528_INT_BAT_OV_DET_MASK), - REGMAP_IRQ_REG(BD70528_INT_DBAT_DET, 4, BD70528_INT_DBAT_DET_MASK), - REGMAP_IRQ_REG(BD70528_INT_BATTSD_COLD_RES, 4, BD70528_INT_BATTSD_COLD_RES_MASK), - REGMAP_IRQ_REG(BD70528_INT_BATTSD_COLD_DET, 4, BD70528_INT_BATTSD_COLD_DET_MASK), - REGMAP_IRQ_REG(BD70528_INT_BATTSD_HOT_RES, 4, BD70528_INT_BATTSD_HOT_RES_MASK), - REGMAP_IRQ_REG(BD70528_INT_BATTSD_HOT_DET, 4, BD70528_INT_BATTSD_HOT_DET_MASK), - REGMAP_IRQ_REG(BD70528_INT_CHG_TSD, 4, BD70528_INT_CHG_TSD_MASK), - REGMAP_IRQ_REG(BD70528_INT_BAT_RMV, 5, BD70528_INT_BAT_RMV_MASK), - REGMAP_IRQ_REG(BD70528_INT_BAT_DET, 5, BD70528_INT_BAT_DET_MASK), - REGMAP_IRQ_REG(BD70528_INT_DCIN2_OV_RES, 5, BD70528_INT_DCIN2_OV_RES_MASK), - REGMAP_IRQ_REG(BD70528_INT_DCIN2_OV_DET, 5, BD70528_INT_DCIN2_OV_DET_MASK), - REGMAP_IRQ_REG(BD70528_INT_DCIN2_RMV, 5, BD70528_INT_DCIN2_RMV_MASK), - REGMAP_IRQ_REG(BD70528_INT_DCIN2_DET, 5, BD70528_INT_DCIN2_DET_MASK), - REGMAP_IRQ_REG(BD70528_INT_DCIN1_RMV, 5, BD70528_INT_DCIN1_RMV_MASK), - REGMAP_IRQ_REG(BD70528_INT_DCIN1_DET, 5, BD70528_INT_DCIN1_DET_MASK), - REGMAP_IRQ_REG(BD70528_INT_RTC_ALARM, 6, BD70528_INT_RTC_ALARM_MASK), - REGMAP_IRQ_REG(BD70528_INT_ELPS_TIM, 6, BD70528_INT_ELPS_TIM_MASK), - REGMAP_IRQ_REG(BD70528_INT_GPIO0, 7, BD70528_INT_GPIO0_MASK), - REGMAP_IRQ_REG(BD70528_INT_GPIO1, 7, BD70528_INT_GPIO1_MASK), - REGMAP_IRQ_REG(BD70528_INT_GPIO2, 7, BD70528_INT_GPIO2_MASK), - REGMAP_IRQ_REG(BD70528_INT_GPIO3, 7, BD70528_INT_GPIO3_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK1_DVS_OPFAIL, 8, BD70528_INT_BUCK1_DVS_OPFAIL_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK2_DVS_OPFAIL, 8, BD70528_INT_BUCK2_DVS_OPFAIL_MASK), - REGMAP_IRQ_REG(BD70528_INT_BUCK3_DVS_OPFAIL, 8, BD70528_INT_BUCK3_DVS_OPFAIL_MASK), - REGMAP_IRQ_REG(BD70528_INT_LED1_VOLT_OPFAIL, 8, BD70528_INT_LED1_VOLT_OPFAIL_MASK), - REGMAP_IRQ_REG(BD70528_INT_LED2_VOLT_OPFAIL, 8, BD70528_INT_LED2_VOLT_OPFAIL_MASK), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LONGPUSH, 0, BD70528_INT_LONGPUSH_MASK, + 0, 1), + REGMAP_IRQ_REG_MAIN(BD70528_INT_WDT, 0, BD70528_INT_WDT_MASK, 0, 1), + REGMAP_IRQ_REG_MAIN(BD70528_INT_HWRESET, 0, BD70528_INT_HWRESET_MASK, 0, + 1), + REGMAP_IRQ_REG_MAIN(BD70528_INT_RSTB_FAULT, 0, + BD70528_INT_RSTB_FAULT_MASK, 0, 1), + REGMAP_IRQ_REG_MAIN(BD70528_INT_VBAT_UVLO, 0, + BD70528_INT_VBAT_UVLO_MASK, 0, 1), + REGMAP_IRQ_REG_MAIN(BD70528_INT_TSD, 0, BD70528_INT_TSD_MASK, 0, 1), + REGMAP_IRQ_REG_MAIN(BD70528_INT_RSTIN, 0, BD70528_INT_RSTIN_MASK, 0, 1), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK1_FAULT, 1, + BD70528_INT_BUCK1_FAULT_MASK, 0, 2), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK2_FAULT, 1, + BD70528_INT_BUCK2_FAULT_MASK, 0, 2), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK3_FAULT, 1, + BD70528_INT_BUCK3_FAULT_MASK, 0, 2), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LDO1_FAULT, 1, + BD70528_INT_LDO1_FAULT_MASK, 0, 2), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LDO2_FAULT, 1, + BD70528_INT_LDO2_FAULT_MASK, 0, 2), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LDO3_FAULT, 1, + BD70528_INT_LDO3_FAULT_MASK, 0, 2), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LED1_FAULT, 1, + BD70528_INT_LED1_FAULT_MASK, 0, 2), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LED2_FAULT, 1, + BD70528_INT_LED2_FAULT_MASK, 0, 2), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK1_OCP, 2, + BD70528_INT_BUCK1_OCP_MASK, 0, 3), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK2_OCP, 2, + BD70528_INT_BUCK2_OCP_MASK, 0, 3), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK3_OCP, 2, + BD70528_INT_BUCK3_OCP_MASK, 0, 3), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LED1_OCP, 2, BD70528_INT_LED1_OCP_MASK, + 0, 3), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LED2_OCP, 2, BD70528_INT_LED2_OCP_MASK, + 0, 3), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK1_FULLON, 2, + BD70528_INT_BUCK1_FULLON_MASK, 0, 3), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK2_FULLON, 2, + BD70528_INT_BUCK2_FULLON_MASK, 0, 3), + REGMAP_IRQ_REG_MAIN(BD70528_INT_SHORTPUSH, 3, + BD70528_INT_SHORTPUSH_MASK, 0, 4), + REGMAP_IRQ_REG_MAIN(BD70528_INT_AUTO_WAKEUP, 3, + BD70528_INT_AUTO_WAKEUP_MASK, 0, 4), + REGMAP_IRQ_REG_MAIN(BD70528_INT_STATE_CHANGE, 3, + BD70528_INT_STATE_CHANGE_MASK, 0, 4), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BAT_OV_RES, 4, + BD70528_INT_BAT_OV_RES_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BAT_OV_DET, 4, + BD70528_INT_BAT_OV_DET_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_DBAT_DET, 4, BD70528_INT_DBAT_DET_MASK, + 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BATTSD_COLD_RES, 4, + BD70528_INT_BATTSD_COLD_RES_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BATTSD_COLD_DET, 4, + BD70528_INT_BATTSD_COLD_DET_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BATTSD_HOT_RES, 4, + BD70528_INT_BATTSD_HOT_RES_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BATTSD_HOT_DET, 4, + BD70528_INT_BATTSD_HOT_DET_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_CHG_TSD, 4, + BD70528_INT_CHG_TSD_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BAT_RMV, 5, BD70528_INT_BAT_RMV_MASK, + 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BAT_DET, 5, BD70528_INT_BAT_DET_MASK, 0, + 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_DCIN2_OV_RES, 5, + BD70528_INT_DCIN2_OV_RES_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_DCIN2_OV_DET, 5, + BD70528_INT_DCIN2_OV_DET_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_DCIN2_RMV, 5, + BD70528_INT_DCIN2_RMV_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_DCIN2_DET, 5, + BD70528_INT_DCIN2_DET_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_DCIN1_RMV, 5, + BD70528_INT_DCIN1_RMV_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_DCIN1_DET, 5, + BD70528_INT_DCIN1_DET_MASK, 0, 5), + REGMAP_IRQ_REG_MAIN(BD70528_INT_RTC_ALARM, 6, + BD70528_INT_RTC_ALARM_MASK, 0, 6), + REGMAP_IRQ_REG_MAIN(BD70528_INT_ELPS_TIM, 6, BD70528_INT_ELPS_TIM_MASK, + 0, 6), + REGMAP_IRQ_REG_MAIN(BD70528_INT_GPIO0, 7, BD70528_INT_GPIO0_MASK, 0, 7), + REGMAP_IRQ_REG_MAIN(BD70528_INT_GPIO1, 7, BD70528_INT_GPIO1_MASK, 0, 7), + REGMAP_IRQ_REG_MAIN(BD70528_INT_GPIO2, 7, BD70528_INT_GPIO2_MASK, 0, 7), + REGMAP_IRQ_REG_MAIN(BD70528_INT_GPIO3, 7, BD70528_INT_GPIO3_MASK, 0, 7), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK1_DVS_OPFAIL, 8, + BD70528_INT_BUCK1_DVS_OPFAIL_MASK, 0, 8), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK2_DVS_OPFAIL, 8, + BD70528_INT_BUCK2_DVS_OPFAIL_MASK, 0, 8), + REGMAP_IRQ_REG_MAIN(BD70528_INT_BUCK3_DVS_OPFAIL, 8, + BD70528_INT_BUCK3_DVS_OPFAIL_MASK, 0, 8), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LED1_VOLT_OPFAIL, 8, + BD70528_INT_LED1_VOLT_OPFAIL_MASK, 0, 8), + REGMAP_IRQ_REG_MAIN(BD70528_INT_LED2_VOLT_OPFAIL, 8, + BD70528_INT_LED2_VOLT_OPFAIL_MASK, 0, 8), +}; + +static struct regmap_main_status main_irq_reg = { + .main_status = BD70528_REG_INT_MAIN, + .num_main_regs = 1, }; static struct regmap_irq_chip bd70528_irq_chip = { .name = "bd70528_irq", - .main_status = BD70528_REG_INT_MAIN, .irqs = &bd70528_irqs[0], .num_irqs = ARRAY_SIZE(bd70528_irqs), .status_base = BD70528_REG_INT_SHDN, @@ -135,11 +157,9 @@ static struct regmap_irq_chip bd70528_irq_chip = { .type_base = BD70528_GPIO1_IN_REG, .init_ack_masked = true, .num_regs = 9, - .num_main_regs = 1, .num_type_reg = 4, - .sub_reg_offsets = &bd70528_sub_irq_offsets[0], - .num_main_status_bits = 8, .irq_reg_stride = 1, + .main_reg = &main_irq_reg, }; Br, Matti Vaittinen
| |