[src/trunk]: src/sys/arch/arm/rockchip add SPI support to rk3328, tested on r...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b559042095fd
branches:  trunk
changeset: 983304:b559042095fd
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat May 15 08:46:00 2021 +0000

description:
add SPI support to rk3328, tested on rock64.

simply adding the SPI clocks (and pwm while here) and enabling
the config match was sufficient, though my first rock64 seems
to have a deal SPI now (does not probe in u-boot or netbsd.)

diffstat:

 sys/arch/arm/rockchip/rk3328_cru.c |  22 +++++++++++++++++++---
 sys/arch/arm/rockchip/rk_spi.c     |   6 ++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diffs (86 lines):

diff -r 8f710a6591a8 -r b559042095fd sys/arch/arm/rockchip/rk3328_cru.c
--- a/sys/arch/arm/rockchip/rk3328_cru.c        Sat May 15 02:37:07 2021 +0000
+++ b/sys/arch/arm/rockchip/rk3328_cru.c        Sat May 15 08:46:00 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3328_cru.c,v 1.7 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: rk3328_cru.c,v 1.8 2021/05/15 08:46:00 mrg Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: rk3328_cru.c,v 1.7 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3328_cru.c,v 1.8 2021/05/15 08:46:00 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -218,6 +218,20 @@
                     CLKGATE_CON(8),    /* gate_reg */
                     __BIT(2),          /* gate_mask */
                     0),
+       RK_COMPOSITE(RK3328_SCLK_SPI, "clk_spi", mux_2plls_parents,
+                    CLKSEL_CON(24),    /* muxdiv_reg */
+                    __BIT(7),          /* mux_mask */
+                    __BITS(6,0),       /* div_mask */
+                    CLKGATE_CON(2),    /* gate_reg */
+                    __BIT(7),          /* gate_mask */
+                    0),
+       RK_COMPOSITE(RK3328_SCLK_PWM, "clk_pwm", mux_2plls_parents,
+                    CLKSEL_CON(24),    /* muxdiv_reg */
+                    __BIT(15),         /* mux_mask */
+                    __BITS(14,8),      /* div_mask */
+                    CLKGATE_CON(2),    /* gate_reg */
+                    __BIT(8),          /* gate_mask */
+                    0),
        RK_COMPOSITE(RK3328_ACLK_PERI_PRE, "aclk_peri_pre", aclk_peri_pre_parents,
                     CLKSEL_CON(28),    /* muxdiv_reg */
                     __BITS(7,6),       /* mux_mask */
@@ -239,7 +253,7 @@
                     __BIT(1),          /* gate_mask */
                     0),
        RK_COMPOSITE(RK3328_SCLK_SDMMC, "clk_sdmmc", mmc_parents,
-                    CLKSEL_CON(30),            /* muxdiv_reg */
+                    CLKSEL_CON(30),    /* muxdiv_reg */
                     __BITS(9,8),       /* mux_mask */
                     __BITS(7,0),       /* div_mask */
                     CLKGATE_CON(4),    /* gate_reg */
@@ -360,6 +374,8 @@
        RK_GATE(RK3328_PCLK_I2C1, "pclk_i2c1", "pclk_bus", CLKGATE_CON(16), 0),
        RK_GATE(RK3328_PCLK_I2C2, "pclk_i2c2", "pclk_bus", CLKGATE_CON(16), 1),
        RK_GATE(RK3328_PCLK_I2C3, "pclk_i2c3", "pclk_bus", CLKGATE_CON(16), 2),
+       RK_GATE(RK3328_PCLK_SPI, "pclk_spi", "pclk_bus", CLKGATE_CON(16), 5),
+       RK_GATE(RK3328_PCLK_PWM, "pclk_rk_pwm", "pclk_bus", CLKGATE_CON(16), 6),
        RK_GATE(RK3328_PCLK_GPIO0, "pclk_gpio0", "pclk_bus", CLKGATE_CON(16), 7),
        RK_GATE(RK3328_PCLK_GPIO1, "pclk_gpio1", "pclk_bus", CLKGATE_CON(16), 8),
        RK_GATE(RK3328_PCLK_GPIO2, "pclk_gpio2", "pclk_bus", CLKGATE_CON(16), 9),
diff -r 8f710a6591a8 -r b559042095fd sys/arch/arm/rockchip/rk_spi.c
--- a/sys/arch/arm/rockchip/rk_spi.c    Sat May 15 02:37:07 2021 +0000
+++ b/sys/arch/arm/rockchip/rk_spi.c    Sat May 15 08:46:00 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rk_spi.c,v 1.6 2021/01/27 03:10:19 thorpej Exp $       */
+/*     $NetBSD: rk_spi.c,v 1.7 2021/05/15 08:46:00 mrg Exp $   */
 
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_spi.c,v 1.6 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_spi.c,v 1.7 2021/05/15 08:46:00 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -144,10 +144,8 @@
 #define SPI_FIFOLEN            32
 
 static const struct device_compatible_entry compat_data[] = {
-#if 0 /* should work on RK3328 but untested */
        { .compat = "rockchip,rk3066-spi" },
        { .compat = "rockchip,rk3328-spi" },
-#endif         
        { .compat = "rockchip,rk3399-spi" },
        DEVICE_COMPAT_EOL
 };