Commit 0890655c authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Mauro Carvalho Chehab

[media] nuvoton-cir: factor out logical device enabling

Factor out enabling of a logical device.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f2c2ba0e
...@@ -110,6 +110,15 @@ static inline void nvt_select_logical_dev(struct nvt_dev *nvt, u8 ldev) ...@@ -110,6 +110,15 @@ static inline void nvt_select_logical_dev(struct nvt_dev *nvt, u8 ldev)
nvt_cr_write(nvt, ldev, CR_LOGICAL_DEV_SEL); nvt_cr_write(nvt, ldev, CR_LOGICAL_DEV_SEL);
} }
/* select and enable logical device with setting EFM mode*/
static inline void nvt_enable_logical_dev(struct nvt_dev *nvt, u8 ldev)
{
nvt_efm_enable(nvt);
nvt_select_logical_dev(nvt, ldev);
nvt_cr_write(nvt, LOGICAL_DEV_ENABLE, CR_LOGICAL_DEV_EN);
nvt_efm_disable(nvt);
}
/* select and disable logical device with setting EFM mode*/ /* select and disable logical device with setting EFM mode*/
static inline void nvt_disable_logical_dev(struct nvt_dev *nvt, u8 ldev) static inline void nvt_disable_logical_dev(struct nvt_dev *nvt, u8 ldev)
{ {
...@@ -924,13 +933,8 @@ static void nvt_enable_cir(struct nvt_dev *nvt) ...@@ -924,13 +933,8 @@ static void nvt_enable_cir(struct nvt_dev *nvt)
CIR_IRCON_RXINV | CIR_IRCON_SAMPLE_PERIOD_SEL, CIR_IRCON_RXINV | CIR_IRCON_SAMPLE_PERIOD_SEL,
CIR_IRCON); CIR_IRCON);
nvt_efm_enable(nvt);
/* enable the CIR logical device */ /* enable the CIR logical device */
nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR); nvt_enable_logical_dev(nvt, LOGICAL_DEV_CIR);
nvt_cr_write(nvt, LOGICAL_DEV_ENABLE, CR_LOGICAL_DEV_EN);
nvt_efm_disable(nvt);
/* clear all pending interrupts */ /* clear all pending interrupts */
nvt_cir_reg_write(nvt, 0xff, CIR_IRSTS); nvt_cir_reg_write(nvt, 0xff, CIR_IRSTS);
...@@ -1176,11 +1180,7 @@ static int nvt_resume(struct pnp_dev *pdev) ...@@ -1176,11 +1180,7 @@ static int nvt_resume(struct pnp_dev *pdev)
nvt_set_cir_iren(nvt); nvt_set_cir_iren(nvt);
/* Enable CIR logical device */ /* Enable CIR logical device */
nvt_efm_enable(nvt); nvt_enable_logical_dev(nvt, LOGICAL_DEV_CIR);
nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR);
nvt_cr_write(nvt, LOGICAL_DEV_ENABLE, CR_LOGICAL_DEV_EN);
nvt_efm_disable(nvt);
nvt_cir_regs_init(nvt); nvt_cir_regs_init(nvt);
nvt_cir_wake_regs_init(nvt); nvt_cir_wake_regs_init(nvt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment