| Message ID | 1422396644-21714-2-git-send-email-agross@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue 27 Jan 14:10 PST 2015, Andy Gross wrote: This solution looks good, just some style things. > diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c [..] > +#define MAX_GSBI 12 > + > +#define TCSR_ADM_CRCI_BASE 0x70 > + > +struct crci_config { > + u32 num_rows; > + const u32 *array; Making this: const u32 (*array)[MAX_GSBI]; > +}; > + > +static const u32 crci_ipq8064[][MAX_GSBI] = { > + { > + 0x000003, 0x00000c, 0x000030, 0x0000c0, > + 0x000300, 0x000c00, 0x003000, 0x00c000, > + 0x030000, 0x0c0000, 0x300000, 0xc00000 > + }, > + { > + 0x000003, 0x00000c, 0x000030, 0x0000c0, > + 0x000300, 0x000c00, 0x003000, 0x00c000, > + 0x030000, 0x0c0000, 0x300000, 0xc00000 > + }, > +}; > + > +static const struct crci_config config_ipq8064 = { > + .num_rows = ARRAY_SIZE(crci_ipq8064), > + .array = crci_ipq8064[0], ...so that you can make this: .array = crci_ipq8064, > +}; [..] > @@ -45,6 +152,20 @@ static int gsbi_probe(struct platform_device *pdev) [..] > + if (config) > + for (i = 0; i < config->num_rows; i++) { > + if (gsbi->mode == GSBI_PROT_SPI) > + val = config->array[i*MAX_GSBI + gsbi_num - 1]; ...will give you: config->array[i][gsbi_num - 1]; > + else > + val = 0; > + > + regmap_update_bits(gsbi->tcsr, > + TCSR_ADM_CRCI_BASE + 0x4*i, > + config->array[i*MAX_GSBI + gsbi_num - 1], val); To me this would be cleaner: mask = config->array[i][gsbi_num - 1]; if (gsbi->mode == GSBI_PRO_SPI) regmap_update_bits(gsbi->tcsr, TCSR_ADM_CRCI_BASE + i * 4, mask, mask); else regmap_update_bits(gsbi->tcsr, TCSR_ADM_CRCI_BASE + i * 4, mask, 0); > + } > + There should be an extra set of {} around the if statment body. Regards, Bjorn
Hi Andy, On 01/28/2015 12:10 AM, Andy Gross wrote: > This patch adds automatic configuration for the ADM CRCI muxing required to > support DMA operations for GSBI clients. The GSBI mode and instance determine > the correct TCSR ADM CRCI MUX value that must be programmed so that the DMA > works properly. > > Signed-off-by: Andy Gross <agross@codeaurora.org> > --- > .../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 17 ++- > drivers/soc/qcom/Kconfig | 1 + > drivers/soc/qcom/qcom_gsbi.c | 148 +++++++++++++++++++- > 3 files changed, 158 insertions(+), 8 deletions(-) > <snip> > diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig > index 7bd2c94..32f20be 100644 > --- a/drivers/soc/qcom/Kconfig > +++ b/drivers/soc/qcom/Kconfig > @@ -4,6 +4,7 @@ > config QCOM_GSBI > tristate "QCOM General Serial Bus Interface" > depends on ARCH_QCOM > + select MFD_SYSCON Wrong indentation? In fact the original Kconfig entry has spaces instead of tabs, could you prepare a cleanup patch for this. > help > Say y here to enable GSBI support. The GSBI provides control > functions for connecting the underlying serial UART, SPI, and I2C <snip>
On Tue, Jan 27, 2015 at 07:11:50PM -0800, Bjorn Andersson wrote: > On Tue 27 Jan 14:10 PST 2015, Andy Gross wrote: > > This solution looks good, just some style things. > > > diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c > [..] > > +#define MAX_GSBI 12 > > + > > +#define TCSR_ADM_CRCI_BASE 0x70 > > + > > +struct crci_config { > > + u32 num_rows; > > + const u32 *array; > > Making this: > const u32 (*array)[MAX_GSBI]; ok, i'll switch to do this instead and change the usage down below. <snip> > > + else > > + val = 0; > > + > > + regmap_update_bits(gsbi->tcsr, > > + TCSR_ADM_CRCI_BASE + 0x4*i, > > + config->array[i*MAX_GSBI + gsbi_num - 1], val); > > To me this would be cleaner: > > mask = config->array[i][gsbi_num - 1]; > if (gsbi->mode == GSBI_PRO_SPI) > regmap_update_bits(gsbi->tcsr, TCSR_ADM_CRCI_BASE + i * 4, mask, mask); > else > regmap_update_bits(gsbi->tcsr, TCSR_ADM_CRCI_BASE + i * 4, mask, 0); i had considered doing something similar. It does make it cleaner, so I'll do this. > > + } > > + > There should be an extra set of {} around the if statment body. done
On Wed, Jan 28, 2015 at 11:05:50AM +0200, Stanimir Varbanov wrote: > <snip> > > > diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig > > index 7bd2c94..32f20be 100644 > > --- a/drivers/soc/qcom/Kconfig > > +++ b/drivers/soc/qcom/Kconfig > > @@ -4,6 +4,7 @@ > > config QCOM_GSBI > > tristate "QCOM General Serial Bus Interface" > > depends on ARCH_QCOM > > + select MFD_SYSCON > > Wrong indentation? In fact the original Kconfig entry has spaces instead > of tabs, could you prepare a cleanup patch for this. yeah I'll switch to spaces since the Kconfig is using spaces. > > help > > Say y here to enable GSBI support. The GSBI provides control > > functions for connecting the underlying serial UART, SPI, and I2C
On 01/27, Andy Gross wrote: > This patch adds automatic configuration for the ADM CRCI muxing required to > support DMA operations for GSBI clients. The GSBI mode and instance determine > the correct TCSR ADM CRCI MUX value that must be programmed so that the DMA > works properly. > > Signed-off-by: Andy Gross <agross@codeaurora.org> > --- > .../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 17 ++- > drivers/soc/qcom/Kconfig | 1 + > drivers/soc/qcom/qcom_gsbi.c | 148 +++++++++++++++++++- > 3 files changed, 158 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt > index 4ce24d4..39eea8a 100644 > --- a/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt > +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt > @@ -6,12 +6,18 @@ configuration settings. The mode setting will govern the input/output mode of > the 4 GSBI IOs. > > Required properties: > -- compatible: must contain "qcom,gsbi-v1.0.0" for APQ8064/IPQ8064 > +- compatible: Should contain: > + "qcom,gsbi-ipq8064" for IPQ8064 > + "qcom,gsbi-apq8064" for APQ8064 > + "qcom,gsbi-msm8960" for MSM8960 > + "qcom,gsbi-msm8660" for MSM8660 Hopefully this is not necessary, but if it is we should leave the old compatible here and say it's deprecated or something. > - reg: Address range for GSBI registers > - clocks: required clock > - clock-names: must contain "iface" entry > - qcom,mode : indicates MUX value for configuration of the serial interface. > Please reference dt-bindings/soc/qcom,gsbi.h for valid mux values. > +- qcom,gsbi-num: indicates GSBI instance number Why not use DT aliases for this? Then other drivers or more generic code can search for a gsbiN alias for the particular gsbi node. No qcom specific property. > +- syscon-tcsr: indicates phandle of TCSR syscon node Make this optional but required if any child nodes use dma? > > Optional properties: > - qcom,crci : indicates CRCI MUX value for QUP CRCI ports. Please reference > diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c > index 729425d..c7a22b5 100644 > --- a/drivers/soc/qcom/qcom_gsbi.c > +++ b/drivers/soc/qcom/qcom_gsbi.c > > struct gsbi_info { > struct clk *hclk; > u32 mode; > u32 crci; > + struct regmap *tcsr; > +}; > + > +static const struct of_device_id gsbi_dt_match[] = { > + { .compatible = "qcom,gsbi-v1.0.0", .data = NULL}, > + { .compatible = "qcom,gsbi-ipq8064", .data = &config_ipq8064}, > + { .compatible = "qcom,gsbi-apq8064", .data = &config_apq8064}, > + { .compatible = "qcom,gsbi-msm8960", .data = &config_msm8960}, > + { .compatible = "qcom,gsbi-msm8660", .data = &config_msm8660}, > + { }, > }; > +MODULE_DEVICE_TABLE(of, gsbi_dt_match); > > static int gsbi_probe(struct platform_device *pdev) > { > struct device_node *node = pdev->dev.of_node; > + const struct of_device_id *match; > struct resource *res; > void __iomem *base; > struct gsbi_info *gsbi; > + u32 gsbi_num, i, val; i should be int > + struct crci_config *config; const? > > gsbi = devm_kzalloc(&pdev->dev, sizeof(*gsbi), GFP_KERNEL); > > @@ -45,6 +152,20 @@ static int gsbi_probe(struct platform_device *pdev) > if (IS_ERR(base)) > return PTR_ERR(base); > > + gsbi->tcsr = syscon_regmap_lookup_by_phandle(node, "syscon-tcsr"); > + if (IS_ERR(gsbi->tcsr)) > + return -EINVAL; > + > + if (of_property_read_u32(node, "qcom,gsbi-num", &gsbi_num)) { > + dev_err(&pdev->dev, "missing gsbi instance number\n"); > + return -EINVAL; > + } As said before, aliases would do the job the same and not require some qcom specific property. > + > + if (!gsbi_num || gsbi_num > MAX_GSBI) { > + dev_err(&pdev->dev, "invalid gsbi number\n"); > + return -EINVAL; > + } > + > if (of_property_read_u32(node, "qcom,mode", &gsbi->mode)) { > dev_err(&pdev->dev, "missing mode configuration\n"); > return -EINVAL; > @@ -64,6 +185,26 @@ static int gsbi_probe(struct platform_device *pdev) > writel_relaxed((gsbi->mode << GSBI_PROTOCOL_SHIFT) | gsbi->crci, > base + GSBI_CTRL_REG); > > + /* > + * modify tcsr to reflect mode and ADM CRCI mux > + * Each gsbi contains a pair of bits, one for RX and one for TX > + * SPI mode requires both bits cleared, otherwise they are set > + */ > + match = of_match_node(gsbi_dt_match, node); Why not match the config to the TCSR compatible string? Wouldn't that more accurately reflect that we need to set different bits depending on which type of TCSR we're using? The version of GSBI hardware is not actually changing in every different SoC so I don't see why we want to change the compatible there just because the TCSR register layout changed. > + config = (struct crci_config *)match->data; Cast shouldn't be necessary if config is const? > + > + if (config) > + for (i = 0; i < config->num_rows; i++) { > + if (gsbi->mode == GSBI_PROT_SPI) Doesn't I2C need the same treatment (anything in QUP really)? Maybe the logic could be changed to check for gsbi->crci == GSBI_CRCI_QUP? > + val = config->array[i*MAX_GSBI + gsbi_num - 1]; > + else > + val = 0; > + > + regmap_update_bits(gsbi->tcsr, > + TCSR_ADM_CRCI_BASE + 0x4*i, > + config->array[i*MAX_GSBI + gsbi_num - 1], val); > + } > + > /* make sure the gsbi control write is not reordered */ > wmb(); >
On Wed, Jan 28, 2015 at 06:11:50PM -0800, Stephen Boyd wrote: <snip> > > Required properties: > > -- compatible: must contain "qcom,gsbi-v1.0.0" for APQ8064/IPQ8064 > > +- compatible: Should contain: > > + "qcom,gsbi-ipq8064" for IPQ8064 > > + "qcom,gsbi-apq8064" for APQ8064 > > + "qcom,gsbi-msm8960" for MSM8960 > > + "qcom,gsbi-msm8660" for MSM8660 > > Hopefully this is not necessary, but if it is we should leave the > old compatible here and say it's deprecated or something. Right. I went back and forth with the tcsr vs gsbi. If change the compats I'll put in a deprecated. > > - reg: Address range for GSBI registers > > - clocks: required clock > > - clock-names: must contain "iface" entry > > - qcom,mode : indicates MUX value for configuration of the serial interface. > > Please reference dt-bindings/soc/qcom,gsbi.h for valid mux values. > > +- qcom,gsbi-num: indicates GSBI instance number > > Why not use DT aliases for this? Then other drivers or more > generic code can search for a gsbiN alias for the particular gsbi > node. No qcom specific property. Yeah thats cleaner. I'll do that. > > > +- syscon-tcsr: indicates phandle of TCSR syscon node > > Make this optional but required if any child nodes use dma? To enforce that I'd have to determine that a child has a dmas. I guess that isn't so bad. <snip> > > static int gsbi_probe(struct platform_device *pdev) > > { > > struct device_node *node = pdev->dev.of_node; > > + const struct of_device_id *match; > > struct resource *res; > > void __iomem *base; > > struct gsbi_info *gsbi; > > + u32 gsbi_num, i, val; > > i should be int > > > + struct crci_config *config; > > const? will fix both. > > > > gsbi = devm_kzalloc(&pdev->dev, sizeof(*gsbi), GFP_KERNEL); > > > > @@ -45,6 +152,20 @@ static int gsbi_probe(struct platform_device *pdev) > > if (IS_ERR(base)) > > return PTR_ERR(base); > > > > + gsbi->tcsr = syscon_regmap_lookup_by_phandle(node, "syscon-tcsr"); > > + if (IS_ERR(gsbi->tcsr)) > > + return -EINVAL; > > + > > + if (of_property_read_u32(node, "qcom,gsbi-num", &gsbi_num)) { > > + dev_err(&pdev->dev, "missing gsbi instance number\n"); > > + return -EINVAL; > > + } > > As said before, aliases would do the job the same and not require > some qcom specific property. Yup. will fix. > > + > > + if (!gsbi_num || gsbi_num > MAX_GSBI) { > > + dev_err(&pdev->dev, "invalid gsbi number\n"); > > + return -EINVAL; > > + } > > + > > if (of_property_read_u32(node, "qcom,mode", &gsbi->mode)) { > > dev_err(&pdev->dev, "missing mode configuration\n"); > > return -EINVAL; > > @@ -64,6 +185,26 @@ static int gsbi_probe(struct platform_device *pdev) > > writel_relaxed((gsbi->mode << GSBI_PROTOCOL_SHIFT) | gsbi->crci, > > base + GSBI_CTRL_REG); > > > > + /* > > + * modify tcsr to reflect mode and ADM CRCI mux > > + * Each gsbi contains a pair of bits, one for RX and one for TX > > + * SPI mode requires both bits cleared, otherwise they are set > > + */ > > + match = of_match_node(gsbi_dt_match, node); > > Why not match the config to the TCSR compatible string? Wouldn't > that more accurately reflect that we need to set different bits > depending on which type of TCSR we're using? The version of GSBI > hardware is not actually changing in every different SoC so I > don't see why we want to change the compatible there just because > the TCSR register layout changed. That is true. However, with the gsbi compat, I avoid doing a match multiple times and get the table I need immediately. The alternative is N checks or pulling the compat strings and comparing them to get the right table. > > + config = (struct crci_config *)match->data; > > Cast shouldn't be necessary if config is const? will check if that works > > + > > + if (config) > > + for (i = 0; i < config->num_rows; i++) { > > + if (gsbi->mode == GSBI_PROT_SPI) > > Doesn't I2C need the same treatment (anything in QUP really)? > Maybe the logic could be changed to check for gsbi->crci == > GSBI_CRCI_QUP? Nope. I2C doesn't support DMA when ADM is the controller. It's only SPI or UART.
On 01/28, Andy Gross wrote: > On Wed, Jan 28, 2015 at 06:11:50PM -0800, Stephen Boyd wrote: > > > > > > +- syscon-tcsr: indicates phandle of TCSR syscon node > > > > Make this optional but required if any child nodes use dma? > > To enforce that I'd have to determine that a child has a dmas. I guess that > isn't so bad. I don't think we need to write any code in the driver to enforce this right now. As long as nobody gets it wrong bad things won't happen and we can just assume that the DT is correct. Once we get some bad DT we can go ahead and implement some DT parsing stuff. > > > > > + > > > + if (!gsbi_num || gsbi_num > MAX_GSBI) { > > > + dev_err(&pdev->dev, "invalid gsbi number\n"); > > > + return -EINVAL; > > > + } > > > + > > > if (of_property_read_u32(node, "qcom,mode", &gsbi->mode)) { > > > dev_err(&pdev->dev, "missing mode configuration\n"); > > > return -EINVAL; > > > @@ -64,6 +185,26 @@ static int gsbi_probe(struct platform_device *pdev) > > > writel_relaxed((gsbi->mode << GSBI_PROTOCOL_SHIFT) | gsbi->crci, > > > base + GSBI_CTRL_REG); > > > > > > + /* > > > + * modify tcsr to reflect mode and ADM CRCI mux > > > + * Each gsbi contains a pair of bits, one for RX and one for TX > > > + * SPI mode requires both bits cleared, otherwise they are set > > > + */ > > > + match = of_match_node(gsbi_dt_match, node); > > > > Why not match the config to the TCSR compatible string? Wouldn't > > that more accurately reflect that we need to set different bits > > depending on which type of TCSR we're using? The version of GSBI > > hardware is not actually changing in every different SoC so I > > don't see why we want to change the compatible there just because > > the TCSR register layout changed. > > That is true. However, with the gsbi compat, I avoid doing a match multiple > times and get the table I need immediately. The alternative is N checks or > pulling the compat strings and comparing them to get the right table. Sorry I'm not following. We always have to call of_match_node() here and I'm just suggesting we replace gsbi_dt_match with tcsr_dt_match and leave gsbi_dt_match like it was before. I don't see how anything is avoided. > > > > > + > > > + if (config) > > > + for (i = 0; i < config->num_rows; i++) { > > > + if (gsbi->mode == GSBI_PROT_SPI) > > > > Doesn't I2C need the same treatment (anything in QUP really)? > > Maybe the logic could be changed to check for gsbi->crci == > > GSBI_CRCI_QUP? > > Nope. I2C doesn't support DMA when ADM is the controller. It's only SPI or > UART. Ok, I don't get it but I guess it doesn't matter if I2C doesn't use it.
diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt index 4ce24d4..39eea8a 100644 --- a/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt @@ -6,12 +6,18 @@ configuration settings. The mode setting will govern the input/output mode of the 4 GSBI IOs. Required properties: -- compatible: must contain "qcom,gsbi-v1.0.0" for APQ8064/IPQ8064 +- compatible: Should contain: + "qcom,gsbi-ipq8064" for IPQ8064 + "qcom,gsbi-apq8064" for APQ8064 + "qcom,gsbi-msm8960" for MSM8960 + "qcom,gsbi-msm8660" for MSM8660 - reg: Address range for GSBI registers - clocks: required clock - clock-names: must contain "iface" entry - qcom,mode : indicates MUX value for configuration of the serial interface. Please reference dt-bindings/soc/qcom,gsbi.h for valid mux values. +- qcom,gsbi-num: indicates GSBI instance number +- syscon-tcsr: indicates phandle of TCSR syscon node Optional properties: - qcom,crci : indicates CRCI MUX value for QUP CRCI ports. Please reference @@ -48,6 +54,9 @@ Example for APQ8064: qcom,mode = <GSBI_PROT_I2C_UART>; qcom,crci = <GSBI_CRCI_QUP>; + qcom,gsbi-num = <4>; + syscon-tcsr = <&tcsr>; + /* child nodes go under here */ i2c_qup4: i2c@16380000 { @@ -76,3 +85,9 @@ Example for APQ8064: }; }; + tcsr: syscon@1a400000 { + compatible = "qcom,apq8064-tcsr", "syscon"; + reg = <0x1a400000 0x100>; + }; + + diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 7bd2c94..32f20be 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -4,6 +4,7 @@ config QCOM_GSBI tristate "QCOM General Serial Bus Interface" depends on ARCH_QCOM + select MFD_SYSCON help Say y here to enable GSBI support. The GSBI provides control functions for connecting the underlying serial UART, SPI, and I2C diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c index 729425d..c7a22b5 100644 --- a/drivers/soc/qcom/qcom_gsbi.c +++ b/drivers/soc/qcom/qcom_gsbi.c @@ -18,22 +18,129 @@ #include <linux/of.h> #include <linux/of_platform.h> #include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/mfd/syscon.h> +#include <dt-bindings/soc/qcom,gsbi.h> #define GSBI_CTRL_REG 0x0000 #define GSBI_PROTOCOL_SHIFT 4 +#define MAX_GSBI 12 + +#define TCSR_ADM_CRCI_BASE 0x70 + +struct crci_config { + u32 num_rows; + const u32 *array; +}; + +static const u32 crci_ipq8064[][MAX_GSBI] = { + { + 0x000003, 0x00000c, 0x000030, 0x0000c0, + 0x000300, 0x000c00, 0x003000, 0x00c000, + 0x030000, 0x0c0000, 0x300000, 0xc00000 + }, + { + 0x000003, 0x00000c, 0x000030, 0x0000c0, + 0x000300, 0x000c00, 0x003000, 0x00c000, + 0x030000, 0x0c0000, 0x300000, 0xc00000 + }, +}; + +static const struct crci_config config_ipq8064 = { + .num_rows = ARRAY_SIZE(crci_ipq8064), + .array = crci_ipq8064[0], +}; + +static const unsigned int crci_apq8064[][MAX_GSBI] = { + { + 0x001800, 0x006000, 0x000030, 0x0000c0, + 0x000300, 0x000400, 0x000000, 0x000000, + 0x000000, 0x000000, 0x000000, 0x000000 + }, + { + 0x000000, 0x000000, 0x000000, 0x000000, + 0x000000, 0x000020, 0x0000c0, 0x000000, + 0x000000, 0x000000, 0x000000, 0x000000 + }, +}; + +static const struct crci_config config_apq8064 = { + .num_rows = ARRAY_SIZE(crci_apq8064), + .array = crci_apq8064[0], +}; + +static const unsigned int crci_msm8960[][MAX_GSBI] = { + { + 0x000003, 0x00000c, 0x000030, 0x0000c0, + 0x000300, 0x000400, 0x000000, 0x000000, + 0x000000, 0x000000, 0x000000, 0x000000 + }, + { + 0x000000, 0x000000, 0x000000, 0x000000, + 0x000000, 0x000020, 0x0000c0, 0x000300, + 0x001800, 0x006000, 0x000000, 0x000000 + }, +}; + +static const struct crci_config config_msm8960 = { + .num_rows = ARRAY_SIZE(crci_msm8960), + .array = crci_msm8960[0], +}; + +static const unsigned int crci_msm8660[][MAX_GSBI] = { + { /* ADM 0 - B */ + 0x000003, 0x00000c, 0x000030, 0x0000c0, + 0x000300, 0x000c00, 0x003000, 0x00c000, + 0x030000, 0x0c0000, 0x300000, 0xc00000 + }, + { /* ADM 0 - B */ + 0x000003, 0x00000c, 0x000030, 0x0000c0, + 0x000300, 0x000c00, 0x003000, 0x00c000, + 0x030000, 0x0c0000, 0x300000, 0xc00000 + }, + { /* ADM 1 - A */ + 0x000003, 0x00000c, 0x000030, 0x0000c0, + 0x000300, 0x000c00, 0x003000, 0x00c000, + 0x030000, 0x0c0000, 0x300000, 0xc00000 + }, + { /* ADM 1 - B */ + 0x000003, 0x00000c, 0x000030, 0x0000c0, + 0x000300, 0x000c00, 0x003000, 0x00c000, + 0x030000, 0x0c0000, 0x300000, 0xc00000 + }, +}; + +static const struct crci_config config_msm8660 = { + .num_rows = ARRAY_SIZE(crci_msm8660), + .array = crci_msm8660[0], +}; struct gsbi_info { struct clk *hclk; u32 mode; u32 crci; + struct regmap *tcsr; +}; + +static const struct of_device_id gsbi_dt_match[] = { + { .compatible = "qcom,gsbi-v1.0.0", .data = NULL}, + { .compatible = "qcom,gsbi-ipq8064", .data = &config_ipq8064}, + { .compatible = "qcom,gsbi-apq8064", .data = &config_apq8064}, + { .compatible = "qcom,gsbi-msm8960", .data = &config_msm8960}, + { .compatible = "qcom,gsbi-msm8660", .data = &config_msm8660}, + { }, }; +MODULE_DEVICE_TABLE(of, gsbi_dt_match); static int gsbi_probe(struct platform_device *pdev) { struct device_node *node = pdev->dev.of_node; + const struct of_device_id *match; struct resource *res; void __iomem *base; struct gsbi_info *gsbi; + u32 gsbi_num, i, val; + struct crci_config *config; gsbi = devm_kzalloc(&pdev->dev, sizeof(*gsbi), GFP_KERNEL); @@ -45,6 +152,20 @@ static int gsbi_probe(struct platform_device *pdev) if (IS_ERR(base)) return PTR_ERR(base); + gsbi->tcsr = syscon_regmap_lookup_by_phandle(node, "syscon-tcsr"); + if (IS_ERR(gsbi->tcsr)) + return -EINVAL; + + if (of_property_read_u32(node, "qcom,gsbi-num", &gsbi_num)) { + dev_err(&pdev->dev, "missing gsbi instance number\n"); + return -EINVAL; + } + + if (!gsbi_num || gsbi_num > MAX_GSBI) { + dev_err(&pdev->dev, "invalid gsbi number\n"); + return -EINVAL; + } + if (of_property_read_u32(node, "qcom,mode", &gsbi->mode)) { dev_err(&pdev->dev, "missing mode configuration\n"); return -EINVAL; @@ -64,6 +185,26 @@ static int gsbi_probe(struct platform_device *pdev) writel_relaxed((gsbi->mode << GSBI_PROTOCOL_SHIFT) | gsbi->crci, base + GSBI_CTRL_REG); + /* + * modify tcsr to reflect mode and ADM CRCI mux + * Each gsbi contains a pair of bits, one for RX and one for TX + * SPI mode requires both bits cleared, otherwise they are set + */ + match = of_match_node(gsbi_dt_match, node); + config = (struct crci_config *)match->data; + + if (config) + for (i = 0; i < config->num_rows; i++) { + if (gsbi->mode == GSBI_PROT_SPI) + val = config->array[i*MAX_GSBI + gsbi_num - 1]; + else + val = 0; + + regmap_update_bits(gsbi->tcsr, + TCSR_ADM_CRCI_BASE + 0x4*i, + config->array[i*MAX_GSBI + gsbi_num - 1], val); + } + /* make sure the gsbi control write is not reordered */ wmb(); @@ -81,13 +222,6 @@ static int gsbi_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id gsbi_dt_match[] = { - { .compatible = "qcom,gsbi-v1.0.0", }, - { }, -}; - -MODULE_DEVICE_TABLE(of, gsbi_dt_match); - static struct platform_driver gsbi_driver = { .driver = { .name = "gsbi",
This patch adds automatic configuration for the ADM CRCI muxing required to support DMA operations for GSBI clients. The GSBI mode and instance determine the correct TCSR ADM CRCI MUX value that must be programmed so that the DMA works properly. Signed-off-by: Andy Gross <agross@codeaurora.org> --- .../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 17 ++- drivers/soc/qcom/Kconfig | 1 + drivers/soc/qcom/qcom_gsbi.c | 148 +++++++++++++++++++- 3 files changed, 158 insertions(+), 8 deletions(-)