From 940582b82915ee234594afff1a0290cead49a290 Mon Sep 17 00:00:00 2001 From: "xingyu.wu" Date: Fri, 6 May 2022 15:52:26 +0800 Subject: [PATCH] dts:starfive: Fix spi and qspi compilation warning Signed-off-by: xingyu.wu --- arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 2 +- arch/riscv/boot/dts/starfive/jh7110.dtsi | 6 +++--- drivers/spi/spi-pl022.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 arch/riscv/boot/dts/starfive/jh7110-common.dtsi diff --git a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi old mode 100644 new mode 100755 index 488b98b..21d2a2b --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi @@ -12,7 +12,7 @@ aliases { spi0="/soc/spi@13010000"; gpio0="/soc/gpio@13040000"; - ethernet0="/soc/gmac0@16030000"; + ethernet0="/soc/ethernet@16030000"; mmc0="/soc/sdio0@16010000"; mmc1="/soc/sdio1@16020000"; }; diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index 7cddd1d..7c75c1c 100755 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -275,8 +275,8 @@ status = "disabled"; }; - qspi: qspi@13010000 { - compatible = "cadence,qspi","cdns,qspi-nor"; + qspi: spi@13010000 { + compatible = "cdns,qspi-nor"; #address-cells = <1>; #size-cells = <0>; reg = <0x0 0x13010000 0x0 0x10000 @@ -1101,7 +1101,7 @@ status = "disabled"; }; - spi0: spi0@10060000 { + spi0: spi@10060000 { compatible = "arm,pl022", "arm,primecell"; reg = <0x0 0x10060000 0x0 0x10000>; clocks = <&clkgen JH7110_SPI0_CLK_APB>; diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 5e1ee45..633c460 100755 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2187,7 +2187,7 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id) pl022->rst = devm_reset_control_get_exclusive(&adev->dev, "rst_apb"); if (!IS_ERR(pl022->rst)) { status = reset_control_deassert(pl022->rst); - if(status){ + if (status) { dev_err(&adev->dev, "could not deassert SSP/SPI bus reset\n"); goto err_no_rst_clr; } -- 2.7.4