@@ -419,27 +419,27 @@ static void rteth_839x_hw_reset(struct rteth_ctrl *ctrl)
419419 u32 int_saved , nbuf ;
420420
421421 /* Preserve L2 notification and NBUF settings */
422- int_saved = sw_r32 (ctrl -> r -> dma_if_intr_msk );
423- nbuf = sw_r32 ( RTL839X_DMA_IF_NBUF_BASE_DESC_ADDR_CTRL );
422+ regmap_read (ctrl -> map , ctrl -> r -> dma_if_intr_msk , & int_saved );
423+ regmap_read ( ctrl -> map , RTL839X_DMA_IF_NBUF_BASE_DESC_ADDR_CTRL , & nbuf );
424424
425425 /* Disable link change interrupt on RTL839x */
426- sw_w32 ( 0 , RTL839X_IMR_PORT_LINK_STS_CHG );
427- sw_w32 ( 0 , RTL839X_IMR_PORT_LINK_STS_CHG + 4 );
426+ regmap_write ( ctrl -> map , RTL839X_IMR_PORT_LINK_STS_CHG , 0 );
427+ regmap_write ( ctrl -> map , RTL839X_IMR_PORT_LINK_STS_CHG + 4 , 0 );
428428
429429 rteth_nic_reset (ctrl , 0xc );
430430
431431 /* Re-enable link change interrupt */
432- sw_w32 ( 0xffffffff , RTL839X_ISR_PORT_LINK_STS_CHG );
433- sw_w32 ( 0xffffffff , RTL839X_ISR_PORT_LINK_STS_CHG + 4 );
434- sw_w32 ( 0xffffffff , RTL839X_IMR_PORT_LINK_STS_CHG );
435- sw_w32 ( 0xffffffff , RTL839X_IMR_PORT_LINK_STS_CHG + 4 );
432+ regmap_write ( ctrl -> map , RTL839X_ISR_PORT_LINK_STS_CHG , 0xffffffff );
433+ regmap_write ( ctrl -> map , RTL839X_ISR_PORT_LINK_STS_CHG + 4 , 0xffffffff );
434+ regmap_write ( ctrl -> map , RTL839X_IMR_PORT_LINK_STS_CHG , 0xffffffff );
435+ regmap_write ( ctrl -> map , RTL839X_IMR_PORT_LINK_STS_CHG + 4 , 0xffffffff );
436436
437437 /* Restore notification settings: on RTL838x these bits are null */
438- sw_w32_mask ( 7 << 20 , int_saved & (7 << 20 ), ctrl -> r -> dma_if_intr_msk );
439- sw_w32 ( nbuf , RTL839X_DMA_IF_NBUF_BASE_DESC_ADDR_CTRL );
438+ regmap_update_bits ( ctrl -> map , ctrl -> r -> dma_if_intr_msk , 7 << 20 , int_saved & (7 << 20 ));
439+ regmap_write ( ctrl -> map , RTL839X_DMA_IF_NBUF_BASE_DESC_ADDR_CTRL , nbuf );
440440
441441 /* Free floating rings without space tracking */
442- sw_w32 ( 0 , RTL839X_DMA_IF_RX_RING_SIZE );
442+ regmap_write ( ctrl -> map , RTL839X_DMA_IF_RX_RING_SIZE , 0 );
443443}
444444
445445static void rteth_93xx_hw_reset (struct rteth_ctrl * ctrl )
0 commit comments