1 files changed, 14 insertions, 3 deletions

diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h
index 048135eea702..379795d61ea7 100644
--- a/drivers/media/rc/nuvoton-cir.h
+++ b/drivers/media/rc/nuvoton-cir.h
@@ -330,9 +330,13 @@ struct nvt_dev {
 #define EFER_EFM_DISABLE        0xaa
 
 /* Chip IDs found in CR_CHIP_ID_{HI,LO} */
-#define CHIP_ID_HIGH            0xb4
-#define CHIP_ID_LOW             0x72
-#define CHIP_ID_LOW2            0x73
+#define CHIP_ID_HIGH_667        0xa5
+#define CHIP_ID_HIGH_677B       0xb4
+#define CHIP_ID_HIGH_677C       0xc3
+#define CHIP_ID_LOW_667         0x13
+#define CHIP_ID_LOW_677B2       0x72
+#define CHIP_ID_LOW_677B3       0x73
+#define CHIP_ID_LOW_677C        0x33
 
 /* Config regs we need to care about */
 #define CR_SOFTWARE_RESET       0x02
@@ -341,6 +345,7 @@ struct nvt_dev {
 #define CR_CHIP_ID_LO           0x21
 #define CR_DEV_POWER_DOWN       0x22 /* bit 2 is CIR power, default power on */
 #define CR_OUTPUT_PIN_SEL       0x27
+#define CR_MULTIFUNC_PIN_SEL    0x2c
 #define CR_LOGICAL_DEV_EN       0x30 /* valid for all logical devices */
 /* next three regs valid for both the CIR and CIR_WAKE logical devices */
 #define CR_CIR_BASE_ADDR_HI     0x60
@@ -364,10 +369,16 @@ struct nvt_dev {
 #define CIR_INTR_MOUSE_IRQ_BIT  0x80
 #define PME_INTR_CIR_PASS_BIT   0x08
 
+/* w83677hg CIR pin config */
 #define OUTPUT_PIN_SEL_MASK     0xbc
 #define OUTPUT_ENABLE_CIR       0x01 /* Pin95=CIRRX, Pin96=CIRTX1 */
 #define OUTPUT_ENABLE_CIRWB     0x40 /* enable wide-band sensor */
 
+/* w83667hg CIR pin config */
+#define MULTIFUNC_PIN_SEL_MASK  0x1f
+#define MULTIFUNC_ENABLE_CIR    0x80 /* Pin75=CIRRX, Pin76=CIRTX1 */
+#define MULTIFUNC_ENABLE_CIRWB  0x20 /* enable wide-band sensor */
+
 /* MCE CIR signal length, related on sample period */
 
 /* MCE CIR controller signal length: about 43ms