Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / include / asm / arch-mx25 / clock.h

diff --git a/arch/arm/include/asm/arch-mx25/clock.h b/arch/arm/include/asm/arch-mx25/clock.h
index 0f47eaf053c2dd57de62eff3d21d310c9636ba8b..3045b78d08f41e26431ada62b7bc683618658c6f 100644 (file)
--- a/arch/arm/include/asm/arch-mx25/clock.h
+++ b/arch/arm/include/asm/arch-mx25/clock.h
@@ -1,32 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  *
  * (c) 2009 Ilya Yanok, Emcraft Systems <yanok@emcraft.com>
  *
  * Modified for mx25 by John Rigby <jrigby@gmail.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #ifndef __ASM_ARCH_CLOCK_H
 #define __ASM_ARCH_CLOCK_H
 
+#ifdef CONFIG_MX25_HCLK_FREQ
+#define MXC_HCLK       CONFIG_MX25_HCLK_FREQ
+#else
+#define MXC_HCLK       24000000
+#endif
+
+#ifdef CONFIG_MX25_CLK32
+#define MXC_CLK32      CONFIG_MX25_CLK32
+#else
+#define MXC_CLK32      32768
+#endif
+
 enum mxc_clock {
+       /* PER clocks (do not change order) */
        MXC_CSI_CLK,
        MXC_EPIT_CLK,
        MXC_ESAI_CLK,
@@ -43,17 +39,19 @@ enum mxc_clock {
        MXC_SSI1_CLK,
        MXC_SSI2_CLK,
        MXC_UART_CLK,
+       /* Other clocks */
        MXC_ARM_CLK,
+       MXC_AHB_CLK,
+       MXC_IPG_CLK,
+       MXC_CSPI_CLK,
        MXC_FEC_CLK,
        MXC_CLK_NUM
 };
 
-ulong imx_get_perclk(int clk);
-ulong imx_get_ahbclk(void);
-
-#define imx_get_uartclk() imx_get_perclk(15)
-#define imx_get_fecclk() (imx_get_ahbclk()/2)
-
+int imx_set_perclk(enum mxc_clock clk, bool from_upll, unsigned int freq);
 unsigned int mxc_get_clock(enum mxc_clock clk);
 
+#define imx_get_uartclk()      mxc_get_clock(MXC_UART_CLK)
+#define imx_get_fecclk()       mxc_get_clock(MXC_FEC_CLK)
+
 #endif /* __ASM_ARCH_CLOCK_H */