* [PATCH v13 0/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD & SPI driver @ 2019-05-21 7:19 Mason Yang 2019-05-21 7:19 ` [PATCH v13 1/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD driver Mason Yang ` (2 more replies) 0 siblings, 3 replies; 13+ messages in thread From: Mason Yang @ 2019-05-21 7:19 UTC (permalink / raw) To: broonie, marek.vasut, linux-kernel, linux-spi, bbrezillon, linux-renesas-soc, Geert Uytterhoeven, lee.jones, sergei.shtylyov, robh+dt, mark.rutland, devicetree Cc: juliensu, Simon Horman, Mason Yang, miquel.raynal Hi, v13 patch including: 1) rename mfd to ddata for SPI driver. 2) Patch RPC-IF devicetree for SPI and HyperFlash. v12 patch including: 1) add back "wbuf" in dts example. 2) RPC-IF replace rpc-if in dts. v11 patch including: 1) Patch mfd include header file. 2) mfd coding style. 3) add back wbuf description in dts. v10 patch including: 1) Address range for > 64M byte flash. 2) Removed dirmap_write due to WBUF 256 bytes transfer issue. 3) Dummy bytes setting according to spi-nor.c layer. v9 patch is for RPC MFD driver and RPC SPI driver. v8 patch including: 1) Supported SoC-specific values in DTS. 2) Rename device node name as flash. v7 patch is according to Geert and Sergei's comments: 1) Add all R-Car Gen3 model in dts. 2) patch rpc-if child node search. 3) minror coding style. v6 patch is accroding to Geert, Marek and Sergei's comments: 1) spi_controller for new code. 2) "renesas,rcar-gen3-rpc" instead of "renesas,r8a77995-rpc." 3) patch external address read mode w/o u64 readq(). 4) patch dts for write buffer & drop "renesas,rpc-mode". 5) coding style and so on. v5 patch is accroding to Sergei's comments: 1) Read 6 bytes ID from Sergei's patch. 2) regmap_update_bits(). 3) C++ style comment. v4 patch is according to Sergei's comments including: 1) Drop soc_device_match(). 2) Drop unused RPC registers. 3) Use ilog2() instead of fls(). 4) Patch read 6 bytes ID w/ one command. 5) Coding style and so on. v3 patch is according to Marek and Geert's comments including: 1) soc_device_mach() to set up RPC_PHYCNT_STRTIM. 2) get_unaligned(). 3) rpc-mode for rpi-spi-flash or rpc-hyperflash. 4) coding style and so on. v2 patch including: 1) remove RPC clock enable/dis-able control, 2) patch run time PM. 3) add RPC module software reset, 4) add regmap. 5) other coding style and so on. thanks for your review. best regards, Mason Mason Yang (3): mfd: Add Renesas R-Car Gen3 RPC-IF MFD driver spi: Add Renesas R-Car Gen3 RPC-IF SPI controller driver dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings .../devicetree/bindings/mfd/renesas-rpc-if.txt | 65 +++ drivers/mfd/Kconfig | 9 + drivers/mfd/Makefile | 1 + drivers/mfd/renesas-rpc.c | 125 +++++ drivers/spi/Kconfig | 6 + drivers/spi/Makefile | 1 + drivers/spi/spi-renesas-rpc.c | 573 +++++++++++++++++++++ include/linux/mfd/renesas-rpc.h | 141 +++++ 8 files changed, 921 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt create mode 100644 drivers/mfd/renesas-rpc.c create mode 100644 drivers/spi/spi-renesas-rpc.c create mode 100644 include/linux/mfd/renesas-rpc.h -- 1.9.1 ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v13 1/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD driver 2019-05-21 7:19 [PATCH v13 0/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD & SPI driver Mason Yang @ 2019-05-21 7:19 ` Mason Yang 2019-06-03 13:02 ` Lee Jones 2019-05-21 7:19 ` [PATCH v13 2/3] spi: Add Renesas R-Car Gen3 RPC-IF SPI controller driver Mason Yang 2019-05-21 7:19 ` [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings Mason Yang 2 siblings, 1 reply; 13+ messages in thread From: Mason Yang @ 2019-05-21 7:19 UTC (permalink / raw) To: broonie, marek.vasut, linux-kernel, linux-spi, bbrezillon, linux-renesas-soc, Geert Uytterhoeven, lee.jones, sergei.shtylyov, robh+dt, mark.rutland, devicetree Cc: juliensu, Simon Horman, Mason Yang, miquel.raynal Add a driver for Renesas R-Car Gen3 RPC-IF MFD Signed-off-by: Mason Yang <masonccyang@mxic.com.tw> --- drivers/mfd/Kconfig | 9 +++ drivers/mfd/Makefile | 1 + drivers/mfd/renesas-rpc.c | 125 +++++++++++++++++++++++++++++++++++ include/linux/mfd/renesas-rpc.h | 141 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 276 insertions(+) create mode 100644 drivers/mfd/renesas-rpc.c create mode 100644 include/linux/mfd/renesas-rpc.h diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 294d956..cdbde79 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1002,6 +1002,15 @@ config MFD_RDC321X southbridge which provides access to GPIOs and Watchdog using the southbridge PCI device configuration space. +config MFD_RENESAS_RPC + tristate "Renesas R-Car Gen3 RPC-IF controller driver" + select MFD_CORE + depends on ARCH_RENESAS + help + This supports Renesas R-Car Gen3 RPC-IF controller which provides + either SPI host or HyperFlash. + You have to select individual components under the corresponding menu. + config MFD_RT5033 tristate "Richtek RT5033 Power Management IC" depends on I2C diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 52b1a90..459eb2f 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -184,6 +184,7 @@ obj-$(CONFIG_MFD_INTEL_QUARK_I2C_GPIO) += intel_quark_i2c_gpio.o obj-$(CONFIG_LPC_SCH) += lpc_sch.o obj-$(CONFIG_LPC_ICH) += lpc_ich.o obj-$(CONFIG_MFD_RDC321X) += rdc321x-southbridge.o +obj-$(CONFIG_MFD_RENESAS_RPC) += renesas-rpc.o obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o obj-$(CONFIG_MFD_JZ4740_ADC) += jz4740-adc.o obj-$(CONFIG_MFD_TPS6586X) += tps6586x.o diff --git a/drivers/mfd/renesas-rpc.c b/drivers/mfd/renesas-rpc.c new file mode 100644 index 0000000..c80c8d1 --- /dev/null +++ b/drivers/mfd/renesas-rpc.c @@ -0,0 +1,125 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2018 ~ 2019 Renesas Solutions Corp. +// Copyright (C) 2019 Macronix International Co., Ltd. +// +// R-Car Gen3 RPC-IF MFD driver +// +// Author: +// Mason Yang <masonccyang@mxic.com.tw> +// + +#include <linux/clk.h> +#include <linux/mfd/core.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/of.h> +#include <linux/regmap.h> +#include <linux/mfd/renesas-rpc.h> +#include <linux/reset.h> + +static const struct mfd_cell rpc_hf_ctlr = { + .name = "rpc-hf", +}; + +static const struct mfd_cell rpc_spi_ctlr = { + .name = "rpc-spi", +}; + +static const struct regmap_range rpc_mfd_volatile_ranges[] = { + regmap_reg_range(RPC_SMRDR0, RPC_SMRDR1), + regmap_reg_range(RPC_SMWDR0, RPC_SMWDR1), + regmap_reg_range(RPC_CMNSR, RPC_CMNSR), +}; + +static const struct regmap_access_table rpc_mfd_volatile_table = { + .yes_ranges = rpc_mfd_volatile_ranges, + .n_yes_ranges = ARRAY_SIZE(rpc_mfd_volatile_ranges), +}; + +static const struct regmap_config rpc_mfd_regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .fast_io = true, + .max_register = RPC_PHYOFFSET2, + .volatile_table = &rpc_mfd_volatile_table, +}; + +static int rpc_mfd_probe(struct platform_device *pdev) +{ + struct device_node *flash; + const struct mfd_cell *cell; + struct resource *res; + struct rpc_mfd *rpc; + void __iomem *base; + + flash = of_get_next_child(pdev->dev.of_node, NULL); + if (!flash) { + dev_warn(&pdev->dev, "no flash node found\n"); + return -ENODEV; + } + + if (of_device_is_compatible(flash, "jedec,spi-nor")) { + cell = &rpc_spi_ctlr; + } else if (of_device_is_compatible(flash, "cfi-flash")) { + cell = &rpc_hf_ctlr; + } else { + dev_warn(&pdev->dev, "unknown flash type\n"); + return -ENODEV; + } + + rpc = devm_kzalloc(&pdev->dev, sizeof(*rpc), GFP_KERNEL); + if (!rpc) + return -ENOMEM; + + rpc->clk_rpc = devm_clk_get(&pdev->dev, "rpc"); + if (IS_ERR(rpc->clk_rpc)) + return PTR_ERR(rpc->clk_rpc); + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); + base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(base)) + return PTR_ERR(base); + + rpc->regmap = devm_regmap_init_mmio(&pdev->dev, base, + &rpc_mfd_regmap_config); + if (IS_ERR(rpc->regmap)) { + dev_err(&pdev->dev, + "failed to init regmap for rpc-mfd, error %ld\n", + PTR_ERR(rpc->regmap)); + return PTR_ERR(rpc->regmap); + } + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dirmap"); + rpc->dirmap = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(rpc->dirmap)) + rpc->dirmap = NULL; + + rpc->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); + if (IS_ERR(rpc->rstc)) + return PTR_ERR(rpc->rstc); + + platform_set_drvdata(pdev, rpc); + + return devm_mfd_add_devices(&pdev->dev, -1, cell, 1, NULL, 0, NULL); +} + +static const struct of_device_id rpc_mfd_of_match[] = { + { .compatible = "renesas,rcar-gen3-rpc", }, + {}, +}; +MODULE_DEVICE_TABLE(of, rpc_mfd_of_match); + +static struct platform_driver rpc_mfd_driver = { + .probe = rpc_mfd_probe, + .driver = { + .name = "rpc-mfd", + .of_match_table = rpc_mfd_of_match, + }, +}; +module_platform_driver(rpc_mfd_driver); + +MODULE_AUTHOR("Mason Yang <masonccyang@mxic.com.tw>"); +MODULE_DESCRIPTION("Renesas R-Car Gen3 RPC MFD driver"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/renesas-rpc.h b/include/linux/mfd/renesas-rpc.h new file mode 100644 index 0000000..bc53d02 --- /dev/null +++ b/include/linux/mfd/renesas-rpc.h @@ -0,0 +1,141 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2018 ~ 2019 Renesas Solutions Corp. +// Copyright (C) 2019 Macronix International Co., Ltd. +// +// R-Car Gen3 RPC-IF MFD driver +// +// Author: +// Mason Yang <masonccyang@mxic.com.tw> +// + +#ifndef __MFD_RENESAS_RPC_H +#define __MFD_RENESAS_RPC_H + +#define RPC_CMNCR 0x0000 // R/W +#define RPC_CMNCR_MD BIT(31) +#define RPC_CMNCR_SFDE BIT(24) // undocumented bit but must be set +#define RPC_CMNCR_MOIIO3(val) (((val) & 0x3) << 22) +#define RPC_CMNCR_MOIIO2(val) (((val) & 0x3) << 20) +#define RPC_CMNCR_MOIIO1(val) (((val) & 0x3) << 18) +#define RPC_CMNCR_MOIIO0(val) (((val) & 0x3) << 16) +#define RPC_CMNCR_MOIIO_HIZ (RPC_CMNCR_MOIIO0(3) | RPC_CMNCR_MOIIO1(3) | \ + RPC_CMNCR_MOIIO2(3) | RPC_CMNCR_MOIIO3(3)) +#define RPC_CMNCR_IO3FV(val) (((val) & 0x3) << 14) // undocumented +#define RPC_CMNCR_IO2FV(val) (((val) & 0x3) << 12) // undocumented +#define RPC_CMNCR_IO0FV(val) (((val) & 0x3) << 8) +#define RPC_CMNCR_IOFV_HIZ (RPC_CMNCR_IO0FV(3) | RPC_CMNCR_IO2FV(3) | \ + RPC_CMNCR_IO3FV(3)) +#define RPC_CMNCR_BSZ(val) (((val) & 0x3) << 0) + +#define RPC_SSLDR 0x0004 // R/W +#define RPC_SSLDR_SPNDL(d) (((d) & 0x7) << 16) +#define RPC_SSLDR_SLNDL(d) (((d) & 0x7) << 8) +#define RPC_SSLDR_SCKDL(d) (((d) & 0x7) << 0) + +#define RPC_DRCR 0x000C // R/W +#define RPC_DRCR_SSLN BIT(24) +#define RPC_DRCR_RBURST(v) ((((v) - 1) & 0x1F) << 16) +#define RPC_DRCR_RCF BIT(9) +#define RPC_DRCR_RBE BIT(8) +#define RPC_DRCR_SSLE BIT(0) + +#define RPC_DRCMR 0x0010 // R/W +#define RPC_DRCMR_CMD(c) (((c) & 0xFF) << 16) +#define RPC_DRCMR_OCMD(c) (((c) & 0xFF) << 0) + +#define RPC_DREAR 0x0014 // R/W +#define RPC_DREAR_EAV(c) (((c) & 0xf) << 16) +#define RPC_DREAR_EAC(c) (((c) & 0x7) << 0) + +#define RPC_DROPR 0x0018 // R/W + +#define RPC_DRENR 0x001C // R/W +#define RPC_DRENR_CDB(o) (u32)((((o) & 0x3) << 30)) +#define RPC_DRENR_OCDB(o) (((o) & 0x3) << 28) +#define RPC_DRENR_ADB(o) (((o) & 0x3) << 24) +#define RPC_DRENR_OPDB(o) (((o) & 0x3) << 20) +#define RPC_DRENR_DRDB(o) (((o) & 0x3) << 16) +#define RPC_DRENR_DME BIT(15) +#define RPC_DRENR_CDE BIT(14) +#define RPC_DRENR_OCDE BIT(12) +#define RPC_DRENR_ADE(v) (((v) & 0xF) << 8) +#define RPC_DRENR_OPDE(v) (((v) & 0xF) << 4) + +#define RPC_SMCR 0x0020 // R/W +#define RPC_SMCR_SSLKP BIT(8) +#define RPC_SMCR_SPIRE BIT(2) +#define RPC_SMCR_SPIWE BIT(1) +#define RPC_SMCR_SPIE BIT(0) + +#define RPC_SMCMR 0x0024 // R/W +#define RPC_SMCMR_CMD(c) (((c) & 0xFF) << 16) +#define RPC_SMCMR_OCMD(c) (((c) & 0xFF) << 0) + +#define RPC_SMADR 0x0028 // R/W +#define RPC_SMOPR 0x002C // R/W +#define RPC_SMOPR_OPD3(o) (((o) & 0xFF) << 24) +#define RPC_SMOPR_OPD2(o) (((o) & 0xFF) << 16) +#define RPC_SMOPR_OPD1(o) (((o) & 0xFF) << 8) +#define RPC_SMOPR_OPD0(o) (((o) & 0xFF) << 0) + +#define RPC_SMENR 0x0030 // R/W +#define RPC_SMENR_CDB(o) (((o) & 0x3) << 30) +#define RPC_SMENR_OCDB(o) (((o) & 0x3) << 28) +#define RPC_SMENR_ADB(o) (((o) & 0x3) << 24) +#define RPC_SMENR_OPDB(o) (((o) & 0x3) << 20) +#define RPC_SMENR_SPIDB(o) (((o) & 0x3) << 16) +#define RPC_SMENR_DME BIT(15) +#define RPC_SMENR_CDE BIT(14) +#define RPC_SMENR_OCDE BIT(12) +#define RPC_SMENR_ADE(v) (((v) & 0xF) << 8) +#define RPC_SMENR_OPDE(v) (((v) & 0xF) << 4) +#define RPC_SMENR_SPIDE(v) (((v) & 0xF) << 0) + +#define RPC_SMRDR0 0x0038 // R +#define RPC_SMRDR1 0x003C // R +#define RPC_SMWDR0 0x0040 // W +#define RPC_SMWDR1 0x0044 // W + +#define RPC_CMNSR 0x0048 // R +#define RPC_CMNSR_SSLF BIT(1) +#define RPC_CMNSR_TEND BIT(0) + +#define RPC_DRDMCR 0x0058 // R/W +#define RPC_DRDRENR 0x005C // R/W + +#define RPC_SMDMCR 0x0060 // R/W +#define RPC_SMDMCR_DMCYC(v) ((((v) - 1) & 0x1F) << 0) + +#define RPC_SMDRENR 0x0064 // R/W +#define RPC_SMDRENR_HYPE (0x7 << 12) +#define RPC_SMDRENR_ADDRE BIT(8) +#define RPC_SMDRENR_OPDRE BIT(4) +#define RPC_SMDRENR_SPIDRE BIT(0) + +#define RPC_PHYCNT 0x007C // R/W +#define RPC_PHYCNT_CAL BIT(31) +#define PRC_PHYCNT_OCTA_AA BIT(22) +#define PRC_PHYCNT_OCTA_SA BIT(23) +#define PRC_PHYCNT_EXDS BIT(21) +#define RPC_PHYCNT_OCT BIT(20) +#define RPC_PHYCNT_STRTIM(v) (((v) & 0x7) << 15) +#define RPC_PHYCNT_WBUF2 BIT(4) +#define RPC_PHYCNT_WBUF BIT(2) +#define RPC_PHYCNT_PHYMEM(v) (((v) & 0x3) << 0) + +#define RPC_PHYOFFSET1 0x0080 // R/W +#define RPC_PHYOFFSET1_DDRTMG(v) (((v) & 0x3) << 28) +#define RPC_PHYOFFSET2 0x0084 // R/W +#define RPC_PHYOFFSET2_OCTTMG(v) (((v) & 0x7) << 8) + +#define RPC_DIRMAP_SIZE 0x4000000 + +struct rpc_mfd { + struct clk *clk_rpc; + void __iomem *dirmap; + struct regmap *regmap; + struct reset_control *rstc; +}; + +#endif // __MFD_RENESAS_RPC_H -- 1.9.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v13 1/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD driver 2019-05-21 7:19 ` [PATCH v13 1/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD driver Mason Yang @ 2019-06-03 13:02 ` Lee Jones 2019-06-04 0:52 ` masonccyang 0 siblings, 1 reply; 13+ messages in thread From: Lee Jones @ 2019-06-03 13:02 UTC (permalink / raw) To: Mason Yang Cc: broonie, marek.vasut, linux-kernel, linux-spi, bbrezillon, linux-renesas-soc, Geert Uytterhoeven, sergei.shtylyov, robh+dt, mark.rutland, devicetree, juliensu, Simon Horman, miquel.raynal On Tue, 21 May 2019, Mason Yang wrote: > Add a driver for Renesas R-Car Gen3 RPC-IF MFD > > Signed-off-by: Mason Yang <masonccyang@mxic.com.tw> > --- > drivers/mfd/Kconfig | 9 +++ > drivers/mfd/Makefile | 1 + > drivers/mfd/renesas-rpc.c | 125 +++++++++++++++++++++++++++++++++++ > include/linux/mfd/renesas-rpc.h | 141 ++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 276 insertions(+) > create mode 100644 drivers/mfd/renesas-rpc.c > create mode 100644 include/linux/mfd/renesas-rpc.h > > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index 294d956..cdbde79 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -1002,6 +1002,15 @@ config MFD_RDC321X > southbridge which provides access to GPIOs and Watchdog using the > southbridge PCI device configuration space. > > +config MFD_RENESAS_RPC > + tristate "Renesas R-Car Gen3 RPC-IF controller driver" Please expand these short-forms, either here or in the help. > + select MFD_CORE > + depends on ARCH_RENESAS > + help > + This supports Renesas R-Car Gen3 RPC-IF controller which provides > + either SPI host or HyperFlash. > + You have to select individual components under the corresponding menu. > + > config MFD_RT5033 > tristate "Richtek RT5033 Power Management IC" > depends on I2C > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index 52b1a90..459eb2f 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -184,6 +184,7 @@ obj-$(CONFIG_MFD_INTEL_QUARK_I2C_GPIO) += intel_quark_i2c_gpio.o > obj-$(CONFIG_LPC_SCH) += lpc_sch.o > obj-$(CONFIG_LPC_ICH) += lpc_ich.o > obj-$(CONFIG_MFD_RDC321X) += rdc321x-southbridge.o > +obj-$(CONFIG_MFD_RENESAS_RPC) += renesas-rpc.o > obj-$(CONFIG_MFD_JANZ_CMODIO) += janz-cmodio.o > obj-$(CONFIG_MFD_JZ4740_ADC) += jz4740-adc.o > obj-$(CONFIG_MFD_TPS6586X) += tps6586x.o > diff --git a/drivers/mfd/renesas-rpc.c b/drivers/mfd/renesas-rpc.c > new file mode 100644 > index 0000000..c80c8d1 > --- /dev/null > +++ b/drivers/mfd/renesas-rpc.c > @@ -0,0 +1,125 @@ > +// SPDX-License-Identifier: GPL-2.0 > +// > +// Copyright (C) 2018 ~ 2019 Renesas Solutions Corp. > +// Copyright (C) 2019 Macronix International Co., Ltd. > +// > +// R-Car Gen3 RPC-IF MFD driver Expand this. > +// Author: > +// Mason Yang <masonccyang@mxic.com.tw> > +// Why do you have blank commented line here? By the way, is C++ style throughout the new format? > +#include <linux/clk.h> > +#include <linux/mfd/core.h> > +#include <linux/module.h> > +#include <linux/platform_device.h> > +#include <linux/of.h> > +#include <linux/regmap.h> > +#include <linux/mfd/renesas-rpc.h> > +#include <linux/reset.h> Alphabetical. > +static const struct mfd_cell rpc_hf_ctlr = { > + .name = "rpc-hf", > +}; > + > +static const struct mfd_cell rpc_spi_ctlr = { > + .name = "rpc-spi", > +}; > + > +static const struct regmap_range rpc_mfd_volatile_ranges[] = { > + regmap_reg_range(RPC_SMRDR0, RPC_SMRDR1), > + regmap_reg_range(RPC_SMWDR0, RPC_SMWDR1), > + regmap_reg_range(RPC_CMNSR, RPC_CMNSR), > +}; > + > +static const struct regmap_access_table rpc_mfd_volatile_table = { > + .yes_ranges = rpc_mfd_volatile_ranges, > + .n_yes_ranges = ARRAY_SIZE(rpc_mfd_volatile_ranges), > +}; > + > +static const struct regmap_config rpc_mfd_regmap_config = { > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > + .fast_io = true, > + .max_register = RPC_PHYOFFSET2, > + .volatile_table = &rpc_mfd_volatile_table, > +}; > + > +static int rpc_mfd_probe(struct platform_device *pdev) Remove the "mfd" from the nomenclature. > + struct device_node *flash; > + const struct mfd_cell *cell; > + struct resource *res; > + struct rpc_mfd *rpc; > + void __iomem *base; > + > + flash = of_get_next_child(pdev->dev.of_node, NULL); > + if (!flash) { > + dev_warn(&pdev->dev, "no flash node found\n"); > + return -ENODEV; > + } > + > + if (of_device_is_compatible(flash, "jedec,spi-nor")) { > + cell = &rpc_spi_ctlr; > + } else if (of_device_is_compatible(flash, "cfi-flash")) { > + cell = &rpc_hf_ctlr; > + } else { > + dev_warn(&pdev->dev, "unknown flash type\n"); > + return -ENODEV; > + } Are there going to be more children coming? If not, I'd argue that this is not an MFD. > + rpc = devm_kzalloc(&pdev->dev, sizeof(*rpc), GFP_KERNEL); > + if (!rpc) > + return -ENOMEM; > + > + rpc->clk_rpc = devm_clk_get(&pdev->dev, "rpc"); > + if (IS_ERR(rpc->clk_rpc)) > + return PTR_ERR(rpc->clk_rpc); > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); > + base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(base)) > + return PTR_ERR(base); > + > + rpc->regmap = devm_regmap_init_mmio(&pdev->dev, base, > + &rpc_mfd_regmap_config); > + if (IS_ERR(rpc->regmap)) { > + dev_err(&pdev->dev, > + "failed to init regmap for rpc-mfd, error %ld\n", > + PTR_ERR(rpc->regmap)); > + return PTR_ERR(rpc->regmap); > + } > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dirmap"); > + rpc->dirmap = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(rpc->dirmap)) > + rpc->dirmap = NULL; > + > + rpc->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL); > + if (IS_ERR(rpc->rstc)) > + return PTR_ERR(rpc->rstc); > + > + platform_set_drvdata(pdev, rpc); > + > + return devm_mfd_add_devices(&pdev->dev, -1, cell, 1, NULL, 0, NULL); > +} > + > +static const struct of_device_id rpc_mfd_of_match[] = { > + { .compatible = "renesas,rcar-gen3-rpc", }, > + {}, > +}; > +MODULE_DEVICE_TABLE(of, rpc_mfd_of_match); > + > +static struct platform_driver rpc_mfd_driver = { > + .probe = rpc_mfd_probe, > + .driver = { > + .name = "rpc-mfd", > + .of_match_table = rpc_mfd_of_match, > + }, > +}; > +module_platform_driver(rpc_mfd_driver); > + > +MODULE_AUTHOR("Mason Yang <masonccyang@mxic.com.tw>"); > +MODULE_DESCRIPTION("Renesas R-Car Gen3 RPC MFD driver"); > +MODULE_LICENSE("GPL v2"); > diff --git a/include/linux/mfd/renesas-rpc.h b/include/linux/mfd/renesas-rpc.h > new file mode 100644 > index 0000000..bc53d02 > --- /dev/null > +++ b/include/linux/mfd/renesas-rpc.h > @@ -0,0 +1,141 @@ > +// SPDX-License-Identifier: GPL-2.0 > +// > +// Copyright (C) 2018 ~ 2019 Renesas Solutions Corp. > +// Copyright (C) 2019 Macronix International Co., Ltd. > +// > +// R-Car Gen3 RPC-IF MFD driver > +// > +// Author: > +// Mason Yang <masonccyang@mxic.com.tw> > +// > + > +#ifndef __MFD_RENESAS_RPC_H > +#define __MFD_RENESAS_RPC_H > + > +#define RPC_CMNCR 0x0000 // R/W > +#define RPC_CMNCR_MD BIT(31) > +#define RPC_CMNCR_SFDE BIT(24) // undocumented bit but must be set > +#define RPC_CMNCR_MOIIO3(val) (((val) & 0x3) << 22) > +#define RPC_CMNCR_MOIIO2(val) (((val) & 0x3) << 20) > +#define RPC_CMNCR_MOIIO1(val) (((val) & 0x3) << 18) > +#define RPC_CMNCR_MOIIO0(val) (((val) & 0x3) << 16) > +#define RPC_CMNCR_MOIIO_HIZ (RPC_CMNCR_MOIIO0(3) | RPC_CMNCR_MOIIO1(3) | \ > + RPC_CMNCR_MOIIO2(3) | RPC_CMNCR_MOIIO3(3)) > +#define RPC_CMNCR_IO3FV(val) (((val) & 0x3) << 14) // undocumented > +#define RPC_CMNCR_IO2FV(val) (((val) & 0x3) << 12) // undocumented > +#define RPC_CMNCR_IO0FV(val) (((val) & 0x3) << 8) > +#define RPC_CMNCR_IOFV_HIZ (RPC_CMNCR_IO0FV(3) | RPC_CMNCR_IO2FV(3) | \ > + RPC_CMNCR_IO3FV(3)) > +#define RPC_CMNCR_BSZ(val) (((val) & 0x3) << 0) > + > +#define RPC_SSLDR 0x0004 // R/W > +#define RPC_SSLDR_SPNDL(d) (((d) & 0x7) << 16) > +#define RPC_SSLDR_SLNDL(d) (((d) & 0x7) << 8) > +#define RPC_SSLDR_SCKDL(d) (((d) & 0x7) << 0) > + > +#define RPC_DRCR 0x000C // R/W > +#define RPC_DRCR_SSLN BIT(24) > +#define RPC_DRCR_RBURST(v) ((((v) - 1) & 0x1F) << 16) > +#define RPC_DRCR_RCF BIT(9) > +#define RPC_DRCR_RBE BIT(8) > +#define RPC_DRCR_SSLE BIT(0) > + > +#define RPC_DRCMR 0x0010 // R/W > +#define RPC_DRCMR_CMD(c) (((c) & 0xFF) << 16) > +#define RPC_DRCMR_OCMD(c) (((c) & 0xFF) << 0) > + > +#define RPC_DREAR 0x0014 // R/W > +#define RPC_DREAR_EAV(c) (((c) & 0xf) << 16) > +#define RPC_DREAR_EAC(c) (((c) & 0x7) << 0) > + > +#define RPC_DROPR 0x0018 // R/W > + > +#define RPC_DRENR 0x001C // R/W > +#define RPC_DRENR_CDB(o) (u32)((((o) & 0x3) << 30)) > +#define RPC_DRENR_OCDB(o) (((o) & 0x3) << 28) > +#define RPC_DRENR_ADB(o) (((o) & 0x3) << 24) > +#define RPC_DRENR_OPDB(o) (((o) & 0x3) << 20) > +#define RPC_DRENR_DRDB(o) (((o) & 0x3) << 16) > +#define RPC_DRENR_DME BIT(15) > +#define RPC_DRENR_CDE BIT(14) > +#define RPC_DRENR_OCDE BIT(12) > +#define RPC_DRENR_ADE(v) (((v) & 0xF) << 8) > +#define RPC_DRENR_OPDE(v) (((v) & 0xF) << 4) > + > +#define RPC_SMCR 0x0020 // R/W > +#define RPC_SMCR_SSLKP BIT(8) > +#define RPC_SMCR_SPIRE BIT(2) > +#define RPC_SMCR_SPIWE BIT(1) > +#define RPC_SMCR_SPIE BIT(0) > + > +#define RPC_SMCMR 0x0024 // R/W > +#define RPC_SMCMR_CMD(c) (((c) & 0xFF) << 16) > +#define RPC_SMCMR_OCMD(c) (((c) & 0xFF) << 0) > + > +#define RPC_SMADR 0x0028 // R/W > +#define RPC_SMOPR 0x002C // R/W > +#define RPC_SMOPR_OPD3(o) (((o) & 0xFF) << 24) > +#define RPC_SMOPR_OPD2(o) (((o) & 0xFF) << 16) > +#define RPC_SMOPR_OPD1(o) (((o) & 0xFF) << 8) > +#define RPC_SMOPR_OPD0(o) (((o) & 0xFF) << 0) > + > +#define RPC_SMENR 0x0030 // R/W > +#define RPC_SMENR_CDB(o) (((o) & 0x3) << 30) > +#define RPC_SMENR_OCDB(o) (((o) & 0x3) << 28) > +#define RPC_SMENR_ADB(o) (((o) & 0x3) << 24) > +#define RPC_SMENR_OPDB(o) (((o) & 0x3) << 20) > +#define RPC_SMENR_SPIDB(o) (((o) & 0x3) << 16) > +#define RPC_SMENR_DME BIT(15) > +#define RPC_SMENR_CDE BIT(14) > +#define RPC_SMENR_OCDE BIT(12) > +#define RPC_SMENR_ADE(v) (((v) & 0xF) << 8) > +#define RPC_SMENR_OPDE(v) (((v) & 0xF) << 4) > +#define RPC_SMENR_SPIDE(v) (((v) & 0xF) << 0) > + > +#define RPC_SMRDR0 0x0038 // R > +#define RPC_SMRDR1 0x003C // R > +#define RPC_SMWDR0 0x0040 // W > +#define RPC_SMWDR1 0x0044 // W > + > +#define RPC_CMNSR 0x0048 // R > +#define RPC_CMNSR_SSLF BIT(1) > +#define RPC_CMNSR_TEND BIT(0) > + > +#define RPC_DRDMCR 0x0058 // R/W > +#define RPC_DRDRENR 0x005C // R/W > + > +#define RPC_SMDMCR 0x0060 // R/W > +#define RPC_SMDMCR_DMCYC(v) ((((v) - 1) & 0x1F) << 0) > + > +#define RPC_SMDRENR 0x0064 // R/W > +#define RPC_SMDRENR_HYPE (0x7 << 12) > +#define RPC_SMDRENR_ADDRE BIT(8) > +#define RPC_SMDRENR_OPDRE BIT(4) > +#define RPC_SMDRENR_SPIDRE BIT(0) > + > +#define RPC_PHYCNT 0x007C // R/W > +#define RPC_PHYCNT_CAL BIT(31) > +#define PRC_PHYCNT_OCTA_AA BIT(22) > +#define PRC_PHYCNT_OCTA_SA BIT(23) > +#define PRC_PHYCNT_EXDS BIT(21) > +#define RPC_PHYCNT_OCT BIT(20) > +#define RPC_PHYCNT_STRTIM(v) (((v) & 0x7) << 15) > +#define RPC_PHYCNT_WBUF2 BIT(4) > +#define RPC_PHYCNT_WBUF BIT(2) > +#define RPC_PHYCNT_PHYMEM(v) (((v) & 0x3) << 0) > + > +#define RPC_PHYOFFSET1 0x0080 // R/W > +#define RPC_PHYOFFSET1_DDRTMG(v) (((v) & 0x3) << 28) > +#define RPC_PHYOFFSET2 0x0084 // R/W > +#define RPC_PHYOFFSET2_OCTTMG(v) (((v) & 0x7) << 8) > + > +#define RPC_DIRMAP_SIZE 0x4000000 > + > +struct rpc_mfd { > + struct clk *clk_rpc; > + void __iomem *dirmap; > + struct regmap *regmap; > + struct reset_control *rstc; > +}; > + > +#endif // __MFD_RENESAS_RPC_H -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v13 1/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD driver 2019-06-03 13:02 ` Lee Jones @ 2019-06-04 0:52 ` masonccyang 0 siblings, 0 replies; 13+ messages in thread From: masonccyang @ 2019-06-04 0:52 UTC (permalink / raw) To: Lee Jones Cc: bbrezillon, broonie, devicetree, Geert Uytterhoeven, Simon Horman, juliensu, linux-kernel, linux-renesas-soc, linux-spi, marek.vasut, mark.rutland, miquel.raynal, robh+dt, sergei.shtylyov Hi Jones, > > +static int rpc_mfd_probe(struct platform_device *pdev) > > Remove the "mfd" from the nomenclature. okay, will fix. > > > + struct device_node *flash; > > + const struct mfd_cell *cell; > > + struct resource *res; > > + struct rpc_mfd *rpc; > > + void __iomem *base; > > + > > + flash = of_get_next_child(pdev->dev.of_node, NULL); > > + if (!flash) { > > + dev_warn(&pdev->dev, "no flash node found\n"); > > + return -ENODEV; > > + } > > + > > + if (of_device_is_compatible(flash, "jedec,spi-nor")) { > > + cell = &rpc_spi_ctlr; > > + } else if (of_device_is_compatible(flash, "cfi-flash")) { > > + cell = &rpc_hf_ctlr; > > + } else { > > + dev_warn(&pdev->dev, "unknown flash type\n"); > > + return -ENODEV; > > + } > > Are there going to be more children coming? No, just spi-nor or cfi-flash. The operation mode is decided at booting time by HW pin configuration. Can't change spi-nor or cfi-flash mode at run-time. > > If not, I'd argue that this is not an MFD. > umm, agreed. thanks & best regards, Mason CONFIDENTIALITY NOTE: This e-mail and any attachments may contain confidential information and/or personal data, which is protected by applicable laws. Please be reminded that duplication, disclosure, distribution, or use of this e-mail (and/or its attachments) or any part thereof is prohibited. If you receive this e-mail in error, please notify us immediately and delete this mail as well as its attachment(s) from your system. In addition, please be informed that collection, processing, and/or use of personal data is prohibited unless expressly permitted by personal data protection laws. Thank you for your attention and cooperation. Macronix International Co., Ltd. ===================================================================== ============================================================================ CONFIDENTIALITY NOTE: This e-mail and any attachments may contain confidential information and/or personal data, which is protected by applicable laws. Please be reminded that duplication, disclosure, distribution, or use of this e-mail (and/or its attachments) or any part thereof is prohibited. If you receive this e-mail in error, please notify us immediately and delete this mail as well as its attachment(s) from your system. In addition, please be informed that collection, processing, and/or use of personal data is prohibited unless expressly permitted by personal data protection laws. Thank you for your attention and cooperation. Macronix International Co., Ltd. ===================================================================== ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v13 2/3] spi: Add Renesas R-Car Gen3 RPC-IF SPI controller driver 2019-05-21 7:19 [PATCH v13 0/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD & SPI driver Mason Yang 2019-05-21 7:19 ` [PATCH v13 1/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD driver Mason Yang @ 2019-05-21 7:19 ` Mason Yang 2019-05-21 7:19 ` [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings Mason Yang 2 siblings, 0 replies; 13+ messages in thread From: Mason Yang @ 2019-05-21 7:19 UTC (permalink / raw) To: broonie, marek.vasut, linux-kernel, linux-spi, bbrezillon, linux-renesas-soc, Geert Uytterhoeven, lee.jones, sergei.shtylyov, robh+dt, mark.rutland, devicetree Cc: juliensu, Simon Horman, Mason Yang, miquel.raynal Add a driver for Renesas R-Car Gen3 RPC-IF SPI controller. Signed-off-by: Mason Yang <masonccyang@mxic.com.tw> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> --- drivers/spi/Kconfig | 6 + drivers/spi/Makefile | 1 + drivers/spi/spi-renesas-rpc.c | 573 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 580 insertions(+) create mode 100644 drivers/spi/spi-renesas-rpc.c diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 0fba8f4..229f6d7 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -570,6 +570,12 @@ config SPI_RSPI help SPI driver for Renesas RSPI and QSPI blocks. +config SPI_RENESAS_RPC + tristate "Renesas R-Car Gen3 RPC-IF SPI controller" + depends on ARCH_RENESAS || COMPILE_TEST + help + SPI driver for Renesas R-Car Gen3 RPC-IF. + config SPI_QCOM_QSPI tristate "QTI QSPI controller" depends on ARCH_QCOM diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index f2f78d0..2a6e052 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -87,6 +87,7 @@ obj-$(CONFIG_SPI_QUP) += spi-qup.o obj-$(CONFIG_SPI_ROCKCHIP) += spi-rockchip.o obj-$(CONFIG_SPI_RB4XX) += spi-rb4xx.o obj-$(CONFIG_SPI_RSPI) += spi-rspi.o +obj-$(CONFIG_SPI_RENESAS_RPC) += spi-renesas-rpc.o obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o spi-s3c24xx-hw-y := spi-s3c24xx.o spi-s3c24xx-hw-$(CONFIG_SPI_S3C24XX_FIQ) += spi-s3c24xx-fiq.o diff --git a/drivers/spi/spi-renesas-rpc.c b/drivers/spi/spi-renesas-rpc.c new file mode 100644 index 0000000..86931cf --- /dev/null +++ b/drivers/spi/spi-renesas-rpc.c @@ -0,0 +1,573 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright (C) 2018 ~ 2019 Renesas Solutions Corp. +// Copyright (C) 2019 Macronix International Co., Ltd. +// +// R-Car Gen3 RPC-IF SPI/QSPI/Octa driver +// +// Author: +// Mason Yang <masonccyang@mxic.com.tw> +// + +#include <linux/clk.h> +#include <linux/io.h> +#include <linux/log2.h> +#include <linux/iopoll.h> +#include <linux/mfd/renesas-rpc.h> +#include <linux/module.h> +#include <linux/mtd/mtd.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/regmap.h> +#include <linux/reset.h> +#include <linux/spi/spi.h> +#include <linux/spi/spi-mem.h> + +#include <asm/unaligned.h> + +struct rpc_spi { + struct rpc_mfd *ddata; + u32 cur_speed_hz; + u32 cmd; + u32 addr; + u32 dummy; + u32 smcr; + u32 smenr; + u32 xferlen; + u32 totalxferlen; + enum spi_mem_data_dir xfer_dir; +}; + +static int rpc_spi_set_freq(struct rpc_spi *rpc, unsigned long freq) +{ + int ret; + + if (rpc->cur_speed_hz == freq) + return 0; + + ret = clk_set_rate(rpc->ddata->clk_rpc, freq); + if (ret) + return ret; + + rpc->cur_speed_hz = freq; + return ret; +} + +static void rpc_spi_hw_init(struct rpc_spi *rpc) +{ + // + // NOTE: The 0x260 are undocumented bits, but they must be set. + // RPC_PHYCNT_STRTIM is strobe timing adjustment bit, + // 0x0 : the delay is biggest, + // 0x1 : the delay is 2nd biggest, + // On H3 ES1.x, the value should be 0, while on others, + // the value should be 6. + // + regmap_write(rpc->ddata->regmap, RPC_PHYCNT, RPC_PHYCNT_CAL | + RPC_PHYCNT_STRTIM(6) | 0x260); + + // + // NOTE: The 0x1511144 are undocumented bits, but they must be set + // for RPC_PHYOFFSET1. + // The 0x31 are undocumented bits, but they must be set + // for RPC_PHYOFFSET2. + // + regmap_write(rpc->ddata->regmap, RPC_PHYOFFSET1, + RPC_PHYOFFSET1_DDRTMG(3) | 0x1511144); + regmap_write(rpc->ddata->regmap, RPC_PHYOFFSET2, 0x31 | + RPC_PHYOFFSET2_OCTTMG(4)); + regmap_write(rpc->ddata->regmap, RPC_SSLDR, RPC_SSLDR_SPNDL(7) | + RPC_SSLDR_SLNDL(7) | RPC_SSLDR_SCKDL(7)); + regmap_write(rpc->ddata->regmap, RPC_CMNCR, RPC_CMNCR_MD | + RPC_CMNCR_SFDE | RPC_CMNCR_MOIIO_HIZ | RPC_CMNCR_IOFV_HIZ | + RPC_CMNCR_BSZ(0)); +} + +static int wait_msg_xfer_end(struct rpc_spi *rpc) +{ + u32 sts; + + return regmap_read_poll_timeout(rpc->ddata->regmap, RPC_CMNSR, sts, + sts & RPC_CMNSR_TEND, 0, USEC_PER_SEC); +} + +static u8 rpc_bits_set(u32 nbytes) +{ + nbytes = clamp(nbytes, 1U, 4U); + + return GENMASK(3, 4 - nbytes); +} + +static int rpc_spi_io_xfer(struct rpc_spi *rpc, + const void *tx_buf, void *rx_buf) +{ + u32 smenr, smcr, data, pos = 0; + int ret; + + regmap_update_bits(rpc->ddata->regmap, RPC_CMNCR, RPC_CMNCR_MD, + RPC_CMNCR_MD); + regmap_write(rpc->ddata->regmap, RPC_SMDRENR, 0); + regmap_write(rpc->ddata->regmap, RPC_SMCMR, rpc->cmd); + regmap_write(rpc->ddata->regmap, RPC_SMDMCR, rpc->dummy); + regmap_write(rpc->ddata->regmap, RPC_SMADR, rpc->addr); + smenr = rpc->smenr; + + if (tx_buf) { + while (pos < rpc->xferlen) { + u32 nbytes = rpc->xferlen - pos; + + regmap_write(rpc->ddata->regmap, RPC_SMWDR0, + get_unaligned((u32 *)(tx_buf + pos))); + + smcr = rpc->smcr | RPC_SMCR_SPIE; + + if (nbytes > 4) { + nbytes = 4; + smcr |= RPC_SMCR_SSLKP; + } + + regmap_write(rpc->ddata->regmap, RPC_SMENR, smenr); + regmap_write(rpc->ddata->regmap, RPC_SMCR, smcr); + ret = wait_msg_xfer_end(rpc); + if (ret) + goto err_out; + + pos += nbytes; + smenr = rpc->smenr & ~RPC_SMENR_CDE & + ~RPC_SMENR_ADE(0xf); + } + } else if (rx_buf) { + // + // RPC-IF spoils the data for the commands without an address + // phase (like RDID) in the manual mode, so we'll have to work + // around this issue by using the external address space read + // mode instead. + // + if (!(smenr & RPC_SMENR_ADE(0xf)) && rpc->ddata->dirmap) { + regmap_update_bits(rpc->ddata->regmap, RPC_CMNCR, + RPC_CMNCR_MD, 0); + regmap_write(rpc->ddata->regmap, RPC_DRCR, + RPC_DRCR_RBURST(32) | RPC_DRCR_RBE); + regmap_write(rpc->ddata->regmap, RPC_DREAR, + RPC_DREAR_EAC(1)); + regmap_write(rpc->ddata->regmap, RPC_DRCMR, rpc->cmd); + regmap_write(rpc->ddata->regmap, RPC_DRDMCR, + rpc->dummy); + regmap_write(rpc->ddata->regmap, RPC_DROPR, 0); + regmap_write(rpc->ddata->regmap, RPC_DRENR, smenr); + memcpy_fromio(rx_buf, rpc->ddata->dirmap, rpc->xferlen); + regmap_write(rpc->ddata->regmap, + RPC_DRCR, RPC_DRCR_RCF); + } else { + while (pos < rpc->xferlen) { + u32 nbytes = rpc->xferlen - pos; + + if (nbytes > 4) + nbytes = 4; + + regmap_write(rpc->ddata->regmap, RPC_SMENR, + smenr); + regmap_write(rpc->ddata->regmap, RPC_SMCR, + rpc->smcr | RPC_SMCR_SPIE); + ret = wait_msg_xfer_end(rpc); + if (ret) + goto err_out; + + regmap_read(rpc->ddata->regmap, RPC_SMRDR0, + &data); + memcpy(rx_buf + pos, &data, nbytes); + pos += nbytes; + + regmap_write(rpc->ddata->regmap, RPC_SMADR, + rpc->addr + pos); + } + } + } else { + regmap_write(rpc->ddata->regmap, RPC_SMENR, rpc->smenr); + regmap_write(rpc->ddata->regmap, RPC_SMCR, + rpc->smcr | RPC_SMCR_SPIE); + ret = wait_msg_xfer_end(rpc); + if (ret) + goto err_out; + } + + return 0; + +err_out: + return reset_control_reset(rpc->ddata->rstc); +} + +static void rpc_spi_mem_set_prep_op_cfg(struct spi_device *spi, + const struct spi_mem_op *op, + u64 *offs, size_t *len) +{ + struct rpc_spi *rpc = spi_controller_get_devdata(spi->controller); + + rpc->cmd = RPC_SMCMR_CMD(op->cmd.opcode); + rpc->smenr = RPC_SMENR_CDE | + RPC_SMENR_CDB(ilog2(op->cmd.buswidth)); + rpc->totalxferlen = 1; + rpc->xfer_dir = SPI_MEM_NO_DATA; + rpc->xferlen = 0; + rpc->addr = 0; + + if (op->addr.nbytes) { + rpc->smenr |= RPC_SMENR_ADB(ilog2(op->addr.buswidth)); + if (op->addr.nbytes == 4) + rpc->smenr |= RPC_SMENR_ADE(0xf); + else + rpc->smenr |= RPC_SMENR_ADE(0x7); + + if (offs && len) + rpc->addr = *offs; + else + rpc->addr = op->addr.val; + rpc->totalxferlen += op->addr.nbytes; + } + + if (op->dummy.nbytes) { + rpc->smenr |= RPC_SMENR_DME; + rpc->dummy = RPC_SMDMCR_DMCYC(op->dummy.nbytes * 8 / + op->dummy.buswidth); + rpc->totalxferlen += op->dummy.nbytes; + } + + if (op->data.nbytes || (offs && len)) { + switch (op->data.dir) { + case SPI_MEM_DATA_IN: + rpc->smcr = RPC_SMCR_SPIRE; + rpc->xfer_dir = SPI_MEM_DATA_IN; + break; + case SPI_MEM_DATA_OUT: + rpc->smcr = RPC_SMCR_SPIWE; + rpc->xfer_dir = SPI_MEM_DATA_OUT; + break; + default: + break; + } + + if (offs && len) { + rpc->smenr |= RPC_SMENR_SPIDE(rpc_bits_set(*len)) | + RPC_SMENR_SPIDB(ilog2(op->data.buswidth)); + rpc->xferlen = *len; + rpc->totalxferlen += *len; + } else { + rpc->smenr |= + RPC_SMENR_SPIDE(rpc_bits_set(op->data.nbytes)) | + RPC_SMENR_SPIDB(ilog2(op->data.buswidth)); + rpc->xferlen = op->data.nbytes; + rpc->totalxferlen += op->data.nbytes; + } + } +} + +static bool rpc_spi_mem_supports_op(struct spi_mem *mem, + const struct spi_mem_op *op) +{ + if (op->data.buswidth > 4 || op->addr.buswidth > 4 || + op->dummy.buswidth > 4 || op->cmd.buswidth > 4 || + op->addr.nbytes > 4) + return false; + + return true; +} + +static ssize_t rpc_spi_mem_dirmap_read(struct spi_mem_dirmap_desc *desc, + u64 offs, size_t len, void *buf) +{ + struct rpc_spi *rpc = + spi_controller_get_devdata(desc->mem->spi->controller); + loff_t from = offs & (RPC_DIRMAP_SIZE - 1); + size_t size = RPC_DIRMAP_SIZE - from; + int ret; + + if (offs + desc->info.offset + len > U32_MAX) + return -EINVAL; + + if (len > size) + len = size; + + ret = rpc_spi_set_freq(rpc, desc->mem->spi->max_speed_hz); + if (ret) + return ret; + + rpc_spi_mem_set_prep_op_cfg(desc->mem->spi, + &desc->info.op_tmpl, &offs, &len); + + regmap_update_bits(rpc->ddata->regmap, RPC_CMNCR, RPC_CMNCR_MD, 0); + regmap_write(rpc->ddata->regmap, RPC_DRCR, RPC_DRCR_RBURST(32) | + RPC_DRCR_RBE); + + regmap_write(rpc->ddata->regmap, RPC_DRCMR, rpc->cmd); + regmap_write(rpc->ddata->regmap, RPC_DREAR, + RPC_DREAR_EAV(offs >> 25) | RPC_DREAR_EAC(1)); + regmap_write(rpc->ddata->regmap, RPC_DROPR, 0); + regmap_write(rpc->ddata->regmap, RPC_DRENR, rpc->smenr); + regmap_write(rpc->ddata->regmap, RPC_DRDMCR, rpc->dummy); + regmap_write(rpc->ddata->regmap, RPC_DRDRENR, 0); + + memcpy_fromio(buf, rpc->ddata->dirmap + desc->info.offset + from, len); + + return len; +} + +static int rpc_spi_mem_dirmap_create(struct spi_mem_dirmap_desc *desc) +{ + struct rpc_spi *rpc = + spi_controller_get_devdata(desc->mem->spi->controller); + + if (desc->info.offset + desc->info.length > U32_MAX) + return -ENOTSUPP; + + if (!rpc_spi_mem_supports_op(desc->mem, &desc->info.op_tmpl)) + return -ENOTSUPP; + + if (!rpc->ddata->dirmap && + desc->info.op_tmpl.data.dir == SPI_MEM_DATA_IN) + return -ENOTSUPP; + + if (desc->info.op_tmpl.data.dir == SPI_MEM_DATA_OUT) + return -ENOTSUPP; + + return 0; +} + +static int rpc_spi_mem_exec_op(struct spi_mem *mem, + const struct spi_mem_op *op) +{ + struct rpc_spi *rpc = spi_controller_get_devdata(mem->spi->controller); + int ret; + + ret = rpc_spi_set_freq(rpc, mem->spi->max_speed_hz); + if (ret) + return ret; + + rpc_spi_mem_set_prep_op_cfg(mem->spi, op, NULL, NULL); + + ret = rpc_spi_io_xfer(rpc, + op->data.dir == SPI_MEM_DATA_OUT ? + op->data.buf.out : NULL, + op->data.dir == SPI_MEM_DATA_IN ? + op->data.buf.in : NULL); + + return ret; +} + +static const struct spi_controller_mem_ops rpc_spi_mem_ops = { + .supports_op = rpc_spi_mem_supports_op, + .exec_op = rpc_spi_mem_exec_op, + .dirmap_create = rpc_spi_mem_dirmap_create, + .dirmap_read = rpc_spi_mem_dirmap_read, +}; + +static void rpc_spi_transfer_setup(struct rpc_spi *rpc, + struct spi_message *msg) +{ + struct spi_transfer *t, xfer[4] = { }; + u32 i, xfercnt, xferpos = 0; + + rpc->totalxferlen = 0; + rpc->xfer_dir = SPI_MEM_NO_DATA; + + list_for_each_entry(t, &msg->transfers, transfer_list) { + if (t->tx_buf) { + xfer[xferpos].tx_buf = t->tx_buf; + xfer[xferpos].tx_nbits = t->tx_nbits; + } + + if (t->rx_buf) { + xfer[xferpos].rx_buf = t->rx_buf; + xfer[xferpos].rx_nbits = t->rx_nbits; + } + + if (t->len) { + xfer[xferpos++].len = t->len; + rpc->totalxferlen += t->len; + } + + if (list_is_last(&t->transfer_list, &msg->transfers)) { + if (xferpos > 1) { + if (t->rx_buf) { + rpc->xfer_dir = SPI_MEM_DATA_IN; + rpc->smcr = RPC_SMCR_SPIRE; + } else if (t->tx_buf) { + rpc->xfer_dir = SPI_MEM_DATA_OUT; + rpc->smcr = RPC_SMCR_SPIWE; + } + } + } + } + + xfercnt = xferpos; + rpc->xferlen = xfer[--xferpos].len; + rpc->cmd = RPC_SMCMR_CMD(((u8 *)xfer[0].tx_buf)[0]); + rpc->smenr = RPC_SMENR_CDE | + RPC_SMENR_CDB(ilog2((unsigned int)xfer[0].tx_nbits)); + rpc->addr = 0; + + if (xfercnt > 2 && xfer[1].len && xfer[1].tx_buf) { + rpc->smenr |= + RPC_SMENR_ADB(ilog2((unsigned int)xfer[1].tx_nbits)); + + for (i = 0; i < xfer[1].len; i++) + rpc->addr |= ((u8 *)xfer[1].tx_buf)[i] << + (8 * (xfer[1].len - i - 1)); + + if (xfer[1].len == 4) + rpc->smenr |= RPC_SMENR_ADE(0xf); + else + rpc->smenr |= RPC_SMENR_ADE(0x7); + } + + if (xfercnt > 3 && xfer[2].len && xfer[2].tx_buf) { + rpc->smenr |= RPC_SMENR_DME; + rpc->dummy = RPC_SMDMCR_DMCYC(xfer[2].len * 8 / + xfer[2].tx_nbits); + } + + for (i = xfercnt - 1; i < xfercnt && xfercnt > 1; i++) { + if (xfer[i].rx_buf) { + rpc->smenr |= + RPC_SMENR_SPIDE(rpc_bits_set(xfer[i].len)) | + RPC_SMENR_SPIDB(ilog2 + ((unsigned int)xfer[i].rx_nbits)); + } else if (xfer[i].tx_buf) { + rpc->smenr |= + RPC_SMENR_SPIDE(rpc_bits_set(xfer[i].len)) | + RPC_SMENR_SPIDB(ilog2 + ((unsigned int)xfer[i].tx_nbits)); + } + } +} + +static inline int rpc_spi_xfer_message(struct rpc_spi *rpc, + struct spi_transfer *data_xfer) +{ + int ret; + + ret = rpc_spi_set_freq(rpc, data_xfer->speed_hz); + if (ret) + return ret; + + ret = rpc_spi_io_xfer(rpc, + rpc->xfer_dir == SPI_MEM_DATA_OUT ? + data_xfer->tx_buf : NULL, + rpc->xfer_dir == SPI_MEM_DATA_IN ? + data_xfer->rx_buf : NULL); + + return ret; +} + +static int rpc_spi_transfer_one_message(struct spi_controller *ctlr, + struct spi_message *msg) +{ + struct rpc_spi *rpc = spi_controller_get_devdata(ctlr); + struct spi_transfer *data_xfer; + int ret; + + rpc_spi_transfer_setup(rpc, msg); + + data_xfer = list_last_entry(&msg->transfers, struct spi_transfer, + transfer_list); + + ret = rpc_spi_xfer_message(rpc, data_xfer); + if (ret) + goto out; + + msg->status = 0; + msg->actual_length = rpc->totalxferlen; +out: + spi_finalize_current_message(ctlr); + return 0; +} + +static int rpc_spi_probe(struct platform_device *pdev) +{ + struct spi_controller *ctlr; + struct rpc_mfd *rpc_mfd = dev_get_drvdata(pdev->dev.parent); + struct rpc_spi *rpc; + int ret; + + ctlr = spi_alloc_master(&pdev->dev, sizeof(*rpc)); + if (!ctlr) + return -ENOMEM; + + platform_set_drvdata(pdev, ctlr); + + rpc = spi_controller_get_devdata(ctlr); + + rpc->ddata = rpc_mfd; + ctlr->dev.of_node = pdev->dev.parent->of_node; + + pm_runtime_enable(&pdev->dev); + ctlr->auto_runtime_pm = true; + + ctlr->num_chipselect = 1; + ctlr->mem_ops = &rpc_spi_mem_ops; + ctlr->transfer_one_message = rpc_spi_transfer_one_message; + + ctlr->bits_per_word_mask = SPI_BPW_MASK(8); + ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_TX_QUAD | SPI_RX_QUAD; + + pm_runtime_get_sync(&pdev->dev); + rpc_spi_hw_init(rpc); + pm_runtime_put(&pdev->dev); + + ret = spi_register_controller(ctlr); + if (ret) { + dev_err(&pdev->dev, "spi_register_controller failed\n"); + goto err_put_ctlr; + } + + return 0; +err_put_ctlr: + spi_controller_put(ctlr); + pm_runtime_disable(&pdev->dev); + + return ret; +} + +static int rpc_spi_remove(struct platform_device *pdev) +{ + struct spi_controller *ctlr = platform_get_drvdata(pdev); + + pm_runtime_disable(&pdev->dev); + spi_unregister_controller(ctlr); + + return 0; +} + +#ifdef CONFIG_PM_SLEEP +static int rpc_spi_suspend(struct device *dev) +{ + struct spi_controller *ctlr = dev_get_drvdata(dev); + + return spi_controller_suspend(ctlr); +} + +static int rpc_spi_resume(struct device *dev) +{ + struct spi_controller *ctlr = dev_get_drvdata(dev); + + return spi_controller_resume(ctlr); +} + +static SIMPLE_DEV_PM_OPS(rpc_spi_pm_ops, rpc_spi_suspend, rpc_spi_resume); +#define DEV_PM_OPS (&rpc_spi_pm_ops) +#else +#define DEV_PM_OPS NULL +#endif + +static struct platform_driver rpc_spi_driver = { + .probe = rpc_spi_probe, + .remove = rpc_spi_remove, + .driver = { + .name = "rpc-spi", + .pm = DEV_PM_OPS, + }, +}; +module_platform_driver(rpc_spi_driver); + +MODULE_AUTHOR("Mason Yang <masonccyang@mxic.com.tw>"); +MODULE_DESCRIPTION("Renesas R-Car Gen3 RPC-IF SPI controller driver"); +MODULE_LICENSE("GPL v2"); -- 1.9.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings 2019-05-21 7:19 [PATCH v13 0/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD & SPI driver Mason Yang 2019-05-21 7:19 ` [PATCH v13 1/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD driver Mason Yang 2019-05-21 7:19 ` [PATCH v13 2/3] spi: Add Renesas R-Car Gen3 RPC-IF SPI controller driver Mason Yang @ 2019-05-21 7:19 ` Mason Yang 2019-05-22 16:50 ` Sergei Shtylyov 2 siblings, 1 reply; 13+ messages in thread From: Mason Yang @ 2019-05-21 7:19 UTC (permalink / raw) To: broonie, marek.vasut, linux-kernel, linux-spi, bbrezillon, linux-renesas-soc, Geert Uytterhoeven, lee.jones, sergei.shtylyov, robh+dt, mark.rutland, devicetree Cc: juliensu, Simon Horman, Mason Yang, miquel.raynal Document the bindings used by the Renesas R-Car Gen3 RPC-IF controller. Signed-off-by: Mason Yang <masonccyang@mxic.com.tw> --- .../devicetree/bindings/mfd/renesas-rpc-if.txt | 65 ++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt diff --git a/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt new file mode 100644 index 0000000..20ec85b --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt @@ -0,0 +1,65 @@ +Renesas R-Car Gen3 RPC-IF controller Device Tree Bindings +--------------------------------------------------------- + +RPC-IF supports both SPI NOR and HyperFlash (CFI-compliant flash) + +Required properties: +- compatible: should be an SoC-specific compatible value, followed by + "renesas,rcar-gen3-rpc" as a fallback. + supported SoC-specific values are: + "renesas,r8a77995-rpc" (R-Car D3) +- reg: should contain three register areas: + first for RPC-IF registers, + second for the direct mapping read mode and + third for the write buffer area. +- reg-names: should contain "regs", "dirmap" and "wbuf" +- clocks: should contain 1 entries for the module's clock +- clock-names: should contain "rpc" +- power-domains: should contain system-controller(sysc) for power-domain-cell +- resets: should contain clock pulse generator(cpg) for reset-cell, + power-domain-cell and clock-cell +- #address-cells: should be 1 +- #size-cells: should be 0 + +Example: +- SPI mode: + + rpc: spi@ee200000 { + compatible = "renesas,r8a77995-rpc", "renesas,rcar-gen3-rpc"; + reg = <0 0xee200000 0 0x200>, <0 0x08000000 0 0x4000000>, + <0 0xee208000 0 0x100>; + reg-names = "regs", "dirmap", "wbuf"; + clocks = <&cpg CPG_MOD 917>; + clock-names = "rpc"; + power-domains = <&sysc R8A77995_PD_ALWAYS_ON>; + resets = <&cpg 917>; + #address-cells = <1>; + #size-cells = <0>; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <40000000>; + spi-tx-bus-width = <1>; + spi-rx-bus-width = <1>; + }; + }; + +- HF mode: + rpc: spi@ee200000 { + compatible = "renesas,r8a77995-rpc", "renesas,rcar-gen3-rpc"; + reg = <0 0xee200000 0 0x200>, <0 0x08000000 0 0x4000000>, + <0 0xee208000 0 0x100>; + reg-names = "regs", "dirmap", "wbuf"; + clocks = <&cpg CPG_MOD 917>; + clock-names = "rpc"; + power-domains = <&sysc R8A77995_PD_ALWAYS_ON>; + resets = <&cpg 917>; + #address-cells = <1>; + #size-cells = <0>; + + flash@0 { + compatible = "cypress,hyperflash", "cfi-flash"; + reg = <0>; + }; + }; -- 1.9.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings 2019-05-21 7:19 ` [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings Mason Yang @ 2019-05-22 16:50 ` Sergei Shtylyov 2019-05-23 9:16 ` masonccyang 2019-06-03 13:04 ` Lee Jones 0 siblings, 2 replies; 13+ messages in thread From: Sergei Shtylyov @ 2019-05-22 16:50 UTC (permalink / raw) To: Mason Yang, broonie, marek.vasut, linux-kernel, linux-spi, bbrezillon, linux-renesas-soc, Geert Uytterhoeven, lee.jones, robh+dt, mark.rutland, devicetree Cc: juliensu, Simon Horman, miquel.raynal On 05/21/2019 10:19 AM, Mason Yang wrote: > Document the bindings used by the Renesas R-Car Gen3 RPC-IF controller. > > Signed-off-by: Mason Yang <masonccyang@mxic.com.tw> > --- > .../devicetree/bindings/mfd/renesas-rpc-if.txt | 65 ++++++++++++++++++++++ > 1 file changed, 65 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > > diff --git a/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > new file mode 100644 > index 0000000..20ec85b > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > @@ -0,0 +1,65 @@ > +Renesas R-Car Gen3 RPC-IF controller Device Tree Bindings > +--------------------------------------------------------- > + > +RPC-IF supports both SPI NOR and HyperFlash (CFI-compliant flash) > + > +Required properties: > +- compatible: should be an SoC-specific compatible value, followed by > + "renesas,rcar-gen3-rpc" as a fallback. > + supported SoC-specific values are: > + "renesas,r8a77995-rpc" (R-Car D3) > +- reg: should contain three register areas: > + first for RPC-IF registers, > + second for the direct mapping read mode and > + third for the write buffer area. > +- reg-names: should contain "regs", "dirmap" and "wbuf" > +- clocks: should contain 1 entries for the module's clock > +- clock-names: should contain "rpc" > +- power-domains: should contain system-controller(sysc) for power-domain-cell > +- resets: should contain clock pulse generator(cpg) for reset-cell, > + power-domain-cell and clock-cell That's just some nonsense, sorry... I suggest that you stop reposting your patches as I'm going to post my version of this patchset RSN (based on your patches, of course) and I'm going to take care of fixing this file as well. > +- #address-cells: should be 1 > +- #size-cells: should be 0 [...] MBR, Sergei ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings 2019-05-22 16:50 ` Sergei Shtylyov @ 2019-05-23 9:16 ` masonccyang 2019-06-03 13:04 ` Lee Jones 1 sibling, 0 replies; 13+ messages in thread From: masonccyang @ 2019-05-23 9:16 UTC (permalink / raw) To: Sergei Shtylyov Cc: bbrezillon, broonie, devicetree, Geert Uytterhoeven, Simon Horman, juliensu, lee.jones, linux-kernel, linux-renesas-soc, linux-spi, marek.vasut, mark.rutland, miquel.raynal, robh+dt Hi Sergei, > On 05/21/2019 10:19 AM, Mason Yang wrote: > > > Document the bindings used by the Renesas R-Car Gen3 RPC-IF controller. > > > > Signed-off-by: Mason Yang <masonccyang@mxic.com.tw> > > --- > > .../devicetree/bindings/mfd/renesas-rpc-if.txt | 65 ++++++++++++++++++++++ > > 1 file changed, 65 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > > > > diff --git a/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt b/ > Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > > new file mode 100644 > > index 0000000..20ec85b > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > > @@ -0,0 +1,65 @@ > > +Renesas R-Car Gen3 RPC-IF controller Device Tree Bindings > > +--------------------------------------------------------- > > + > > +RPC-IF supports both SPI NOR and HyperFlash (CFI-compliant flash) > > + > > +Required properties: > > +- compatible: should be an SoC-specific compatible value, followed by > > + "renesas,rcar-gen3-rpc" as a fallback. > > + supported SoC-specific values are: > > + "renesas,r8a77995-rpc" (R-Car D3) > > +- reg: should contain three register areas: > > + first for RPC-IF registers, > > + second for the direct mapping read mode and > > + third for the write buffer area. > > +- reg-names: should contain "regs", "dirmap" and "wbuf" > > +- clocks: should contain 1 entries for the module's clock > > +- clock-names: should contain "rpc" > > +- power-domains: should contain system-controller(sysc) for power-domain-cell > > +- resets: should contain clock pulse generator(cpg) for reset-cell, > > + power-domain-cell and clock-cell > > That's just some nonsense, sorry... > I suggest that you stop reposting your patches as I'm going to post > my version of this patchset RSN (based on your patches, of course) and I'm > going to take care of fixing this file as well. okay, just let me know your patch then. thanks & best regards, Mason CONFIDENTIALITY NOTE: This e-mail and any attachments may contain confidential information and/or personal data, which is protected by applicable laws. Please be reminded that duplication, disclosure, distribution, or use of this e-mail (and/or its attachments) or any part thereof is prohibited. If you receive this e-mail in error, please notify us immediately and delete this mail as well as its attachment(s) from your system. In addition, please be informed that collection, processing, and/or use of personal data is prohibited unless expressly permitted by personal data protection laws. Thank you for your attention and cooperation. Macronix International Co., Ltd. ===================================================================== ============================================================================ CONFIDENTIALITY NOTE: This e-mail and any attachments may contain confidential information and/or personal data, which is protected by applicable laws. Please be reminded that duplication, disclosure, distribution, or use of this e-mail (and/or its attachments) or any part thereof is prohibited. If you receive this e-mail in error, please notify us immediately and delete this mail as well as its attachment(s) from your system. In addition, please be informed that collection, processing, and/or use of personal data is prohibited unless expressly permitted by personal data protection laws. Thank you for your attention and cooperation. Macronix International Co., Ltd. ===================================================================== ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings 2019-05-22 16:50 ` Sergei Shtylyov 2019-05-23 9:16 ` masonccyang @ 2019-06-03 13:04 ` Lee Jones 2019-06-03 14:55 ` Sergei Shtylyov 1 sibling, 1 reply; 13+ messages in thread From: Lee Jones @ 2019-06-03 13:04 UTC (permalink / raw) To: Sergei Shtylyov Cc: Mason Yang, broonie, marek.vasut, linux-kernel, linux-spi, bbrezillon, linux-renesas-soc, Geert Uytterhoeven, robh+dt, mark.rutland, devicetree, juliensu, Simon Horman, miquel.raynal On Wed, 22 May 2019, Sergei Shtylyov wrote: > On 05/21/2019 10:19 AM, Mason Yang wrote: > > > Document the bindings used by the Renesas R-Car Gen3 RPC-IF controller. > > > > Signed-off-by: Mason Yang <masonccyang@mxic.com.tw> > > --- > > .../devicetree/bindings/mfd/renesas-rpc-if.txt | 65 ++++++++++++++++++++++ > > 1 file changed, 65 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > > > > diff --git a/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > > new file mode 100644 > > index 0000000..20ec85b > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > > @@ -0,0 +1,65 @@ > > +Renesas R-Car Gen3 RPC-IF controller Device Tree Bindings > > +--------------------------------------------------------- > > + > > +RPC-IF supports both SPI NOR and HyperFlash (CFI-compliant flash) > > + > > +Required properties: > > +- compatible: should be an SoC-specific compatible value, followed by > > + "renesas,rcar-gen3-rpc" as a fallback. > > + supported SoC-specific values are: > > + "renesas,r8a77995-rpc" (R-Car D3) > > +- reg: should contain three register areas: > > + first for RPC-IF registers, > > + second for the direct mapping read mode and > > + third for the write buffer area. > > +- reg-names: should contain "regs", "dirmap" and "wbuf" > > +- clocks: should contain 1 entries for the module's clock > > +- clock-names: should contain "rpc" > > +- power-domains: should contain system-controller(sysc) for power-domain-cell > > +- resets: should contain clock pulse generator(cpg) for reset-cell, > > + power-domain-cell and clock-cell > > That's just some nonsense, sorry... > I suggest that you stop reposting your patches as I'm going to post > my version of this patchset RSN (based on your patches, of course) and I'm > going to take care of fixing this file as well. Why is this necessary? Why not just provide some constructive feedback instead? > > +- #address-cells: should be 1 > > +- #size-cells: should be 0 > [...] > > MBR, Sergei -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings 2019-06-03 13:04 ` Lee Jones @ 2019-06-03 14:55 ` Sergei Shtylyov 2019-06-06 7:40 ` masonccyang 0 siblings, 1 reply; 13+ messages in thread From: Sergei Shtylyov @ 2019-06-03 14:55 UTC (permalink / raw) To: Lee Jones Cc: Mason Yang, broonie, marek.vasut, linux-kernel, linux-spi, bbrezillon, linux-renesas-soc, Geert Uytterhoeven, robh+dt, mark.rutland, devicetree, juliensu, Simon Horman, miquel.raynal Hello! On 06/03/2019 04:04 PM, Lee Jones wrote: >>> Document the bindings used by the Renesas R-Car Gen3 RPC-IF controller. >>> >>> Signed-off-by: Mason Yang <masonccyang@mxic.com.tw> >>> --- >>> .../devicetree/bindings/mfd/renesas-rpc-if.txt | 65 ++++++++++++++++++++++ >>> 1 file changed, 65 insertions(+) >>> create mode 100644 Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt >>> >>> diff --git a/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt >>> new file mode 100644 >>> index 0000000..20ec85b >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt >>> @@ -0,0 +1,65 @@ >>> +Renesas R-Car Gen3 RPC-IF controller Device Tree Bindings >>> +--------------------------------------------------------- >>> + >>> +RPC-IF supports both SPI NOR and HyperFlash (CFI-compliant flash) >>> + >>> +Required properties: >>> +- compatible: should be an SoC-specific compatible value, followed by >>> + "renesas,rcar-gen3-rpc" as a fallback. >>> + supported SoC-specific values are: >>> + "renesas,r8a77995-rpc" (R-Car D3) >>> +- reg: should contain three register areas: >>> + first for RPC-IF registers, >>> + second for the direct mapping read mode and >>> + third for the write buffer area. >>> +- reg-names: should contain "regs", "dirmap" and "wbuf" >>> +- clocks: should contain 1 entries for the module's clock >>> +- clock-names: should contain "rpc" >>> +- power-domains: should contain system-controller(sysc) for power-domain-cell >>> +- resets: should contain clock pulse generator(cpg) for reset-cell, >>> + power-domain-cell and clock-cell >> >> That's just some nonsense, sorry... >> I suggest that you stop reposting your patches as I'm going to post >> my version of this patchset RSN (based on your patches, of course) and I'm >> going to take care of fixing this file as well. > > Why is this necessary? Because Mason doesn't want to develop the HyperFlash driver (or even move his code in preparation to this driver being developed). I must develop this driver, and I'd like to avoid the extra churn of mving the code between the MFD and SPI drivers. > Why not just provide some constructive feedback instead? I was providing the feedback during these 13 revisions... unfortunately, it wasn't fully considered. >>> +- #address-cells: should be 1 >>> +- #size-cells: should be 0 >> [...] MBR, Sergei ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings 2019-06-03 14:55 ` Sergei Shtylyov @ 2019-06-06 7:40 ` masonccyang 2019-06-18 12:01 ` Marek Vasut 0 siblings, 1 reply; 13+ messages in thread From: masonccyang @ 2019-06-06 7:40 UTC (permalink / raw) To: Lee Jones Cc: bbrezillon, broonie, devicetree, Geert Uytterhoeven, Simon Horman, juliensu, Lee Jones, linux-kernel, linux-renesas-soc, linux-spi, marek.vasut, mark.rutland, miquel.raynal, robh+dt, Sergei Shtylyov Hi Jones, > Subject > > Re: [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF > controller bindings > > Hello! > > On 06/03/2019 04:04 PM, Lee Jones wrote: > > >>> Document the bindings used by the Renesas R-Car Gen3 RPC-IF controller. > >>> > >>> Signed-off-by: Mason Yang <masonccyang@mxic.com.tw> > >>> --- > >>> .../devicetree/bindings/mfd/renesas-rpc-if.txt | 65 ++++++++++++++++++++++ > >>> 1 file changed, 65 insertions(+) > >>> create mode 100644 Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > >>> > >>> diff --git a/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt b/ > Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > >>> new file mode 100644 > >>> index 0000000..20ec85b > >>> --- /dev/null > >>> +++ b/Documentation/devicetree/bindings/mfd/renesas-rpc-if.txt > >>> @@ -0,0 +1,65 @@ > >>> +Renesas R-Car Gen3 RPC-IF controller Device Tree Bindings > >>> +--------------------------------------------------------- > >>> + > >>> +RPC-IF supports both SPI NOR and HyperFlash (CFI-compliant flash) > >>> + > >>> +Required properties: > >>> +- compatible: should be an SoC-specific compatible value, followed by > >>> + "renesas,rcar-gen3-rpc" as a fallback. > >>> + supported SoC-specific values are: > >>> + "renesas,r8a77995-rpc" (R-Car D3) > >>> +- reg: should contain three register areas: > >>> + first for RPC-IF registers, > >>> + second for the direct mapping read mode and > >>> + third for the write buffer area. > >>> +- reg-names: should contain "regs", "dirmap" and "wbuf" > >>> +- clocks: should contain 1 entries for the module's clock > >>> +- clock-names: should contain "rpc" > >>> +- power-domains: should contain system-controller(sysc) for power-domain-cell > >>> +- resets: should contain clock pulse generator(cpg) for reset-cell, > >>> + power-domain-cell and clock-cell > >> > >> That's just some nonsense, sorry... > >> I suggest that you stop reposting your patches as I'm going to post > >> my version of this patchset RSN (based on your patches, of course) and I'm > >> going to take care of fixing this file as well. > > > > Why is this necessary? > > Because Mason doesn't want to develop the HyperFlash driver (or even move his code > in preparation to this driver being developed). I must develop this driver, and I'd > like to avoid the extra churn of mving the code between the MFD and SPI drivers. > There might be some misunderstandings. I had been requested to boot R-CAR from the OctaFlash and finally I have achieved it by patching SPI framework for OctaFlash operation and RPC-IF SPI driver. We were aware of the lacking support of RPC-IF in the Linux kernel at that time and I though I could contribute what I had developed. At that time for my first submission of RPC-IF SPI on 15 NOv 2018, there was no any HyperFlash (or Hyper Bus) patches. And we did not consider it because the resource of HyperFlash was shortage to us. RPC-IF SPI was applied by Mark on 12,Feb 2019 but Marek comment to add supporting MFD for RPC-IF and then I patched RPC-IF to MFD and SPI till this v13. I always think about: Is RPC-IF really good/suitable for MFD ? RPC-IF works either in SPI or HyperFlash is decided by external hardware pins configuration and it can NOT switch it's operation mode in the run time. This is not like my understanding of MFD. As your comments: ------------------------------------------------------------------------> > + flash = of_get_next_child(pdev->dev.of_node, NULL); > + if (!flash) { > + dev_warn(&pdev->dev, "no flash node found\n"); > + return -ENODEV; > + } > + > + if (of_device_is_compatible(flash, "jedec,spi-nor")) { > + cell = &rpc_spi_ctlr; > + } else if (of_device_is_compatible(flash, "cfi-flash")) { > + cell = &rpc_hf_ctlr; > + } else { > + dev_warn(&pdev->dev, "unknown flash type\n"); > + return -ENODEV; > + } Are there going to be more children coming? If not, I'd argue that this is not an MFD. <------------------------------------------------------------------- I agreed with your opinion and I will resubmit RPC-IF in SPI only if you also agree with it. thanks & best regards, Mason CONFIDENTIALITY NOTE: This e-mail and any attachments may contain confidential information and/or personal data, which is protected by applicable laws. Please be reminded that duplication, disclosure, distribution, or use of this e-mail (and/or its attachments) or any part thereof is prohibited. If you receive this e-mail in error, please notify us immediately and delete this mail as well as its attachment(s) from your system. In addition, please be informed that collection, processing, and/or use of personal data is prohibited unless expressly permitted by personal data protection laws. Thank you for your attention and cooperation. Macronix International Co., Ltd. ===================================================================== ============================================================================ CONFIDENTIALITY NOTE: This e-mail and any attachments may contain confidential information and/or personal data, which is protected by applicable laws. Please be reminded that duplication, disclosure, distribution, or use of this e-mail (and/or its attachments) or any part thereof is prohibited. If you receive this e-mail in error, please notify us immediately and delete this mail as well as its attachment(s) from your system. In addition, please be informed that collection, processing, and/or use of personal data is prohibited unless expressly permitted by personal data protection laws. Thank you for your attention and cooperation. Macronix International Co., Ltd. ===================================================================== ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings 2019-06-06 7:40 ` masonccyang @ 2019-06-18 12:01 ` Marek Vasut 2019-06-19 7:36 ` masonccyang 0 siblings, 1 reply; 13+ messages in thread From: Marek Vasut @ 2019-06-18 12:01 UTC (permalink / raw) To: masonccyang, Lee Jones Cc: bbrezillon, broonie, devicetree, Geert Uytterhoeven, Simon Horman, juliensu, linux-kernel, linux-renesas-soc, linux-spi, mark.rutland, miquel.raynal, robh+dt, Sergei Shtylyov On 6/6/19 9:40 AM, masonccyang@mxic.com.tw wrote: [...] > RPC-IF works either in SPI or HyperFlash is decided by external hardware > pins > configuration and it can NOT switch it's operation mode in the run time. > This is not like my understanding of MFD. Which external hardware pins decide the RPC configuration ? It seems to me like PHYCNT register, PHYMEM bitfield, selects what device is connected, and then a couple of other bits control the communication, but I see nothing which would be tied to any external configuration pins. [...] -- Best regards, Marek Vasut ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings 2019-06-18 12:01 ` Marek Vasut @ 2019-06-19 7:36 ` masonccyang 0 siblings, 0 replies; 13+ messages in thread From: masonccyang @ 2019-06-19 7:36 UTC (permalink / raw) To: Marek Vasut Cc: bbrezillon, broonie, devicetree, Geert Uytterhoeven, Simon Horman, juliensu, Lee Jones, linux-kernel, linux-renesas-soc, linux-spi, mark.rutland, miquel.raynal, robh+dt, Sergei Shtylyov Hi Marek, > Subject > > Re: [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF > controller bindings > > On 6/6/19 9:40 AM, masonccyang@mxic.com.tw wrote: > [...] > > > RPC-IF works either in SPI or HyperFlash is decided by external hardware > > pins > > configuration and it can NOT switch it's operation mode in the run time. > > This is not like my understanding of MFD. > > Which external hardware pins decide the RPC configuration ? > > It seems to me like PHYCNT register, PHYMEM bitfield, selects what > device is connected, and then a couple of other bits control the > communication, but I see nothing which would be tied to any external > configuration pins. > You may refer to R-Car D3 Draak Eva. board hardware manual and start-up guide, i.e., Table 2.12 Pin Multiplexing of R-Car D3 Mode setting pins and set by hardware switch 1, 2, 3, 13, 31 and 10 to configure booting from SPI mode or HyperFlash mode. thanks & best regards, Mason CONFIDENTIALITY NOTE: This e-mail and any attachments may contain confidential information and/or personal data, which is protected by applicable laws. Please be reminded that duplication, disclosure, distribution, or use of this e-mail (and/or its attachments) or any part thereof is prohibited. If you receive this e-mail in error, please notify us immediately and delete this mail as well as its attachment(s) from your system. In addition, please be informed that collection, processing, and/or use of personal data is prohibited unless expressly permitted by personal data protection laws. Thank you for your attention and cooperation. Macronix International Co., Ltd. ===================================================================== ============================================================================ CONFIDENTIALITY NOTE: This e-mail and any attachments may contain confidential information and/or personal data, which is protected by applicable laws. Please be reminded that duplication, disclosure, distribution, or use of this e-mail (and/or its attachments) or any part thereof is prohibited. If you receive this e-mail in error, please notify us immediately and delete this mail as well as its attachment(s) from your system. In addition, please be informed that collection, processing, and/or use of personal data is prohibited unless expressly permitted by personal data protection laws. Thank you for your attention and cooperation. Macronix International Co., Ltd. ===================================================================== ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-06-19 7:36 UTC | newest] Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-21 7:19 [PATCH v13 0/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD & SPI driver Mason Yang 2019-05-21 7:19 ` [PATCH v13 1/3] mfd: Add Renesas R-Car Gen3 RPC-IF MFD driver Mason Yang 2019-06-03 13:02 ` Lee Jones 2019-06-04 0:52 ` masonccyang 2019-05-21 7:19 ` [PATCH v13 2/3] spi: Add Renesas R-Car Gen3 RPC-IF SPI controller driver Mason Yang 2019-05-21 7:19 ` [PATCH v13 3/3] dt-bindings: mfd: Document Renesas R-Car Gen3 RPC-IF controller bindings Mason Yang 2019-05-22 16:50 ` Sergei Shtylyov 2019-05-23 9:16 ` masonccyang 2019-06-03 13:04 ` Lee Jones 2019-06-03 14:55 ` Sergei Shtylyov 2019-06-06 7:40 ` masonccyang 2019-06-18 12:01 ` Marek Vasut 2019-06-19 7:36 ` masonccyang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).