Merge branch 'CR_2522_ECO_EVB_515_samin.guo' into 'jh7110-5.15.y-devel'

CR_2522：support gmac with jh7110B-evb

See merge request sdk/linux!585

diff --git a/drivers/clk/starfive/clk-starfive-jh7110-sys.c b/drivers/clk/starfive/clk-starfive-jh7110-sys.c
index 2b02740..7b52a61 100644 (file)
--- a/drivers/clk/starfive/clk-starfive-jh7110-sys.c
+++ b/drivers/clk/starfive/clk-starfive-jh7110-sys.c
@@ -50,7 +50,7 @@ static const struct jh7110_clk_data jh7110_clk_sys_data[] __initconst = {
        JH7110_GATE(JH7110_AHB1, "ahb1", CLK_IS_CRITICAL, JH7110_STG_AXIAHB),
        JH7110__DIV(JH7110_APB_BUS_FUNC, "apb_bus_func",
                        8, JH7110_STG_AXIAHB),
-       JH7110_GATE(JH7110_APB0, "apb0", CLK_IGNORE_UNUSED, JH7110_APB_BUS),
+       JH7110_GATE(JH7110_APB0, "apb0", CLK_IS_CRITICAL, JH7110_APB_BUS),
        JH7110__DIV(JH7110_PLL0_DIV2, "pll0_div2", 2, JH7110_PLL0_OUT),
        JH7110__DIV(JH7110_PLL1_DIV2, "pll1_div2", 2, JH7110_PLL1_OUT),
        JH7110__DIV(JH7110_PLL2_DIV2, "pll2_div2", 2, JH7110_PLL2_OUT),

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index aa53d32..2111366 100755 (executable)
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -424,7 +424,7 @@ static int __init dw_i2c_init_driver(void)
 {
        return platform_driver_register(&dw_i2c_driver);
 }
-device_initcall(dw_i2c_init_driver);
+subsys_initcall(dw_i2c_init_driver);
 
 static void __exit dw_i2c_exit_driver(void)
 {

diff --git a/drivers/spi/spi-pl022-starfive.c b/drivers/spi/spi-pl022-starfive.c
old mode 100755 (executable)
new mode 100644 (file)
index 1e08aae..e7c96e5
--- a/drivers/spi/spi-pl022-starfive.c
+++ b/drivers/spi/spi-pl022-starfive.c
@@ -2249,13 +2249,15 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
                goto err_no_irq;
        }
 
+       /* dma is not used unless configured in the device tree */
+       platform_info->enable_dma = 0;
+
        /* If that failed, use channels from platform_info */
        if (status == 0)
                platform_info->enable_dma = 1;
-       else if (platform_flag) {
+       else if (platform_flag)
                platform_info->enable_dma = 0;
-               dev_info(&adev->dev, "work without dma!\n");
-       } else if (platform_info->enable_dma) {
+       else if (platform_info->enable_dma) {
                status = pl022_dma_probe(pl022);
                if (status != 0)
                        platform_info->enable_dma = 0;

diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
old mode 100755 (executable)
new mode 100644 (file)