diff options
author | Heiko Stuebner <heiko@sntech.de> | 2019-06-27 11:57:13 +0200 |
---|---|---|
committer | Heiko Stuebner <heiko@sntech.de> | 2019-06-27 11:57:13 +0200 |
commit | 65d9c3fb3e136dae28088edfd1cc3b3a0c8b9ef2 (patch) | |
tree | 2be9ea62b1fb42913ec0e159af0d6bb891b474d2 | |
parent | ARM: dts: rockchip: fix vop iommu-cells on rk322x (diff) | |
parent | clk: rockchip: add clock id for hdmi_phy special clock on rk3228 (diff) | |
download | linux-65d9c3fb3e136dae28088edfd1cc3b3a0c8b9ef2.tar.xz linux-65d9c3fb3e136dae28088edfd1cc3b3a0c8b9ef2.zip |
Merge branch 'v5.3-shared/clk-ids' into v5.3-armsoc/dts32
-rw-r--r-- | include/dt-bindings/clock/rk3228-cru.h | 1 | ||||
-rw-r--r-- | include/dt-bindings/clock/rk3328-cru.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/rk3228-cru.h b/include/dt-bindings/clock/rk3228-cru.h index 55655ab0a4c4..a0422f62c040 100644 --- a/include/dt-bindings/clock/rk3228-cru.h +++ b/include/dt-bindings/clock/rk3228-cru.h @@ -73,6 +73,7 @@ #define SCLK_WIFI 141 #define SCLK_OTGPHY0 142 #define SCLK_OTGPHY1 143 +#define SCLK_HDMI_PHY 144 /* dclk gates */ #define DCLK_VOP 190 diff --git a/include/dt-bindings/clock/rk3328-cru.h b/include/dt-bindings/clock/rk3328-cru.h index bcaa4559ab1b..6ad54c39f8da 100644 --- a/include/dt-bindings/clock/rk3328-cru.h +++ b/include/dt-bindings/clock/rk3328-cru.h @@ -173,6 +173,7 @@ #define PCLK_DCF 233 #define PCLK_SARADC 234 #define PCLK_ACODECPHY 235 +#define PCLK_WDT 236 /* hclk gates */ #define HCLK_PERI 308 |