Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56cb3cc1 authored by Micky Ching's avatar Micky Ching Committed by Lee Jones
Browse files

mfd: rtsx: Add support for card reader rtl8402 



rtl8402 is much like rtl8411, so just add it to rtl8411.c

Signed-off-by: default avatarMicky Ching <micky_ching@realsil.com.cn>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 0da14eeb

drivers/mfd/rtl8411.c

+40 −4
Original line number Diff line number Diff line
@@ -191,24 +191,25 @@ static int rtl8411_card_power_off(struct rtsx_pcr *pcr, int card) 
			BPP_LDO_POWB, BPP_LDO_SUSPEND);

}



static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)

static int rtl8411_do_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage,

		int bpp_tuned18_shift, int bpp_asic_1v8)

{

	u8 mask, val;

	int err;



	mask = (BPP_REG_TUNED18 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_MASK;

	mask = (BPP_REG_TUNED18 << bpp_tuned18_shift) | BPP_PAD_MASK;

	if (voltage == OUTPUT_3V3) {

		err = rtsx_pci_write_register(pcr,

				SD30_DRIVE_SEL, 0x07, pcr->sd30_drive_sel_3v3);

		if (err < 0)

			return err;

		val = (BPP_ASIC_3V3 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_3V3;

		val = (BPP_ASIC_3V3 << bpp_tuned18_shift) | BPP_PAD_3V3;

	} else if (voltage == OUTPUT_1V8) {

		err = rtsx_pci_write_register(pcr,

				SD30_DRIVE_SEL, 0x07, pcr->sd30_drive_sel_1v8);

		if (err < 0)

			return err;

		val = (BPP_ASIC_1V8 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_1V8;

		val = (bpp_asic_1v8 << bpp_tuned18_shift) | BPP_PAD_1V8;

	} else {

		return -EINVAL;

	}
@@ -216,6 +217,18 @@ static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) 
	return rtsx_pci_write_register(pcr, LDO_CTL, mask, val);

}



static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)

{

	return rtl8411_do_switch_output_voltage(pcr, voltage,

			BPP_TUNED18_SHIFT_8411, BPP_ASIC_1V8);

}



static int rtl8402_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)

{

	return rtl8411_do_switch_output_voltage(pcr, voltage,

			BPP_TUNED18_SHIFT_8402, BPP_ASIC_2V0);

}



static unsigned int rtl8411_cd_deglitch(struct rtsx_pcr *pcr)

{

	unsigned int card_exist;
@@ -295,6 +308,22 @@ static const struct pcr_ops rtl8411_pcr_ops = { 
	.force_power_down = rtl8411_force_power_down,

};



static const struct pcr_ops rtl8402_pcr_ops = {

	.fetch_vendor_settings = rtl8411_fetch_vendor_settings,

	.extra_init_hw = rtl8411_extra_init_hw,

	.optimize_phy = NULL,

	.turn_on_led = rtl8411_turn_on_led,

	.turn_off_led = rtl8411_turn_off_led,

	.enable_auto_blink = rtl8411_enable_auto_blink,

	.disable_auto_blink = rtl8411_disable_auto_blink,

	.card_power_on = rtl8411_card_power_on,

	.card_power_off = rtl8411_card_power_off,

	.switch_output_voltage = rtl8402_switch_output_voltage,

	.cd_deglitch = rtl8411_cd_deglitch,

	.conv_clk_and_div_n = rtl8411_conv_clk_and_div_n,

	.force_power_down = rtl8411_force_power_down,

};



static const struct pcr_ops rtl8411b_pcr_ops = {

	.fetch_vendor_settings = rtl8411b_fetch_vendor_settings,

	.extra_init_hw = rtl8411b_extra_init_hw,
@@ -471,3 +500,10 @@ void rtl8411b_init_params(struct rtsx_pcr *pcr) 
	else

		set_pull_ctrl_tables(pcr, rtl8411b_qfn64);

}



void rtl8402_init_params(struct rtsx_pcr *pcr)

{

	rtl8411_init_common_params(pcr);

	pcr->ops = &rtl8402_pcr_ops;

	set_pull_ctrl_tables(pcr, rtl8411);

}

drivers/mfd/rtsx_pcr.c

+5 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ static const struct pci_device_id rtsx_pci_ids[] = { 
	{ PCI_DEVICE(0x10EC, 0x5227), PCI_CLASS_OTHERS << 16, 0xFF0000 },

	{ PCI_DEVICE(0x10EC, 0x5249), PCI_CLASS_OTHERS << 16, 0xFF0000 },

	{ PCI_DEVICE(0x10EC, 0x5287), PCI_CLASS_OTHERS << 16, 0xFF0000 },

	{ PCI_DEVICE(0x10EC, 0x5286), PCI_CLASS_OTHERS << 16, 0xFF0000 },

	{ 0, }

};
@@ -1061,6 +1062,10 @@ static int rtsx_pci_init_chip(struct rtsx_pcr *pcr) 
	case 0x5287:

		rtl8411b_init_params(pcr);

		break;



	case 0x5286:

		rtl8402_init_params(pcr);

		break;

	}



	dev_dbg(&(pcr->pci->dev), "PID: 0x%04x, IC version: 0x%02x\n",

drivers/mfd/rtsx_pcr.h

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
void rts5209_init_params(struct rtsx_pcr *pcr);

void rts5229_init_params(struct rtsx_pcr *pcr);

void rtl8411_init_params(struct rtsx_pcr *pcr);

void rtl8402_init_params(struct rtsx_pcr *pcr);

void rts5227_init_params(struct rtsx_pcr *pcr);

void rts5249_init_params(struct rtsx_pcr *pcr);

void rtl8411b_init_params(struct rtsx_pcr *pcr);