diff options
| author | jianlong.huang <jianlong.huang@starfivetech.com> | 2022-04-21 08:58:55 +0300 |
|---|---|---|
| committer | jianlong.huang <jianlong.huang@starfivetech.com> | 2022-04-21 08:58:55 +0300 |
| commit | f2f8faec1a3b483d70705a7ce869d80d7984914b (patch) | |
| tree | 17ee23cf502fa5f20599fba8a320650d71c55237 | |
| parent | 3a61d187fe5646b1500618cba818355b74327d3f (diff) | |
| download | linux-f2f8faec1a3b483d70705a7ce869d80d7984914b.tar.xz | |
modify interface different from kernel5.15
Signed-off-by: jianlong.huang <jianlong.huang@starfivetech.com>
| -rw-r--r-- | drivers/clk/starfive/clk-starfive-jh7100.c | 6 | ||||
| -rw-r--r-- | drivers/pinctrl/pinctrl-starfive.c | 4 | ||||
| -rw-r--r-- | drivers/tty/serial/8250/8250_dw.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/clk/starfive/clk-starfive-jh7100.c b/drivers/clk/starfive/clk-starfive-jh7100.c index 048164c3f5ed..b0c1126c528e 100644 --- a/drivers/clk/starfive/clk-starfive-jh7100.c +++ b/drivers/clk/starfive/clk-starfive-jh7100.c @@ -583,17 +583,17 @@ static int __init clk_starfive_jh7100_probe(struct platform_device *pdev) if (IS_ERR(priv->base)) return PTR_ERR(priv->base); - priv->pll[0] = devm_clk_hw_register_fixed_factor(priv->dev, "pll0_out", + priv->pll[0] = clk_hw_register_fixed_factor(priv->dev, "pll0_out", "osc_sys", 0, 40, 1); if (IS_ERR(priv->pll[0])) return PTR_ERR(priv->pll[0]); - priv->pll[1] = devm_clk_hw_register_fixed_factor(priv->dev, "pll1_out", + priv->pll[1] = clk_hw_register_fixed_factor(priv->dev, "pll1_out", "osc_sys", 0, 64, 1); if (IS_ERR(priv->pll[1])) return PTR_ERR(priv->pll[1]); - priv->pll[2] = devm_clk_hw_register_fixed_factor(priv->dev, "pll2_out", + priv->pll[2] = clk_hw_register_fixed_factor(priv->dev, "pll2_out", "pll2_refclk", 0, 55, 1); if (IS_ERR(priv->pll[2])) return PTR_ERR(priv->pll[2]); diff --git a/drivers/pinctrl/pinctrl-starfive.c b/drivers/pinctrl/pinctrl-starfive.c index 7147f3e4446b..e461741de8cb 100644 --- a/drivers/pinctrl/pinctrl-starfive.c +++ b/drivers/pinctrl/pinctrl-starfive.c @@ -1187,11 +1187,11 @@ static void starfive_gpio_irq_handler(struct irq_desc *desc) mis = readl_relaxed(sfp->base + GPIOMIS + 0); for_each_set_bit(pin, &mis, 32) - generic_handle_domain_irq(sfp->gc.irq.domain, pin); + generic_handle_irq(irq_find_mapping(sfp->gc.irq.domain, pin)); mis = readl_relaxed(sfp->base + GPIOMIS + 4); for_each_set_bit(pin, &mis, 32) - generic_handle_domain_irq(sfp->gc.irq.domain, pin + 32); + generic_handle_irq(irq_find_mapping(sfp->gc.irq.domain, pin + 32)); chained_irq_exit(chip, desc); } diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 1fcb162f15c1..f98364db41ba 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -423,7 +423,7 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) p->serial_out = dw8250_serial_out38x; if (of_device_is_compatible(np, "starfive,jh7100-hsuart") || of_device_is_compatible(np, "starfive,jh7100-uart")) - p->set_termios = dw8250_do_set_termios; + p->set_termios = serial8250_do_set_termios; } else if (acpi_dev_present("APMC0D08", NULL, -1)) { p->iotype = UPIO_MEM32; |