pci: imx: remove weak overrides no longer used

There are no users of the imx6_pcie_toggle_power and imx6_pcie_toggle_reset
weak overrides and as these functions are able to be handled now via dt
properties lets remove these.

Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Tim Harvey <tharvey@gateworks.com>

diff --git a/arch/arm/include/asm/arch-mx6/sys_proto.h b/arch/arm/include/asm/arch-mx6/sys_proto.h
index c7542e4b04e1ba602ae761148a9b7f41ab73b945..7845fa8e56932d91bad33ba9b5c2f99d2073087a 100644 (file)
--- a/arch/arm/include/asm/arch-mx6/sys_proto.h
+++ b/arch/arm/include/asm/arch-mx6/sys_proto.h
@@ -18,9 +18,6 @@
 #define is_usbotg_phy_active(void) (!(readl(USB_PHY0_BASE_ADDR + USBPHY_PWD) & \
                                   USBPHY_PWD_RXPWDRX))
 
-int imx6_pcie_toggle_power(struct udevice *vpcie);
-int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high);
-
 enum ldo_reg {
        LDO_ARM,
        LDO_SOC,

diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c
index f8daedbce359832072d4658b1bd1b2403d2730c8..46ac01713ff73f79b86799f4c239be0240789fe9 100644 (file)
--- a/drivers/pci/pcie_imx.c
+++ b/drivers/pci/pcie_imx.c
@@ -532,7 +532,7 @@ static int imx6_pcie_init_phy(void)
        return 0;
 }
 
-__weak int imx6_pcie_toggle_power(struct udevice *vpcie)
+int imx6_pcie_toggle_power(struct udevice *vpcie)
 {
 #ifdef CONFIG_PCIE_IMX_POWER_GPIO
        gpio_request(CONFIG_PCIE_IMX_POWER_GPIO, "pcie_power");
@@ -554,7 +554,7 @@ __weak int imx6_pcie_toggle_power(struct udevice *vpcie)
        return 0;
 }
 
-__weak int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
+int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
 {
        /*
         * See 'PCI EXPRESS BASE SPECIFICATION, REV 3.0, SECTION 6.6.1'
@@ -570,12 +570,6 @@ __weak int imx6_pcie_toggle_reset(struct gpio_desc *gpio, bool active_high)
         * configuration file and the condition below will handle the rest
         * of the reset toggling.
         *
-        * In case your #PERST toggling logic is more complex, for example
-        * connected via CPLD or somesuch, you can override this function
-        * in your board file and implement reset logic as needed. You must
-        * not forget to wait at least 20 ms after de-asserting #PERST in
-        * this case either though.
-        *
         * In case your #PERST line of the PCIe EP device is not connected
         * at all, your design is broken and you should fix your design,
         * otherwise you will observe problems like for example the link