File tree Expand file tree Collapse file tree 2 files changed +2
-12
lines changed Expand file tree Collapse file tree 2 files changed +2
-12
lines changed Original file line number Diff line number Diff line change @@ -189,12 +189,8 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
189
189
if (!d -> type_buf_def [i ])
190
190
continue ;
191
191
reg = d -> get_irq_reg (d , d -> chip -> type_base , i );
192
- if (d -> chip -> type_invert )
193
- ret = regmap_update_bits (d -> map , reg ,
194
- d -> type_buf_def [i ], ~d -> type_buf [i ]);
195
- else
196
- ret = regmap_update_bits (d -> map , reg ,
197
- d -> type_buf_def [i ], d -> type_buf [i ]);
192
+ ret = regmap_update_bits (d -> map , reg ,
193
+ d -> type_buf_def [i ], d -> type_buf [i ]);
198
194
if (ret != 0 )
199
195
dev_err (d -> map -> dev , "Failed to sync type in %x\n" ,
200
196
reg );
@@ -1028,9 +1024,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
1028
1024
1029
1025
ret = regmap_read (map , reg , & d -> type_buf_def [i ]);
1030
1026
1031
- if (d -> chip -> type_invert )
1032
- d -> type_buf_def [i ] = ~d -> type_buf_def [i ];
1033
-
1034
1027
if (ret ) {
1035
1028
dev_err (map -> dev , "Failed to get type defaults at 0x%x: %d\n" ,
1036
1029
reg , ret );
Original file line number Diff line number Diff line change @@ -1555,8 +1555,6 @@ struct regmap_irq_chip_data;
1555
1555
* @ack_invert: Inverted ack register: cleared bits for ack.
1556
1556
* @clear_ack: Use this to set 1 and 0 or vice-versa to clear interrupts.
1557
1557
* @wake_invert: Inverted wake register: cleared bits are wake enabled.
1558
- * @type_invert: Invert the type flags. Deprecated, use config registers
1559
- * instead.
1560
1558
* @type_in_mask: Use the mask registers for controlling irq type. Use this if
1561
1559
* the hardware provides separate bits for rising/falling edge
1562
1560
* or low/high level interrupts and they should be combined into
@@ -1633,7 +1631,6 @@ struct regmap_irq_chip {
1633
1631
unsigned int clear_ack :1 ;
1634
1632
unsigned int wake_invert :1 ;
1635
1633
unsigned int runtime_pm :1 ;
1636
- unsigned int type_invert :1 ;
1637
1634
unsigned int type_in_mask :1 ;
1638
1635
unsigned int clear_on_unmask :1 ;
1639
1636
unsigned int not_fixed_stride :1 ;
You can’t perform that action at this time.
0 commit comments