diff options
| author | Tom Rini <trini@konsulko.com> | 2020-03-10 13:13:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-03-10 13:13:08 -0400 |
| commit | 3a1cb953085ecca1dd2f87288375801ebd580bab (patch) | |
| tree | 3a7bacdbbd6ac9a5d3fe98f1eeb67a30ffac90e4 /include/dt-bindings | |
| parent | b62cd976543ae1b90050346c870d8357d749fe2d (diff) | |
| parent | 9f656fbee3b433ae1e9daf5d92d46bbdcc9551eb (diff) | |
Merge tag 'u-boot-imx-20200310' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2020.04
-----------------
- DM : mx6sabresd
- mx6ul_14x14_evk: fix video
- mx8qxp; fix console for booting
- sync DTS with kernel (imx6sx)
- drop obsolete woodburn (mx35)
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/660550811
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/imx6sx-clock.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/dt-bindings/clock/imx6sx-clock.h b/include/dt-bindings/clock/imx6sx-clock.h index 36f0324902..1c64997d61 100644 --- a/include/dt-bindings/clock/imx6sx-clock.h +++ b/include/dt-bindings/clock/imx6sx-clock.h @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (C) 2014 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * */ #ifndef __DT_BINDINGS_CLOCK_IMX6SX_H @@ -275,6 +271,11 @@ #define IMX6SX_PLL6_BYPASS 262 #define IMX6SX_PLL7_BYPASS 263 #define IMX6SX_CLK_SPDIF_GCLK 264 -#define IMX6SX_CLK_CLK_END 265 +#define IMX6SX_CLK_LVDS2_SEL 265 +#define IMX6SX_CLK_LVDS2_OUT 266 +#define IMX6SX_CLK_LVDS2_IN 267 +#define IMX6SX_CLK_ANACLK2 268 +#define IMX6SX_CLK_MMDC_P1_IPG 269 +#define IMX6SX_CLK_CLK_END 270 #endif /* __DT_BINDINGS_CLOCK_IMX6SX_H */ |