Add MMC and DMA support for Actions S700
Subsystems (6)
v3 cover Add MMC and DMA support for Actions S700
This Series(v3) addressed the review comments provide by Rob, and there are changes in patch 5/10 for it.
Also, one of the important change for this series(v3) is about the way we we handle address range conflict between pinctrl and sps node.
In the last Series(v2), patch 4/10 was sent as *do not merge* but while discussing about some proper solution for it, we have come up with idea of limiting pinctrl address range(to 0x100) to avoid this conflict. This is safe to do as current pinctrl driver uses address range only up to 0x100 (even less than that?), and this would let sps to work properly.
Since sps block is now enabled , we have to provide power-domain bit for dma to work properly and patch 6/10 has that change now.
Looking forward have some comments for this series.
---------------------------------------------------------------------------
Series(v2) addressed the review comments provided by Andre, and there are changes in patch 1/10, 2/10, 5/10 and 9/10.
* Accessor function (to get the frame lenght) has moved from patch 2/9 to patch 1/9 with inline removed.
* Removed the unnecessary line break.
* Added comments about the way DMA descriptor differs between S700 and S900.
* Added a macro to define fcnt value.
* Updated dma DT bindings.
* Used SoC secific compatible string for MMC.
Apart from it, a new patch 8/10 is added in this series to update mmc DT bindings.
Series is rebased on 5.7.0-rc6.
-----------------------------------------------------------------------------
Series(v1) have following changes from the previous series.
New patch(5/8) has been introduced that converts dma dt-binding for Actions OWL SoC from text format to yaml file.
For patch(2/8) new accessor function is added to get the frame lenght which is common to both S900 and S700. Apart from it SoC check is removed from irq routine as it is not needed.
Patch(4/8) which is an hack to prove our DMA and MMC works for S700 is now sent as *do not merge* patch.
DMA is tested using dmatest with follwoing result:
root@ubuntu:~# echo dma0chan1 > /sys/module/dmatest/parameters/channel root@ubuntu:~# echo 2000 > /sys/module/dmatest/parameters/timeout root@ubuntu:~# echo 1 > /sys/module/dmatest/parameters/iterations root@ubuntu:~# echo 1 > /sys/module/dmatest/parameters/run
root@ubuntu:~# dmesg | tail [ 303.362586] dmatest: Added 1 threads using dma0chan1 [ 317.258658] dmatest: Started 1 threads using dma0chan1 [ 317.259397] dmatest: dma0chan1-copy0: summary 1 tests, 0 failures 16129.03 iops 32258 KB/s (0)
-------------------------------------------------------------------------------
The intention of RFC series is to enable uSD and DMA support for Cubieboard7 based on Actions S700 SoC, and on the way we found that it requires changes in dmaengine present on S700 as its different from what is present on S900.
Patch(1/8) does provide a new way to describe DMA descriptor, idea is to remove the bit-fields as its less maintainable. It is only build tested and it would be great if this can be tested on S900 based hardware.
Patch(2/8) adds S700 DMA engine support, there is new compatible string added for it, which means a changed bindings needed to submitted for this. I would plan to send it later the converted "owl-dma.yaml".
Patch(4/8) disables the sps node as its memory range is conflicting pinctrl node and results in pinctrl proble failure.
Rest of patches in the series adds DMA/MMC nodes for S700 alone with binding constants and enables the uSD for Cubieboard7.
This whole series is tested, by building/compiling Kernel on Cubieboard7-lite which was *almost* successful (OOM kicked in, while Linking due to less RAM present on hardware).
Following is the mmc speed :
ubuntu@ubuntu:~$ sudo hdparm -tT /dev/mmcblk0
/dev/mmcblk0:
Timing cached reads: 1310 MB in 2.00 seconds = 655.15 MB/sec
Timing buffered disk reads: 62 MB in 3.05 seconds = 20.30 MB/sec
Amit Singh Tomar (10):
dmaengine: Actions: get rid of bit fields from dma descriptor
dmaengine: Actions: Add support for S700 DMA engine
clk: actions: Add MMC clock-register reset bits
arm64: dts: actions: limit address range for pinctrl node
dt-bindings: dmaengine: convert Actions Semi Owl SoCs bindings to yaml
arm64: dts: actions: Add DMA Controller for S700
dt-bindings: reset: s700: Add binding constants for mmc
dt-bindings: mmc: owl: add compatible string actions,s700-mmc
arm64: dts: actions: Add MMC controller support for S700
arm64: dts: actions: Add uSD support for Cubieboard7
Documentation/devicetree/bindings/dma/owl-dma.txt | 47 -------- Documentation/devicetree/bindings/dma/owl-dma.yaml | 79 +++++++++++++ Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 6 +- arch/arm64/boot/dts/actions/s700-cubieboard7.dts | 41 +++++++ arch/arm64/boot/dts/actions/s700.dtsi | 51 ++++++++- drivers/clk/actions/owl-s700.c | 3 + drivers/dma/owl-dma.c | 126 ++++++++++++--------- include/dt-bindings/reset/actions,s700-reset.h | 3 + 8 files changed, 256 insertions(+), 100 deletions(-) delete mode 100644 Documentation/devicetree/bindings/dma/owl-dma.txt create mode 100644 Documentation/devicetree/bindings/dma/owl-dma.yaml
Signature · 1 line
2.7.4
PATCH v3 1/10 dmaengine: Actions: get rid of bit fields from dma descriptor
At the moment, Driver uses bit fields to describe registers of the DMA descriptor structure that makes it less portable and maintainable, and Andre suugested(and even sketched important bits for it) to make use of array to describe this DMA descriptors instead. It gives the flexibility while extending support for other platform such as Actions S700.
This commit removes the "owl_dma_lli_hw" (that includes bit-fields) and uses array to describe DMA descriptor.
---
Changes since v2:
* No change.
Changes since v1:
* Defined macro for frame count value.
* Introduced llc_hw_flen() from patch 2/9.
* Removed the unnecessary line break.
Changes since rfc:
* No change.
--- drivers/dma/owl-dma.c | 84 ++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 44 deletions(-)
drivers/dma/owl-dma.c +40 -44
@@ -120,30 +120,21 @@#define BIT_FIELD (val, width, shift, newshift) \ ((((val) >> (shift)) & ((BIT(width)) - 1)) << (newshift)) -/** -* struct owl_dma_lli_hw - Hardware link list for dma transfer -* @next_lli: physical address of the next link list -* @saddr: source physical address -* @daddr: destination physical address -* @flen: frame length -* @fcnt: frame count -* @src_stride: source stride -* @dst_stride: destination stride -* @ctrla: dma_mode and linklist ctrl config -* @ctrlb: interrupt config -* @const_num: data for constant fill -*/ -struct owl_dma_lli_hw { -u32 next_lli; -u32 saddr; -u32 daddr; -u32 flen:20 ; -u32 fcnt:12 ; -u32 src_stride; -u32 dst_stride; -u32 ctrla; -u32 ctrlb; -u32 const_num; +/* Frame count value is fixed as 1 */ +#define FCNT_VAL 0x1 + +/* Describe DMA descriptor, hardware link list for dma transfer */ +enum owl_dmadesc_offsets { +OWL_DMADESC_NEXT_LLI =0 , +OWL_DMADESC_SADDR , +OWL_DMADESC_DADDR , +OWL_DMADESC_FLEN , +OWL_DMADESC_SRC_STRIDE , +OWL_DMADESC_DST_STRIDE , +OWL_DMADESC_CTRLA , +OWL_DMADESC_CTRLB , +OWL_DMADESC_CONST_NUM , +OWL_DMADESC_SIZE };/**
@@ -153,7 +144,7 @@ struct owl_dma_lli_hw {* @node: node for txd's lli_list */ struct owl_dma_lli { -struct owl_dma_lli_hw hw; +u32 hw[OWL_DMADESC_SIZE ];dma_addr_t phys;struct list_head node; };
@@ -320,6 +311,11 @@ static inline u32 llc_hw_ctrlb(u32 int_ctl)return ctl; } +static u32 llc_hw_flen (struct owl_dma_lli *lli) +{ +return lli->hw[OWL_DMADESC_FLEN ] &GENMASK (19 ,0 ); +} +static void owl_dma_free_lli (struct owl_dma *od,struct owl_dma_lli *lli) {
@@ -351,8 +347,9 @@ static struct owl_dma_lli *owl_dma_add_lli(struct owl_dma_txd *txd,list_add_tail (&next->node, &txd->lli_list);if (prev) { - prev->hw.next_lli = next->phys; - prev->hw.ctrla |=llc_hw_ctrla (OWL_DMA_MODE_LME ,0 ); + prev->hw[OWL_DMADESC_NEXT_LLI ] = next->phys; + prev->hw[OWL_DMADESC_CTRLA ] |= +llc_hw_ctrla (OWL_DMA_MODE_LME ,0 ); }return next;
@@ -365,8 +362,7 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, struct dma_slave_config *sconfig, bool is_cyclic) { -struct owl_dma_lli_hw *hw = &lli->hw; -u32 mode; +u32 mode, ctrlb; mode =OWL_DMA_MODE_PW (0 );
@@ -407,22 +403,22 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan,return -EINVAL ; } - hw->next_lli =0 ;/* One link list by default */ - hw->saddr = src; - hw->daddr = dst; - - hw->fcnt =1 ;/* Frame count fixed as 1 */ - hw->flen = len;/* Max frame length is 1MB */ - hw->src_stride =0 ; - hw->dst_stride =0 ; - hw->ctrla =llc_hw_ctrla (mode, -OWL_DMA_LLC_SAV_LOAD_NEXT | -OWL_DMA_LLC_DAV_LOAD_NEXT ); + lli->hw[OWL_DMADESC_CTRLA ] =llc_hw_ctrla (mode, +OWL_DMA_LLC_SAV_LOAD_NEXT | +OWL_DMA_LLC_DAV_LOAD_NEXT );if (is_cyclic) - hw->ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_BLOCK ); + ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_BLOCK );else - hw->ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_SUPER_BLOCK ); + ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_SUPER_BLOCK ); + + lli->hw[OWL_DMADESC_NEXT_LLI ] =0 ; + lli->hw[OWL_DMADESC_SADDR ] = src; + lli->hw[OWL_DMADESC_DADDR ] = dst; + lli->hw[OWL_DMADESC_SRC_STRIDE ] =0 ; + lli->hw[OWL_DMADESC_DST_STRIDE ] =0 ; + lli->hw[OWL_DMADESC_FLEN ] = len |FCNT_VAL <<20 ; + lli->hw[OWL_DMADESC_CTRLB ] = ctrlb;return 0 ; }
@@ -754,7 +750,7 @@ static u32 owl_dma_getbytes_chan(struct owl_dma_vchan *vchan)/* Start from the next active node */ if (lli->phys == next_lli_phy) {list_for_each_entry (lli, &txd->lli_list, node) - bytes += lli->hw.flen; + bytes +=llc_hw_flen (lli);break ; } }
@@ -785,7 +781,7 @@ static enum dma_status owl_dma_tx_status(struct dma_chan *chan,if (vd) { txd =to_owl_txd (&vd->tx);list_for_each_entry (lli, &txd->lli_list, node) - bytes += lli->hw.flen; + bytes +=llc_hw_flen (lli); }else { bytes =owl_dma_getbytes_chan (vchan); }
Signature · 1 line
2.7.4
Re: [PATCH v3 01/10] dmaengine: Actions: get rid of bit fields from dma descriptor
Quoted 52 lines · Amit Singh Tomar
At the moment, Driver uses bit fields to describe registers of the DMA descriptor structure that makes it less portable and maintainable, and Andre suugested(and even sketched important bits for it) to make use of array to describe this DMA descriptors instead. It gives the flexibility
while extending support for other platform such as Actions S700.This commit removes the "
owl_dma_lli_hw" (that includes bit-fields) and uses array to describe DMA descriptor.Suggested-by Andre Przywara <[email protected]>Signed-off-by Amit Singh Tomar <[email protected]>---
Changes since v2:
* No change.
Changes since v1:
* Defined macro for frame count value.
* Introducedllc_hw_flen()from patch 2/9.
* Removed the unnecessary line break.
Changes since rfc:
* No change.
---drivers/dma/owl-dma.c| 84
++++++++++++++++++++++++---------------------------1 file changed, 40 insertions(+), 44 deletions(-)drivers/dma/owl-dma.c +0
-18@@ -120,30 +120,21 @@#define BIT_FIELD (val, width, shift, newshift) \ ((((val) >> (shift)) & ((BIT(width)) - 1)) << (newshift)) -/** -* struct owl_dma_lli_hw - Hardware link list for dma transfer -* @next_lli: physical address of the next link list -* @saddr: source physical address -* @daddr: destination physical address -* @flen: frame length -* @fcnt: frame count -* @src_stride: source stride -* @dst_stride: destination stride -* @ctrla: dma_mode and linklist ctrl config -* @ctrlb: interrupt config -* @const_num: data for constant fill -*/ -struct owl_dma_lli_hw { -u32 next_lli; -u32 saddr; -u32 daddr; -u32 flen:20 ;
drivers/dma/owl-dma.c line 126
Quoted 10 lines
drivers/dma/owl-dma.c +4
-6- u32 fcnt:12; -u32 src_stride; -u32 dst_stride; -u32 ctrla; -u32 ctrlb; -u32 const_num; +/* Frame count value is fixed as 1 */ +#define FCNT_VAL 0x1 + +/* Describe DMA descriptor, hardware link list for dma transfer */
Individual comments for these enums?
Quoted 77 lines
drivers/dma/owl-dma.c +20
-3+enum owl_dmadesc_offsets { +OWL_DMADESC_NEXT_LLI =0 , +OWL_DMADESC_SADDR , +OWL_DMADESC_DADDR , +OWL_DMADESC_FLEN , +OWL_DMADESC_SRC_STRIDE , +OWL_DMADESC_DST_STRIDE , +OWL_DMADESC_CTRLA , +OWL_DMADESC_CTRLB , +OWL_DMADESC_CONST_NUM , +OWL_DMADESC_SIZE };/** @@ -153,7 +144,7 @@ struct owl_dma_lli_hw {* @node: node for txd's lli_list */ struct owl_dma_lli { -struct owl_dma_lli_hw hw; +u32 hw[OWL_DMADESC_SIZE ];dma_addr_t phys;struct list_head node; };@@ -320,6 +311,11 @@ static inline u32 llc_hw_ctrlb(u32 int_ctl)return ctl; } +static u32 llc_hw_flen (struct owl_dma_lli *lli) +{ +return lli->hw[OWL_DMADESC_FLEN ] &GENMASK (19 ,0 ); +} +static void owl_dma_free_lli (struct owl_dma *od,struct owl_dma_lli *lli) {@@ -351,8 +347,9 @@ static struct owl_dma_lli *owl_dma_add_lli(struct owl_dma_txd *txd,list_add_tail (&next->node, &txd->lli_list);if (prev) { - prev->hw.next_lli = next->phys; - prev->hw.ctrla |=llc_hw_ctrla (OWL_DMA_MODE_LME ,0 ); + prev->hw[OWL_DMADESC_NEXT_LLI ] = next->phys; + prev->hw[OWL_DMADESC_CTRLA ] |= +llc_hw_ctrla (OWL_DMA_MODE_LME ,0 ); }return next;drivers/dma/owl-dma.c +3
-13@@ -365,8 +362,7 @@ static inline int owl_dma_cfg_lli(structowl_dma_vchan *vchan, struct dma_slave_config *sconfig, bool is_cyclic) { - struct owl_dma_lli_hw *hw = &lli->hw; -u32 mode; + u32 mode, ctrlb; mode =OWL_DMA_MODE_PW (0 );@@ -407,22 +403,22 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, return -EINVAL ; } - hw->next_lli =0 ;/* One link list by default */ - hw->saddr = src; - hw->daddr = dst; - - hw->fcnt =1 ;/* Frame count fixed as 1 */ - hw->flen = len;/* Max frame length is 1MB */ - hw->src_stride =0 ; - hw->dst_stride =0 ; - hw->ctrla =llc_hw_ctrla (mode, -OWL_DMA_LLC_SAV_LOAD_NEXT | -OWL_DMA_LLC_DAV_LOAD_NEXT ); + lli->hw[OWL_DMADESC_CTRLA] = llc_hw_ctrla(mode, + OWL_DMA_LLC_SAV_LOAD_NEXT |
drivers/dma/owl-dma.c static inline int owl_dma_cfg_lli(struct · line 416
Quoted 10 lines
drivers/dma/owl-dma.c +5
-2+ OWL_DMA_LLC_DAV_LOAD_NEXT);if (is_cyclic) - hw->ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_BLOCK ); + ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_BLOCK );else - hw->ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_SUPER_BLOCK ); + ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_SUPER_BLOCK ); + + lli->hw[OWL_DMADESC_NEXT_LLI ] =0 ;
Again, please preserve the old comments.
drivers/dma/owl-dma.c static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, · line 420
Quoted 5 lines
drivers/dma/owl-dma.c +5
-0+ lli->hw[OWL_DMADESC_SADDR ] = src; + lli->hw[OWL_DMADESC_DADDR ] = dst; + lli->hw[OWL_DMADESC_SRC_STRIDE ] =0 ; + lli->hw[OWL_DMADESC_DST_STRIDE ] =0 ; + lli->hw[OWL_DMADESC_FLEN ] = len |FCNT_VAL <<20 ;
Please explain what you're doing here.
Thanks,
Mani
Quoted 24 lines
drivers/dma/owl-dma.c +1
-0+ lli->hw[OWL_DMADESC_CTRLB ] = ctrlb;return 0 ;}
drivers/dma/owl-dma.c +1
-1@@ -754,7 +750,7 @@ static u32 owl_dma_getbytes_chan(struct owl_dma_vchan *vchan)/* Start from the next active node */ if (lli->phys == next_lli_phy) {list_for_each_entry (lli, &txd->lli_list, node) - bytes += lli->hw.flen; + bytes +=llc_hw_flen (lli);break ; }}drivers/dma/owl-dma.c +1
-1@@ -785,7 +781,7 @@ static enum dma_status owl_dma_tx_status(structdma_chan *chan, if (vd) { txd =to_owl_txd (&vd->tx);list_for_each_entry (lli, &txd->lli_list, node) - bytes += lli->hw.flen; + bytes +=llc_hw_flen (lli); } else { bytes =owl_dma_getbytes_chan (vchan);}
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
Re: [PATCH v3 01/10] dmaengine: Actions: get rid of bit fields from dma descriptor
Hi,
Thanks for having a look.
Quoted 1 line · Manivannan Sadhasivam
Individual comments for these enums?
I was expecting this comment , and thought these fields are self explanatory But if you prefer to have description about it, I would have it in next version.
Quoted 79 lines
Quoted 79 lines
drivers/dma/owl-dma.c +11
-0+enum owl_dmadesc_offsets { +OWL_DMADESC_NEXT_LLI =0 , +OWL_DMADESC_SADDR , +OWL_DMADESC_DADDR , +OWL_DMADESC_FLEN , +OWL_DMADESC_SRC_STRIDE , +OWL_DMADESC_DST_STRIDE , +OWL_DMADESC_CTRLA , +OWL_DMADESC_CTRLB , +OWL_DMADESC_CONST_NUM , +OWL_DMADESC_SIZE };
/**
drivers/dma/owl-dma.c +9
-3@@ -153,7 +144,7 @@ struct owl_dma_lli_hw {* @node: node for txd's lli_list */ struct owl_dma_lli { -struct owl_dma_lli_hw hw; +u32 hw[OWL_DMADESC_SIZE ];dma_addr_t phys;struct list_head node; };@@ -320,6 +311,11 @@ static inline u32 llc_hw_ctrlb(u32 int_ctl)return ctl; } +static u32 llc_hw_flen (struct owl_dma_lli *lli) +{ +return lli->hw[OWL_DMADESC_FLEN ] &GENMASK (19 ,0 ); +} +static void owl_dma_free_lli (struct owl_dma *od,struct owl_dma_lli *lli) {@@ -351,8 +347,9 @@ static struct owl_dma_lli *owl_dma_add_lli(struct owl_dma_txd *txd,list_add_tail (&next->node, &txd->lli_list);if (prev) { - prev->hw.next_lli = next->phys; - prev->hw.ctrla |=llc_hw_ctrla (OWL_DMA_MODE_LME ,0 ); + prev->hw[OWL_DMADESC_NEXT_LLI ] = next->phys; + prev->hw[OWL_DMADESC_CTRLA ] |= +llc_hw_ctrla (OWL_DMA_MODE_LME ,0 ); }return next;drivers/dma/owl-dma.c +4
-13@@ -365,8 +362,7 @@ static inline int owl_dma_cfg_lli(structowl_dma_vchan *vchan, struct dma_slave_config *sconfig, bool is_cyclic) { - struct owl_dma_lli_hw *hw = &lli->hw; -u32 mode; + u32 mode, ctrlb; mode =OWL_DMA_MODE_PW (0 );@@ -407,22 +403,22 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, return -EINVAL ; } - hw->next_lli =0 ;/* One link list by default */ - hw->saddr = src; - hw->daddr = dst; - - hw->fcnt =1 ;/* Frame count fixed as 1 */ - hw->flen = len;/* Max frame length is 1MB */ - hw->src_stride =0 ; - hw->dst_stride =0 ; - hw->ctrla =llc_hw_ctrla (mode, -OWL_DMA_LLC_SAV_LOAD_NEXT | -OWL_DMA_LLC_DAV_LOAD_NEXT ); + lli->hw[OWL_DMADESC_CTRLA ] =llc_hw_ctrla (mode, +OWL_DMA_LLC_SAV_LOAD_NEXT | +OWL_DMA_LLC_DAV_LOAD_NEXT );
Quoted 10 lines
drivers/dma/owl-dma.c static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, · line 415
Quoted 8 lines
drivers/dma/owl-dma.c +4
-2if (is_cyclic) - hw->ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_BLOCK ); + ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_BLOCK );else - hw->ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_SUPER_BLOCK ); + ctrlb =llc_hw_ctrlb (OWL_DMA_INTCTL_SUPER_BLOCK ); + + lli->hw[OWL_DMADESC_NEXT_LLI ] =0 ;Again, please preserve the old comments.
Sure, would do it.
Quoted 8 lines
drivers/dma/owl-dma.c static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, · line 420
Quoted 6 lines
drivers/dma/owl-dma.c +5
-0+ lli->hw[OWL_DMADESC_SADDR ] = src; + lli->hw[OWL_DMADESC_DADDR ] = dst; + lli->hw[OWL_DMADESC_SRC_STRIDE ] =0 ; + lli->hw[OWL_DMADESC_DST_STRIDE ] =0 ; + lli->hw[OWL_DMADESC_FLEN ] = len |FCNT_VAL <<20 ;Please explain what you're doing here.
Actually , in next the patch 2/10 there is comment that explains a bit about it.
/*
* S700 put flen and fcnt at offset 0x0c and 0x1c respectively,
* whereas S900 put flen and fcnt at offset 0x0c.
*/
Shall I add more details to it in the next patch 02/10 ?
Thanks
-Amit.
PATCH v3 2/10 dmaengine: Actions: Add support for S700 DMA engine
In reply to Amit Singh TomarDMA controller present on S700 SoC is compatible with the one on S900 (as most of registers are same), but it has different DMA descriptor structure where registers "fcnt" and "ctrlb" uses different encoding.
For instance, on S900 "fcnt" starts at offset 0x0c and uses upper 12 bits whereas on S700, it starts at offset 0x1c and uses lower 12 bits.
This commit adds support for DMA controller present on S700.
---
Changes since v2:
* No changes.
Changes since v1:
* Moved llc_hw_flen() to patch 1/9.
* provided comments about dma descriptor difference. between S700 and S900.
Changes since RFC:
* Added accessor function to get the frame lenght.
* Removed the SoC specific check in IRQ routine.
--- drivers/dma/owl-dma.c | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-)
drivers/dma/owl-dma.c +37 -9
@@ -137,6 +137,11 @@ enum owl_dmadesc_offsets { OWL_DMADESC_SIZE }; +enum owl_dma_id { +S900_DMA , +S700_DMA , +}; +/** * struct owl_dma_lli - Link list for dma transfer * @hw: hardware link list
@@ -203,6 +208,7 @@ struct owl_dma_vchan {* @pchans: array of data for the physical channels * @nr_vchans: the number of physical channels * @vchans: array of data for the physical channels +* @devid: device id based on OWL SoC */ struct owl_dma {struct dma_device dma;
@@ -217,6 +223,7 @@ struct owl_dma {unsigned int nr_vchans;struct owl_dma_vchan *vchans; +enum owl_dma_id devid; }; static void pchan_update(struct owl_dma_pchan *pchan, u32 reg,
@@ -306,6 +313,11 @@ static inline u32 llc_hw_ctrlb(u32 int_ctl) {u32 ctl; +/* +* Irrespective of the SoC, ctrlb value starts filling from +* bit 18. +*/ + ctl =BIT_FIELD (int_ctl,7 ,0 ,18 );return ctl;
@@ -362,6 +374,7 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, struct dma_slave_config *sconfig, bool is_cyclic) { +struct owl_dma *od =to_owl_dma (vchan->vc.chan.device);u32 mode, ctrlb; mode =OWL_DMA_MODE_PW (0 );
@@ -417,8 +430,18 @@ static inline int owl_dma_cfg_lli(struct owl_dma_vchan *vchan, lli->hw[OWL_DMADESC_DADDR ] = dst; lli->hw[OWL_DMADESC_SRC_STRIDE ] =0 ; lli->hw[OWL_DMADESC_DST_STRIDE ] =0 ; - lli->hw[OWL_DMADESC_FLEN ] = len |FCNT_VAL <<20 ; - lli->hw[OWL_DMADESC_CTRLB ] = ctrlb; + +/* +* S700 put flen and fcnt at offset 0x0c and 0x1c respectively, +* whereas S900 put flen and fcnt at offset 0x0c. +*/ +if (od->devid ==S700_DMA ) { + lli->hw[OWL_DMADESC_FLEN ] = len; + lli->hw[OWL_DMADESC_CTRLB ] =FCNT_VAL | ctrlb; + }else { + lli->hw[OWL_DMADESC_FLEN ] = len |FCNT_VAL <<20 ; + lli->hw[OWL_DMADESC_CTRLB ] = ctrlb; + }return 0 ; }
@@ -580,7 +603,7 @@ static irqreturn_t owl_dma_interrupt(int irq, void *dev_id) global_irq_pending =dma_readl (od,OWL_DMA_IRQ_PD0 ); -if (chan_irq_pending && !(global_irq_pending &BIT (i))) { +if (chan_irq_pending && !(global_irq_pending &BIT (i))) {dev_dbg (od->dma.dev,"global and channel IRQ pending match err\n" );
@@ -1038,11 +1061,20 @@ static struct dma_chan *owl_dma_of_xlate(struct of_phandle_args *dma_spec,return chan; } +static const struct of_device_id owl_dma_match[] = { + { .compatible ="actions,s900-dma" , .data = (void *)S900_DMA ,}, + { .compatible ="actions,s700-dma" , .data = (void *)S700_DMA ,}, + {/* sentinel */ }, +}; +MODULE_DEVICE_TABLE (of, owl_dma_match); +static int owl_dma_probe (struct platform_device *pdev) {struct device_node *np = pdev->dev.of_node;struct owl_dma *od;int ret, i, nr_channels, nr_requests; +const struct of_device_id *of_id = +of_match_device (owl_dma_match, &pdev->dev); od =devm_kzalloc (&pdev->dev,sizeof (*od),GFP_KERNEL );if (!od)
@@ -1067,6 +1099,8 @@ static int owl_dma_probe(struct platform_device *pdev)dev_info (&pdev->dev,"dma-channels %d, dma-requests %d\n" , nr_channels, nr_requests); + od->devid = (enum owl_dma_id )of_id->data; + od->nr_pchans = nr_channels; od->nr_vchans = nr_requests;
@@ -1199,12 +1233,6 @@ static int owl_dma_remove(struct platform_device *pdev)return 0 ; } -static const struct of_device_id owl_dma_match[] = { - { .compatible ="actions,s900-dma" , }, - {/* sentinel */ } -}; -MODULE_DEVICE_TABLE (of, owl_dma_match); -static struct platform_driver owl_dma_driver = { .probe = owl_dma_probe, .remove = owl_dma_remove,
Signature · 1 line
2.7.4
kernel test robot
build botRe: [PATCH v3 02/10] dmaengine: Actions: Add support for S700 DMA engine
Thank you for the patch! Perhaps something to improve:
Hi Amit,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on robh/for-next]
[also build test WARNING on clk/clk-next pza/reset/next linus/master v5.7 next-20200605] [if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url: https://github.com/0day-ci/linux/commits/Amit-Singh-Tomar/Add-MMC-and-DMA-support-for-Actions-S700/20200603-013935 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next config: arm64-randconfig-r024-20200605 (attached as .config) compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 6dd738e2f0609f7d3313b574a1d471263d2d3ba1)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>, old ones prefixed by <<):
>> drivers/dma/owl-dma.c:1102:14: warning: cast to smaller integer type 'enum owl_dma_id' from 'const void *' [-Wvoid-pointer-to-enum-cast]
od->devid = (enum owl_dma_id)of_id->data;
^~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
vim +1102 drivers/dma/owl-dma.c
1070
1071 static int owl_dma_probe(struct platform_device *pdev)
1072 {
1073 struct device_node *np = pdev->dev.of_node;
1074 struct owl_dma *od;
1075 int ret, i, nr_channels, nr_requests;
1076 const struct of_device_id *of_id =
1077 of_match_device(owl_dma_match, &pdev->dev);
1078
1079 od = devm_kzalloc(&pdev->dev, sizeof(*od), GFP_KERNEL);
1080 if (!od)
1081 return -ENOMEM;
1082
1083 od->base = devm_platform_ioremap_resource(pdev, 0);
1084 if (IS_ERR(od->base))
1085 return PTR_ERR(od->base);
1086
1087 ret = of_property_read_u32(np, "dma-channels", &nr_channels);
1088 if (ret) {
1089 dev_err(&pdev->dev, "can't get dma-channels\n");
1090 return ret;
1091 }
1092
1093 ret = of_property_read_u32(np, "dma-requests", &nr_requests);
1094 if (ret) {
1095 dev_err(&pdev->dev, "can't get dma-requests\n");
1096 return ret;
1097 }
1098
1099 dev_info(&pdev->dev, "dma-channels %d, dma-requests %d\n",
1100 nr_channels, nr_requests);
1101
> 1102 od->devid = (enum owl_dma_id)of_id->data;
1103
1104 od->nr_pchans = nr_channels;
1105 od->nr_vchans = nr_requests;
1106
1107 pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
1108
1109 platform_set_drvdata(pdev, od);
1110 spin_lock_init(&od->lock);
1111
1112 dma_cap_set(DMA_MEMCPY, od->dma.cap_mask);
1113 dma_cap_set(DMA_SLAVE, od->dma.cap_mask);
1114 dma_cap_set(DMA_CYCLIC, od->dma.cap_mask);
1115
1116 od->dma.dev = &pdev->dev;
1117 od->dma.device_free_chan_resources = owl_dma_free_chan_resources;
1118 od->dma.device_tx_status = owl_dma_tx_status;
1119 od->dma.device_issue_pending = owl_dma_issue_pending;
1120 od->dma.device_prep_dma_memcpy = owl_dma_prep_memcpy;
1121 od->dma.device_prep_slave_sg = owl_dma_prep_slave_sg;
1122 od->dma.device_prep_dma_cyclic = owl_prep_dma_cyclic;
1123 od->dma.device_config = owl_dma_config;
1124 od->dma.device_pause = owl_dma_pause;
1125 od->dma.device_resume = owl_dma_resume;
1126 od->dma.device_terminate_all = owl_dma_terminate_all;
1127 od->dma.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
1128 od->dma.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_4_BYTES);
1129 od->dma.directions = BIT(DMA_MEM_TO_MEM);
1130 od->dma.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
1131
1132 INIT_LIST_HEAD(&od->dma.channels);
1133
1134 od->clk = devm_clk_get(&pdev->dev, NULL);
1135 if (IS_ERR(od->clk)) {
1136 dev_err(&pdev->dev, "unable to get clock\n");
1137 return PTR_ERR(od->clk);
1138 }
1139
1140 /*
1141 * Eventhough the DMA controller is capable of generating 4
1142 * IRQ's for DMA priority feature, we only use 1 IRQ for
1143 * simplification.
1144 */
1145 od->irq = platform_get_irq(pdev, 0);
1146 ret = devm_request_irq(&pdev->dev, od->irq, owl_dma_interrupt, 0,
1147 dev_name(&pdev->dev), od);
1148 if (ret) {
1149 dev_err(&pdev->dev, "unable to request IRQ\n");
1150 return ret;
1151 }
1152
1153 /* Init physical channel */
1154 od->pchans = devm_kcalloc(&pdev->dev, od->nr_pchans,
1155 sizeof(struct owl_dma_pchan), GFP_KERNEL);
1156 if (!od->pchans)
1157 return -ENOMEM;
1158
1159 for (i = 0; i < od->nr_pchans; i++) {
1160 struct owl_dma_pchan *pchan = &od->pchans[i];
1161
1162 pchan->id = i;
1163 pchan->base = od->base + OWL_DMA_CHAN_BASE(i);
1164 }
1165
1166 /* Init virtual channel */
1167 od->vchans = devm_kcalloc(&pdev->dev, od->nr_vchans,
1168 sizeof(struct owl_dma_vchan), GFP_KERNEL);
1169 if (!od->vchans)
1170 return -ENOMEM;
1171
1172 for (i = 0; i < od->nr_vchans; i++) {
1173 struct owl_dma_vchan *vchan = &od->vchans[i];
1174
1175 vchan->vc.desc_free = owl_dma_desc_free;
1176 vchan_init(&vchan->vc, &od->dma);
1177 }
1178
1179 /* Create a pool of consistent memory blocks for hardware descriptors */
1180 od->lli_pool = dma_pool_create(dev_name(od->dma.dev), od->dma.dev,
1181 sizeof(struct owl_dma_lli),
1182 __alignof__(struct owl_dma_lli),
1183 0); 1184 if (!od->lli_pool) {
1185 dev_err(&pdev->dev, "unable to allocate DMA descriptor pool\n");
1186 return -ENOMEM;
1187 }
1188
1189 clk_prepare_enable(od->clk);
1190
1191 ret = dma_async_device_register(&od->dma);
1192 if (ret) {
1193 dev_err(&pdev->dev, "failed to register DMA engine device\n");
1194 goto err_pool_free;
1195 }
1196
1197 /* Device-tree DMA controller registration */
1198 ret = of_dma_controller_register(pdev->dev.of_node,
1199 owl_dma_of_xlate, od);
1200 if (ret) {
1201 dev_err(&pdev->dev, "of_dma_controller_register failed\n");
1202 goto err_dma_unregister;
1203 }
1204
1205 return 0;
1206
1207 err_dma_unregister:
1208 dma_async_device_unregister(&od->dma);
1209 err_pool_free:
1210 clk_disable_unprepare(od->clk);
1211 dma_pool_destroy(od->lli_pool);
1212
1213 return ret;
1214 }
1215
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v3 3/10 clk: actions: Add MMC clock-register reset bits
In reply to Amit Singh TomarThis commit adds reset bits needed for MMC clock registers present on Actions S700 SoC.
---
Changes from v2:
* No change.
Changes from v1:
* No change.
Changes from RFC:
* No change.
--- drivers/clk/actions/owl-s700.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/clk/actions/owl-s700.c +3 -0
@@ -577,6 +577,9 @@ static const struct owl_reset_map s700_resets[] = { [RESET_DSI] = { CMU_DEVRST0, BIT(2) }, [RESET_CSI] = { CMU_DEVRST0, BIT(13) }, [RESET_SI] = { CMU_DEVRST0, BIT(14) }, + [RESET_SD0] = { CMU_DEVRST0, BIT(22) }, + [RESET_SD1] = { CMU_DEVRST0, BIT(23) }, + [RESET_SD2] = { CMU_DEVRST0, BIT(24) }, [RESET_I2C0] = { CMU_DEVRST1, BIT(0) }, [RESET_I2C1] = { CMU_DEVRST1, BIT(1) }, [RESET_I2C2] = { CMU_DEVRST1, BIT(2) },
Signature · 1 line
2.7.4
PATCH v3 4/10 arm64: dts: actions: limit address range for pinctrl node
In reply to Amit Singh TomarAfter commit 7cdf8446ed1d ("arm64: dts: actions: Add pinctrl node for Actions Semi S700") following error has been observed while booting Linux on Cubieboard7-lite(based on S700 SoC).
[ 0.257415] pinctrl-s700 e01b0000.pinctrl: can't request region for resource [mem 0xe01b0000-0xe01b0fff] [ 0.266902] pinctrl-s700: probe of e01b0000.pinctrl failed with error -16
This is due to the fact that memory range for "sps" power domain controller clashes with pinctrl.
One way to fix it, is to limit pinctrl address range which is safe to do as current pinctrl driver uses address range only up to 0x100.
This commit limits the pinctrl address range to 0x100 so that it doesn't conflict with sps range.
Semi S700")
---
Changes since v2:
* this is no more don't merge and fixed the broken S700 boot by limiting pinctrl address range.
* Modified the subject to reflect the changes.
Changes since v1:
* No change.
Changes since RFC:
* kept as do not merge.
--- arch/arm64/boot/dts/actions/s700.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/actions/s700.dtsi +1 -1
@@ -231,7 +231,7 @@ pinctrl: pinctrl@e01b0000 { compatible = "actions,s700-pinctrl"; - reg = <0x0 0xe01b0000 0x0 0x1000>; + reg = <0x0 0xe01b0000 0x0 0x100>; clocks = <&cmu CLK_GPIO>; gpio-controller; gpio-ranges = <&pinctrl 0 0 136>;
Signature · 1 line
2.7.4
PATCH v3 5/10 dt-bindings: dmaengine: convert Actions Semi Owl SoCs bindings to yaml
In reply to Amit Singh TomarConverts the device tree bindings for the Actions Semi Owl SoCs DMA Controller over to YAML schemas.
It also adds new compatible string "actions,s700-dma".
---
Changes since v2:
* Addressed Rob's comments:
- removed unnecessary description.
- added unevaluatedProperties
- added relevant information about dma-channels and dma-request
* Added power-domain property.
Change since v1:
* Updated the description field to reflect
only the necessary information.
* replaced the maxItems field with description for each controller attribute(except interrupts).
* Replaced the clock macro with number to keep the example as independent as possible.
New patch, was not there in RFC.
--- Documentation/devicetree/bindings/dma/owl-dma.txt | 47 ------------- Documentation/devicetree/bindings/dma/owl-dma.yaml | 79 ++++++++++++++++++++++ 2 files changed, 79 insertions(+), 47 deletions(-) delete mode 100644 Documentation/devicetree/bindings/dma/owl-dma.txt create mode 100644 Documentation/devicetree/bindings/dma/owl-dma.yaml
Documentation/devicetree/bindings/dma/owl-dma.txt deleted +0 -47
@@ -1,47 +0,0 @@ -* Actions Semi Owl SoCs DMA controller - -This binding follows the generic DMA bindings defined in dma.txt. - -Required properties: -- compatible: Should be "actions,s900-dma". -- reg: Should contain DMA registers location and length. -- interrupts: Should contain 4 interrupts shared by all channel. -- #dma-cells: Must be <1>. Used to represent the number of integer - cells in the dmas property of client device. -- dma-channels: Physical channels supported. -- dma-requests: Number of DMA request signals supported by the controller. - Refer to Documentation/devicetree/bindings/dma/dma.txt -- clocks: Phandle and Specifier of the clock feeding the DMA controller. - -Example: - -Controller: - dma: dma-controller@e0260000 { - compatible = "actions,s900-dma"; - reg = <0x0 0xe0260000 0x0 0x1000>; - interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>, - <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>; - #dma-cells = <1>; - dma-channels = <12>; - dma-requests = <46>; - clocks = <&clock CLK_DMAC>; - }; - -Client: - -DMA clients connected to the Actions Semi Owl SoCs DMA controller must -use the format described in the dma.txt file, using a two-cell specifier -for each channel. - -The two cells in order are: -1. A phandle pointing to the DMA controller. -2. The channel id. - -uart5: serial@e012a000 { - ... - dma-names = "tx", "rx"; - dmas = <&dma 26>, <&dma 27>; - ... -};
Documentation/devicetree/bindings/dma/owl-dma.yaml new file +79 -0
79 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v3 6/10 arm64: dts: actions: Add DMA Controller for S700
In reply to Amit Singh TomarThis commit adds DAM controller present on Actions S700, it differs from S900 in terms of number of dma channels and requests.
---
Changes since v2:
* added power-domain property as sps
is enabled now and DMA needs it.
Changes since v1:
* No Change.
Changes since RFC:
* No Change.
--- arch/arm64/boot/dts/actions/s700.dtsi | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/arm64/boot/dts/actions/s700.dtsi +15 -0
@@ -6,6 +6,7 @@ #include <dt-bindings/clock/actions,s700-cmu.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/reset/actions,s700-reset.h> +#include <dt-bindings/power/owl-s700-powergate.h> / { compatible = "actions,s700";
@@ -244,5 +245,19 @@ <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; }; + + dma: dma-controller@e0230000 { + compatible = "actions,s700-dma"; + reg = <0x0 0xe0230000 0x0 0x1000>; + interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>; + #dma-cells = <1>; + dma-channels = <10>; + dma-requests = <44>; + clocks = <&cmu CLK_DMAC>; + power-domains = <&sps S700_PD_DMA>; + }; }; };
Signature · 1 line
2.7.4
Re: [PATCH v3 06/10] arm64: dts: actions: Add DMA Controller for S700
Quoted 1 line · Amit Singh Tomar
This commit adds DAM controller present on Actions S700, it differs
DMA
Quoted 22 lines
from
S900 in terms of number of dma channels and requests.Signed-off-by Amit Singh Tomar <[email protected]>---
Changes since v2:
* added power-domain property as sps
is enabled now and DMA needs it.
Changes since v1:
* No Change.
Changes since RFC:
* No Change.
---arch/arm64/boot/dts/actions/s700.dtsi| 15 +++++++++++++++1 file changed, 15 insertions(+)arch/arm64/boot/dts/actions/s700.dtsi +0
-0
arch/arm64/boot/dts/actions/s700.dtsi line 9
Quoted 4 lines
arch/arm64/boot/dts/actions/s700.dtsi +1
-0@@ -6,6 +6,7 @@ #include <dt-bindings/clock/actions,s700-cmu.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/reset/actions,s700-reset.h> +#include <dt-bindings/power/owl-s700-powergate.h>
Sort this alphabetically.
Thanks,
Mani
Quoted 23 lines
arch/arm64/boot/dts/actions/s700.dtsi +14
-0/ { compatible = "actions,s700";@@ -244,5 +245,19 @@ <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>; }; + + dma: dma-controller@e0230000 { + compatible = "actions,s700-dma"; + reg = <0x0 0xe0230000 0x0 0x1000>; + interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>; + #dma-cells = <1>; + dma-channels = <10>; + dma-requests = <44>; + clocks = <&cmu CLK_DMAC>; + power-domains = <&sps S700_PD_DMA>; + }; }; };
Signature · 1 line
Sent from my Android device with K-9 Mail. Please excuse my brevity.
PATCH v3 7/10 dt-bindings: reset: s700: Add binding constants for mmc
In reply to Amit Singh TomarThis commit adds device tree binding reset constants for mmc controller present on Actions S700 Soc.
---
Changes since v2:
* No change.
Changes since v1:
* No change.
Changes since RFC:
* added Rob's acked-by tag
--- include/dt-bindings/reset/actions,s700-reset.h | 3 +++ 1 file changed, 3 insertions(+)
include/dt-bindings/reset/actions,s700-reset.h +3 -0
@@ -30,5 +30,8 @@#define RESET_UART4 20#define RESET_UART5 21#define RESET_UART6 22 +#define RESET_SD0 23 +#define RESET_SD1 24 +#define RESET_SD2 25#endif /* __DT_BINDINGS_ACTIONS_S700_RESET_H */
Signature · 1 line
2.7.4
PATCH v3 8/10 dt-bindings: mmc: owl: add compatible string actions,s700-mmc
In reply to Amit Singh TomarThe commit adds a new SoC specific compatible string "actions,s700-mmc" in combination with more generic string "actions,owl-mmc".
Placement order of these strings should abide by the principle of "from most specific to most general".
---
Changes since v2:
* Added Rob's Reviewed-by tag
* Newly added patch in v2.
--- Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/mmc/owl-mmc.yaml +5 -1
@@ -14,7 +14,11 @@ maintainers: properties: compatible: - const: actions,owl-mmc + oneOf: + - const: actions,owl-mmc + - items: + - const: actions,s700-mmc + - const: actions,owl-mmc reg: maxItems: 1
Signature · 1 line
2.7.4
PATCH v3 9/10 arm64: dts: actions: Add MMC controller support for S700
In reply to Amit Singh TomarThis commits adds support for MMC controllers present on Actions S700 SoC, there are 3 MMC controllers in this SoC which can be used for accessing SD/EMMC/SDIO cards.
---
Changes since v2:
* No change.
Changes since v1:
* Added SoC specific compatibe string.
Changes since RFC:
* No change
--- arch/arm64/boot/dts/actions/s700.dtsi | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/actions/s700.dtsi +33 -0
@@ -259,5 +259,38 @@ clocks = <&cmu CLK_DMAC>; power-domains = <&sps S700_PD_DMA>; }; + + mmc0: mmc@e0210000 { + compatible = "actions,s700-mmc", "actions,owl-mmc"; + reg = <0x0 0xe0210000 0x0 0x4000>; + interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_SD0>; + resets = <&cmu RESET_SD0>; + dmas = <&dma 2>; + dma-names = "mmc"; + status = "disabled"; + }; + + mmc1: mmc@e0214000 { + compatible = "actions,s700-mmc", "actions,owl-mmc"; + reg = <0x0 0xe0214000 0x0 0x4000>; + interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_SD1>; + resets = <&cmu RESET_SD1>; + dmas = <&dma 3>; + dma-names = "mmc"; + status = "disabled"; + }; + + mmc2: mmc@e0218000 { + compatible = "actions,s700-mmc", "actions,owl-mmc"; + reg = <0x0 0xe0218000 0x0 0x4000>; + interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cmu CLK_SD2>; + resets = <&cmu RESET_SD2>; + dmas = <&dma 4>; + dma-names = "mmc"; + status = "disabled"; + }; }; };
Signature · 1 line
2.7.4
PATCH v3 10/10 arm64: dts: actions: Add uSD support for Cubieboard7
In reply to Amit Singh TomarThis commit adds uSD support for Cubieboard7 board based on Actions Semi S700 SoC. SD0 is connected to uSD slot. Since there is no PMIC support added yet, fixed regulator has been used as a regulator node.
---
Changes since v2:
* No change.
Changes since v1:
* No change.
Changes since RFC:
* No change.
--- arch/arm64/boot/dts/actions/s700-cubieboard7.dts | 41 ++++++++++++++++++++++++ arch/arm64/boot/dts/actions/s700.dtsi | 1 + 2 files changed, 42 insertions(+)
arch/arm64/boot/dts/actions/s700-cubieboard7.dts +41 -0
@@ -13,6 +13,7 @@ aliases { serial3 = &uart3; + mmc0 = &mmc0; }; chosen {
@@ -28,6 +29,23 @@ device_type = "memory"; reg = <0x1 0xe0000000 0x0 0x0>; }; + + /* Fixed regulator used in the absence of PMIC */ + vcc_3v1: vcc-3v1 { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.1V"; + regulator-min-microvolt = <3100000>; + regulator-max-microvolt = <3100000>; + }; + + /* Fixed regulator used in the absence of PMIC */ + sd_vcc: sd-vcc { + compatible = "regulator-fixed"; + regulator-name = "fixed-3.1V"; + regulator-min-microvolt = <3100000>; + regulator-max-microvolt = <3100000>; + regulator-always-on; + }; }; &i2c0 {
@@ -81,6 +99,14 @@ bias-pull-up; }; }; + + mmc0_default: mmc0_default { + pinmux { + groups = "sd0_d0_mfp", "sd0_d1_mfp", "sd0_d2_d3_mfp", + "sd0_cmd_mfp", "sd0_clk_mfp"; + function = "sd0"; + }; + }; }; &timer {
@@ -90,3 +116,18 @@ &uart3 { status = "okay"; }; + +/* uSD */ +&mmc0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_default>; + cd-gpios = <&pinctrl 120 GPIO_ACTIVE_LOW>; + no-sdio; + no-mmc; + no-1-8-v; + bus-width = <4>; + vmmc-supply = <&sd_vcc>; + vqmmc-supply = <&sd_vcc>; +}; +
arch/arm64/boot/dts/actions/s700.dtsi +1 -0
@@ -4,6 +4,7 @@ */ #include <dt-bindings/clock/actions,s700-cmu.h> +#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/reset/actions,s700-reset.h> #include <dt-bindings/power/owl-s700-powergate.h>
Signature · 1 line
2.7.4