Skip to content

amlogic: remote: Add support for Sony SIRC 12/15/20 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 3, 2018
Merged

amlogic: remote: Add support for Sony SIRC 12/15/20 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions drivers/amlogic/input/remote/remote_meson.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ struct remote_chip {
struct ir_map_tab_list *cur_tab;
int custom_num;
struct key_number key_num;
unsigned long repeat_max_jiffies;
int decode_status;
int sys_custom_code;
const char *keymap_name;
Expand Down
144 changes: 144 additions & 0 deletions drivers/amlogic/input/remote/remote_regmap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,84 @@ static struct remote_reg_map regs_default_toshiba[] = {
{ REG_DURATN3 , 0x00}
};

static struct remote_reg_map regs_default_sony_sirc12[] = {
/* (4 +/- .5) * 600 us */
{ REG_LDR_ACTIVE, 135 << 16 | 105 << 0 },
/* (1 +/- .5) * 600 us */
{ REG_LDR_IDLE, 45 << 16 | 15 << 0 },
/* No repeat code */
{ REG_LDR_REPEAT, 0 },
/* (2 +/- .5) * 600 us */
{ REG_BIT_0, 75 << 16 | 45 << 0 },
/*
* Filter: 140 us, max frame time: (4.5 + 1.5 + 12 * 3.5) * 600 us,
* base time: 20 us
*/
{ REG_REG0, 7 << 28 | 1440 << 12 | (20 - 1) },
/* Logic "1": (3 +/- .5) * 600 us */
{ REG_STATUS, 1 << 30 | 105 << 20 | 75 << 10 },
/* Decoder, frame body limited to 11 bits because of IP erratum */
{ REG_REG1, 1 << 15 | (11 - 1) << 8 },
/* Check repeat time, compare frames for repeat, lsb first, Sony SIRC */
{ REG_REG2, 1 << 12 | 1 << 11 | 0 << 8 | 0x6 },
{ REG_DURATN2, 0 },
{ REG_DURATN3, 0 },
/* Repeat max frame interval: 50 ms */
{ REG_REG3, 500 },
};

static struct remote_reg_map regs_default_sony_sirc15[] = {
/* (4 +/- .5) * 600 us */
{ REG_LDR_ACTIVE, 135 << 16 | 105 << 0 },
/* (1 +/- .5) * 600 us */
{ REG_LDR_IDLE, 45 << 16 | 15 << 0 },
/* No repeat code */
{ REG_LDR_REPEAT, 0 },
/* (2 +/- .5) * 600 us */
{ REG_BIT_0, 75 << 16 | 45 << 0 },
/*
* Filter: 140 us, max frame time: (4.5 + 1.5 + 15 * 3.5) * 600 us,
* base time: 20 us
*/
{ REG_REG0, 7 << 28 | 1755 << 12 | (20 - 1) },
/* Logic "1": (3 +/- .5) * 600 us */
{ REG_STATUS, 1 << 30 | 105 << 20 | 75 << 10 },
/* Decoder, frame body limited to 14 bits because of IP erratum */
{ REG_REG1, 1 << 15 | (14 - 1) << 8 },
/* Check repeat time, compare frames for repeat, lsb first, Sony SIRC */
{ REG_REG2, 1 << 12 | 1 << 11 | 0 << 8 | 0x6 },
{ REG_DURATN2, 0 },
{ REG_DURATN3, 0 },
/* Repeat max frame interval: 50 ms */
{ REG_REG3, 500 },
};

static struct remote_reg_map regs_default_sony_sirc20[] = {
/* (4 +/- .5) * 600 us */
{ REG_LDR_ACTIVE, 135 << 16 | 105 << 0 },
/* (1 +/- .5) * 600 us */
{ REG_LDR_IDLE, 45 << 16 | 15 << 0 },
/* No repeat code */
{ REG_LDR_REPEAT, 0 },
/* (2 +/- .5) * 600 us */
{ REG_BIT_0, 75 << 16 | 45 << 0 },
/*
* Filter: 140 us, max frame time: (4.5 + 1.5 + 20 * 3.5) * 600 us,
* base time: 20 us
*/
{ REG_REG0, 7 << 28 | 2280 << 12 | (20 - 1) },
/* Logic "1": (3 +/- .5) * 600 us */
{ REG_STATUS, 1 << 30 | 105 << 20 | 75 << 10 },
/* Decoder, frame body limited to 19 bits because of IP erratum */
{ REG_REG1, 1 << 15 | (19 - 1) << 8 },
/* Check repeat time, compare frames for repeat, lsb first, Sony SIRC */
{ REG_REG2, 1 << 12 | 1 << 11 | 0 << 8 | 0x6 },
{ REG_DURATN2, 0 },
{ REG_DURATN3, 0 },
/* Repeat max frame interval: 50 ms */
{ REG_REG3, 500 },
};

void set_hardcode(struct remote_chip *chip, int code)
{
remote_dbg(chip->dev, "framecode=0x%x\n", code);
Expand Down Expand Up @@ -462,6 +540,39 @@ static u32 ir_toshiba_get_custom_code(struct remote_chip *chip)
return custom_code;
}

static int ir_sony_sirc_get_scancode(struct remote_chip *chip)
{
int code = 0;
int decode_status = 0;
int status = 0;

remote_reg_read(chip, MULTI_IR_ID, REG_STATUS, &decode_status);
if (decode_status & 0x01 &&
!time_is_before_eq_jiffies(chip->repeat_max_jiffies))
status |= REMOTE_REPEAT;
/*
* Workaround for IP erratum causing the repeat max frame interval in
* REG3 to be ignored for SIRC
*/
chip->repeat_max_jiffies = jiffies + msecs_to_jiffies(60);
chip->decode_status = status; /*set decode status*/
remote_reg_read(chip, MULTI_IR_ID, REG_FRAME, &code);
remote_dbg(chip->dev, "framecode=0x%x\n", code);
chip->r_dev->cur_hardcode = code;
code &= 0x7f;
return code;
}

static int ir_sony_sirc_get_decode_status(struct remote_chip *chip)
{
return chip->decode_status;
}

static u32 ir_sony_sirc_get_custom_code(struct remote_chip *chip)
{
return chip->r_dev->cur_hardcode >> 7;
}


/*legacy IR controller support protocols*/
static struct aml_remote_reg_proto reg_legacy_nec = {
Expand Down Expand Up @@ -555,6 +666,36 @@ static struct aml_remote_reg_proto reg_toshiba = {
.get_custom_code = ir_toshiba_get_custom_code,
};

static struct aml_remote_reg_proto reg_sony_sirc12 = {
.protocol = REMOTE_TYPE_SONY_SIRC12,
.name = "SONY_SIRC12",
.reg_map = regs_default_sony_sirc12,
.reg_map_size = ARRAY_SIZE(regs_default_sony_sirc12),
.get_scancode = ir_sony_sirc_get_scancode,
.get_decode_status = ir_sony_sirc_get_decode_status,
.get_custom_code = ir_sony_sirc_get_custom_code,
};

static struct aml_remote_reg_proto reg_sony_sirc15 = {
.protocol = REMOTE_TYPE_SONY_SIRC15,
.name = "SONY_SIRC15",
.reg_map = regs_default_sony_sirc15,
.reg_map_size = ARRAY_SIZE(regs_default_sony_sirc15),
.get_scancode = ir_sony_sirc_get_scancode,
.get_decode_status = ir_sony_sirc_get_decode_status,
.get_custom_code = ir_sony_sirc_get_custom_code,
};

static struct aml_remote_reg_proto reg_sony_sirc20 = {
.protocol = REMOTE_TYPE_SONY_SIRC20,
.name = "SONY_SIRC20",
.reg_map = regs_default_sony_sirc20,
.reg_map_size = ARRAY_SIZE(regs_default_sony_sirc20),
.get_scancode = ir_sony_sirc_get_scancode,
.get_decode_status = ir_sony_sirc_get_decode_status,
.get_custom_code = ir_sony_sirc_get_custom_code,
};


const struct aml_remote_reg_proto *remote_reg_proto[] = {
&reg_nec,
Expand All @@ -566,6 +707,9 @@ const struct aml_remote_reg_proto *remote_reg_proto[] = {
&reg_rc6,
&reg_legacy_nec,
&reg_toshiba,
&reg_sony_sirc12,
&reg_sony_sirc15,
&reg_sony_sirc20,
NULL
};

Expand Down
3 changes: 3 additions & 0 deletions include/dt-bindings/input/meson_rc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
#define REMOTE_TYPE_RC5 0x04
#define REMOTE_TYPE_RC6 0x05
#define REMOTE_TYPE_TOSHIBA 0x06
#define REMOTE_TYPE_SONY_SIRC12 0x07
#define REMOTE_TYPE_SONY_SIRC15 0x08
#define REMOTE_TYPE_SONY_SIRC20 0x09

/*hardware decode one protocol by using legacy IR controller*/
#define REMOTE_TYPE_LEGACY_NEC 0xff
Expand Down