Commit 19f3bd54 authored by Micky Ching's avatar Micky Ching Committed by Lee Jones
Browse files

mfd: rtsx: Remove LCTLR defination 



To enable/disable ASPM we should find LINK CONTROL register
in PCI config space. All old chip use 0x80 address, but new
chip may use another address, so we using pci_find_capability()
to get LINK CONTROL address.

rtsx_gops.c was removed, we consider to put some common operations
to this file, but the actual thing is, only a group of chips
are in common ops1, and another group of chips in common ops2,
it is hard to decide put which ops into generic ops file.

Signed-off-by: default avatarMicky Ching <micky_ching@realsil.com.cn>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent b0385381

drivers/mfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-$(CONFIG_MFD_CROS_EC) += cros_ec.o 
obj-$(CONFIG_MFD_CROS_EC_I2C)	+= cros_ec_i2c.o

obj-$(CONFIG_MFD_CROS_EC_SPI)	+= cros_ec_spi.o



rtsx_pci-objs			:= rtsx_pcr.o rtsx_gops.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o

rtsx_pci-objs			:= rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o

obj-$(CONFIG_MFD_RTSX_PCI)	+= rtsx_pci.o

obj-$(CONFIG_MFD_RTSX_USB)	+= rtsx_usb.o

drivers/mfd/rts5227.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int rts5227_optimize_phy(struct rtsx_pcr *pcr) 
{

	int err;



	err = rtsx_gops_pm_reset(pcr);

	err = rtsx_pci_write_register(pcr, PM_CTRL3, D3_DELINK_MODE_EN, 0x00);

	if (err < 0)

		return err;

drivers/mfd/rts5249.c

+1 −2
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ static int rts5249_extra_init_hw(struct rtsx_pcr *pcr) 
		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB0, 0xB0);

	else

		rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, 0xB0, 0x80);

	rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PM_CTRL3, 0x10, 0x00);



	return rtsx_pci_send_cmd(pcr, 100);

}
@@ -128,7 +127,7 @@ static int rts5249_optimize_phy(struct rtsx_pcr *pcr) 
{

	int err;



	err = rtsx_gops_pm_reset(pcr);

	err = rtsx_pci_write_register(pcr, PM_CTRL3, D3_DELINK_MODE_EN, 0x00);

	if (err < 0)

		return err;

drivers/mfd/rtsx_gops.c

deleted100644 → 0
+0 −37
Original line number Diff line number Diff line 
/* Driver for Realtek PCI-Express card reader

 *

 * Copyright(c) 2009-2013 Realtek Semiconductor Corp. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the

 * Free Software Foundation; either version 2, or (at your option) any

 * later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License along

 * with this program; if not, see <http://www.gnu.org/licenses/>.

 *

 * Author:

 *   Micky Ching <micky_ching@realsil.com.cn>

 */



#include <linux/mfd/rtsx_pci.h>

#include "rtsx_pcr.h"



int rtsx_gops_pm_reset(struct rtsx_pcr *pcr)

{

	int err;



	/* init aspm */

	rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0xFF, 0x00);

	err = rtsx_pci_update_cfg_byte(pcr, LCTLR, ~LCTLR_ASPM_CTL_MASK, 0x00);

	if (err < 0)

		return err;



	/* reset PM_CTRL3 before send buffer cmd */

	return rtsx_pci_write_register(pcr, PM_CTRL3, D3_DELINK_MODE_EN, 0x00);

}

drivers/mfd/rtsx_pcr.c

+17 −5
Original line number Diff line number Diff line
@@ -63,6 +63,18 @@ static const struct pci_device_id rtsx_pci_ids[] = { 


MODULE_DEVICE_TABLE(pci, rtsx_pci_ids);



static inline void rtsx_pci_enable_aspm(struct rtsx_pcr *pcr)

{

	rtsx_pci_update_cfg_byte(pcr, pcr->pcie_cap + PCI_EXP_LNKCTL,

		0xFC, pcr->aspm_en);

}



static inline void rtsx_pci_disable_aspm(struct rtsx_pcr *pcr)

{

	rtsx_pci_update_cfg_byte(pcr, pcr->pcie_cap + PCI_EXP_LNKCTL,

		0xFC, 0);

}



void rtsx_pci_start_run(struct rtsx_pcr *pcr)

{

	/* If pci device removed, don't queue idle work any more */
@@ -75,7 +87,7 @@ void rtsx_pci_start_run(struct rtsx_pcr *pcr) 
			pcr->ops->enable_auto_blink(pcr);



		if (pcr->aspm_en)

			rtsx_pci_write_config_byte(pcr, LCTLR, 0);

			rtsx_pci_disable_aspm(pcr);

	}



	mod_delayed_work(system_wq, &pcr->idle_work, msecs_to_jiffies(200));
@@ -942,7 +954,7 @@ static void rtsx_pci_idle_work(struct work_struct *work) 
		pcr->ops->turn_off_led(pcr);



	if (pcr->aspm_en)

		rtsx_pci_write_config_byte(pcr, LCTLR, pcr->aspm_en);

		rtsx_pci_enable_aspm(pcr);



	mutex_unlock(&pcr->pcr_mutex);

}
@@ -968,6 +980,7 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr) 
{

	int err;



	pcr->pcie_cap = pci_find_capability(pcr->pci, PCI_CAP_ID_EXP);

	rtsx_pci_writel(pcr, RTSX_HCBAR, pcr->host_cmds_addr);



	rtsx_pci_enable_bus_int(pcr);
@@ -980,6 +993,7 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr) 
	/* Wait SSC power stable */

	udelay(200);



	rtsx_pci_disable_aspm(pcr);

	if (pcr->ops->optimize_phy) {

		err = pcr->ops->optimize_phy(pcr);

		if (err < 0)
@@ -1028,10 +1042,8 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr) 
	if (err < 0)

		return err;



	rtsx_pci_write_config_byte(pcr, LCTLR, 0);



	/* Enable clk_request_n to enable clock power management */

	rtsx_pci_write_config_byte(pcr, 0x81, 1);

	rtsx_pci_write_config_byte(pcr, pcr->pcie_cap + PCI_EXP_LNKCTL + 1, 1);

	/* Enter L1 when host tx idle */

	rtsx_pci_write_config_byte(pcr, 0x70F, 0x5B);

CRA Git | Maintained and supported by SUSTech CRA and CCSE