Changeset 38298


Ignore:
Timestamp:
2013-10-03T15:06:42+02:00 (4 years ago)
Author:
luka
Message:

imx6: update upstream pcie patches

Signed-off-by: Luka Perkov <luka@…>

Location:
trunk/target/linux/imx6/patches-3.10
Files:
2 added
11 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/imx6/patches-3.10/0001-usb-chipidea-improve-kconfig.patch

    r37686 r38298  
    1 From 20a677fd63c57edd5b0c463baa44f133b2f2d4a0 Mon Sep 17 00:00:00 2001 
    21From: Peter Chen <peter.chen@freescale.com> 
    3 Date: Thu, 13 Jun 2013 17:59:52 +0300 
    42Subject: [PATCH] usb: chipidea: improve kconfig 
    53 
  • trunk/target/linux/imx6/patches-3.10/0002-usb-chipidea-fix-the-build-error-with-randconfig.patch

    r37686 r38298  
    1 From 972a6c5d56b42d6dd326867d5974ffa58383ec53 Mon Sep 17 00:00:00 2001 
    21From: Peter Chen <peter.chen@freescale.com> 
    3 Date: Mon, 29 Jul 2013 13:09:57 +0300 
    42Subject: [PATCH] usb: chipidea: fix the build error with randconfig 
    53 
  • trunk/target/linux/imx6/patches-3.10/0003-usb-chipidea-improve-kconfig-2.0.patch

    r37853 r38298  
    1 From a0cfdc6bc73bc47b63b05b850cf66cf67f2487bf Mon Sep 17 00:00:00 2001 
    21From: Lothar Waßmann <LW@KARO-electronics.de> 
    3 Date: Wed, 14 Aug 2013 12:43:58 +0300 
    42Subject: [PATCH] usb: chipidea: improve kconfig 2.0 
    53 
  • trunk/target/linux/imx6/patches-3.10/0004-i2c-imx-retry-on-NAK.patch

    r37935 r38298  
    1 From 0d1ee1f265cf9730feb214ddd18bc430c0800e8b Mon Sep 17 00:00:00 2001 
    21From: Tim Harvey <tharvey@gateworks.com> 
    3 Date: Tue, 10 Sep 2013 21:42:29 +0200 
    42Subject: [PATCH] i2c: imx: retry on NAK 
    53 
  • trunk/target/linux/imx6/patches-3.10/0005-ahci_imx-add-ahci-sata-support-on-imx-platforms.patch

    r37936 r38298  
    1 From 9e54eae23bc9cca0d8a955018c35b1250e09a73a Mon Sep 17 00:00:00 2001 
    21From: Richard Zhu <r65037@freescale.com> 
    3 Date: Wed, 24 Jul 2013 14:15:29 +0800 
    42Subject: [PATCH] ahci_imx: add ahci sata support on imx platforms 
    53 
  • trunk/target/linux/imx6/patches-3.10/0006-ARM-imx6q-update-the-sata-bits-definitions-of-gpr13.patch

    r37936 r38298  
    1 From 6a6c21ef487be47b300a0b24cd6afeb69d8b9a1a Mon Sep 17 00:00:00 2001 
    21From: Richard Zhu <r65037@freescale.com> 
    3 Date: Wed, 24 Jul 2013 14:15:28 +0800 
    42Subject: [PATCH] ARM: imx6q: update the sata bits definitions of gpr13 
    53 
  • trunk/target/linux/imx6/patches-3.10/0007-ARM-dtsi-enable-ahci-sata-on-imx6q-platforms.patch

    r37936 r38298  
    1 From 0fb1f804269e549b556b475c8655bc862c220622 Mon Sep 17 00:00:00 2001 
    21From: Richard Zhu <r65037@freescale.com> 
    3 Date: Tue, 16 Jul 2013 11:28:46 +0800 
    42Subject: [PATCH] ARM: dtsi: enable ahci sata on imx6q platforms 
    53 
  • trunk/target/linux/imx6/patches-3.10/0008-ahci_imx-depend-on-CONFIG_MFD_SYSCON.patch

    r37936 r38298  
    1 From 867974fc09f93bdd7f98d46ac3733934486bbf4a Mon Sep 17 00:00:00 2001 
    21From: Tejun Heo <tj@kernel.org> 
    3 Date: Fri, 26 Jul 2013 08:57:56 -0400 
    42Subject: [PATCH] ahci_imx: depend on CONFIG_MFD_SYSCON 
    53 
  • trunk/target/linux/imx6/patches-3.10/0010-ARM-imx6q-Add-PCIe-bits-to-GPR-syscon-definition.patch

    r38297 r38298  
    1 Subject: [v6,2/3] ARM: imx6q: Add PCIe bits to GPR syscon definition 
    21From: Sean Cross <xobs@kosagi.com> 
     2Subject: [PATCH 1/2] ARM: imx6q: Add PCIe bits to GPR syscon definition 
    33 
    44PCIe requires additional bits be defined for GPR8 and GPR12. 
    55 
    66Signed-off-by: Sean Cross <xobs@kosagi.com> 
     7Signed-off-by: Shawn Guo <shawn.guo@linaro.org> 
     8Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> 
    79--- 
    8  include/linux/mfd/syscon/imx6q-iomuxc-gpr.h |    8 ++++++++ 
     10 include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 8 ++++++++ 
    911 1 file changed, 8 insertions(+) 
    1012 
  • trunk/target/linux/imx6/patches-3.10/0011-PCI-imx6-Add-support-for-i.MX6-PCIe-controller.patch

    r38297 r38298  
    1 Subject: [v6,3/3] PCI: imx6: Add support for i.MX6 PCIe controller 
     1Subject: [PATCH 2/2] PCI: imx6: Add support for i.MX6 PCIe controller 
    22From: Sean Cross <xobs@kosagi.com> 
    33 
     
    66 
    77Signed-off-by: Sean Cross <xobs@kosagi.com> 
    8 Acked-by: Bjorn Helgaas <bhelgaas@google.com> 
     8Signed-off-by: Shawn Guo <shawn.guo@linaro.org> 
     9Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> 
    910Acked-by: Sascha Hauer <s.hauer@pengutronix.de> 
    1011--- 
    11  arch/arm/boot/dts/imx6qdl.dtsi                     |   16 + 
    12  arch/arm/mach-imx/Kconfig                          |    2 + 
    13  arch/arm/mach-imx/clk-imx6q.c                      |    4 + 
    14  drivers/pci/host/Kconfig                           |    6 + 
    15  drivers/pci/host/Makefile                          |    1 + 
    16  drivers/pci/host/pci-imx6.c                        |  576 ++++++++++++++++++++ 
    17  7 files changed, 611 insertions(+), 1 deletion(-) 
     12 drivers/pci/host/Kconfig                           |   6 + 
     13 drivers/pci/host/Makefile                          |   1 + 
     14 drivers/pci/host/pci-imx6.c                        | 575 +++++++++++++++++++++ 
     15 4 files changed, 588 insertions(+), 1 deletion(-) 
    1816 create mode 100644 drivers/pci/host/pci-imx6.c 
    1917 
    20 --- a/arch/arm/boot/dts/imx6qdl.dtsi 
    21 +++ b/arch/arm/boot/dts/imx6qdl.dtsi 
    22 @@ -108,6 +108,22 @@ 
    23                         cache-level = <2>; 
    24                 }; 
    25   
    26 +               pcie: pcie@0x01000000 { 
    27 +                       compatible = "fsl,imx6q-pcie", "snps,dw-pcie"; 
    28 +                       reg = <0x01ffc000 0x4000>; /* DBI */ 
    29 +                       #address-cells = <3>; 
    30 +                       #size-cells = <2>; 
    31 +                       device_type = "pci"; 
    32 +                       ranges = <0x00000800 0 0x01f00000 0x01f00000 0 0x00080000 /* configuration space */ 
    33 +                                 0x81000000 0 0          0x01f80000 0 0x00010000 /* downstream I/O */ 
    34 +                                 0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ 
    35 +                       num-lanes = <1>; 
    36 +                       interrupts = <0 123 0x04>; 
    37 +                       clocks = <&clks 189>, <&clks 187>, <&clks 205>, <&clks 144>; 
    38 +                       clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi"; 
    39 +                       status = "disabled"; 
    40 +               }; 
    41 + 
    42                 pmu { 
    43                         compatible = "arm,cortex-a9-pmu"; 
    44                         interrupts = <0 94 0x04>; 
    45 --- a/arch/arm/mach-imx/Kconfig 
    46 +++ b/arch/arm/mach-imx/Kconfig 
    47 @@ -806,6 +806,8 @@ config SOC_IMX6Q 
    48         select HAVE_IMX_SRC 
    49         select HAVE_SMP 
    50         select MFD_SYSCON 
    51 +       select MIGHT_HAVE_PCI 
    52 +       select PCI_DOMAINS if PCI 
    53         select PINCTRL 
    54         select PINCTRL_IMX6Q 
    55         select PL310_ERRATA_588369 if CACHE_PL310 
    56 --- a/arch/arm/mach-imx/clk-imx6q.c 
    57 +++ b/arch/arm/mach-imx/clk-imx6q.c 
    58 @@ -586,6 +586,10 @@ int __init mx6q_clocks_init(void) 
    59                 clk_prepare_enable(clk[usbphy2_gate]); 
    60         } 
    61   
    62 +       /* All existing boards with PCIe use LVDS1 */ 
    63 +       if (IS_ENABLED(CONFIG_PCI_IMX6)) 
    64 +               clk_set_parent(clk[lvds1_sel], clk[sata_ref]); 
    65 + 
    66         /* Set initial power mode */ 
    67         imx6q_set_lpm(WAIT_CLOCKED); 
    68   
    6918--- /dev/null 
    7019+++ b/drivers/pci/host/Kconfig 
    7120@@ -0,0 +1,13 @@ 
    7221+menu "PCI host controller drivers" 
    73 +       depends on PCI 
     22+      depends on PCI 
    7423+ 
    7524+config PCIE_DW 
    76 +       bool 
     25+      bool 
    7726+ 
    7827+config PCI_IMX6 
     
    9039--- /dev/null 
    9140+++ b/drivers/pci/host/pci-imx6.c 
    92 @@ -0,0 +1,576 @@ 
     41@@ -0,0 +1,575 @@ 
    9342+/* 
    9443+ * PCIe host controller driver for Freescale i.MX6 SoCs 
     
    174123+ 
    175124+               udelay(1); 
    176 +       } while ((wait_counter < max_iterations) && (val != exp_val)); 
     125+       } while (wait_counter < max_iterations); 
    177126+ 
    178127+       return -ETIMEDOUT; 
     
    261210+       writel(var, dbi_base + PCIE_PHY_CTRL); 
    262211+ 
    263 +       /* wait for ack de-assetion */ 
     212+       /* wait for ack de-assertion */ 
    264213+       ret = pcie_phy_poll_ack(dbi_base, 0); 
    265214+       if (ret) 
     
    279228+       writel(var, dbi_base + PCIE_PHY_CTRL); 
    280229+ 
    281 +       /* wait for ack de-assetion */ 
     230+       /* wait for ack de-assertion */ 
    282231+       ret = pcie_phy_poll_ack(dbi_base, 0); 
    283232+       if (ret) 
     
    455404+               return 0; 
    456405+ 
    457 +       dev_err(pp->dev, 
    458 +               "transition to gen2 is stuck, reset PHY!\n"); 
     406+       dev_err(pp->dev, "transition to gen2 is stuck, reset PHY!\n"); 
    459407+ 
    460408+       pcie_phy_read(pp->dbi_base, 
     
    590538+ 
    591539+       /* Fetch clocks */ 
    592 +       imx6_pcie->lvds_gate = clk_get(&pdev->dev, "lvds_gate"); 
     540+       imx6_pcie->lvds_gate = devm_clk_get(&pdev->dev, "lvds_gate"); 
    593541+       if (IS_ERR(imx6_pcie->lvds_gate)) { 
    594542+               dev_err(&pdev->dev, 
     
    598546+       } 
    599547+ 
    600 +       imx6_pcie->sata_ref_100m = clk_get(&pdev->dev, "sata_ref_100m"); 
     548+       imx6_pcie->sata_ref_100m = devm_clk_get(&pdev->dev, "sata_ref_100m"); 
    601549+       if (IS_ERR(imx6_pcie->sata_ref_100m)) { 
    602550+               dev_err(&pdev->dev, 
     
    606554+       } 
    607555+ 
    608 +       imx6_pcie->pcie_ref_125m = clk_get(&pdev->dev, "pcie_ref_125m"); 
     556+       imx6_pcie->pcie_ref_125m = devm_clk_get(&pdev->dev, "pcie_ref_125m"); 
    609557+       if (IS_ERR(imx6_pcie->pcie_ref_125m)) { 
    610558+               dev_err(&pdev->dev, 
     
    614562+       } 
    615563+ 
    616 +       imx6_pcie->pcie_axi = clk_get(&pdev->dev, "pcie_axi"); 
     564+       imx6_pcie->pcie_axi = devm_clk_get(&pdev->dev, "pcie_axi"); 
    617565+       if (IS_ERR(imx6_pcie->pcie_axi)) { 
    618566+               dev_err(&pdev->dev, 
     
    658606+/* Freescale PCIe driver does not allow module unload */ 
    659607+ 
    660 +static int __init imx6_init(void) 
     608+static int __init imx6_pcie_init(void) 
    661609+{ 
    662610+       return platform_driver_probe(&imx6_pcie_driver, imx6_pcie_probe); 
    663611+} 
    664 +module_init(imx6_init); 
     612+module_init(imx6_pcie_init); 
    665613+ 
    666614+MODULE_AUTHOR("Sean Cross <xobs@kosagi.com>"); 
  • trunk/target/linux/imx6/patches-3.10/0012-ARM-imx-Add-LVDS-general-purpose-clocks-to-i.MX6Q.patch

    r38297 r38298  
    1 Subject: [v6,1/3] ARM: imx: Add LVDS general-purpose clocks to i.MX6Q 
    21From: Sean Cross <xobs@kosagi.com> 
     2Subject: [PATCH 1/3] ARM: imx: Add LVDS general-purpose clocks to i.MX6Q 
    33 
    44The i.MX6 has two general-purpose LVDS clocks that can be driven 
     
    77 
    88Signed-off-by: Sean Cross <xobs@kosagi.com> 
     9Signed-off-by: Shawn Guo <shawn.guo@linaro.org> 
    910--- 
    10  arch/arm/mach-imx/clk-imx6q.c                      |   20 +++++++++++++++++++- 
     11 .../devicetree/bindings/clock/imx6q-clock.txt        |  4 ++++ 
     12 arch/arm/mach-imx/clk-imx6q.c                        | 20 +++++++++++++++++++- 
    1113 2 files changed, 23 insertions(+), 1 deletion(-) 
    1214 
     15--- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt 
     16+++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt 
     17@@ -208,6 +208,10 @@ clocks and IDs. 
     18        pll4_post_div           193 
     19        pll5_post_div           194 
     20        pll5_video_div          195 
     21+       lvds1_sel               204 
     22+       lvds2_sel               205 
     23+       lvds1_gate              206 
     24+       lvds2_gate              207 
     25  
     26 Examples: 
     27  
    1328--- a/arch/arm/mach-imx/clk-imx6q.c 
    1429+++ b/arch/arm/mach-imx/clk-imx6q.c 
  • trunk/target/linux/imx6/patches-3.10/0015-thermal-add-imx-thermal-driver-support.patch

    r38229 r38298  
    2626 create mode 100644 drivers/thermal/imx_thermal.c 
    2727 
    28 diff --git a/Documentation/devicetree/bindings/thermal/imx-thermal.txt b/Documentation/devicetree/bindings/thermal/imx-thermal.txt 
    29 new file mode 100644 
    30 index 0000000..541c25e 
    3128--- /dev/null 
    3229+++ b/Documentation/devicetree/bindings/thermal/imx-thermal.txt 
     
    4946+       fsl,tempmon-data = <&ocotp>; 
    5047+}; 
    51 diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig 
    52 index e988c81..69eed55 100644 
    5348--- a/drivers/thermal/Kconfig 
    5449+++ b/drivers/thermal/Kconfig 
     
    7166        bool "SPEAr thermal sensor driver" 
    7267        depends on PLAT_SPEAR 
    73 diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile 
    74 index 67184a2..dff19c6 100644 
    7568--- a/drivers/thermal/Makefile 
    7669+++ b/drivers/thermal/Makefile 
    77 @@ -21,6 +21,7 @@ obj-$(CONFIG_EXYNOS_THERMAL)  += exynos_thermal.o 
     70@@ -21,6 +21,7 @@ obj-$(CONFIG_EXYNOS_THERMAL)  += exynos_t 
    7871 obj-$(CONFIG_DOVE_THERMAL)     += dove_thermal.o 
    7972 obj-$(CONFIG_DB8500_THERMAL)   += db8500_thermal.o 
     
    8275 obj-$(CONFIG_DB8500_CPUFREQ_COOLING)   += db8500_cpufreq_cooling.o 
    8376 obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o 
    84  obj-$(CONFIG_X86_PKG_TEMP_THERMAL)     += x86_pkg_temp_thermal.o 
    85 diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c 
    86 new file mode 100644 
    87 index 0000000..d16c33c 
     77  
    8878--- /dev/null 
    8979+++ b/drivers/thermal/imx_thermal.c 
     
    486476+MODULE_LICENSE("GPL v2"); 
    487477+MODULE_ALIAS("platform:imx-thermal"); 
    488 --  
    489 1.8.4 
    490  
  • trunk/target/linux/imx6/patches-3.10/010-pcie-backport-fixes.patch

    r38080 r38298  
     1--- a/arch/arm/boot/dts/imx6qdl.dtsi 
     2+++ b/arch/arm/boot/dts/imx6qdl.dtsi 
     3@@ -119,7 +119,7 @@ 
     4                                  0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ 
     5                        num-lanes = <1>; 
     6                        interrupts = <0 123 0x04>; 
     7-                       clocks = <&clks 189>, <&clks 187>, <&clks 206>, <&clks 144>; 
     8+                       clocks = <&clks 189>, <&clks 187>, <&clks 198>, <&clks 144>; 
     9                        clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi"; 
     10                        status = "disabled"; 
     11                }; 
    112--- a/drivers/pci/Kconfig 
    213+++ b/drivers/pci/Kconfig 
  • trunk/target/linux/imx6/patches-3.10/011-pci-tweaks.patch

    r38182 r38298  
    1 --- a/arch/arm/boot/dts/imx6qdl.dtsi 
    2 +++ b/arch/arm/boot/dts/imx6qdl.dtsi 
    3 @@ -119,7 +119,7 @@ 
    4                                   0x82000000 0 0x01000000 0x01000000 0 0x00f00000>; /* non-prefetchable memory */ 
    5                         num-lanes = <1>; 
    6                         interrupts = <0 123 0x04>; 
    7 -                       clocks = <&clks 189>, <&clks 187>, <&clks 205>, <&clks 144>; 
    8 +                       clocks = <&clks 189>, <&clks 187>, <&clks 198>, <&clks 144>; 
    9                         clock-names = "pcie_ref_125m", "sata_ref_100m", "lvds_gate", "pcie_axi"; 
    10                         status = "disabled"; 
    11                 }; 
    121--- a/drivers/pci/host/pci-imx6.c 
    132+++ b/drivers/pci/host/pci-imx6.c 
Note: See TracChangeset for help on using the changeset viewer.