UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: mt7621-pci: avoid using clk_* operations 

There is no clock driver for ralink mips and clk_enable
are no-ops for this architecture. This has been also tested
without using clocks and seems to work so avoid to use them
in this driver.

Fixes: ad9c87e129d1: "staging: mt7621-pci: parse and init
port data from device tree"
Reported-by: NeilBrown <neil@brown.name>

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Tested-by: NeilBrown <neil@brown.name>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergio Paracuellos 2018-11-24 18:54:55 +01:00 committed by Greg Kroah-Hartman
parent e51844bf82
commit 2f5496d878
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/mt7621-pci/pci-mt7621.c
View File

@ -16,7 +16,6 @@
*/ */
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/clk.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/module.h> #include <linux/module.h>
@ -167,7 +166,6 @@
* @pcie: pointer to PCIe host info * @pcie: pointer to PCIe host info
* @phy_reg_offset: offset to related phy registers * @phy_reg_offset: offset to related phy registers
* @pcie_rst: pointer to port reset control * @pcie_rst: pointer to port reset control
* @pcie_clk: PCIe clock
* @slot: port slot * @slot: port slot
* @enabled: indicates if port is enabled * @enabled: indicates if port is enabled
*/ */
@ -177,7 +175,6 @@ struct mt7621_pcie_port {
struct mt7621_pcie *pcie; struct mt7621_pcie *pcie;
u32 phy_reg_offset; u32 phy_reg_offset;
struct reset_control *pcie_rst; struct reset_control *pcie_rst;
struct clk *pcie_clk;
u32 slot; u32 slot;
bool enabled; bool enabled;
}; };
@ -531,12 +528,6 @@ static int mt7621_pcie_parse_port(struct mt7621_pcie *pcie,
return PTR_ERR(port->base); return PTR_ERR(port->base);
snprintf(name, sizeof(name), "pcie%d", slot); snprintf(name, sizeof(name), "pcie%d", slot);
port->pcie_clk = devm_clk_get(dev, name);
if (IS_ERR(port->pcie_clk)) {
dev_err(dev, "failed to get pcie%d clock\n", slot);
return PTR_ERR(port->pcie_clk);
}
port->pcie_rst = devm_reset_control_get_exclusive(dev, name); port->pcie_rst = devm_reset_control_get_exclusive(dev, name);
if (PTR_ERR(port->pcie_rst) == -EPROBE_DEFER) { if (PTR_ERR(port->pcie_rst) == -EPROBE_DEFER) {
dev_err(dev, "failed to get pcie%d reset control\n", slot); dev_err(dev, "failed to get pcie%d reset control\n", slot);
@ -597,13 +588,6 @@ static int mt7621_pcie_init_port(struct mt7621_pcie_port *port)
struct device *dev = pcie->dev; struct device *dev = pcie->dev;
u32 slot = port->slot; u32 slot = port->slot;
u32 val = 0; u32 val = 0;
int err;
err = clk_prepare_enable(port->pcie_clk);
if (err) {
dev_err(dev, "failed to enable pcie%d clock\n", slot);
return err;
}
mt7621_reset_port(port); mt7621_reset_port(port);