projects
/
openwrt
/
staging
/
noltari.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bcm63xx: kernel: fix up bcm63268 roboswitch gpio registers
[openwrt/staging/noltari.git]
/
target
/
linux
/
bcm63xx
/
patches-5.15
/
348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch
diff --git
a/target/linux/bcm63xx/patches-5.15/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch
b/target/linux/bcm63xx/patches-5.15/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch
index cdff8d5a4d885ce1abff40ceb438409eb0bf866f..e4496227c1950344d857e6c7de7ff33033acf63f 100644
(file)
--- a/
target/linux/bcm63xx/patches-5.15/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch
+++ b/
target/linux/bcm63xx/patches-5.15/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch
@@
-10,7
+10,7
@@
/*************************************************************************
* _REG relative to RSET_WDT
/*************************************************************************
* _REG relative to RSET_WDT
-@@ -153
4,6 +1537
,11 @@
+@@ -153
9,6 +1542
,11 @@
#define STRAPBUS_63268_FCVO_SHIFT 21
#define STRAPBUS_63268_FCVO_MASK (0xf << STRAPBUS_63268_FCVO_SHIFT)
#define STRAPBUS_63268_FCVO_SHIFT 21
#define STRAPBUS_63268_FCVO_MASK (0xf << STRAPBUS_63268_FCVO_SHIFT)
@@
-24,7
+24,7
@@
#define STRAPBUS_6328_FCVO_MASK (0x1f << STRAPBUS_6328_FCVO_SHIFT)
--- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c
#define STRAPBUS_6328_FCVO_MASK (0x1f << STRAPBUS_6328_FCVO_SHIFT)
--- a/arch/mips/bcm63xx/clk.c
+++ b/arch/mips/bcm63xx/clk.c
-@@ -
64,6 +64
,26 @@ static void bcm_ub_hwclock_set(u32 mask,
+@@ -
76,6 +76
,26 @@ static void bcm_ub_hwclock_set(u32 mask,
bcm_perf_writel(reg, PERF_UB_CKCTL_REG);
}
bcm_perf_writel(reg, PERF_UB_CKCTL_REG);
}
@@
-51,7
+51,7
@@
/*
* Ethernet MAC "misc" clock: dma clocks and main clock on 6348
*/
/*
* Ethernet MAC "misc" clock: dma clocks and main clock on 6348
*/
-@@ -2
36,7 +256
,17 @@ static void usbh_set(struct clk *clk, in
+@@ -2
50,7 +270
,17 @@ static void usbh_set(struct clk *clk, in
} else if (BCMCPU_IS_6368()) {
bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
} else if (BCMCPU_IS_63268()) {
} else if (BCMCPU_IS_6368()) {
bcm_hwclock_set(CKCTL_6368_USBH_EN, enable);
} else if (BCMCPU_IS_63268()) {