From: mason.huo <mason.huo@starfivetech.com>
Date: Fri, 6 May 2022 07:35:59 +0000 (+0800)
Subject: PCI: plda: Fix kernel compile warnings
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=157cf2806f0a92d517de95d525c4733a27ea8783;p=platform%2Fkernel%2Flinux-starfive.git

PCI: plda: Fix kernel compile warnings

Remove the unused functions.
Adjust the dts configuration.

Signed-off-by: mason.huo <mason.huo@starfivetech.com>
---

diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
old mode 100755
new mode 100644
index 7cddd1d..e0252bdb
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -1118,14 +1118,23 @@
 			status = "disabled";
 		};
 
-		pcie0: pcie0@2B000000 {
+		pcie0: pcie@2B000000 {
 			compatible = "plda,pci-xpressrich3-axi";
+			#address-cells = <3>;
+			#size-cells = <2>;
+			#interrupt-cells = <1>;
 			reg = <0x0 0x2B000000 0x0 0x1000000
 			       0x9 0x40000000 0x0 0x10000000>;
 			reg-names = "reg", "config";
+			device_type = "pci";
+			starfive,stg-syscon = <&stg_syscon 0xc0 0xc4 0x130>;
+			bus-range = <0x0 0xff>;
+			ranges = <0x82000000  0x0 0x30000000  0x0 0x30000000 0x0 0x06000000>;
+			msi-parent = <&plic>;
 			interrupts = <56>;
 			interrupt-controller;
 			interrupt-names = "msi";
+			interrupt-parent = <&plic>;
 			interrupt-map-mask = <0x0 0x0 0x0 0x7>;
 			interrupt-map = <0x0 0x0 0x0 0x1 &plic 0x1>,
 					<0x0 0x0 0x0 0x2 &plic 0x2>,
@@ -1143,28 +1152,20 @@
 				 <&clkgen JH7110_PCIE0_CLK_AXI_MST0>,
 				 <&clkgen JH7110_PCIE0_CLK_APB>;
 			clock-names =  "tl", "axi_mst0", "apb";
-			#interrupt-cells = <1>;
-			device_type = "pci";
-			starfive,stg-syscon = <&stg_syscon 0xc0 0xc4 0x130>;
-			bus-range = <0x0 0xff>;
-			msi-parent = <&plic>;
-			#address-cells = <3>;
-			#size-cells = <2>;
-			ranges = <0x82000000  0x0 0x30000000  0x0 0x30000000 0x0 0x06000000>;
 			status = "disabled";
 		};
 
-		pcie1:pcie1@2C000000 {
+		pcie1:pcie@2C000000 {
 			compatible = "plda,pci-xpressrich3-axi";
+			#address-cells = <3>;
+			#size-cells = <2>;
+			#interrupt-cells = <1>;
 			reg = <0x0 0x2C000000 0x0 0x1000000
 			       0x9 0xc0000000 0x0 0x10000000>;
 			reg-names = "reg", "config";
 			device_type = "pci";
 			starfive,stg-syscon = <&stg_syscon 0x270 0x274 0x2e0>;
 			bus-range = <0x0 0xff>;
-			#address-cells = <3>;
-			#size-cells = <2>;
-			#interrupt-cells = <1>;
 			ranges = <0x82000000  0x0 0x38000000  0x0 0x38000000 0x0 0x06000000>;
 			msi-parent = <&plic>;
 			interrupts = <57>;
diff --git a/drivers/pci/controller/pcie-plda.c b/drivers/pci/controller/pcie-plda.c
index be0dd7a..957f542 100644
--- a/drivers/pci/controller/pcie-plda.c
+++ b/drivers/pci/controller/pcie-plda.c
@@ -142,11 +142,6 @@ static inline u32 plda_readl(struct plda_pcie *pcie, const u32 reg)
 	return readl_relaxed(pcie->reg_base + reg);
 }
 
-static bool plda_pcie_link_is_up(struct plda_pcie *pcie)
-{
-	return !!((plda_readl(pcie, PCIE_BASIC_STATUS) & LINK_UP_MASK));
-}
-
 static bool plda_pcie_hide_rc_bar(struct pci_bus *bus, unsigned int  devfn,
 				  int offset)
 {
@@ -157,19 +152,6 @@ static bool plda_pcie_hide_rc_bar(struct pci_bus *bus, unsigned int  devfn,
 	return false;
 }
 
-static void __iomem *plda_map_bus(struct plda_pcie *pcie, unsigned char busno,
-				  unsigned int devfn,
-				  int where, u8 byte_en)
-{
-	plda_writel(pcie, (busno << CFGNUM_BUS_SHIFT) |
-			(devfn << CFGNUM_DEVFN_SHIFT) |
-			(byte_en << CFGNUM_BE_SHIFT) |
-			(1 << CFGNUM_FBE_SHIFT),
-			PCIE_CFGNUM);
-
-	return pcie->reg_base + CFG_SPACE + where;
-}
-
 static int _plda_pcie_config_read(struct plda_pcie *pcie, unsigned char busno,
 				  unsigned int devfn, int where, int size,
 				  u32 *value)