summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/patches-4.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2017-07-28 20:09:53 +0200
committerMathias Kresin <dev@kresin.me>2017-07-29 09:24:27 +0200
commitb27977b41be6d010c9d5a8fc67e5e48135f11aae (patch)
treee8a4f31a6645102bc28a62f6ae1c6e363b0cc739 /target/linux/brcm63xx/patches-4.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
parent0a17d2970a5ea9dd83b0fc194cccb38dca19d29b (diff)
downloadmtk-20170518-b27977b41be6d010c9d5a8fc67e5e48135f11aae.zip
mtk-20170518-b27977b41be6d010c9d5a8fc67e5e48135f11aae.tar.gz
mtk-20170518-b27977b41be6d010c9d5a8fc67e5e48135f11aae.tar.bz2
brcm63xx: add NULL clock fix send upstream
Make the behaviour of clk_get_rate consistent with common clk's clk_get_rate by accepting NULL clocks as parameter. Some device drivers rely on this, and will cause an OOPS otherwise. Fixes: FS#735 Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target/linux/brcm63xx/patches-4.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch')
-rw-r--r--target/linux/brcm63xx/patches-4.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-4.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/brcm63xx/patches-4.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
index 6ad2e89..25b0df5 100644
--- a/target/linux/brcm63xx/patches-4.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
+++ b/target/linux/brcm63xx/patches-4.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
@@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
}
static struct clk clk_pcie = {
-@@ -386,9 +400,11 @@ struct clk *clk_get(struct device *dev,
+@@ -389,9 +403,11 @@ struct clk *clk_get(struct device *dev,
return &clk_periph;
if ((BCMCPU_IS_3368() || BCMCPU_IS_6358()) && !strcmp(id, "pcm"))
return &clk_pcm;
@@ -121,7 +121,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
return &clk_pcie;
return ERR_PTR(-ENOENT);
}
-@@ -411,6 +427,7 @@ static int __init bcm63xx_clk_init(void)
+@@ -414,6 +430,7 @@ static int __init bcm63xx_clk_init(void)
clk_hsspi.rate = HSSPI_PLL_HZ_6328;
break;
case BCM6362_CPU_ID: