diff options
| author | John Audia <therealgraysky@proton.me> | 2022-10-26 18:31:12 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-10-30 17:54:59 +0100 |
| commit | a34255b795bcd939a66f11f100e0de8f54fd3707 (patch) | |
| tree | 07fc594e824494ad687083c3d7df595c0c5cabdd /target/linux/bcm27xx/patches-5.15/950-0150-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch | |
| parent | a133423c594fb5d1a7f71c9474d4f550f426f800 (diff) | |
| download | upstream-a34255b795bcd939a66f11f100e0de8f54fd3707.tar.gz upstream-a34255b795bcd939a66f11f100e0de8f54fd3707.tar.bz2 upstream-a34255b795bcd939a66f11f100e0de8f54fd3707.zip | |
kernel: bump 5.15 to 5.15.75
Removed upstreamed:
bcm27xx/patches-5.15/950-0446-drm-vc4-Fix-timings-for-VEC-modes.patch[1]
Manually rebased:
patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
All other patches automatically rebased
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.75&id=2810061452f9b748b096ad023d318690ca519aa3
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0150-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0150-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0150-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch b/target/linux/bcm27xx/patches-5.15/950-0150-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch index 4caf953ced..ee9bcc8517 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0150-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0150-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch @@ -15,7 +15,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net> --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1098,8 +1098,10 @@ static int bcm2835_clock_on(struct clk_h +@@ -1128,8 +1128,10 @@ static int bcm2835_clock_on(struct clk_h return 0; } @@ -28,7 +28,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net> { struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw); struct bcm2835_cprman *cprman = clock->cprman; -@@ -1121,6 +1123,11 @@ static int bcm2835_clock_set_rate(struct +@@ -1151,6 +1153,11 @@ static int bcm2835_clock_set_rate(struct bcm2835_clock_wait_busy(clock); } @@ -40,7 +40,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net> ctl &= ~CM_FRAC; ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0; cprman_write(cprman, data->ctl_reg, ctl); -@@ -1132,6 +1139,12 @@ static int bcm2835_clock_set_rate(struct +@@ -1162,6 +1169,12 @@ static int bcm2835_clock_set_rate(struct return 0; } @@ -53,7 +53,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net> static bool bcm2835_clk_is_pllc(struct clk_hw *hw) { -@@ -1315,6 +1328,7 @@ static const struct clk_ops bcm2835_cloc +@@ -1345,6 +1358,7 @@ static const struct clk_ops bcm2835_cloc .unprepare = bcm2835_clock_off, .recalc_rate = bcm2835_clock_get_rate, .set_rate = bcm2835_clock_set_rate, @@ -61,7 +61,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net> .determine_rate = bcm2835_clock_determine_rate, .set_parent = bcm2835_clock_set_parent, .get_parent = bcm2835_clock_get_parent, -@@ -1497,7 +1511,6 @@ static struct clk_hw *bcm2835_register_c +@@ -1527,7 +1541,6 @@ static struct clk_hw *bcm2835_register_c init.ops = &bcm2835_vpu_clock_clk_ops; } else { init.ops = &bcm2835_clock_clk_ops; |