Commit d24e56f6 authored by Michał Winiarski's avatar Michał Winiarski Committed by Mauro Carvalho Chehab

media: rc: nuvoton: Keep device enabled during reg init

Doing writes when the device is disabled seems to be a NOOP.
For CIR device, we should enable it, initialize it, and then disable it
until it's opened. CIR_WAKE should always be enabled.
Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Cc: Jarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent adbe6cfe
...@@ -535,6 +535,8 @@ static void nvt_set_cir_iren(struct nvt_dev *nvt) ...@@ -535,6 +535,8 @@ static void nvt_set_cir_iren(struct nvt_dev *nvt)
static void nvt_cir_regs_init(struct nvt_dev *nvt) static void nvt_cir_regs_init(struct nvt_dev *nvt)
{ {
nvt_enable_logical_dev(nvt, LOGICAL_DEV_CIR);
/* set sample limit count (PE interrupt raised when reached) */ /* set sample limit count (PE interrupt raised when reached) */
nvt_cir_reg_write(nvt, CIR_RX_LIMIT_COUNT >> 8, CIR_SLCH); nvt_cir_reg_write(nvt, CIR_RX_LIMIT_COUNT >> 8, CIR_SLCH);
nvt_cir_reg_write(nvt, CIR_RX_LIMIT_COUNT & 0xff, CIR_SLCL); nvt_cir_reg_write(nvt, CIR_RX_LIMIT_COUNT & 0xff, CIR_SLCL);
...@@ -546,10 +548,14 @@ static void nvt_cir_regs_init(struct nvt_dev *nvt) ...@@ -546,10 +548,14 @@ static void nvt_cir_regs_init(struct nvt_dev *nvt)
/* clear hardware rx and tx fifos */ /* clear hardware rx and tx fifos */
nvt_clear_cir_fifo(nvt); nvt_clear_cir_fifo(nvt);
nvt_clear_tx_fifo(nvt); nvt_clear_tx_fifo(nvt);
nvt_disable_logical_dev(nvt, LOGICAL_DEV_CIR);
} }
static void nvt_cir_wake_regs_init(struct nvt_dev *nvt) static void nvt_cir_wake_regs_init(struct nvt_dev *nvt)
{ {
nvt_enable_logical_dev(nvt, LOGICAL_DEV_CIR_WAKE);
/* /*
* Disable RX, set specific carrier on = low, off = high, * Disable RX, set specific carrier on = low, off = high,
* and sample period (currently 50us) * and sample period (currently 50us)
...@@ -561,9 +567,6 @@ static void nvt_cir_wake_regs_init(struct nvt_dev *nvt) ...@@ -561,9 +567,6 @@ static void nvt_cir_wake_regs_init(struct nvt_dev *nvt)
/* clear any and all stray interrupts */ /* clear any and all stray interrupts */
nvt_cir_wake_reg_write(nvt, 0xff, CIR_WAKE_IRSTS); nvt_cir_wake_reg_write(nvt, 0xff, CIR_WAKE_IRSTS);
/* enable the CIR WAKE logical device */
nvt_enable_logical_dev(nvt, LOGICAL_DEV_CIR_WAKE);
} }
static void nvt_enable_wake(struct nvt_dev *nvt) static void nvt_enable_wake(struct nvt_dev *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