diff options
| author |   Heiko Stuebner <heiko@sntech.de> | 2024-04-10 07:09:33 +0200 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2024-04-10 07:09:33 +0200 |
| commit | 2865b25f5f038ed0b157d3e796def931aca9c0b2 (patch) | |
| tree | d3faf180bb7c80ce7033090e308121744a0733f6 | |
| parent | Linux 6.9-rc1 (diff) | |
| parent | dt-bindings: reset: Define reset id used for HDMI Receiver (diff) | |
| download | wireguard-linux-2865b25f5f038ed0b157d3e796def931aca9c0b2.tar.xz wireguard-linux-2865b25f5f038ed0b157d3e796def931aca9c0b2.zip | |
Merge branch 'v6.10-shared/clkids' into v6.10-clk/next
| -rw-r--r-- | include/dt-bindings/clock/rk3568-cru.h | 1 | ||||
| -rw-r--r-- | include/dt-bindings/reset/rockchip,rk3588-cru.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/rk3568-cru.h b/include/dt-bindings/clock/rk3568-cru.h index d29890865150..5263085c5b23 100644 --- a/include/dt-bindings/clock/rk3568-cru.h +++ b/include/dt-bindings/clock/rk3568-cru.h @@ -78,6 +78,7 @@ #define CPLL_333M 9 #define ARMCLK 10 #define USB480M 11 +#define USB480M_PHY 12 #define ACLK_CORE_NIU2BUS 18 #define CLK_CORE_PVTM 19 #define CLK_CORE_PVTM_CORE 20 diff --git a/include/dt-bindings/reset/rockchip,rk3588-cru.h b/include/dt-bindings/reset/rockchip,rk3588-cru.h index d4264db2a07f..e2fe4bd5f7f0 100644 --- a/include/dt-bindings/reset/rockchip,rk3588-cru.h +++ b/include/dt-bindings/reset/rockchip,rk3588-cru.h @@ -751,4 +751,6 @@ #define SRST_P_TRNG_CHK 658 #define SRST_TRNG_S 659 +#define SRST_A_HDMIRX_BIU 660 + #endif |