On Mon, May 21, 2018 at 04:38:03PM +0200, Michał Winiarski wrote:
> Doing writes when the device is disabled seems to be a NOOP.
> Let's enable the device, write the values, and then disable it on init.
> This changes the behavior for wake device, which is now being disabled
> after init.
I don't have the datasheet so I might be misunderstanding this. We want
the IR wakeup to work fine even after kernel crash/power loss, right?
> Signed-off-by: Michał Winiarski <michal.winiarski@xxxxxxxxx>
> Cc: Jarod Wilson <jarod@xxxxxxxxxx>
> Cc: Sean Young <sean@xxxxxxxx>
> ---
> drivers/media/rc/nuvoton-cir.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
> index eebd6fef5602..61b68cde35f1 100644
> --- a/drivers/media/rc/nuvoton-cir.c
> +++ b/drivers/media/rc/nuvoton-cir.c
> @@ -535,6 +535,8 @@ static void nvt_set_cir_iren(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) */
> nvt_cir_reg_write(nvt, CIR_RX_LIMIT_COUNT >> 8, CIR_SLCH);
> 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)
> /* clear hardware rx and tx fifos */
> nvt_clear_cir_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)
> {
> + nvt_enable_logical_dev(nvt, LOGICAL_DEV_CIR_WAKE);
> +
> /*
> * Disable RX, set specific carrier on = low, off = high,
> * and sample period (currently 50us)
> @@ -562,8 +568,7 @@ static void nvt_cir_wake_regs_init(struct nvt_dev *nvt)
> /* clear any and all stray interrupts */
> 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);
> + nvt_disable_logical_dev(nvt, LOGICAL_DEV_CIR);
The way I read this is that the CIR, not CIR_WAKE, is being disabled,
which seems contrary to what the commit message says.
Sean
> }
>
> static void nvt_enable_wake(struct nvt_dev *nvt)
> --
> 2.17.0
