diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2019-06-11 15:49:43 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2019-06-11 15:49:43 -0700 |
| commit | f23a4704ee596c0b1534a018b856b3dea4ee81a0 (patch) | |
| tree | ea5b8c526a47f4ee11c6b1a96c84869e08fd275f /include | |
| parent | a466a8675e0032ab788a0d59f78db4cf34d4902a (diff) | |
| parent | 3ff46efbcd90d3d469de8eddaf03d12293aaa50c (diff) | |
Merge tag 'clk-meson-5.2-1-fixes' of https://github.com/BayLibre/clk-meson into v5.3/dt64
MPLL50M DT bindings typo fix
Meson9 VPU typo fixes
# gpg: Signature made Tue 11 Jun 2019 05:02:13 AM PDT
# gpg: using RSA key F4E159AE18F3F56D5F1BB71BE6FC0F1C37F2DA85
# gpg: Good signature from "Jerome Brunet <jbrunet@baylibre.com>" [full]
# gpg: aka "Jerome Brunet <jerome@liltaz.com>" [full]
# gpg: aka "Jerome Brunet <jerome.brunet@gmail.com>" [full]
* tag 'clk-meson-5.2-1-fixes' of https://github.com/BayLibre/clk-meson:
clk: meson: meson8b: fix a typo in the VPU parent names array variable
clk: meson: fix MPLL 50M binding id typo
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/g12a-clkc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index 82c9e0c020b2..e10470ed7c4f 100644 --- a/include/dt-bindings/clock/g12a-clkc.h +++ b/include/dt-bindings/clock/g12a-clkc.h @@ -130,7 +130,7 @@ #define CLKID_MALI_1_SEL 172 #define CLKID_MALI_1 174 #define CLKID_MALI 175 -#define CLKID_MPLL_5OM 177 +#define CLKID_MPLL_50M 177 #define CLKID_CPU_CLK 187 #define CLKID_PCIE_PLL 201 #define CLKID_VDEC_1 204 |