diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-03-19 23:47:58 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-03-19 23:47:59 +0300 |
| commit | c1abbe602b83fba0d71be9510393b0c6dcd9a798 (patch) | |
| tree | 12563926785787680868ac85b84150cdf8123597 /include | |
| parent | a1b46780e49655bdc6f7e5bc7f29dc22bbaeacac (diff) | |
| parent | 73d246b4402c3356f6b3d13665de3a51eea7b555 (diff) | |
| download | linux-c1abbe602b83fba0d71be9510393b0c6dcd9a798.tar.xz | |
Merge tag 'v6.15-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/dt
New peripheral the sdhci controller on rk3528. Enablement of hdmi and hdmi
audio on a number of additional boards. Better handling for scmi shared
memory on rk3568 and a fix for the used SCMI clock ids on rk3576.
As well as some fixes that were a bit late for trying to stuff them into
6.14 at this late stage of the cycle.
* tag 'v6.15-rockchip-dts64-2' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
arm64: dts: rockchip: remove ethm0_clk0_25m_out from Sige5 gmac0
arm64: dts: rockchip: Fix PWM pinctrl names
arm64: dts: rockchip: fix RK3576 SCMI clock IDs
dt-bindings: clock: rk3576: add SCMI clocks
arm64: dts: rockchip: Fix pcie reset gpio on Orange Pi 5 Max
arm64: dts: rockchip: Enable HDMI audio output for ArmSoM Sige7
arm64: dts: rockchip: Enable onboard eMMC on Radxa E20C
arm64: dts: rockchip: Add SDHCI controller for RK3528
arm64: dts: rockchip: Remove bluetooth node from rock-3a
arm64: dts: rockchip: Move rk356x scmi SHMEM to reserved memory
arm64: dts: rockchip: Add AP6275P wireless support to ArmSoM Sige7
arm64: dts: rockchip: Enable HDMI audio outputs for Orange Pi 5 Plus
arm64: dts: rockchip: Enable HDMI1 on Orange Pi 5 Plus
arm64: dts: rockchip: Enable HDMI audio outputs for Orange Pi 5 Max
arm64: dts: rockchip: Enable HDMI0 audio output for Orange Pi 5/5B
Link: https://lore.kernel.org/r/23866869.6Emhk5qWAg@phil
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/rockchip,rk3576-cru.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/rockchip,rk3576-cru.h b/include/dt-bindings/clock/rockchip,rk3576-cru.h index 25aed298ac2c..f576e61bec70 100644 --- a/include/dt-bindings/clock/rockchip,rk3576-cru.h +++ b/include/dt-bindings/clock/rockchip,rk3576-cru.h @@ -589,4 +589,9 @@ #define PCLK_EDP_S 569 #define ACLK_KLAD 570 +/* SCMI clocks, use these when changing clocks through SCMI */ +#define SCMI_ARMCLK_L 10 +#define SCMI_ARMCLK_B 11 +#define SCMI_CLK_GPU 456 + #endif |