brcm63xx: add clkdev lookup support

[openwrt/openwrt.git] / target / linux / brcm63xx / patches-4.4 / 343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch

diff --git a/target/linux/brcm63xx/patches-4.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch b/target/linux/brcm63xx/patches-4.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch
index 3e28a38e02451c6f73ff0b312cd4f8a9393dcb06..cc2937c576046f1347490c0fb8a705c753d51d56 100644 (file)
--- a/target/linux/brcm63xx/patches-4.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch
+++ b/target/linux/brcm63xx/patches-4.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch
@@ -13,7 +13,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318
 
 --- a/arch/mips/bcm63xx/clk.c
 +++ b/arch/mips/bcm63xx/clk.c
-@@ -50,6 +50,18 @@ static void bcm_hwclock_set(u32 mask, in
+@@ -51,6 +51,18 @@ static void bcm_hwclock_set(u32 mask, in
        bcm_perf_writel(reg, PERF_CKCTL_REG);
  }
  
@@ -32,7 +32,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318
  /*
   * Ethernet MAC "misc" clock: dma clocks and main clock on 6348
   */
-@@ -317,12 +329,17 @@ static struct clk clk_ipsec = {
+@@ -361,12 +373,17 @@ static struct clk clk_ipsec = {
  
  static void pcie_set(struct clk *clk, int enable)
  {
@@ -53,15 +53,6 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318
  }
  
  static struct clk clk_pcie = {
-@@ -408,7 +425,7 @@ struct clk *clk_get(struct device *dev,
-       if ((BCMCPU_IS_6362() || BCMCPU_IS_6368() || BCMCPU_IS_63268()) &&
-           !strcmp(id, "ipsec"))
-               return &clk_ipsec;
--      if ((BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_63268()) &&
-+      if ((BCMCPU_IS_6318() || BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_63268()) &&
-           !strcmp(id, "pcie"))
-               return &clk_pcie;
-       return ERR_PTR(-ENOENT);
 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h
 @@ -40,6 +40,12 @@