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

Commit 88a7ee37 authored by Roger Tseng's avatar Roger Tseng Committed by Samuel Ortiz
Browse files

mfd: rtsx: Implement driving adjustment to device-dependent callbacks 



Implement different ways of selecting driving capability(a necessary adjustment
along with voltage change). It was origionally in device-independent
mmc/host/rtsx_pci_sdmmc.c. Moving it here to support devices which may have a
different way of adjustment.

Signed-off-by: default avatarRoger Tseng <rogerable@realtek.com>
Reviewed-by: default avatarWei WANG <wei_wang@realsil.com.cn>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 8ea402f5

drivers/mfd/rtl8411.c

+13 −3
Original line number Diff line number Diff line
@@ -115,14 +115,24 @@ static int rtl8411_card_power_off(struct rtsx_pcr *pcr, int card) 
static int rtl8411_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage)

{

	u8 mask, val;

	int err;



	mask = (BPP_REG_TUNED18 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_MASK;

	if (voltage == OUTPUT_3V3)

	if (voltage == OUTPUT_3V3) {

		err = rtsx_pci_write_register(pcr,

				SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);

		if (err < 0)

			return err;

		val = (BPP_ASIC_3V3 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_3V3;

	else if (voltage == OUTPUT_1V8)

	} else if (voltage == OUTPUT_1V8) {

		err = rtsx_pci_write_register(pcr,

				SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);

		if (err < 0)

			return err;

		val = (BPP_ASIC_1V8 << BPP_TUNED18_SHIFT_8411) | BPP_PAD_1V8;

	else

	} else {

		return -EINVAL;

	}



	return rtsx_pci_write_register(pcr, LDO_CTL, mask, val);

}

drivers/mfd/rts5209.c

+8 −0
Original line number Diff line number Diff line
@@ -149,10 +149,18 @@ static int rts5209_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) 
	int err;



	if (voltage == OUTPUT_3V3) {

		err = rtsx_pci_write_register(pcr,

				SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);

		if (err < 0)

			return err;

		err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24);

		if (err < 0)

			return err;

	} else if (voltage == OUTPUT_1V8) {

		err = rtsx_pci_write_register(pcr,

				SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);

		if (err < 0)

			return err;

		err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24);

		if (err < 0)

			return err;

drivers/mfd/rts5229.c

+8 −0
Original line number Diff line number Diff line
@@ -119,10 +119,18 @@ static int rts5229_switch_output_voltage(struct rtsx_pcr *pcr, u8 voltage) 
	int err;



	if (voltage == OUTPUT_3V3) {

		err = rtsx_pci_write_register(pcr,

				SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_D);

		if (err < 0)

			return err;

		err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4FC0 | 0x24);

		if (err < 0)

			return err;

	} else if (voltage == OUTPUT_1V8) {

		err = rtsx_pci_write_register(pcr,

				SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);

		if (err < 0)

			return err;

		err = rtsx_pci_write_phy_register(pcr, 0x08, 0x4C40 | 0x24);

		if (err < 0)

			return err;