mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
d1186b8a0e
I have changed the way the patches are generated a bit. Instead of using orange-pi branch from megous tree for 6.6 kernel, I have used the following kernel branches a83t-suspend, af8133j, anx, audio, axp, cam, drm, err, fixes, mbus, modem, opi3, pb, pinetab, pp, ppkb, samuel, speed, tbs-a711, ths These branches were carefully chosen to include only allwinner related patches and remove importing of the rockchip related patches into the allwinner kernel. Following patches are modified to fix patch application failure - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-reg_usb1_vbus-status-ok.patch - patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch - patches.armbian/arm64-dts-allwinner-h616-Add-efuse_xlate-cpu-frequency-scaling-v1_6_2.patch - patches.armbian/arm64-dts-allwinner-h616-LED-green_power_on-red_status_heartbeat.patch - patches.armbian/arm64-dts-allwinner-overlay-Add-Overlays-for-sunxi64.patch - patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch Following patches are modified because of kernel api change to fix compilation failure - patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Vasily Khoruzhick <anarsoul@gmail.com>
|
|
Date: Tue, 24 Jul 2018 10:17:55 -0700
|
|
Subject: drv:clk:sunxi-ng: ccu: add min/max rate sun50i-a64
|
|
|
|
---
|
|
drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 2 ++
|
|
drivers/clk/sunxi-ng/ccu_nkm.c | 5 +++++
|
|
drivers/clk/sunxi-ng/ccu_nkm.h | 3 +++
|
|
3 files changed, 10 insertions(+)
|
|
|
|
diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c
|
|
index ea701bc51ade..f52353fcef3e 100644
|
|
--- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c
|
|
+++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c
|
|
@@ -196,6 +196,8 @@ static struct ccu_nkm pll_mipi_clk = {
|
|
.n = _SUNXI_CCU_MULT(8, 4),
|
|
.k = _SUNXI_CCU_MULT_MIN(4, 2, 2),
|
|
.m = _SUNXI_CCU_DIV(0, 4),
|
|
+ .min_rate = 300000000,
|
|
+ .max_rate = 1400000000,
|
|
.common = {
|
|
.reg = 0x040,
|
|
.hw.init = CLK_HW_INIT("pll-mipi", "pll-video0",
|
|
diff --git a/drivers/clk/sunxi-ng/ccu_nkm.c b/drivers/clk/sunxi-ng/ccu_nkm.c
|
|
index eed64547ad42..93b1a85bbfb8 100644
|
|
--- a/drivers/clk/sunxi-ng/ccu_nkm.c
|
|
+++ b/drivers/clk/sunxi-ng/ccu_nkm.c
|
|
@@ -158,6 +158,11 @@ static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux,
|
|
_nkm.min_m = 1;
|
|
_nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
|
|
|
|
+ if (rate < nkm->min_rate)
|
|
+ rate = nkm->min_rate;
|
|
+ if (nkm->max_rate && (rate > nkm->max_rate))
|
|
+ rate = nkm->max_rate;
|
|
+
|
|
if (nkm->common.features & CCU_FEATURE_FIXED_POSTDIV)
|
|
rate *= nkm->fixed_post_div;
|
|
|
|
diff --git a/drivers/clk/sunxi-ng/ccu_nkm.h b/drivers/clk/sunxi-ng/ccu_nkm.h
|
|
index 6601defb3f38..57aa8087c2a7 100644
|
|
--- a/drivers/clk/sunxi-ng/ccu_nkm.h
|
|
+++ b/drivers/clk/sunxi-ng/ccu_nkm.h
|
|
@@ -28,6 +28,9 @@ struct ccu_nkm {
|
|
|
|
unsigned int fixed_post_div;
|
|
|
|
+ unsigned int min_rate;
|
|
+ unsigned int max_rate;
|
|
+
|
|
struct ccu_common common;
|
|
};
|
|
|
|
--
|
|
Armbian
|
|
|