sunxi: SPI: Add SUN6I generation SPI support
v2 cover sunxi: SPI: Add SUN6I generation SPI support
We already have a driver for the SPI devices in older Allwinner CPUs. Newer SoCs (SUN6I generation) have a similar, but improved IP block. This series adds support for that, so we can access the SPI flash that some newer boards come with.
This series gathers some patches that have appeared on the list in one form or another before (hence the v2 tag), but brings them all together and updates them.
The SUN4I/SUN6I SPI devices share a very similar architecure, but differ annoyingly in quite some details, to a point where a shared driver would look unnecessarily complicated. So we use an #ifdef based approach, which keeps the driver simple, at the cost of not being able to access both types of device in one binary build. But since there are no SoCs which feature both types, this is a theoretical disadvantage.
Patch 1/4 moves the clock toggling from the probe/remove to the claim/release-bus stage.
Patch 2/4 adds the SPI gate clocks and reset gates to the clock drivers, also describes at least the enable bit for the SPI mod clock. This is used in patch 3/4, which uses the new DM clock framework in the driver, helping to abstract differences between the SUN4I/SUN6I types.
Patch 4/4 eventually adds support for the new SUN6I generation SPI device. The actual device support is determined at compile time, based on the CONFIG_SUNXI_GEN_SUN6I symbol.
What's left out of this series is the config bits needed to actually activate the support for a board. At the moment this is unnecessarily verbose, so that Oskari is looking at simplifying this at the Kconfig level, which would complement this series.
This has been briefly tested on the Pine64-LTS and the OrangePi PC2 board. Please test them if you have other devices with a SUN6I SPI generation.
Cheers,
Andre.
Jagan Teki (2):
clk: sunxi: Implement SPI gates clocks and reset
spi: sunxi: Add CLK support to Allwinner SPI driver
Oskari Lemmela (2):
spi: sunxi: Enable and disable SPI clock on bus claim/release
spi: sunxi: Support newer SoCs
drivers/clk/sunxi/clk_a10.c | 9 +++ drivers/clk/sunxi/clk_a10s.c | 7 ++ drivers/clk/sunxi/clk_a23.c | 7 ++ drivers/clk/sunxi/clk_a31.c | 13 ++++ drivers/clk/sunxi/clk_a64.c | 7 ++ drivers/clk/sunxi/clk_a80.c | 15 ++++ drivers/clk/sunxi/clk_a83t.c | 7 ++ drivers/clk/sunxi/clk_h3.c | 7 ++ drivers/clk/sunxi/clk_h6.c | 6 ++ drivers/clk/sunxi/clk_r40.c | 13 ++++ drivers/clk/sunxi/clk_v3s.c | 4 + drivers/spi/Kconfig | 4 +- drivers/spi/sun4i_spi.c | 177 +++++++++++++++++++++++++++++++++++++------ 13 files changed, 252 insertions(+), 24 deletions(-)
Signature · 1 line
2.14.5
PATCH v2 1/4 spi: sunxi: Enable and disable SPI clock on bus claim/release
From: Oskari Lemmela <[email protected]>
Introduce a function to disable the SPI clock, and turn it on and off on bus claim/release, instead of enabling it just once at probe time.
--- drivers/spi/sun4i_spi.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-)
drivers/spi/sun4i_spi.c +16 -2
@@ -239,7 +239,7 @@ static int sun4i_spi_parse_pins(struct udevice *dev)return 0 ; } -static inline void sun4i_spi_enable_clock (void ) +static void sun4i_spi_enable_clock (void ) {struct sunxi_ccm_reg *const ccm = (struct sunxi_ccm_reg *const )SUNXI_CCM_BASE ;
@@ -248,6 +248,16 @@ static inline void sun4i_spi_enable_clock(void)writel ((1 <<31 ), &ccm->spi0_clk_cfg); } +static void sun4i_spi_disable_clock (void ) +{ +struct sunxi_ccm_reg *const ccm = + (struct sunxi_ccm_reg *const )SUNXI_CCM_BASE ; + +writel (0 , &ccm->spi0_clk_cfg); +clrbits_le32 (&ccm->ahb_gate0, (1 <<AHB_GATE_OFFSET_SPI0 )); + +} +static int sun4i_spi_ofdata_to_platdata (struct udevice *bus) {struct sun4i_spi_platdata *plat =dev_get_platdata (bus);
@@ -269,7 +279,6 @@ static int sun4i_spi_probe(struct udevice *bus)struct sun4i_spi_platdata *plat =dev_get_platdata (bus);struct sun4i_spi_priv *priv =dev_get_priv (bus); -sun4i_spi_enable_clock ();sun4i_spi_parse_pins (bus); priv->regs = (struct sun4i_spi_regs *)(uintptr_t )plat->base_addr;
@@ -282,9 +291,12 @@ static int sun4i_spi_claim_bus(struct udevice *dev) {struct sun4i_spi_priv *priv =dev_get_priv (dev->parent); +sun4i_spi_enable_clock (); +writel (SUN4I_CTL_ENABLE |SUN4I_CTL_MASTER |SUN4I_CTL_TP |SUN4I_CTL_CS_MANUAL |SUN4I_CTL_CS_ACTIVE_LOW , &priv->regs->ctl); +return 0 ; }
@@ -297,6 +309,8 @@ static int sun4i_spi_release_bus(struct udevice *dev) reg &= ~SUN4I_CTL_ENABLE ;writel (reg, &priv->regs->ctl); +sun4i_spi_disable_clock (); +return 0 ; }
Signature · 1 line
2.14.5
PATCH v2 2/4 clk: sunxi: Implement SPI gates clocks and reset
In reply to Andre PrzywaraFrom: Jagan Teki <[email protected]>
In every SoC the SPI device requires an AHB clock, also the MOD clock needs to be toggled. Provide those as gate clocks for all SoCs as per the manual.
The driver doesn't tinker with the actual SPI frequency, so we get away without a proper MOD clock implementation.
Newer SoCs also provide a reset gate per SPI device. Add them as well.
--- drivers/clk/sunxi/clk_a10.c | 9 +++++++++ drivers/clk/sunxi/clk_a10s.c | 7 +++++++ drivers/clk/sunxi/clk_a23.c | 7 +++++++ drivers/clk/sunxi/clk_a31.c | 13 +++++++++++++ drivers/clk/sunxi/clk_a64.c | 7 +++++++ drivers/clk/sunxi/clk_a80.c | 15 +++++++++++++++ drivers/clk/sunxi/clk_a83t.c | 7 +++++++ drivers/clk/sunxi/clk_h3.c | 7 +++++++ drivers/clk/sunxi/clk_h6.c | 6 ++++++ drivers/clk/sunxi/clk_r40.c | 13 +++++++++++++ drivers/clk/sunxi/clk_v3s.c | 4 ++++ 11 files changed, 95 insertions(+)
drivers/clk/sunxi/clk_a10.c +9 -0
@@ -22,6 +22,10 @@ static struct ccu_clk_gate a10_gates[] = { [CLK_AHB_MMC1] = GATE(0x060, BIT(9)), [CLK_AHB_MMC2] = GATE(0x060, BIT(10)), [CLK_AHB_MMC3] = GATE(0x060, BIT(11)), + [CLK_AHB_SPI0] = GATE(0x060, BIT(20)), + [CLK_AHB_SPI1] = GATE(0x060, BIT(21)), + [CLK_AHB_SPI2] = GATE(0x060, BIT(22)), + [CLK_AHB_SPI3] = GATE(0x060, BIT(23)), [CLK_APB1_UART0] = GATE(0x06c, BIT(16)), [CLK_APB1_UART1] = GATE(0x06c, BIT(17)),
@@ -32,6 +36,11 @@ static struct ccu_clk_gate a10_gates[] = { [CLK_APB1_UART6] = GATE(0x06c, BIT(22)), [CLK_APB1_UART7] = GATE(0x06c, BIT(23)), + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_SPI1] = GATE(0x0a4, BIT(31)), + [CLK_SPI2] = GATE(0x0a8, BIT(31)), + [CLK_SPI3] = GATE(0x0d4, BIT(31)), /* SPI3 is separate */ + [CLK_USB_OHCI0] = GATE(0x0cc, BIT(6)), [CLK_USB_OHCI1] = GATE(0x0cc, BIT(7)), [CLK_USB_PHY] = GATE(0x0cc, BIT(8)),
drivers/clk/sunxi/clk_a10s.c +7 -0
@@ -19,6 +19,13 @@ static struct ccu_clk_gate a10s_gates[] = { [CLK_AHB_MMC0] = GATE(0x060, BIT(8)), [CLK_AHB_MMC1] = GATE(0x060, BIT(9)), [CLK_AHB_MMC2] = GATE(0x060, BIT(10)), + [CLK_AHB_SPI0] = GATE(0x060, BIT(20)), + [CLK_AHB_SPI1] = GATE(0x060, BIT(21)), + [CLK_AHB_SPI2] = GATE(0x060, BIT(22)), + + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_SPI1] = GATE(0x0a4, BIT(31)), + [CLK_SPI2] = GATE(0x0a8, BIT(31)), [CLK_APB1_UART0] = GATE(0x06c, BIT(16)), [CLK_APB1_UART1] = GATE(0x06c, BIT(17)),
drivers/clk/sunxi/clk_a23.c +7 -0
@@ -16,6 +16,8 @@ static struct ccu_clk_gate a23_gates[] = { [CLK_BUS_MMC0] = GATE(0x060, BIT(8)), [CLK_BUS_MMC1] = GATE(0x060, BIT(9)), [CLK_BUS_MMC2] = GATE(0x060, BIT(10)), + [CLK_BUS_SPI0] = GATE(0x060, BIT(20)), + [CLK_BUS_SPI1] = GATE(0x060, BIT(21)), [CLK_BUS_OTG] = GATE(0x060, BIT(24)), [CLK_BUS_EHCI] = GATE(0x060, BIT(26)), [CLK_BUS_OHCI] = GATE(0x060, BIT(29)),
@@ -26,6 +28,9 @@ static struct ccu_clk_gate a23_gates[] = { [CLK_BUS_UART3] = GATE(0x06c, BIT(19)), [CLK_BUS_UART4] = GATE(0x06c, BIT(20)), + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_SPI1] = GATE(0x0a4, BIT(31)), + [CLK_USB_PHY0] = GATE(0x0cc, BIT(8)), [CLK_USB_PHY1] = GATE(0x0cc, BIT(9)), [CLK_USB_HSIC] = GATE(0x0cc, BIT(10)),
@@ -41,6 +46,8 @@ static struct ccu_reset a23_resets[] = { [RST_BUS_MMC0] = RESET(0x2c0, BIT(8)), [RST_BUS_MMC1] = RESET(0x2c0, BIT(9)), [RST_BUS_MMC2] = RESET(0x2c0, BIT(10)), + [RST_BUS_SPI0] = RESET(0x2c0, BIT(20)), + [RST_BUS_SPI1] = RESET(0x2c0, BIT(21)), [RST_BUS_OTG] = RESET(0x2c0, BIT(24)), [RST_BUS_EHCI] = RESET(0x2c0, BIT(26)), [RST_BUS_OHCI] = RESET(0x2c0, BIT(29)),
drivers/clk/sunxi/clk_a31.c +13 -0
@@ -17,6 +17,10 @@ static struct ccu_clk_gate a31_gates[] = { [CLK_AHB1_MMC1] = GATE(0x060, BIT(9)), [CLK_AHB1_MMC2] = GATE(0x060, BIT(10)), [CLK_AHB1_MMC3] = GATE(0x060, BIT(11)), + [CLK_AHB1_SPI0] = GATE(0x060, BIT(20)), + [CLK_AHB1_SPI1] = GATE(0x060, BIT(21)), + [CLK_AHB1_SPI2] = GATE(0x060, BIT(22)), + [CLK_AHB1_SPI3] = GATE(0x060, BIT(23)), [CLK_AHB1_OTG] = GATE(0x060, BIT(24)), [CLK_AHB1_EHCI0] = GATE(0x060, BIT(26)), [CLK_AHB1_EHCI1] = GATE(0x060, BIT(27)),
@@ -31,6 +35,11 @@ static struct ccu_clk_gate a31_gates[] = { [CLK_APB2_UART4] = GATE(0x06c, BIT(20)), [CLK_APB2_UART5] = GATE(0x06c, BIT(21)), + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_SPI1] = GATE(0x0a4, BIT(31)), + [CLK_SPI2] = GATE(0x0a8, BIT(31)), + [CLK_SPI3] = GATE(0x0ac, BIT(31)), + [CLK_USB_PHY0] = GATE(0x0cc, BIT(8)), [CLK_USB_PHY1] = GATE(0x0cc, BIT(9)), [CLK_USB_PHY2] = GATE(0x0cc, BIT(10)),
@@ -48,6 +57,10 @@ static struct ccu_reset a31_resets[] = { [RST_AHB1_MMC1] = RESET(0x2c0, BIT(9)), [RST_AHB1_MMC2] = RESET(0x2c0, BIT(10)), [RST_AHB1_MMC3] = RESET(0x2c0, BIT(11)), + [RST_AHB1_SPI0] = RESET(0x2c0, BIT(20)), + [RST_AHB1_SPI1] = RESET(0x2c0, BIT(21)), + [RST_AHB1_SPI2] = RESET(0x2c0, BIT(22)), + [RST_AHB1_SPI3] = RESET(0x2c0, BIT(23)), [RST_AHB1_OTG] = RESET(0x2c0, BIT(24)), [RST_AHB1_EHCI0] = RESET(0x2c0, BIT(26)), [RST_AHB1_EHCI1] = RESET(0x2c0, BIT(27)),
drivers/clk/sunxi/clk_a64.c +7 -0
@@ -16,6 +16,8 @@ static const struct ccu_clk_gate a64_gates[] = { [CLK_BUS_MMC0] = GATE(0x060, BIT(8)), [CLK_BUS_MMC1] = GATE(0x060, BIT(9)), [CLK_BUS_MMC2] = GATE(0x060, BIT(10)), + [CLK_BUS_SPI0] = GATE(0x060, BIT(20)), + [CLK_BUS_SPI1] = GATE(0x060, BIT(21)), [CLK_BUS_OTG] = GATE(0x060, BIT(23)), [CLK_BUS_EHCI0] = GATE(0x060, BIT(24)), [CLK_BUS_EHCI1] = GATE(0x060, BIT(25)),
@@ -28,6 +30,9 @@ static const struct ccu_clk_gate a64_gates[] = { [CLK_BUS_UART3] = GATE(0x06c, BIT(19)), [CLK_BUS_UART4] = GATE(0x06c, BIT(20)), + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_SPI1] = GATE(0x0a4, BIT(31)), + [CLK_USB_PHY0] = GATE(0x0cc, BIT(8)), [CLK_USB_PHY1] = GATE(0x0cc, BIT(9)), [CLK_USB_HSIC] = GATE(0x0cc, BIT(10)),
@@ -44,6 +49,8 @@ static const struct ccu_reset a64_resets[] = { [RST_BUS_MMC0] = RESET(0x2c0, BIT(8)), [RST_BUS_MMC1] = RESET(0x2c0, BIT(9)), [RST_BUS_MMC2] = RESET(0x2c0, BIT(10)), + [RST_BUS_SPI0] = RESET(0x2c0, BIT(20)), + [RST_BUS_SPI1] = RESET(0x2c0, BIT(21)), [RST_BUS_OTG] = RESET(0x2c0, BIT(23)), [RST_BUS_EHCI0] = RESET(0x2c0, BIT(24)), [RST_BUS_EHCI1] = RESET(0x2c0, BIT(25)),
drivers/clk/sunxi/clk_a80.c +15 -0
@@ -13,6 +13,16 @@#include <dt-bindings/reset/sun9i-a80-ccu.h> static const struct ccu_clk_gate a80_gates[] = { + [CLK_SPI0 ] =GATE (0x030 ,BIT (31 )), + [CLK_SPI1 ] =GATE (0x034 ,BIT (31 )), + [CLK_SPI2 ] =GATE (0x038 ,BIT (31 )), + [CLK_SPI3 ] =GATE (0x03c ,BIT (31 )), + + [CLK_BUS_SPI0 ] =GATE (0x180 ,BIT (20 )), + [CLK_BUS_SPI1 ] =GATE (0x180 ,BIT (21 )), + [CLK_BUS_SPI2 ] =GATE (0x180 ,BIT (22 )), + [CLK_BUS_SPI3 ] =GATE (0x180 ,BIT (23 )), + [CLK_BUS_MMC ] =GATE (0x580 ,BIT (8 )), [CLK_BUS_UART0 ] =GATE (0x594 ,BIT (16 )),
@@ -24,6 +34,11 @@ static const struct ccu_clk_gate a80_gates[] = { };static const struct ccu_reset a80_resets[] = { + [RST_BUS_SPI0 ] =RESET (0x1a0 ,BIT (20 )), + [RST_BUS_SPI1 ] =RESET (0x1a0 ,BIT (21 )), + [RST_BUS_SPI2 ] =RESET (0x1a0 ,BIT (22 )), + [RST_BUS_SPI3 ] =RESET (0x1a0 ,BIT (23 )), + [RST_BUS_MMC ] =RESET (0x5a0 ,BIT (8 )), [RST_BUS_UART0 ] =RESET (0x5b4 ,BIT (16 )),
drivers/clk/sunxi/clk_a83t.c +7 -0
@@ -16,6 +16,8 @@ static struct ccu_clk_gate a83t_gates[] = { [CLK_BUS_MMC0] = GATE(0x060, BIT(8)), [CLK_BUS_MMC1] = GATE(0x060, BIT(9)), [CLK_BUS_MMC2] = GATE(0x060, BIT(10)), + [CLK_BUS_SPI0] = GATE(0x060, BIT(20)), + [CLK_BUS_SPI1] = GATE(0x060, BIT(21)), [CLK_BUS_OTG] = GATE(0x060, BIT(24)), [CLK_BUS_EHCI0] = GATE(0x060, BIT(26)), [CLK_BUS_EHCI1] = GATE(0x060, BIT(27)),
@@ -27,6 +29,9 @@ static struct ccu_clk_gate a83t_gates[] = { [CLK_BUS_UART3] = GATE(0x06c, BIT(19)), [CLK_BUS_UART4] = GATE(0x06c, BIT(20)), + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_SPI1] = GATE(0x0a4, BIT(31)), + [CLK_USB_PHY0] = GATE(0x0cc, BIT(8)), [CLK_USB_PHY1] = GATE(0x0cc, BIT(9)), [CLK_USB_HSIC] = GATE(0x0cc, BIT(10)),
@@ -42,6 +47,8 @@ static struct ccu_reset a83t_resets[] = { [RST_BUS_MMC0] = RESET(0x2c0, BIT(8)), [RST_BUS_MMC1] = RESET(0x2c0, BIT(9)), [RST_BUS_MMC2] = RESET(0x2c0, BIT(10)), + [RST_BUS_SPI0] = RESET(0x2c0, BIT(20)), + [RST_BUS_SPI1] = RESET(0x2c0, BIT(21)), [RST_BUS_OTG] = RESET(0x2c0, BIT(24)), [RST_BUS_EHCI0] = RESET(0x2c0, BIT(26)), [RST_BUS_EHCI1] = RESET(0x2c0, BIT(27)),
drivers/clk/sunxi/clk_h3.c +7 -0
@@ -16,6 +16,8 @@ static struct ccu_clk_gate h3_gates[] = { [CLK_BUS_MMC0] = GATE(0x060, BIT(8)), [CLK_BUS_MMC1] = GATE(0x060, BIT(9)), [CLK_BUS_MMC2] = GATE(0x060, BIT(10)), + [CLK_BUS_SPI0] = GATE(0x060, BIT(20)), + [CLK_BUS_SPI1] = GATE(0x060, BIT(21)), [CLK_BUS_OTG] = GATE(0x060, BIT(23)), [CLK_BUS_EHCI0] = GATE(0x060, BIT(24)), [CLK_BUS_EHCI1] = GATE(0x060, BIT(25)),
@@ -31,6 +33,9 @@ static struct ccu_clk_gate h3_gates[] = { [CLK_BUS_UART2] = GATE(0x06c, BIT(18)), [CLK_BUS_UART3] = GATE(0x06c, BIT(19)), + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_SPI1] = GATE(0x0a4, BIT(31)), + [CLK_USB_PHY0] = GATE(0x0cc, BIT(8)), [CLK_USB_PHY1] = GATE(0x0cc, BIT(9)), [CLK_USB_PHY2] = GATE(0x0cc, BIT(10)),
@@ -50,6 +55,8 @@ static struct ccu_reset h3_resets[] = { [RST_BUS_MMC0] = RESET(0x2c0, BIT(8)), [RST_BUS_MMC1] = RESET(0x2c0, BIT(9)), [RST_BUS_MMC2] = RESET(0x2c0, BIT(10)), + [RST_BUS_SPI0] = RESET(0x2c0, BIT(20)), + [RST_BUS_SPI1] = RESET(0x2c0, BIT(21)), [RST_BUS_OTG] = RESET(0x2c0, BIT(23)), [RST_BUS_EHCI0] = RESET(0x2c0, BIT(24)), [RST_BUS_EHCI1] = RESET(0x2c0, BIT(25)),
drivers/clk/sunxi/clk_h6.c +6 -0
@@ -20,6 +20,10 @@ static struct ccu_clk_gate h6_gates[] = { [CLK_BUS_UART1] = GATE(0x90c, BIT(1)), [CLK_BUS_UART2] = GATE(0x90c, BIT(2)), [CLK_BUS_UART3] = GATE(0x90c, BIT(3)), + [CLK_SPI0] = GATE(0x940, BIT(31)), + [CLK_SPI1] = GATE(0x944, BIT(31)), + [CLK_BUS_SPI0] = GATE(0x96c, BIT(0)), + [CLK_BUS_SPI1] = GATE(0x96c, BIT(1)), };static struct ccu_reset h6_resets[] = {
@@ -30,6 +34,8 @@ static struct ccu_reset h6_resets[] = { [RST_BUS_UART1] = RESET(0x90c, BIT(17)), [RST_BUS_UART2] = RESET(0x90c, BIT(18)), [RST_BUS_UART3] = RESET(0x90c, BIT(19)), + [RST_BUS_SPI0] = RESET(0x96c, BIT(16)), + [RST_BUS_SPI1] = RESET(0x96c, BIT(17)), };static const struct ccu_desc h6_ccu_desc = {
drivers/clk/sunxi/clk_r40.c +13 -0
@@ -17,6 +17,10 @@ static struct ccu_clk_gate r40_gates[] = { [CLK_BUS_MMC1] = GATE(0x060, BIT(9)), [CLK_BUS_MMC2] = GATE(0x060, BIT(10)), [CLK_BUS_MMC3] = GATE(0x060, BIT(11)), + [CLK_BUS_SPI0] = GATE(0x060, BIT(20)), + [CLK_BUS_SPI1] = GATE(0x060, BIT(21)), + [CLK_BUS_SPI2] = GATE(0x060, BIT(22)), + [CLK_BUS_SPI3] = GATE(0x060, BIT(23)), [CLK_BUS_OTG] = GATE(0x060, BIT(25)), [CLK_BUS_EHCI0] = GATE(0x060, BIT(26)), [CLK_BUS_EHCI1] = GATE(0x060, BIT(27)),
@@ -34,6 +38,11 @@ static struct ccu_clk_gate r40_gates[] = { [CLK_BUS_UART6] = GATE(0x06c, BIT(22)), [CLK_BUS_UART7] = GATE(0x06c, BIT(23)), + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_SPI1] = GATE(0x0a4, BIT(31)), + [CLK_SPI2] = GATE(0x0a8, BIT(31)), + [CLK_SPI3] = GATE(0x0ac, BIT(31)), + [CLK_USB_PHY0] = GATE(0x0cc, BIT(8)), [CLK_USB_PHY1] = GATE(0x0cc, BIT(9)), [CLK_USB_PHY2] = GATE(0x0cc, BIT(10)),
@@ -51,6 +60,10 @@ static struct ccu_reset r40_resets[] = { [RST_BUS_MMC1] = RESET(0x2c0, BIT(9)), [RST_BUS_MMC2] = RESET(0x2c0, BIT(10)), [RST_BUS_MMC3] = RESET(0x2c0, BIT(11)), + [RST_BUS_SPI0] = RESET(0x2c0, BIT(20)), + [RST_BUS_SPI1] = RESET(0x2c0, BIT(21)), + [RST_BUS_SPI2] = RESET(0x2c0, BIT(22)), + [RST_BUS_SPI3] = RESET(0x2c0, BIT(23)), [RST_BUS_OTG] = RESET(0x2c0, BIT(25)), [RST_BUS_EHCI0] = RESET(0x2c0, BIT(26)), [RST_BUS_EHCI1] = RESET(0x2c0, BIT(27)),
drivers/clk/sunxi/clk_v3s.c +4 -0
@@ -17,11 +17,14 @@ static struct ccu_clk_gate v3s_gates[] = { [CLK_BUS_MMC1] = GATE(0x060, BIT(9)), [CLK_BUS_MMC2] = GATE(0x060, BIT(10)), [CLK_BUS_OTG] = GATE(0x060, BIT(24)), + [CLK_BUS_SPI0] = GATE(0x060, BIT(20)), [CLK_BUS_UART0] = GATE(0x06c, BIT(16)), [CLK_BUS_UART1] = GATE(0x06c, BIT(17)), [CLK_BUS_UART2] = GATE(0x06c, BIT(18)), + [CLK_SPI0] = GATE(0x0a0, BIT(31)), + [CLK_USB_PHY0] = GATE(0x0cc, BIT(8)), };
@@ -31,6 +34,7 @@ static struct ccu_reset v3s_resets[] = { [RST_BUS_MMC0] = RESET(0x2c0, BIT(8)), [RST_BUS_MMC1] = RESET(0x2c0, BIT(9)), [RST_BUS_MMC2] = RESET(0x2c0, BIT(10)), + [RST_BUS_SPI0] = RESET(0x2c0, BIT(20)), [RST_BUS_OTG] = RESET(0x2c0, BIT(24)), [RST_BUS_UART0] = RESET(0x2d8, BIT(16)),
Signature · 1 line
2.14.5
PATCH v2 3/4 spi: sunxi: Add CLK support to Allwinner SPI driver
In reply to Andre PrzywaraFrom: Jagan Teki <[email protected]>
Add support for DM_CLK driven clocks and reset gates.
--- drivers/spi/sun4i_spi.c | 83 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 66 insertions(+), 17 deletions(-)
drivers/spi/sun4i_spi.c +66 -17
@@ -19,7 +19,9 @@*/ #include <common.h> +#include <clk.h> #include <dm.h> +#include <reset.h> #include <spi.h> #include <errno.h> #include <fdt_support.h>
@@ -114,6 +116,9 @@ struct sun4i_spi_platdata {struct sun4i_spi_priv {struct sun4i_spi_regs *regs; +struct clk ahb_clk; +struct clk mod_clk; +struct reset_ctl rst_ctl;u32 freq;u32 mode;
@@ -239,23 +244,48 @@ static int sun4i_spi_parse_pins(struct udevice *dev)return 0 ; } -static void sun4i_spi_enable_clock (void ) +static int sun4i_spi_enable_clock (struct udevice *dev) { -struct sunxi_ccm_reg *const ccm = - (struct sunxi_ccm_reg *const )SUNXI_CCM_BASE ; +struct sun4i_spi_priv *priv =dev_get_priv (dev); +int ret; + + ret =clk_enable (&priv->ahb_clk); +if (ret) { +dev_err (dev,"failed to enable ahb clock (ret=%d)\n" , ret); +return ret; + } + + ret =clk_enable (&priv->mod_clk); +if (ret) { +dev_err (dev,"failed to enable mod clock (ret=%d)\n" , ret); + goto err_ahb; + } -setbits_le32 (&ccm->ahb_gate0, (1 <<AHB_GATE_OFFSET_SPI0 )); -writel ((1 <<31 ), &ccm->spi0_clk_cfg); +if (reset_valid (&priv->rst_ctl)) + ret =reset_deassert (&priv->rst_ctl); +if (ret) { +dev_err (dev,"failed to deassert reset gate (ret=%d)\n" , ret); + goto err_mod; + } + +return 0 ; + +err_mod: +clk_disable (&priv->mod_clk); +err_ahb: +clk_disable (&priv->ahb_clk); + +return ret; } -static void sun4i_spi_disable_clock (void ) +static void sun4i_spi_disable_clock (struct udevice *dev) { -struct sunxi_ccm_reg *const ccm = - (struct sunxi_ccm_reg *const )SUNXI_CCM_BASE ; - -writel (0 , &ccm->spi0_clk_cfg); -clrbits_le32 (&ccm->ahb_gate0, (1 <<AHB_GATE_OFFSET_SPI0 )); +struct sun4i_spi_priv *priv =dev_get_priv (dev); +clk_disable (&priv->ahb_clk); +clk_disable (&priv->mod_clk); +if (reset_valid (&priv->rst_ctl)) +reset_assert (&priv->rst_ctl); }static int sun4i_spi_ofdata_to_platdata (struct udevice *bus)
@@ -274,12 +304,31 @@ static int sun4i_spi_ofdata_to_platdata(struct udevice *bus)return 0 ; } -static int sun4i_spi_probe (struct udevice *bus) +static int sun4i_spi_probe (struct udevice *dev) { -struct sun4i_spi_platdata *plat =dev_get_platdata (bus); -struct sun4i_spi_priv *priv =dev_get_priv (bus); +struct sun4i_spi_platdata *plat =dev_get_platdata (dev); +struct sun4i_spi_priv *priv =dev_get_priv (dev); +int ret; + + ret =clk_get_by_name (dev,"ahb" , &priv->ahb_clk); +if (ret) { +dev_err (dev,"failed to get ahb clock\n" ); +return ret; + } + + ret =clk_get_by_name (dev,"mod" , &priv->mod_clk); +if (ret) { +dev_err (dev,"failed to get mod clock\n" ); +return ret; + } + + ret =reset_get_by_index (dev,0 , &priv->rst_ctl); +if (ret && ret != -ENOENT ) { +dev_err (dev,"failed to get reset gate\n" ); +return ret; + } -sun4i_spi_parse_pins (bus); +sun4i_spi_parse_pins (dev); priv->regs = (struct sun4i_spi_regs *)(uintptr_t )plat->base_addr; priv->freq = plat->max_hz;
@@ -291,7 +340,7 @@ static int sun4i_spi_claim_bus(struct udevice *dev) {struct sun4i_spi_priv *priv =dev_get_priv (dev->parent); -sun4i_spi_enable_clock (); +sun4i_spi_enable_clock (dev->parent); writel(SUN4I_CTL_ENABLE | SUN4I_CTL_MASTER | SUN4I_CTL_TP | SUN4I_CTL_CS_MANUAL | SUN4I_CTL_CS_ACTIVE_LOW,
@@ -309,7 +358,7 @@ static int sun4i_spi_release_bus(struct udevice *dev) reg &= ~SUN4I_CTL_ENABLE ;writel (reg, &priv->regs->ctl); -sun4i_spi_disable_clock (); +sun4i_spi_disable_clock (dev->parent);return 0 ; }
Signature · 1 line
2.14.5
PATCH v2 4/4 spi: sunxi: Support newer SoCs
In reply to Andre PrzywaraFrom: Oskari Lemmela <[email protected]>
So far the Allwinner SPI driver just covered the older generation SPI peripheral found in the A10 and A20 devices.
Newer SoCs use a slightly different device, which is still annoyingly
similar: Too similar to justify a separate driver, but too different to have a neatly integrated driver.
Embrace the U-Boot spirit and solve this issue with some #ifdefs ;-)
Should the need arise, this can be later turned into runtime decisions, but so far we will never see the need for a joint driver in a certain binary build.
The technical changes were based on arch/arm/mach-sunxi/spl_spi_sunxi.c.
--- drivers/spi/Kconfig | 4 +-- drivers/spi/sun4i_spi.c | 94 ++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 84 insertions(+), 14 deletions(-)
drivers/spi/Kconfig +2 -2
@@ -223,9 +223,9 @@ config STM32_QSPI this ST IP core. config SUN4I_SPI - bool "Allwinner A10 SoCs SPI controller" + bool "Allwinner SoCs SPI driver" help - SPI driver for Allwinner sun4i, sun5i and sun7i SoCs + SPI driver for Allwinner SoCs config TEGRA114_SPI bool "nVidia Tegra114 SPI driver"
drivers/spi/sun4i_spi.c +82 -12
188 lines not on this page · raw message
Signature · 1 line
2.14.5
v2 cover sunxi: SPI: Add SUN6I generation SPI support
In reply to Andre PrzywaraQuoted 26 lines · Andre Przywara
We already have a driver for the SPI devices in older Allwinner CPUs. Newer SoCs (SUN6I generation) have a similar, but improved IP block. This series adds support for that, so we can access the SPI flash that some newer boards come with.
This series gathers some patches that have appeared on the list in one form or another before (hence the v2 tag), but brings them all together and updates them.The SUN4I/SUN6I SPI devices share a very similar architecure, but differ annoyingly in quite some details, to a point where a shared driver would look unnecessarily complicated. So we use an #ifdef based approach, which keeps the driver simple, at the cost of not being able to access both types of device in one binary build. But since there are no SoCs which feature both types, this is a theoretical disadvantage.
Patch 1/4 moves the clock toggling from the probe/remove to the claim/release-bus stage.
Patch 2/4 adds the SPI gate clocks and reset gates to the clock drivers, also describes at least the enable bit for the SPI mod clock. This is used in patch 3/4, which uses the new DM clock framework in the driver, helping to abstract differences between the SUN4I/SUN6I types.
Patch 4/4 eventually adds support for the new SUN6I generation SPI device. The actual device support is determined at compile time, based on theCONFIG_SUNXI_GEN_SUN6Isymbol.
Quoted 7 lines
What's left out of this series is the config bits needed to actually activate the support for a board. At the moment this is unnecessarily verbose, so that Oskari is looking at simplifying this at the
Kconfiglevel, which would complement this series.This has been briefly tested on the Pine64-LTS and the OrangePi PC2 board. Please test them if you have other devices with a SUN6I SPI generation.
I have new series for this which I sent two days back [1]. which uses same sun4i driver and implement enum reg set to avoid ifdef.
v2 cover sunxi: SPI: Add SUN6I generation SPI support
Quoted 32 lines · On Tue, 12 Feb 2019 16:15:22 +0530 Jagan Teki <[email protected]>…
Quoted 31 lines · Andre Przywara
We already have a driver for the SPI devices in older Allwinner CPUs. Newer SoCs (SUN6I generation) have a similar, but improved IP block. This series adds support for that, so we can access the SPI flash that some newer boards come with.
This series gathers some patches that have appeared on the list in one form or another before (hence the v2 tag), but brings them all together and updates them.The SUN4I/SUN6I SPI devices share a very similar architecure, but differ annoyingly in quite some details, to a point where a shared driver would look unnecessarily complicated. So we use an #ifdef based approach, which keeps the driver simple, at the cost of not being able to access both types of device in one binary build. But since there are no SoCs which feature both types, this is a theoretical disadvantage.
Patch 1/4 moves the clock toggling from the probe/remove to the claim/release-bus stage.
Patch 2/4 adds the SPI gate clocks and reset gates to the clock drivers, also describes at least the enable bit for the SPI mod clock. This is used in patch 3/4, which uses the new DM clock framework in the driver, helping to abstract differences between the SUN4I/SUN6I types.
Patch 4/4 eventually adds support for the new SUN6I generation SPI device. The actual device support is determined at compile time, based on theCONFIG_SUNXI_GEN_SUN6Isymbol.What's left out of this series is the config bits needed to actually activate the support for a board. At the moment this is unnecessarily verbose, so that Oskari is looking at simplifying this at the
Kconfiglevel, which would complement this series.
Quoted 7 lines
Quoted 2 lines
This has been briefly tested on the Pine64-LTS and the OrangePi PC2 board. Please test them if you have other devices with a SUN6I SPI generation.
I have new series for this which I sent two days back [1]. which uses same sun4i driver and implement enum reg set to avoid ifdef.
Ah, sorry, I missed that completely. Will have a look at this later on.
Cheers,
Andre.