[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-460-g3f3c3c6
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-460-g3f3c3c6
|
From: jorasse <jo...@us...> - 2014-10-29 19:04:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 3f3c3c6030eb6eb64e10015c0c1beadacd0032c0 (commit)
from cdb5c302f4a670a7e430467adb4d59a61ce4e82a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3f3c3c6030eb6eb64e10015c0c1beadacd0032c0
Author: Eric Jarrige <eri...@ar...>
Date: Wed Oct 29 20:02:42 2014 +0100
[LINUX] 3.18: clean up patchwork
-----------------------------------------------------------------------
Summary of changes:
...dd_board_to_linux_build_system.patch.dont_apply | 60 --------
...s-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 | 83 -----------
...-usbmisc_imx-add_imx51_support.patch.dont_build | 143 --------------------
...platfrom-get_max_timeout_count-hook.patch.tofix | 60 --------
...-incorrect-max_discard_to-for-uSDHC.patch.tofix | 54 --------
...sdhci-add-platform-set_timeout-hook.patch.tofix | 84 ------------
...correct-max-timeout-value-for-uSDHC.patch.tofix | 62 ---------
...SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix | 124 -----------------
...-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 | 96 -------------
...fig-space-as-platform-resource.patch.dont_apply | 30 ----
...x6-fix-occasional-link-failure.patch.dont_apply | 29 ----
11 files changed, 0 insertions(+), 825 deletions(-)
delete mode 100644 patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
delete mode 100644 patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
delete mode 100644 patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
delete mode 100644 patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
delete mode 100644 patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
delete mode 100644 patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
delete mode 100644 patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
delete mode 100644 patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
delete mode 100644 patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
delete mode 100644 patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
delete mode 100644 patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
diff --git a/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply b/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
deleted file mode 100644
index 7dfaa54..0000000
--- a/patches/linux/3.18/0024-armadeus-apf9328-add_board_to_linux_build_system.patch.dont_apply
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/Kconfig
-===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Kconfig 2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Kconfig 2013-01-01 21:22:49.000000000 +0100
-@@ -202,10 +202,43 @@
- bool "APF9328"
- select IMX_HAVE_PLATFORM_IMX_I2C
- select IMX_HAVE_PLATFORM_IMX_UART
-+ select IMX_HAVE_PLATFORM_SPI_IMX
-+ select IMX_HAVE_PLATFORM_IMX_FB
-+ select IMX_HAVE_PLATFORM_MXC_PWM
-+ select IMX_HAVE_PLATFORM_IMX_UDC
-+ select SERIAL_IMX_UART1
- select SOC_IMX1
- help
- Say Yes here if you are using the Armadeus APF9328 development board
-
-+choice
-+ prompt "Flash available on board"
-+ depends on MACH_APF9328
-+ default IMX_APF9328_FLASH_16MB
-+
-+config IMX_APF9328_FLASH_8MB
-+ bool "8MB"
-+
-+config IMX_APF9328_FLASH_16MB
-+ bool "16MB"
-+
-+endchoice
-+
-+choice
-+ prompt "Baseboard"
-+ depends on MACH_APF9328
-+ default MACH_APF9328_DEV
-+
-+config MACH_APF9328_DEV
-+ prompt "DevLight/DevFull"
-+ bool
-+ help
-+ This selects the APF9328_DevLight/DevFull as baseboard. You have
-+ to manually activates the devices you want to use if you have a
-+ DevFull.
-+
-+endchoice
-+
- endif
-
- if ARCH_MULTI_V5
-Index: linux-3.8-rc1/arch/arm/mach-imx/Makefile
-===================================================================
---- linux-3.8-rc1.orig/arch/arm/mach-imx/Makefile 2012-12-22 02:19:00.000000000 +0100
-+++ linux-3.8-rc1/arch/arm/mach-imx/Makefile 2013-01-01 21:22:49.000000000 +0100
-@@ -42,6 +42,7 @@
- obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
- obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
- obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
-+obj-$(CONFIG_MACH_APF9328_DEV) += apf9328-dev.o
-
- # i.MX21 based machines
- obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
diff --git a/patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2 b/patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
deleted file mode 100644
index c946277..0000000
--- a/patches/linux/3.18/0232-armadeus-net-phy-fix_smsc_reset.patch.applied-3.17-rc2
+++ /dev/null
@@ -1,83 +0,0 @@
-LAN87xx needs to be wake up before reset. By default, smsc driver does not
-provides soft_reset function and it's the default reset function is used. Due
-to that, the phy initialization fails.
-
-Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
----
---- linux-3.16/drivers/net/phy/smsc.c
-+++ linux-3.16/drivers/net/phy/smsc.c
-@@ -43,6 +43,22 @@ static int smsc_phy_ack_interrupt(struct
-
- static int smsc_phy_config_init(struct phy_device *phydev)
- {
-+ int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
-+
-+ if (rc < 0)
-+ return rc;
-+
-+ /* Enable energy detect mode for this SMSC Transceivers */
-+ rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,
-+ rc | MII_LAN83C185_EDPWRDOWN);
-+ if (rc < 0)
-+ return rc;
-+
-+ return smsc_phy_ack_interrupt(phydev);
-+}
-+
-+static int smsc_phy_reset(struct phy_device *phydev)
-+{
- int rc = phy_read(phydev, MII_LAN83C185_SPECIAL_MODES);
- if (rc < 0)
- return rc;
-@@ -66,18 +82,7 @@ static int smsc_phy_config_init(struct p
- rc = phy_read(phydev, MII_BMCR);
- } while (rc & BMCR_RESET);
- }
--
-- rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);
-- if (rc < 0)
-- return rc;
--
-- /* Enable energy detect mode for this SMSC Transceivers */
-- rc = phy_write(phydev, MII_LAN83C185_CTRL_STATUS,
-- rc | MII_LAN83C185_EDPWRDOWN);
-- if (rc < 0)
-- return rc;
--
-- return smsc_phy_ack_interrupt (phydev);
-+ return 0;
- }
-
- static int lan911x_config_init(struct phy_device *phydev)
-@@ -142,6 +147,7 @@ static struct phy_driver smsc_phy_driver
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .config_init = smsc_phy_config_init,
-+ .soft_reset = smsc_phy_reset,
-
- /* IRQ related */
- .ack_interrupt = smsc_phy_ack_interrupt,
-@@ -164,6 +170,7 @@ static struct phy_driver smsc_phy_driver
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .config_init = smsc_phy_config_init,
-+ .soft_reset = smsc_phy_reset,
-
- /* IRQ related */
- .ack_interrupt = smsc_phy_ack_interrupt,
-@@ -186,6 +193,7 @@ static struct phy_driver smsc_phy_driver
- .config_aneg = genphy_config_aneg,
- .read_status = genphy_read_status,
- .config_init = smsc_phy_config_init,
-+ .soft_reset = smsc_phy_reset,
-
- /* IRQ related */
- .ack_interrupt = smsc_phy_ack_interrupt,
-@@ -230,6 +238,7 @@ static struct phy_driver smsc_phy_driver
- .config_aneg = genphy_config_aneg,
- .read_status = lan87xx_read_status,
- .config_init = smsc_phy_config_init,
-+ .soft_reset = smsc_phy_reset,
-
- /* IRQ related */
- .ack_interrupt = smsc_phy_ack_interrupt,
diff --git a/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build b/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
deleted file mode 100644
index 76a8fd5..0000000
--- a/patches/linux/3.18/0408-armadeus-imx51-chipidea-usbmisc_imx-add_imx51_support.patch.dont_build
+++ /dev/null
@@ -1,143 +0,0 @@
-Index: linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
-===================================================================
---- linux-3.12-rc1.orig/drivers/usb/chipidea/usbmisc_imx.c
-+++ linux-3.12-rc1/drivers/usb/chipidea/usbmisc_imx.c
-@@ -21,6 +21,23 @@
- #define MX25_USB_PHY_CTRL_OFFSET 0x08
- #define MX25_BM_EXTERNAL_VBUS_DIVIDER BIT(23)
-
-+#define MX51_USB_OTG_PHY_CTRL_OFFSET 0x00
-+#define MX51_USB_OTG_PHY_CTRL_0_OFFSET 0x08
-+#define MX51_USB_OTG_PHY_CTRL_1_OFFSET 0x0c
-+#define MX51_USB_CTRL_1_OFFSET 0x10
-+#define MX51_USB_UH2_CTRL_OFFSET 0x14
-+#define MX51_USB_UH3_CTRL_OFFSET 0x18
-+#define MX51_USB_CTRL_OTG_EXT_CLK_EN (1 << 25)
-+#define MX51_USB_CTRL_UH1_EXT_CLK_EN (1 << 25)
-+#define MX51_USB_CTRL_UH2_EXT_CLK_EN (1 << 26)
-+#define MX51_USB_CTRL_UH3_EXT_CLK_EN (1 << 26)
-+#define MX51_USB_UTMI_PHYCTRL1_PLLDIV_MASK 0x3
-+#define MX51_USB_PLL_DIV_19_2_MHZ 0x01
-+#define MX51_BM_OVER_CUR_DIS_H2 BIT(4)
-+#define MX51_BM_OVER_CUR_DIS_H1 BIT(8)
-+#define MX51_BM_OVER_CUR_DIS_OTG BIT(24)
-+#define MX51_BM_OVER_CUR_DIS_UHx BIT(30)
-+
- #define MX53_USB_OTG_PHY_CTRL_0_OFFSET 0x08
- #define MX53_USB_UH2_CTRL_OFFSET 0x14
- #define MX53_USB_UH3_CTRL_OFFSET 0x18
-@@ -68,6 +85,91 @@ static int usbmisc_imx25_post(struct imx
- return 0;
- }
-
-+static int usbmisc_imx51_init(struct imx_usbmisc_data *data)
-+{
-+ void __iomem *reg = NULL;
-+ unsigned long flags;
-+ u32 val = 0;
-+
-+ if (data->index > 3)
-+ return -EINVAL;
-+
-+ if (data->index == 0) {
-+ spin_lock_irqsave(&usbmisc->lock, flags);
-+ reg = usbmisc->base + MX51_USB_OTG_PHY_CTRL_1_OFFSET;
-+ val = readl(reg) & ~MX51_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
-+ val |= MX51_USB_PLL_DIV_19_2_MHZ;
-+ writel(val, reg);
-+ spin_unlock_irqrestore(&usbmisc->lock, flags);
-+ }
-+
-+ if (data->disable_oc) {
-+ spin_lock_irqsave(&usbmisc->lock, flags);
-+ switch (data->index) {
-+ case 0:
-+ reg = usbmisc->base + MX51_USB_OTG_PHY_CTRL_OFFSET;
-+ val = readl(reg) | MX51_BM_OVER_CUR_DIS_OTG;
-+ break;
-+ case 1:
-+ reg = usbmisc->base + MX51_USB_OTG_PHY_CTRL_0_OFFSET;
-+ val = readl(reg) | MX51_BM_OVER_CUR_DIS_H1;
-+ break;
-+ case 2:
-+ reg = usbmisc->base + MX51_USB_UH2_CTRL_OFFSET;
-+ val = readl(reg) | MX51_BM_OVER_CUR_DIS_H2;
-+ break;
-+ }
-+ writel(val, reg);
-+ spin_unlock_irqrestore(&usbmisc->lock, flags);
-+ }
-+
-+ if (data->index == 1) {
-+ reg = ioremap(0x73f80000+0x200+0x140, SZ_4K);
-+ val = readl(reg) & (~(0xff<<16));
-+ writel(val, reg);
-+ iounmap(reg);
-+ }
-+
-+ return 0;
-+}
-+
-+static int usbmisc_imx51_post(struct imx_usbmisc_data *data)
-+{
-+ void __iomem *reg = NULL;
-+ unsigned long flags;
-+ u32 val = 0;
-+
-+ if (data->index > 3)
-+ return -EINVAL;
-+
-+ if (data->ext_clk_en) {
-+ spin_lock_irqsave(&usbmisc->lock, flags);
-+ switch (data->index) {
-+ case 0:
-+ reg = usbmisc->base + MX51_USB_CTRL_1_OFFSET;
-+ val = readl(reg) | MX51_USB_CTRL_OTG_EXT_CLK_EN;
-+ break;
-+ case 1:
-+ reg = usbmisc->base + MX51_USB_CTRL_1_OFFSET;
-+ val = readl(reg) | MX51_USB_CTRL_UH1_EXT_CLK_EN;
-+ break;
-+ case 2:
-+ reg = usbmisc->base + MX51_USB_CTRL_1_OFFSET;
-+ val = readl(reg) | MX51_USB_CTRL_UH2_EXT_CLK_EN;
-+ break;
-+ case 3:
-+ reg = usbmisc->base + MX51_USB_CTRL_1_OFFSET;
-+ val = readl(reg) | MX51_USB_CTRL_UH3_EXT_CLK_EN;
-+ break;
-+ }
-+ if (reg && val)
-+ writel(val, reg);
-+ spin_unlock_irqrestore(&usbmisc->lock, flags);
-+ }
-+
-+ return 0;
-+}
-+
- static int usbmisc_imx53_init(struct imx_usbmisc_data *data)
- {
- void __iomem *reg = NULL;
-@@ -128,6 +230,11 @@ static const struct usbmisc_ops imx25_us
- .post = usbmisc_imx25_post,
- };
-
-+static const struct usbmisc_ops imx51_usbmisc_ops = {
-+ .init = usbmisc_imx51_init,
-+ .post = usbmisc_imx51_post,
-+};
-+
- static const struct usbmisc_ops imx53_usbmisc_ops = {
- .init = usbmisc_imx53_init,
- };
-@@ -162,6 +269,10 @@ static const struct of_device_id usbmisc
- .data = &imx25_usbmisc_ops,
- },
- {
-+ .compatible = "fsl,imx51-usbmisc",
-+ .data = &imx51_usbmisc_ops,
-+ },
-+ {
- .compatible = "fsl,imx53-usbmisc",
- .data = &imx53_usbmisc_ops,
- },
diff --git a/patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix b/patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
deleted file mode 100644
index ad2553c..0000000
--- a/patches/linux/3.18/0498-v2-1-5-mmc-sdhci-add-platfrom-get_max_timeout_count-hook.patch.tofix
+++ /dev/null
@@ -1,60 +0,0 @@
-From patchwork Tue Dec 17 08:16:27 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2,1/5] mmc: sdhci: add platfrom get_max_timeout_count hook
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359651
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:27 +0800
-
-Currently the max_discard_to is simply got by (1 << 27) / host->timeout_clk
-which is assumed to be the maximum timeout value, however, some platforms
-maximum timeout counter may not be 1 << 27, e.g. i.MX uSDHC is 1 << 28.
-Thus 1 << 27 may not be correct for such platforms.
-
-It is also possible that other platforms may have different problems.
-To be flexible, we add a get_max_timeout_count hook to get the correct
-maximum timeout value for these platforms.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci.c | 4 +++-
- drivers/mmc/host/sdhci.h | 1 +
- 2 files changed, 4 insertions(+), 1 deletions(-)
-
-Index: linux-3.15-rc1/drivers/mmc/host/sdhci.c
-===================================================================
---- linux-3.15-rc1.orig/drivers/mmc/host/sdhci.c
-+++ linux-3.15-rc1/drivers/mmc/host/sdhci.c
-@@ -2938,8 +2938,9 @@ int sdhci_add_host(struct sdhci_host *ho
- if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
- host->timeout_clk = mmc->f_max / 1000;
-
-- mmc->max_busy_timeout = (1 << 27) / host->timeout_clk;
--
-+ mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
-+ host->ops->get_max_timeout_count(host) : 1 << 27;
-+ mmc->max_busy_timeout /= host->timeout_clk;
- mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
-
- if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12)
-Index: linux-3.15-rc1/drivers/mmc/host/sdhci.h
-===================================================================
---- linux-3.15-rc1.orig/drivers/mmc/host/sdhci.h
-+++ linux-3.15-rc1/drivers/mmc/host/sdhci.h
-@@ -281,6 +281,7 @@ struct sdhci_ops {
- unsigned int (*get_max_clock)(struct sdhci_host *host);
- unsigned int (*get_min_clock)(struct sdhci_host *host);
- unsigned int (*get_timeout_clock)(struct sdhci_host *host);
-+ unsigned int (*get_max_timeout_count)(struct sdhci_host *host);
- int (*platform_bus_width)(struct sdhci_host *host,
- int width);
- void (*platform_send_init_74_clocks)(struct sdhci_host *host,
diff --git a/patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix b/patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
deleted file mode 100644
index 36593ae..0000000
--- a/patches/linux/3.18/0499-v2-2-5-mmc-sdhci-esdhc-imx-fix-incorrect-max_discard_to-for-uSDHC.patch.tofix
+++ /dev/null
@@ -1,54 +0,0 @@
-From patchwork Tue Dec 17 08:16:28 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2, 2/5] mmc: sdhci-esdhc-imx: fix incorrect max_discard_to for uSDHC
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359661
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:28 +0800
-
-The default sdhci code use the 1 << 27 as the max timeout counter to
-to calculate the max_discard_to, however it's not correct for uSDHC
-since its the max counter is 1 << 28.
-Implement esdhc_get_max_timeout to handle it correctly.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci-esdhc-imx.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index de2655e..5d9b56d 100644
---- a/drivers/mmc/host/sdhci-esdhc-imx.c
-+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -880,6 +880,14 @@ static int esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs)
- return esdhc_change_pinstate(host, uhs);
- }
-
-+static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host)
-+{
-+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+ struct pltfm_imx_data *imx_data = pltfm_host->priv;
-+
-+ return esdhc_is_usdhc(imx_data) ? 1 << 28 : 1 << 27;
-+}
-+
- static struct sdhci_ops sdhci_esdhc_ops = {
- .read_l = esdhc_readl_le,
- .read_w = esdhc_readw_le,
-@@ -892,6 +900,7 @@ static struct sdhci_ops sdhci_esdhc_ops = {
- .get_ro = esdhc_pltfm_get_ro,
- .platform_bus_width = esdhc_pltfm_bus_width,
- .set_uhs_signaling = esdhc_set_uhs_signaling,
-+ .get_max_timeout_count = esdhc_get_max_timeout_count,
- };
-
- static const struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
diff --git a/patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix b/patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
deleted file mode 100644
index 368ac34..0000000
--- a/patches/linux/3.18/0500-v2-3-5-mmc-sdhci-add-platform-set_timeout-hook.patch.tofix
+++ /dev/null
@@ -1,84 +0,0 @@
-From patchwork Tue Dec 17 08:16:29 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2,3/5] mmc: sdhci: add platform set_timeout hook
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359671
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:29 +0800
-
-Currently the common code assume 0xE is the maximum timeout counter
-value and use it to write into the timeout counter register.
-However, it's fairly possible that some other SoCs may have different
-max timeout register value. That means 0xE may be incorrect and
-becomes meaningless.
-
-It's also possible that other platforms has different timeout
-calculation algorithm. To be flexible, this patch provides a .set_timeout
-hook for those platforms to set the timeout on their way if they need.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci.c | 19 ++++++++++++++-----
- drivers/mmc/host/sdhci.h | 2 ++
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
-index 7fef3bb..47ecf50 100644
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -726,19 +726,28 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host)
- sdhci_clear_set_irqs(host, dma_irqs, pio_irqs);
- }
-
--static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
-+static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
- {
- u8 count;
-+
-+ if (host->ops->set_timeout) {
-+ host->ops->set_timeout(host, cmd);
-+ } else {
-+ count = sdhci_calc_timeout(host, cmd);
-+ sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
-+ }
-+}
-+
-+static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
-+{
- u8 ctrl;
- struct mmc_data *data = cmd->data;
- int ret;
-
- WARN_ON(host->data);
-
-- if (data || (cmd->flags & MMC_RSP_BUSY)) {
-- count = sdhci_calc_timeout(host, cmd);
-- sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
-- }
-+ if (data || (cmd->flags & MMC_RSP_BUSY))
-+ sdhci_set_timeout(host, cmd);
-
- if (!data)
- return;
-diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
-index acba9a7..25c1572 100644
---- a/drivers/mmc/host/sdhci.h
-+++ b/drivers/mmc/host/sdhci.h
-@@ -282,6 +282,8 @@ struct sdhci_ops {
- unsigned int (*get_min_clock)(struct sdhci_host *host);
- unsigned int (*get_timeout_clock)(struct sdhci_host *host);
- unsigned int (*get_max_timeout_count)(struct sdhci_host *host);
-+ void (*set_timeout)(struct sdhci_host *host,
-+ struct mmc_command *cmd);
- int (*platform_bus_width)(struct sdhci_host *host,
- int width);
- void (*platform_send_init_74_clocks)(struct sdhci_host *host,
diff --git a/patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix b/patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
deleted file mode 100644
index 05a5823..0000000
--- a/patches/linux/3.18/0501-v2-4-5-mmc-sdhci-esdhc-imx-set-the-correct-max-timeout-value-for-uSDHC.patch.tofix
+++ /dev/null
@@ -1,62 +0,0 @@
-From patchwork Tue Dec 17 08:16:30 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2, 4/5] mmc: sdhci-esdhc-imx: set the correct max timeout value for
- uSDHC
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359681
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:30 +0800
-
-The default sdhci driver write 0xE into timeout counter register to
-set the maximum timeout. The value is not correct for uSDHC since the
-max counter value for uSDHC is 0xF.
-Instead of using common timeout code in sdhci, we implement esdhc_set_timeout
-to handle the difference between eSDHC and uSDHC.
-
-Currently we simply set the max timeout value as before.
-But in the future, we probably may implement IMX specific timeout
-setting algorithm and use suitable timeout for different CMDs.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci-esdhc-imx.c | 11 +++++++++++
- 1 files changed, 11 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index 5d9b56d..2a04847 100644
---- a/drivers/mmc/host/sdhci-esdhc-imx.c
-+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -888,6 +888,16 @@ static unsigned int esdhc_get_max_timeout_count(struct sdhci_host *host)
- return esdhc_is_usdhc(imx_data) ? 1 << 28 : 1 << 27;
- }
-
-+static void esdhc_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
-+{
-+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-+ struct pltfm_imx_data *imx_data = pltfm_host->priv;
-+
-+ /* use maximum timeout counter */
-+ sdhci_writeb(host, esdhc_is_usdhc(imx_data) ? 0xF : 0xE,
-+ SDHCI_TIMEOUT_CONTROL);
-+}
-+
- static struct sdhci_ops sdhci_esdhc_ops = {
- .read_l = esdhc_readl_le,
- .read_w = esdhc_readw_le,
-@@ -901,6 +911,7 @@ static struct sdhci_ops sdhci_esdhc_ops = {
- .platform_bus_width = esdhc_pltfm_bus_width,
- .set_uhs_signaling = esdhc_set_uhs_signaling,
- .get_max_timeout_count = esdhc_get_max_timeout_count,
-+ .set_timeout = esdhc_set_timeout,
- };
-
- static const struct sdhci_pltfm_data sdhci_esdhc_imx_pdata = {
diff --git a/patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix b/patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
deleted file mode 100644
index 9eeb6be..0000000
--- a/patches/linux/3.18/0502-v2-5-5-mmc-sdhci-calculate-max_discard_to-dynamically-for-SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK.patch.tofix
+++ /dev/null
@@ -1,124 +0,0 @@
-From patchwork Tue Dec 17 08:16:31 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v2, 5/5] mmc: sdhci: calculate max_discard_to dynamically for
- SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK
-From: Aisheng Dong <b2...@fr...>
-X-Patchwork-Id: 3359691
-Message-Id: <138...@fr...>
-To: <lin...@vg...>
-Cc: ulf...@li..., sha...@li...,
- ed....@al...,
- s....@pe..., adr...@in...,
- vla...@me..., cj...@la..., b2...@fr...,
- lin...@li...
-Date: Tue, 17 Dec 2013 16:16:31 +0800
-
-For host controllers using SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK, since the card
-clock is changed dynamically for different cards, it does not make sense
-to use the maximum host clock to calculate max_discard_to which may lead
-the max_discard_to to be much smaller than its capbility and affect the card
-discard performance a lot.
-e.g. the host clock is 200Mhz, but the card is working on 50Mhz. Then the
-max_discard_to is only 1/4 of its real capbility.
-
-In this patch, it uses the actual_clock to calculate the max_discard_to
-dynamically as long as a new clock speed is set.
-
-Tested with a high speed SDHC card shows:
-Originally:
-mmc1: new high speed SDHC card at address aaaa
-mmc1: calculated max. discard sectors 49152 for timeout 1355 ms
-Now:
-mmc1: new high speed SDHC card at address aaaa
-mmc1: calculated max. discard sectors 712704 for timeout 5422 ms
-The max_discard_sectors will increase a lot which will also improve discard
-performance a lot.
-
-The one known limitation of this approach is that it does not cover the special
-case for user changes the clock via sysfs, since the max_discard_to is only
-initialised for one time during the mmc queue init.
-
-Signed-off-by: Dong Aisheng <b2...@fr...>
-
----
-drivers/mmc/host/sdhci.c | 47 +++++++++++++++++++++++++++------------------
- 1 files changed, 28 insertions(+), 19 deletions(-)
-
-Index: linux-3.15-rc1/drivers/mmc/host/sdhci.c
-===================================================================
---- linux-3.15-rc1.orig/drivers/mmc/host/sdhci.c
-+++ linux-3.15-rc1/drivers/mmc/host/sdhci.c
-@@ -1160,7 +1160,7 @@ static void sdhci_set_clock(struct sdhci
- if (host->ops->set_clock) {
- host->ops->set_clock(host, clock);
- if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK)
-- return;
-+ goto out;
- }
-
- sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
-@@ -1259,6 +1259,16 @@ clock_set:
-
- out:
- host->clock = clock;
-+
-+ /* update timeout_clk and max_busy_timeout once the SDCLK is changed */
-+ if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK && clock) {
-+ host->timeout_clk = host->mmc->actual_clock ?
-+ host->mmc->actual_clock / 1000 :
-+ host->clock / 1000;
-+ host->mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
-+ host->ops->get_max_timeout_count(host) : 1 << 27;
-+ host->mmc->max_busy_timeout /= host->timeout_clk;
-+ }
- }
-
- static inline void sdhci_update_clock(struct sdhci_host *host)
-@@ -2929,27 +2939,27 @@ int sdhci_add_host(struct sdhci_host *ho
- } else
- mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200;
-
-- host->timeout_clk =
-- (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
-- if (host->timeout_clk == 0) {
-- if (host->ops->get_timeout_clock) {
-- host->timeout_clk = host->ops->get_timeout_clock(host);
-- } else if (!(host->quirks &
-- SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
-- pr_err("%s: Hardware doesn't specify timeout clock "
-- "frequency.\n", mmc_hostname(mmc));
-- return -ENODEV;
-+ if (!(host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
-+ host->timeout_clk = (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >>
-+ SDHCI_TIMEOUT_CLK_SHIFT;
-+ if (host->timeout_clk == 0) {
-+ if (host->ops->get_timeout_clock) {
-+ host->timeout_clk =
-+ host->ops->get_timeout_clock(host);
-+ } else {
-+ pr_err("%s: Hardware doesn't specify timeout"
-+ "clock frequency.\n", mmc_hostname(mmc));
-+ return -ENODEV;
-+ }
- }
-- }
-- if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
-- host->timeout_clk *= 1000;
-+ if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
-+ host->timeout_clk *= 1000;
-
-- if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
-- host->timeout_clk = mmc->f_max / 1000;
-+ mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
-+ host->ops->get_max_timeout_count(host) : 1 << 27;
-+ mmc->max_busy_timeout /= host->timeout_clk;
-+ }
-
-- mmc->max_busy_timeout = host->ops->get_max_timeout_count ?
-- host->ops->get_max_timeout_count(host) : 1 << 27;
-- mmc->max_busy_timeout /= host->timeout_clk;
- mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
-
- if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12)
diff --git a/patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3 b/patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
deleted file mode 100644
index 23a02fa..0000000
--- a/patches/linux/3.18/0506-usb-gadget-remove-PWD-in-ccflags-y.patch.applied-3.17-rc3
+++ /dev/null
@@ -1,96 +0,0 @@
-From 33cf4516f3e77a07bff59abdf8e74588573a2fd8 Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@gm...>
-Date: Sun, 17 Aug 2014 23:04:39 +0200
-Subject: [PATCH] usb: gadget: remove $(PWD) in ccflags-y
-
-The variable $(PWD) is useless, and it may break the compilation.
-For example, it breaks the kernel compilation when it's done with
-buildroot :
-
- /home/trem/Codes/armadeus/armadeus/buildroot/output/host/usr/bin/ccache
-/home/trem/Codes/armadeus/armadeus/buildroot/output/host/usr/bin/arm-buildroot-linux-uclibcgnueabi-gcc
--Wp,-MD,drivers/usb/gadget/legacy/.hid.o.d -nostdinc -isystem
-/home/trem/Codes/armadeus/armadeus/buildroot/output/host/usr/lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.7.3/include
--I./arch/arm/include -Iarch/arm/include/generated -Iinclude
--I./arch/arm/include/uapi -Iarch/arm/include/generated/uapi
--I./include/uapi -Iinclude/generated/uapi -include
-./include/linux/kconfig.h -D__KERNEL__ -mlittle-endian -Wall -Wundef
--Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common
--Werror-implicit-function-declaration -Wno-format-security
--fno-dwarf2-cfi-asm -mabi=aapcs-linux -mno-thumb-interwork -mfpu=vfp
--funwind-tables -marm -D__LINUX_ARM_ARCH__=5 -march=armv5te
--mtune=arm9tdmi -msoft-float -Uarm -fno-delete-null-pointer-checks -O2
---param=allow-store-data-races=0 -Wframe-larger-than=1024
--fno-stack-protector -Wno-unused-but-set-variable -fomit-frame-pointer
--fno-var-tracking-assignments -g -Wdeclaration-after-statement
--Wno-pointer-sign -fno-strict-overflow -fconserve-stack
--Werror=implicit-int -Werror=strict-prototypes -DCC_HAVE_ASM_GOTO
--I/home/trem/Codes/armadeus/armadeus/buildroot/drivers/usb/gadget/
--I/home/trem/Codes/armadeus/armadeus/buildroot/drivers/usb/gadget/udc/
--I/home/trem/Codes/armadeus/armadeus/buildroot/drivers/usb/gadget/function/
--DMODULE -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(hid)"
--D"KBUILD_MODNAME=KBUILD_STR(g_hid)" -c -o
-drivers/usb/gadget/legacy/hid.o drivers/usb/gadget/legacy/hid.c
-drivers/usb/gadget/epautoconf.c:23:26: erreur fatale: gadget_chips.h :
-Aucun fichier ou dossier de ce type
-
-This compilation line include :
-..../buildroot/driver/usb/gadget
-but the real path is :
-..../buildroot/output/build/linux-3.17-rc1/driver/usb/gadget
-
-Signed-off-by: Philippe Reynes <tr...@gm...>
----
- drivers/usb/gadget/Makefile | 2 +-
- drivers/usb/gadget/function/Makefile | 4 ++--
- drivers/usb/gadget/legacy/Makefile | 6 +++---
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
-index a186afe..9add915 100644
---- a/drivers/usb/gadget/Makefile
-+++ b/drivers/usb/gadget/Makefile
-@@ -3,7 +3,7 @@
- #
- subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG
- subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE) += -DVERBOSE_DEBUG
--ccflags-y += -I$(PWD)/drivers/usb/gadget/udc
-+ccflags-y += -Idrivers/usb/gadget/udc
-
- obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o
- libcomposite-y := usbstring.o config.o epautoconf.o
-diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile
-index 6d91f21..83ae106 100644
---- a/drivers/usb/gadget/function/Makefile
-+++ b/drivers/usb/gadget/function/Makefile
-@@ -2,8 +2,8 @@
- # USB peripheral controller drivers
- #
-
--ccflags-y := -I$(PWD)/drivers/usb/gadget/
--ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
-+ccflags-y := -Idrivers/usb/gadget/
-+ccflags-y += -Idrivers/usb/gadget/udc/
-
- # USB Functions
- usb_f_acm-y := f_acm.o
-diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile
-index a11aad5..edba2d1 100644
---- a/drivers/usb/gadget/legacy/Makefile
-+++ b/drivers/usb/gadget/legacy/Makefile
-@@ -2,9 +2,9 @@
- # USB gadget drivers
- #
-
--ccflags-y := -I$(PWD)/drivers/usb/gadget/
--ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/
--ccflags-y += -I$(PWD)/drivers/usb/gadget/function/
-+ccflags-y := -Idrivers/usb/gadget/
-+ccflags-y += -Idrivers/usb/gadget/udc/
-+ccflags-y += -Idrivers/usb/gadget/function/
-
- g_zero-y := zero.o
- g_audio-y := audio.o
---
-1.7.4.4
-
diff --git a/patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply b/patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
deleted file mode 100644
index 90ce2f8..0000000
--- a/patches/linux/3.18/0507-ARM-imx6-add-pci-config-space-as-platform-resource.patch.dont_apply
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
-index 9455fd0ec830..6fbba53a309b 100644
---- a/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
-+++ b/Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
-@@ -17,7 +17,9 @@ Example:
-
- pcie@0x01000000 {
- compatible = "fsl,imx6q-pcie", "snps,dw-pcie";
-- reg = <0x01ffc000 0x4000>;
-+ reg = <0x01ffc000 0x04000>,
-+ <0x01f00000 0x80000>;
-+ reg-names = "dbi", "config";
- #address-cells = <3>;
- #size-cells = <2>;
- device_type = "pci";
-diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
-index ce0599134a69..6b5da2a98aaf 100644
---- a/arch/arm/boot/dts/imx6qdl.dtsi
-+++ b/arch/arm/boot/dts/imx6qdl.dtsi
-@@ -133,7 +133,9 @@
-
- pcie: pcie@0x01000000 {
- compatible = "fsl,imx6q-pcie", "snps,dw-pcie";
-- reg = <0x01ffc000 0x4000>; /* DBI */
-+ reg = <0x01ffc000 0x04000>,
-+ <0x01f00000 0x80000>;
-+ reg-names = "dbi", "config";
- #address-cells = <3>;
- #size-cells = <2>;
- device_type = "pci";
diff --git a/patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply b/patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
deleted file mode 100644
index 2cec0e3..0000000
--- a/patches/linux/3.18/0508-PCI-imx6-fix-occasional-link-failure.patch.dont_apply
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
-index 1be6073..9b6bab9 100644
---- a/drivers/pci/host/pci-imx6.c
-+++ b/drivers/pci/host/pci-imx6.c
-@@ -256,11 +256,6 @@ static int imx6_pcie_deassert_core_reset(struct pcie_port *pp)
- struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
- int ret;
-
-- regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
-- IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18);
-- regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
-- IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16);
--
- ret = clk_prepare_enable(imx6_pcie->pcie_phy);
- if (ret) {
- dev_err(pp->dev, "unable to enable pcie_phy clock\n");
-@@ -282,6 +277,12 @@ static int imx6_pcie_deassert_core_reset(struct pcie_port *pp)
- /* allow the clocks to stabilize */
- usleep_range(200, 500);
-
-+ /* power up core phy and enable ref clock */
-+ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
-+ IMX6Q_GPR1_PCIE_TEST_PD, 0 << 18);
-+ regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
-+ IMX6Q_GPR1_PCIE_REF_CLK_EN, 1 << 16);
-+
- /* Some boards don't have PCIe reset GPIO. */
- if (gpio_is_valid(imx6_pcie->reset_gpio)) {
- gpio_set_value(imx6_pcie->reset_gpio, 0);
hooks/post-receive
--
armadeus
|