Implement calculating the SPI controller frequency in imxccm(4).

ok kettenis@

diff --git a/sys/dev/fdt/imxccm.c b/sys/dev/fdt/imxccm.c
index d961041..72bcaaa 100644 (file)
--- a/sys/dev/fdt/imxccm.c
+++ b/sys/dev/fdt/imxccm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxccm.c,v 1.8 2018/06/17 19:46:48 kettenis Exp $ */
+/* $OpenBSD: imxccm.c,v 1.9 2018/07/26 10:55:26 patrick Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -91,6 +91,8 @@
 #define CCM_CSCDR1_USDHCx_CLK_SEL_MASK         0x1
 #define CCM_CSCDR1_USDHCx_PODF_MASK            0x7
 #define CCM_CSCDR1_UART_PODF_MASK              0x7
+#define CCM_CSCDR2_ECSPI_PODF_SHIFT            19
+#define CCM_CSCDR2_ECSPI_PODF_MASK             0x7
 #define CCM_CCGR1_ENET                         (3 << 10)
 #define CCM_CCGR4_125M_PCIE                    (3 << 0)
 #define CCM_CCGR5_100M_SATA                    (3 << 4)
@@ -125,6 +127,7 @@
 #define  CCM_ANALOG_PLL_ENET_ENABLE_CLK_125MHZ (1 << 10) /* i.MX7 */
 
 #define HCLK_FREQ                              24000000
+#define PLL3_60M                               60000000
 #define PLL3_80M                               80000000
 
 #define HREAD4(sc, reg)                                                        \
@@ -307,6 +310,18 @@ imxccm_armclk_set_parent(struct imxccm_softc *sc, enum imxanatop_clocks clock)
        }
 }
 
+uint32_t
+imxccm_get_ecspiclk(struct imxccm_softc *sc)
+{
+       uint32_t clkroot = PLL3_60M;
+       uint32_t podf = HREAD4(sc, CCM_CSCDR2);
+
+       podf >>= CCM_CSCDR2_ECSPI_PODF_SHIFT;
+       podf &= CCM_CSCDR2_ECSPI_PODF_MASK;
+
+       return clkroot / (podf + 1);
+}
+
 unsigned int
 imxccm_get_usdhx(struct imxccm_softc *sc, int x)
 {
@@ -754,6 +769,7 @@ imxccm_enable(void *cookie, uint32_t *cells, int on)
                        return;
                case IMX6_CLK_IPG:
                case IMX6_CLK_IPG_PER:
+               case IMX6_CLK_ECSPI_ROOT:
                        /* always on */
                        return;
                default:
@@ -885,6 +901,8 @@ imxccm_get_frequency(void *cookie, uint32_t *cells)
                        return imxccm_get_ipgclk(sc);
                case IMX6_CLK_IPG_PER:
                        return imxccm_get_ipg_perclk(sc);
+               case IMX6_CLK_ECSPI_ROOT:
+                       return imxccm_get_ecspiclk(sc);
                case IMX6_CLK_UART_SERIAL:
                        return imxccm_get_uartclk(sc);
                case IMX6_CLK_USDHC1:

diff --git a/sys/dev/fdt/imxccm_clocks.h b/sys/dev/fdt/imxccm_clocks.h
index 361375f..3e5bea4 100644 (file)
--- a/sys/dev/fdt/imxccm_clocks.h
+++ b/sys/dev/fdt/imxccm_clocks.h
@@ -6,8 +6,10 @@
 
 #define IMX6_CLK_IPG           0x3e
 #define IMX6_CLK_IPG_PER       0x3f
+#define IMX6_CLK_ECSPI_ROOT    0x47
 #define IMX6_CLK_ARM           0x68
 #define IMX6_CLK_AHB           0x69
+#define IMX6_CLK_ECSPI2                0x71
 #define IMX6_CLK_ENET          0x75
 #define IMX6_CLK_I2C1          0x7d
 #define IMX6_CLK_I2C2          0x7e
@@ -33,6 +35,7 @@
 #define IMX6_CLK_PLL7          0xe5
 
 struct imxccm_gate imx6_gates[] = {
+       [IMX6_CLK_ECSPI2] = { CCM_CCGR1, 1, IMX6_CLK_ECSPI_ROOT },
        [IMX6_CLK_ENET] = { CCM_CCGR1, 5, IMX6_CLK_IPG },
        [IMX6_CLK_I2C1] = { CCM_CCGR2, 3, IMX6_CLK_IPG_PER },
        [IMX6_CLK_I2C2] = { CCM_CCGR2, 4, IMX6_CLK_IPG_PER },