* [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support @ 2020-05-27 12:01 Serge Semin 2020-05-27 12:01 ` [PATCH v4 01/11] dt-bindings: i2c: Convert DW I2C binding to DT schema Serge Semin ` (10 more replies) 0 siblings, 11 replies; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang Cc: Serge Semin, Serge Semin, Alexey Malahov, Maxim Kaurkin, Pavel Parkhomenko, Ramil Zaripov, Ekaterina Skachko, Vadim Vlasov, Alexey Kolotnikov, Thomas Bogendoerfer, Andy Shevchenko, Mika Westerberg, Rob Herring, linux-mips, linux-i2c, devicetree, linux-kernel Jarkko, Wolfram, the merge window is upon us, please review/merge in/whatever the patchset. Initially this has been a small patchset which embedded the Baikal-T1 System I2C support into the DW APB I2C driver as is by using a simplest way. After a short discussion with Andy we decided to implement what he suggested (introduce regmap-based accessors and create a glue driver) and even more than that to provide some cleanups of the code. So here is what this patchset consists of. First of all we've found out that current implementation of scripts/dtc didn't support i2c dt nodes with 10bit and slave flags set in the reg property. You'll see an error if you try to dt_binding_check it. So the very first patch fixes the problem by adding these flags support into the check_i2c_bus_reg() method. Traditionally we converted the plain text-based DT binding to the DT schema and added Baikal-T1 System I2C device support there. This required to mark the reg property redundant for Baikal-T1 I2C since its reg-space is indirectly accessed by means of the System Controller cmd/read/write registers. Then as Andy suggested we replaced the Synopsys DW APB I2C common driver registers IO accessors into the regmap API methods. This doesn't change the code logic much, though in two places we managed to replace some bulky peaces of code with a ready-to-use regmap methods. Additionally before adding the glue layer API we initiated a set of cleanups: - Define components of the multi-object drivers (like i2c-designware-core.o and i2c-designware-paltform.o) with using `-y` suffixed makefile variables instead of `-objs` suffixed one. This is encouraged by Documentation/kbuild/makefiles.rst text since `-objs` is supposed to be used to build host programs. - Make DW I2C slave driver depended on the DW I2C core code instead of the platform one, which it really is. - Move Intel Baytrail semaphore feature to the platform if-clause of the kernel config. After this we finally can introduce the glue layer API for the DW APB I2C platform driver. So there are three methods exported from the driver: i2c_dw_plat_setup(), i2c_dw_plat_clear(), &i2c_dw_plat_dev_pm_ops to setup, cleanup and add PM operations to the glue driven I2C device. Before setting the platform DW I2C device up the glue probe code is supposed to create an instance of DW I2C device generic object and pre-initialize its `struct device` pointer together with optional platform-specific flags. In addition to that we converted the MSCC Ocelot SoC I2C specific code into the glue layer seeing it's really too specific and, which is more important, isn't that complicated so we could unpin it without much of worrying to break something. Meanwhile we discovered that MODEL_CHERRYTRAIL and MODEL_MASK actually were no longer used in the code. MODEL_MSCC flag has been discarded since the MSCC Ocelot I2C code conversion to the glue driver. So now we can get rid of all the MODEL-specific flags. Finally we introduced a glue driver with Baikal-T1 System I2C device support. The driver probe tries to find a syscon regmap, creates the DW APB I2C regmap based on it and passes it further to the DW I2C device descriptor. Then it does normal DW APB I2C platform setup by calling a generic setup method. Cleanup is straightforward. It's just calling a generic DW APB I2C clean method. This patchset is rebased and tested on the mainline Linux kernel 5.6-rc4: base-commit: 0e698dfa2822 ("Linux 5.7-rc4") tag: v5.7-rc4 Note new vendor prefix for Baikal-T1 System I2C device will be added in the framework of the next patchset: https://lkml.org/lkml/2020/5/6/1047 Changelog v2: - Fix the SoB tags. - Use a shorter summary describing the bindings convertion patch. - Patch "i2c: designware: Detect the FIFO size in the common code" has been acked by Jarkko and applied by Wolfram to for-next so drop it from the set. - Patch "i2c: designware: Discard i2c_dw_read_comp_param() function" has been acked by Jarkko and applied by Wolfram to for-next so drop it from the set. - Make sure that "mscc,ocelot-i2c" compatible node may have up to two registers space defined in the DT node, while normal DW I2C controller will have only one registers space. - Add "mscc,ocelot-i2c" DT schema example to test the previous fix. - Declare "unevaluatedProperties" property instead of "additionalProperties" one in the DT schema. - Due to the previous fix we can now discard the dummy boolean properties declaration, since the proper type evaluation will be performed by the generic i2c-controller.yaml schema. - Refactor the DW I2C APB driver related series to address the Andies notes. - Convert DW APB I2C driver to using regmap instead of handwritten accessors. - Use `-y` to build multi-object DW APB drivers. - Fix DW APB I2C slave code dependency. It should depend on I2C_DESIGNWARE_CORE instead I2C_DESIGNWARE_PLATFORM. - Move Baytrail semaphore config to the platform if-clause. - Introduce a glue-layer platform driver API. - Unpin Microsemi Ocelot I2C code into a glue driver. - Remove MODEL_CHERRYTRAIL and MODEL_MASK as no longer needed. - Add support for custom regmap passed from glue driver. - Add Baikal-T1 System I2C support in a dedicated glue layer driver. Link: https://lore.kernel.org/linux-i2c/20200510095019.20981-1-Sergey.Semin@baikalelectronics.ru/ Changelog v3: - Move fixes and less invasive patches to the head of the series. - Add patch "dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example" since Rob says the flag can be discarded until dtc is fixed. - Add patch "i2c: designware: Retrieve quirk flags as early as possible" as a first preparation before adding Baikal-T1 System I2C support. - Add patch "i2c: designware: Move reg-space remapping into a dedicated function" as a second preparation before adding Baikal-T1 System I2C support. - Add patch "i2c: designware: Add Baikal-T1 System I2C support", which integrates the Baikal-T1 I2C support into the DW I2C platform driver. - Get back the reg property being mandatory even if it's Baikal-T1 System I2C DT node. Rob says it has to be in the DT node if there is a dedicated registers range in the System Controller registers space. - Replace if-endif clause around the I2C_DESIGNWARE_BAYTRAIL config with "depends on" operator. Link: https://lore.kernel.org/linux-i2c/20200526215528.16417-1-Sergey.Semin@baikalelectronics.ru/ Changelog v4: - Rebase on top of the i2c/for-next branch. - Use PTR_ERR_OR_ZERO() helper in the bt1_i2c_request_regs() and in the dw_i2c_plat_request_regs() methods. - Discard devm_platform_get_and_ioremap_resource() utilization. - Discard patch "scripts/dtc: check: Add 10bit/slave i2c reg flags support" since it must be merged in to the dtc upstream repository. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Maxim Kaurkin <Maxim.Kaurkin@baikalelectronics.ru> Cc: Pavel Parkhomenko <Pavel.Parkhomenko@baikalelectronics.ru> Cc: Ramil Zaripov <Ramil.Zaripov@baikalelectronics.ru> Cc: Ekaterina Skachko <Ekaterina.Skachko@baikalelectronics.ru> Cc: Vadim Vlasov <V.Vlasov@baikalelectronics.ru> Cc: Alexey Kolotnikov <Alexey.Kolotnikov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: linux-mips@vger.kernel.org Cc: linux-i2c@vger.kernel.org Cc: devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org Serge Semin (11): dt-bindings: i2c: Convert DW I2C binding to DT schema dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example dt-bindings: i2c: dw: Add Baikal-T1 SoC I2C controller i2c: designware: Use `-y` to build multi-object modules i2c: designware: slave: Set DW I2C core module dependency i2c: designware: Add Baytrail sem config DW I2C platform dependency i2c: designware: Discard Cherry Trail model flag i2c: designware: Convert driver to using regmap API i2c: designware: Retrieve quirk flags as early as possible i2c: designware: Move reg-space remapping into a dedicated function i2c: designware: Add Baikal-T1 System I2C support .../bindings/i2c/i2c-designware.txt | 73 ------- .../bindings/i2c/snps,designware-i2c.yaml | 156 +++++++++++++++ drivers/i2c/busses/Kconfig | 28 +-- drivers/i2c/busses/Makefile | 18 +- drivers/i2c/busses/i2c-designware-common.c | 178 +++++++++++++----- drivers/i2c/busses/i2c-designware-core.h | 28 +-- drivers/i2c/busses/i2c-designware-master.c | 125 ++++++------ drivers/i2c/busses/i2c-designware-pcidrv.c | 1 - drivers/i2c/busses/i2c-designware-platdrv.c | 96 +++++++++- drivers/i2c/busses/i2c-designware-slave.c | 77 ++++---- 10 files changed, 520 insertions(+), 260 deletions(-) delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-designware.txt create mode 100644 Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml -- 2.26.2 ^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v4 01/11] dt-bindings: i2c: Convert DW I2C binding to DT schema 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 12:01 ` [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example Serge Semin ` (9 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang, Rob Herring Cc: Serge Semin, Serge Semin, Rob Herring, Alexey Malahov, Thomas Bogendoerfer, Andy Shevchenko, Mika Westerberg, linux-mips, linux-i2c, devicetree, linux-kernel Modern device tree bindings are supposed to be created as YAML-files in accordance with dt-schema. This commit replaces Synopsys DW I2C legacy bare text bindings with YAML file. As before the bindings file states that the corresponding dts node is supposed to be compatible either with generic DW I2C controller or with Microsemi Ocelot SoC I2C one, to have registers, interrupts and clocks properties. In addition the node may have clock-frequency, i2c-sda-hold-time-ns, i2c-scl-falling-time-ns and i2c-sda-falling-time-ns optional properties. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Reviewed-by: Rob Herring <robh@kernel.org> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: linux-mips@vger.kernel.org --- Changelog v2: - Make sure that "mscc,ocelot-i2c" compatible node may have up to two registers space defined, while normal DW I2C controller will have only one registers space. - Add "mscc,ocelot-i2c" example to test the previous fix. - Declare "unevaluatedProperties" property instead of "additionalProperties" one. - Due to the previous fix we can now discard the dummy boolean properties definitions, since the proper type evaluation will be performed by the generic i2c-controller.yaml schema. Changelog v3: - Discard $ref from the "-ns" suffixed properties since they've got the uint32-array type by default applied in the common schema. Set "maxItems: 1" there instead to make sure the property will have a single value specified. --- .../bindings/i2c/i2c-designware.txt | 73 --------- .../bindings/i2c/snps,designware-i2c.yaml | 154 ++++++++++++++++++ 2 files changed, 154 insertions(+), 73 deletions(-) delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-designware.txt create mode 100644 Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml diff --git a/Documentation/devicetree/bindings/i2c/i2c-designware.txt b/Documentation/devicetree/bindings/i2c/i2c-designware.txt deleted file mode 100644 index 08be4d3846e5..000000000000 --- a/Documentation/devicetree/bindings/i2c/i2c-designware.txt +++ /dev/null @@ -1,73 +0,0 @@ -* Synopsys DesignWare I2C - -Required properties : - - - compatible : should be "snps,designware-i2c" - or "mscc,ocelot-i2c" with "snps,designware-i2c" for fallback - - reg : Offset and length of the register set for the device - - interrupts : <IRQ> where IRQ is the interrupt number. - - clocks : phandles for the clocks, see the description of clock-names below. - The phandle for the "ic_clk" clock is required. The phandle for the "pclk" - clock is optional. If a single clock is specified but no clock-name, it is - the "ic_clk" clock. If both clocks are listed, the "ic_clk" must be first. - -Recommended properties : - - - clock-frequency : desired I2C bus clock frequency in Hz. - -Optional properties : - - - clock-names : Contains the names of the clocks: - "ic_clk", for the core clock used to generate the external I2C clock. - "pclk", the interface clock, required for register access. - - - reg : for "mscc,ocelot-i2c", a second register set to configure the SDA hold - time, named ICPU_CFG:TWI_DELAY in the datasheet. - - - i2c-sda-hold-time-ns : should contain the SDA hold time in nanoseconds. - This option is only supported in hardware blocks version 1.11a or newer and - on Microsemi SoCs ("mscc,ocelot-i2c" compatible). - - - i2c-scl-falling-time-ns : should contain the SCL falling time in nanoseconds. - This value which is by default 300ns is used to compute the tLOW period. - - - i2c-sda-falling-time-ns : should contain the SDA falling time in nanoseconds. - This value which is by default 300ns is used to compute the tHIGH period. - -Examples : - - i2c@f0000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "snps,designware-i2c"; - reg = <0xf0000 0x1000>; - interrupts = <11>; - clock-frequency = <400000>; - }; - - i2c@1120000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "snps,designware-i2c"; - reg = <0x1120000 0x1000>; - interrupt-parent = <&ictl>; - interrupts = <12 1>; - clock-frequency = <400000>; - i2c-sda-hold-time-ns = <300>; - i2c-sda-falling-time-ns = <300>; - i2c-scl-falling-time-ns = <300>; - }; - - i2c@1120000 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0x2000 0x100>; - clock-frequency = <400000>; - clocks = <&i2cclk>; - interrupts = <0>; - - eeprom@64 { - compatible = "linux,slave-24c02"; - reg = <0x40000064>; - }; - }; diff --git a/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml new file mode 100644 index 000000000000..4bd430b2b41d --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml @@ -0,0 +1,154 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/i2c/snps,designware-i2c.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys DesignWare APB I2C Controller + +maintainers: + - Jarkko Nikula <jarkko.nikula@linux.intel.com> + +allOf: + - $ref: /schemas/i2c/i2c-controller.yaml# + - if: + properties: + compatible: + not: + contains: + const: mscc,ocelot-i2c + then: + properties: + reg: + maxItems: 1 + +properties: + compatible: + oneOf: + - description: Generic Synopsys DesignWare I2C controller + const: snps,designware-i2c + - description: Microsemi Ocelot SoCs I2C controller + items: + - const: mscc,ocelot-i2c + - const: snps,designware-i2c + + reg: + minItems: 1 + items: + - description: DW APB I2C controller memory mapped registers + - description: | + ICPU_CFG:TWI_DELAY registers to setup the SDA hold time. + This registers are specific to the Ocelot I2C-controller. + + interrupts: + maxItems: 1 + + clocks: + minItems: 1 + items: + - description: I2C controller reference clock source + - description: APB interface clock source + + clock-names: + minItems: 1 + items: + - const: ref + - const: pclk + + resets: + maxItems: 1 + + clock-frequency: + description: Desired I2C bus clock frequency in Hz + enum: [100000, 400000, 1000000, 3400000] + default: 400000 + + i2c-sda-hold-time-ns: + maxItems: 1 + description: | + The property should contain the SDA hold time in nanoseconds. This option + is only supported in hardware blocks version 1.11a or newer or on + Microsemi SoCs. + + i2c-scl-falling-time-ns: + maxItems: 1 + description: | + The property should contain the SCL falling time in nanoseconds. + This value is used to compute the tLOW period. + default: 300 + + i2c-sda-falling-time-ns: + maxItems: 1 + description: | + The property should contain the SDA falling time in nanoseconds. + This value is used to compute the tHIGH period. + default: 300 + + dmas: + items: + - description: TX DMA Channel + - description: RX DMA Channel + + dma-names: + items: + - const: tx + - const: rx + +unevaluatedProperties: false + +required: + - compatible + - reg + - "#address-cells" + - "#size-cells" + - interrupts + +examples: + - | + i2c@f0000 { + compatible = "snps,designware-i2c"; + reg = <0xf0000 0x1000>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <11>; + clock-frequency = <400000>; + }; + - | + i2c@1120000 { + compatible = "snps,designware-i2c"; + reg = <0x1120000 0x1000>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <12 1>; + clock-frequency = <400000>; + i2c-sda-hold-time-ns = <300>; + i2c-sda-falling-time-ns = <300>; + i2c-scl-falling-time-ns = <300>; + }; + - | + i2c@2000 { + compatible = "snps,designware-i2c"; + reg = <0x2000 0x100>; + #address-cells = <1>; + #size-cells = <0>; + clock-frequency = <400000>; + clocks = <&i2cclk>; + interrupts = <0>; + + eeprom@64 { + compatible = "linux,slave-24c02"; + reg = <0x40000064>; + }; + }; + - | + i2c@100400 { + compatible = "mscc,ocelot-i2c", "snps,designware-i2c"; + reg = <0x100400 0x100>, <0x198 0x8>; + pinctrl-0 = <&i2c_pins>; + pinctrl-names = "default"; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <8>; + clocks = <&ahb_clk>; + }; +... -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin 2020-05-27 12:01 ` [PATCH v4 01/11] dt-bindings: i2c: Convert DW I2C binding to DT schema Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 17:12 ` Rob Herring 2020-05-27 12:01 ` [PATCH v4 03/11] dt-bindings: i2c: dw: Add Baikal-T1 SoC I2C controller Serge Semin ` (8 subsequent siblings) 10 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang, Rob Herring Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Andy Shevchenko, Mika Westerberg, linux-mips, linux-i2c, devicetree, linux-kernel dtc currently doesn't support I2C_OWN_SLAVE_ADDRESS flag set in the i2c "reg" property. If it is the compiler will print a warning: Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64: I2C bus unit address format error, expected "40000064" Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64:reg: I2C address must be less than 10-bits, got "0x40000064" In order to silence dtc up let's discard the flag from the DW I2C DT binding example for now. Just revert this commit when dtc is fixed. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: linux-mips@vger.kernel.org --- Changelog v3: - This is a new patch created as a result of the Rob request to remove the EEPROM-slave bit setting in the DT binndings example until the dtc is fixed. --- Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml index 4bd430b2b41d..101d78e8f19d 100644 --- a/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml @@ -137,7 +137,7 @@ examples: eeprom@64 { compatible = "linux,slave-24c02"; - reg = <0x40000064>; + reg = <0x64>; }; }; - | -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example 2020-05-27 12:01 ` [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example Serge Semin @ 2020-05-27 17:12 ` Rob Herring 2020-05-27 17:18 ` Serge Semin 0 siblings, 1 reply; 33+ messages in thread From: Rob Herring @ 2020-05-27 17:12 UTC (permalink / raw) To: Serge Semin Cc: Jarkko Nikula, Wolfram Sang, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Andy Shevchenko, Mika Westerberg, linux-mips, linux-i2c, devicetree, linux-kernel On Wed, May 27, 2020 at 03:01:02PM +0300, Serge Semin wrote: > dtc currently doesn't support I2C_OWN_SLAVE_ADDRESS flag set in the > i2c "reg" property. If it is the compiler will print a warning: > > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64: I2C bus unit address format error, expected "40000064" > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64:reg: I2C address must be less than 10-bits, got "0x40000064" > > In order to silence dtc up let's discard the flag from the DW I2C DT > binding example for now. Just revert this commit when dtc is fixed. > > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Mika Westerberg <mika.westerberg@linux.intel.com> > Cc: linux-mips@vger.kernel.org > > --- > > Changelog v3: > - This is a new patch created as a result of the Rob request to remove > the EEPROM-slave bit setting in the DT binndings example until the dtc > is fixed. > --- > Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml > index 4bd430b2b41d..101d78e8f19d 100644 > --- a/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml > +++ b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml > @@ -137,7 +137,7 @@ examples: > > eeprom@64 { > compatible = "linux,slave-24c02"; > - reg = <0x40000064>; > + reg = <0x64>; But the compatible is a slave, so you need an example with a different device. > }; > }; > - | > -- > 2.26.2 > ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example 2020-05-27 17:12 ` Rob Herring @ 2020-05-27 17:18 ` Serge Semin 2020-05-27 17:56 ` Andy Shevchenko 0 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 17:18 UTC (permalink / raw) To: Rob Herring Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Alexey Malahov, Thomas Bogendoerfer, Andy Shevchenko, Mika Westerberg, linux-mips, linux-i2c, devicetree, linux-kernel On Wed, May 27, 2020 at 11:12:04AM -0600, Rob Herring wrote: > On Wed, May 27, 2020 at 03:01:02PM +0300, Serge Semin wrote: > > dtc currently doesn't support I2C_OWN_SLAVE_ADDRESS flag set in the > > i2c "reg" property. If it is the compiler will print a warning: > > > > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64: I2C bus unit address format error, expected "40000064" > > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64:reg: I2C address must be less than 10-bits, got "0x40000064" > > > > In order to silence dtc up let's discard the flag from the DW I2C DT > > binding example for now. Just revert this commit when dtc is fixed. > > > > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > > Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> > > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Cc: Mika Westerberg <mika.westerberg@linux.intel.com> > > Cc: linux-mips@vger.kernel.org > > > > --- > > > > Changelog v3: > > - This is a new patch created as a result of the Rob request to remove > > the EEPROM-slave bit setting in the DT binndings example until the dtc > > is fixed. > > --- > > Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml > > index 4bd430b2b41d..101d78e8f19d 100644 > > --- a/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml > > +++ b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml > > @@ -137,7 +137,7 @@ examples: > > > > eeprom@64 { > > compatible = "linux,slave-24c02"; > > - reg = <0x40000064>; > > + reg = <0x64>; > > But the compatible is a slave, so you need an example with a different > device. Ok. I'll replace the sub-node with just "atmel,24c02" compatible string then. -Sergey > > > }; > > }; > > - | > > -- > > 2.26.2 > > ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example 2020-05-27 17:18 ` Serge Semin @ 2020-05-27 17:56 ` Andy Shevchenko 2020-05-28 8:39 ` Serge Semin 0 siblings, 1 reply; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 17:56 UTC (permalink / raw) To: Serge Semin Cc: Rob Herring, Serge Semin, Jarkko Nikula, Wolfram Sang, Alexey Malahov, Thomas Bogendoerfer, Mika Westerberg, linux-mips, linux-i2c, devicetree, linux-kernel On Wed, May 27, 2020 at 08:18:41PM +0300, Serge Semin wrote: > On Wed, May 27, 2020 at 11:12:04AM -0600, Rob Herring wrote: > > On Wed, May 27, 2020 at 03:01:02PM +0300, Serge Semin wrote: > > > dtc currently doesn't support I2C_OWN_SLAVE_ADDRESS flag set in the > > > i2c "reg" property. If it is the compiler will print a warning: > > > > > > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64: I2C bus unit address format error, expected "40000064" > > > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64:reg: I2C address must be less than 10-bits, got "0x40000064" > > > > > > In order to silence dtc up let's discard the flag from the DW I2C DT > > > binding example for now. Just revert this commit when dtc is fixed. > > > eeprom@64 { > > > compatible = "linux,slave-24c02"; > > > - reg = <0x40000064>; > > > + reg = <0x64>; > > > > But the compatible is a slave, so you need an example with a different > > device. > > Ok. I'll replace the sub-node with just "atmel,24c02" compatible string then. But how it will be different to the another slave connected to the master? This example is specifically to show that DesingWare I²C controller may be switched to slave mode. > > > }; > > > }; > > > - | -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example 2020-05-27 17:56 ` Andy Shevchenko @ 2020-05-28 8:39 ` Serge Semin 2020-05-28 10:00 ` Andy Shevchenko 0 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-28 8:39 UTC (permalink / raw) To: Andy Shevchenko Cc: Serge Semin, Rob Herring, Jarkko Nikula, Wolfram Sang, Alexey Malahov, Thomas Bogendoerfer, Mika Westerberg, linux-mips, linux-i2c, devicetree, linux-kernel On Wed, May 27, 2020 at 08:56:24PM +0300, Andy Shevchenko wrote: > On Wed, May 27, 2020 at 08:18:41PM +0300, Serge Semin wrote: > > On Wed, May 27, 2020 at 11:12:04AM -0600, Rob Herring wrote: > > > On Wed, May 27, 2020 at 03:01:02PM +0300, Serge Semin wrote: > > > > dtc currently doesn't support I2C_OWN_SLAVE_ADDRESS flag set in the > > > > i2c "reg" property. If it is the compiler will print a warning: > > > > > > > > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64: I2C bus unit address format error, expected "40000064" > > > > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64:reg: I2C address must be less than 10-bits, got "0x40000064" > > > > > > > > In order to silence dtc up let's discard the flag from the DW I2C DT > > > > binding example for now. Just revert this commit when dtc is fixed. > > > > > eeprom@64 { > > > > compatible = "linux,slave-24c02"; > > > > - reg = <0x40000064>; > > > > + reg = <0x64>; > > > > > > But the compatible is a slave, so you need an example with a different > > > device. > > > > > Ok. I'll replace the sub-node with just "atmel,24c02" compatible string then. > > But how it will be different to the another slave connected to the master? > > This example is specifically to show that DesingWare I²C controller may be > switched to slave mode. Well, dtc doesn't support it and prints warning that the address is invalid. Though I do understand you concern and is mostly agree with it. Let's do this in the next way. I'll resend the series with eeprom@64 sub-node replaced with just a normal eeprom-device. The message log will have an info why this has been done. In the non-mergeable section of the patch I'll suggest to Rob reconsider the patch acking, since we can leave the slave-marked sub-node and just live with the dtc warning until it's fixed in there. -Sergey > > > > > }; > > > > }; > > > > - | > > -- > With Best Regards, > Andy Shevchenko > > ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example 2020-05-28 8:39 ` Serge Semin @ 2020-05-28 10:00 ` Andy Shevchenko 0 siblings, 0 replies; 33+ messages in thread From: Andy Shevchenko @ 2020-05-28 10:00 UTC (permalink / raw) To: Serge Semin Cc: Serge Semin, Rob Herring, Jarkko Nikula, Wolfram Sang, Alexey Malahov, Thomas Bogendoerfer, Mika Westerberg, linux-mips, linux-i2c, devicetree, linux-kernel On Thu, May 28, 2020 at 11:39:23AM +0300, Serge Semin wrote: > On Wed, May 27, 2020 at 08:56:24PM +0300, Andy Shevchenko wrote: > > On Wed, May 27, 2020 at 08:18:41PM +0300, Serge Semin wrote: > > > On Wed, May 27, 2020 at 11:12:04AM -0600, Rob Herring wrote: > > > > On Wed, May 27, 2020 at 03:01:02PM +0300, Serge Semin wrote: > > > > > dtc currently doesn't support I2C_OWN_SLAVE_ADDRESS flag set in the > > > > > i2c "reg" property. If it is the compiler will print a warning: > > > > > > > > > > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64: I2C bus unit address format error, expected "40000064" > > > > > Warning (i2c_bus_reg): /example-2/i2c@1120000/eeprom@64:reg: I2C address must be less than 10-bits, got "0x40000064" > > > > > > > > > > In order to silence dtc up let's discard the flag from the DW I2C DT > > > > > binding example for now. Just revert this commit when dtc is fixed. > > > > > > > eeprom@64 { > > > > > compatible = "linux,slave-24c02"; > > > > > - reg = <0x40000064>; > > > > > + reg = <0x64>; > > > > > > > > But the compatible is a slave, so you need an example with a different > > > > device. > > > > > > > > Ok. I'll replace the sub-node with just "atmel,24c02" compatible string then. > > > > But how it will be different to the another slave connected to the master? > > > > This example is specifically to show that DesingWare I²C controller may be > > switched to slave mode. > > Well, dtc doesn't support it and prints warning that the address is invalid. > Though I do understand you concern and is mostly agree with it. Let's do this in > the next way. I'll resend the series with eeprom@64 sub-node replaced with just > a normal eeprom-device. The message log will have an info why this has been > done. In the non-mergeable section of the patch I'll suggest to Rob reconsider > the patch acking, since we can leave the slave-marked sub-node and just live > with the dtc warning until it's fixed in there. Thanks! -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v4 03/11] dt-bindings: i2c: dw: Add Baikal-T1 SoC I2C controller 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin 2020-05-27 12:01 ` [PATCH v4 01/11] dt-bindings: i2c: Convert DW I2C binding to DT schema Serge Semin 2020-05-27 12:01 ` [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 12:01 ` [PATCH v4 04/11] i2c: designware: Use `-y` to build multi-object modules Serge Semin ` (7 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang, Rob Herring Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Andy Shevchenko, Mika Westerberg, linux-mips, linux-i2c, devicetree, linux-kernel Add the "baikal,bt1-sys-i2c" compatible string to the DW I2C binding. Even though the corresponding node is supposed to be a child of the Baikal-T1 System Controller, its reg property is left required for compatibility. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: linux-mips@vger.kernel.org --- Changelog v2: - Make the reg property being optional if it's Baikal-T1 System I2C DT node. Changelog v3: - Get back the reg property being mandatory even if it's Baikal-T1 System I2C DT node. Rob says it has to be in the DT node if there is a dedicated registers range in the System Controller registers space. --- Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml index 101d78e8f19d..8c9b3db1b1b8 100644 --- a/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml +++ b/Documentation/devicetree/bindings/i2c/snps,designware-i2c.yaml @@ -31,6 +31,8 @@ properties: items: - const: mscc,ocelot-i2c - const: snps,designware-i2c + - description: Baikal-T1 SoC System I2C controller + const: baikal,bt1-sys-i2c reg: minItems: 1 -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH v4 04/11] i2c: designware: Use `-y` to build multi-object modules 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin ` (2 preceding siblings ...) 2020-05-27 12:01 ` [PATCH v4 03/11] dt-bindings: i2c: dw: Add Baikal-T1 SoC I2C controller Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 12:01 ` [PATCH v4 05/11] i2c: designware: slave: Set DW I2C core module dependency Serge Semin ` (6 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Andy Shevchenko, Mika Westerberg, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel Since commit 4f8272802739 ("Documentation: update kbuild loadable modules goals & examples") `-objs` is fitted for building host programs, lets change DW I2C core, platform and PCI driver kbuild directives to using `-y`, which more straightforward for device drivers. By doing so we can discard the ifeq construction in favor to the more natural and less bulky `<module>-$(CONFIG_X) += x.o` Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: linux-mips@vger.kernel.org Cc: devicetree@vger.kernel.org --- drivers/i2c/busses/Makefile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index a33aa107a05d..c6813d7b2780 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -48,17 +48,15 @@ obj-$(CONFIG_I2C_CADENCE) += i2c-cadence.o obj-$(CONFIG_I2C_CBUS_GPIO) += i2c-cbus-gpio.o obj-$(CONFIG_I2C_CPM) += i2c-cpm.o obj-$(CONFIG_I2C_DAVINCI) += i2c-davinci.o -obj-$(CONFIG_I2C_DESIGNWARE_CORE) += i2c-designware-core.o -i2c-designware-core-objs := i2c-designware-common.o -i2c-designware-core-objs += i2c-designware-master.o -ifeq ($(CONFIG_I2C_DESIGNWARE_SLAVE),y) -i2c-designware-core-objs += i2c-designware-slave.o -endif -obj-$(CONFIG_I2C_DESIGNWARE_PLATFORM) += i2c-designware-platform.o -i2c-designware-platform-objs := i2c-designware-platdrv.o +obj-$(CONFIG_I2C_DESIGNWARE_CORE) += i2c-designware-core.o +i2c-designware-core-y := i2c-designware-common.o +i2c-designware-core-y += i2c-designware-master.o +i2c-designware-core-$(CONFIG_I2C_DESIGNWARE_SLAVE) += i2c-designware-slave.o +obj-$(CONFIG_I2C_DESIGNWARE_PLATFORM) += i2c-designware-platform.o +i2c-designware-platform-y := i2c-designware-platdrv.o i2c-designware-platform-$(CONFIG_I2C_DESIGNWARE_BAYTRAIL) += i2c-designware-baytrail.o -obj-$(CONFIG_I2C_DESIGNWARE_PCI) += i2c-designware-pci.o -i2c-designware-pci-objs := i2c-designware-pcidrv.o +obj-$(CONFIG_I2C_DESIGNWARE_PCI) += i2c-designware-pci.o +i2c-designware-pci-y := i2c-designware-pcidrv.o obj-$(CONFIG_I2C_DIGICOLOR) += i2c-digicolor.o obj-$(CONFIG_I2C_EFM32) += i2c-efm32.o obj-$(CONFIG_I2C_EG20T) += i2c-eg20t.o -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH v4 05/11] i2c: designware: slave: Set DW I2C core module dependency 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin ` (3 preceding siblings ...) 2020-05-27 12:01 ` [PATCH v4 04/11] i2c: designware: Use `-y` to build multi-object modules Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 12:01 ` [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency Serge Semin ` (5 subsequent siblings) 10 siblings, 0 replies; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Andy Shevchenko, Mika Westerberg, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel DW APB I2C slave code in fact depends on the DW I2C driver core, but not on the platform code as it used to be before commit 90bc1ee6de9f ("i2c: designware: Allow slave mode for PCI enumerated devices"). Yes, the I2C slave interface is currently supported by both the platform and PCI versions of the IP core, but it still depends on the DW I2C core functionality and must be available only if the last one is enabled. So make sure the DW APB I2C slave config is only available if the I2C_DESIGNWARE_CORE config is enabled. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: linux-mips@vger.kernel.org Cc: devicetree@vger.kernel.org --- drivers/i2c/busses/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 1d940810e47e..7f92f6a96042 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -529,6 +529,7 @@ config I2C_DESIGNWARE_CORE config I2C_DESIGNWARE_SLAVE bool "Synopsys DesignWare Slave" + depends on I2C_DESIGNWARE_CORE select I2C_SLAVE help If you say yes to this option, support will be included for the -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin ` (4 preceding siblings ...) 2020-05-27 12:01 ` [PATCH v4 05/11] i2c: designware: slave: Set DW I2C core module dependency Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 13:42 ` Andy Shevchenko 2020-05-27 12:01 ` [PATCH v4 07/11] i2c: designware: Discard Cherry Trail model flag Serge Semin ` (4 subsequent siblings) 10 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Andy Shevchenko, Mika Westerberg, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel Currently Intel Baytrail I2C semaphore is a feature of the DW APB I2C platform driver. It's a bit confusing to see it's config in the menu at some separated place with no reference to the platform code. Let's move the config definition to be below the I2C_DESIGNWARE_PLATFORM config and mark it with "depends on I2C_DESIGNWARE_PLATFORM" statement. By doing so the config menu will display the feature right below the DW I2C platform driver item and will indent it to the right so signifying its belonging. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: Rob Herring <robh+dt@kernel.org> Cc: linux-mips@vger.kernel.org Cc: devicetree@vger.kernel.org --- Changelog v3: - Replace if-endif clause around the I2C_DESIGNWARE_BAYTRAIL config with "depends on" operator. --- drivers/i2c/busses/Kconfig | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 7f92f6a96042..7cd279c36898 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -549,20 +549,10 @@ config I2C_DESIGNWARE_PLATFORM This driver can also be built as a module. If so, the module will be called i2c-designware-platform. -config I2C_DESIGNWARE_PCI - tristate "Synopsys DesignWare PCI" - depends on PCI - select I2C_DESIGNWARE_CORE - help - If you say yes to this option, support will be included for the - Synopsys DesignWare I2C adapter. Only master mode is supported. - - This driver can also be built as a module. If so, the module - will be called i2c-designware-pci. - config I2C_DESIGNWARE_BAYTRAIL bool "Intel Baytrail I2C semaphore support" depends on ACPI + depends on I2C_DESIGNWARE_PLATFORM depends on (I2C_DESIGNWARE_PLATFORM=m && IOSF_MBI) || \ (I2C_DESIGNWARE_PLATFORM=y && IOSF_MBI=y) help @@ -572,6 +562,17 @@ config I2C_DESIGNWARE_BAYTRAIL the platform firmware controlling it. You should say Y if running on a BayTrail system using the AXP288. +config I2C_DESIGNWARE_PCI + tristate "Synopsys DesignWare PCI" + depends on PCI + select I2C_DESIGNWARE_CORE + help + If you say yes to this option, support will be included for the + Synopsys DesignWare I2C adapter. Only master mode is supported. + + This driver can also be built as a module. If so, the module + will be called i2c-designware-pci. + config I2C_DIGICOLOR tristate "Conexant Digicolor I2C driver" depends on ARCH_DIGICOLOR || COMPILE_TEST -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency 2020-05-27 12:01 ` [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency Serge Semin @ 2020-05-27 13:42 ` Andy Shevchenko 2020-05-27 14:24 ` Serge Semin 0 siblings, 1 reply; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 13:42 UTC (permalink / raw) To: Serge Semin Cc: Jarkko Nikula, Wolfram Sang, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Mika Westerberg, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 03:01:06PM +0300, Serge Semin wrote: > Currently Intel Baytrail I2C semaphore is a feature of the DW APB I2C > platform driver. It's a bit confusing to see it's config in the menu at > some separated place with no reference to the platform code. Let's move the > config definition to be below the I2C_DESIGNWARE_PLATFORM config and mark > it with "depends on I2C_DESIGNWARE_PLATFORM" statement. By doing so the > config menu will display the feature right below the DW I2C platform > driver item and will indent it to the right so signifying its belonging. ... > config I2C_DESIGNWARE_BAYTRAIL > bool "Intel Baytrail I2C semaphore support" > depends on ACPI > + depends on I2C_DESIGNWARE_PLATFORM > depends on (I2C_DESIGNWARE_PLATFORM=m && IOSF_MBI) || \ > (I2C_DESIGNWARE_PLATFORM=y && IOSF_MBI=y) I didn't get this. What is broken now with existing dependencies? (The move of the PCI part is fine) -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency 2020-05-27 13:42 ` Andy Shevchenko @ 2020-05-27 14:24 ` Serge Semin 2020-05-27 15:46 ` Andy Shevchenko 0 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 14:24 UTC (permalink / raw) To: Andy Shevchenko Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Alexey Malahov, Thomas Bogendoerfer, Mika Westerberg, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 04:42:20PM +0300, Andy Shevchenko wrote: > On Wed, May 27, 2020 at 03:01:06PM +0300, Serge Semin wrote: > > Currently Intel Baytrail I2C semaphore is a feature of the DW APB I2C > > platform driver. It's a bit confusing to see it's config in the menu at > > some separated place with no reference to the platform code. Let's move the > > config definition to be below the I2C_DESIGNWARE_PLATFORM config and mark > > it with "depends on I2C_DESIGNWARE_PLATFORM" statement. By doing so the > > config menu will display the feature right below the DW I2C platform > > driver item and will indent it to the right so signifying its belonging. > > ... > > > config I2C_DESIGNWARE_BAYTRAIL > > bool "Intel Baytrail I2C semaphore support" > > depends on ACPI > > + depends on I2C_DESIGNWARE_PLATFORM > > depends on (I2C_DESIGNWARE_PLATFORM=m && IOSF_MBI) || \ > > (I2C_DESIGNWARE_PLATFORM=y && IOSF_MBI=y) > > I didn't get this. What is broken now with existing dependencies? With no explicit "depends on I2C_DESIGNWARE_PLATFORM" the entry isn't right shifted with respect to the I2C_DESIGNWARE_PLATFORM config entry in the kernel menuconfig. So it looks like a normal no-yes driver without it. -Sergey > > (The move of the PCI part is fine) > > -- > With Best Regards, > Andy Shevchenko > > ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency 2020-05-27 14:24 ` Serge Semin @ 2020-05-27 15:46 ` Andy Shevchenko 2020-05-27 16:00 ` Serge Semin 0 siblings, 1 reply; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 15:46 UTC (permalink / raw) To: Serge Semin Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Alexey Malahov, Thomas Bogendoerfer, Mika Westerberg, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 05:24:06PM +0300, Serge Semin wrote: > On Wed, May 27, 2020 at 04:42:20PM +0300, Andy Shevchenko wrote: > > On Wed, May 27, 2020 at 03:01:06PM +0300, Serge Semin wrote: > > > Currently Intel Baytrail I2C semaphore is a feature of the DW APB I2C > > > platform driver. It's a bit confusing to see it's config in the menu at > > > some separated place with no reference to the platform code. Let's move the > > > config definition to be below the I2C_DESIGNWARE_PLATFORM config and mark > > > it with "depends on I2C_DESIGNWARE_PLATFORM" statement. By doing so the > > > config menu will display the feature right below the DW I2C platform > > > driver item and will indent it to the right so signifying its belonging. ... > > > config I2C_DESIGNWARE_BAYTRAIL > > > bool "Intel Baytrail I2C semaphore support" > > > depends on ACPI > > > + depends on I2C_DESIGNWARE_PLATFORM > > > depends on (I2C_DESIGNWARE_PLATFORM=m && IOSF_MBI) || \ > > > (I2C_DESIGNWARE_PLATFORM=y && IOSF_MBI=y) > > > > I didn't get this. What is broken now with existing dependencies? > > With no explicit "depends on I2C_DESIGNWARE_PLATFORM" the entry isn't right > shifted with respect to the I2C_DESIGNWARE_PLATFORM config entry in the kernel > menuconfig. So it looks like a normal no-yes driver without it. I didn't get. Is there problems with current case? (I don't see it). If there is a problem, it should have a separate patch and commit message. As for now above excerpt seems redundant and unneeded churn. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency 2020-05-27 15:46 ` Andy Shevchenko @ 2020-05-27 16:00 ` Serge Semin 2020-05-27 16:43 ` Andy Shevchenko 0 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 16:00 UTC (permalink / raw) To: Andy Shevchenko Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Alexey Malahov, Thomas Bogendoerfer, Mika Westerberg, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 06:46:32PM +0300, Andy Shevchenko wrote: > On Wed, May 27, 2020 at 05:24:06PM +0300, Serge Semin wrote: > > On Wed, May 27, 2020 at 04:42:20PM +0300, Andy Shevchenko wrote: > > > On Wed, May 27, 2020 at 03:01:06PM +0300, Serge Semin wrote: > > > > Currently Intel Baytrail I2C semaphore is a feature of the DW APB I2C > > > > platform driver. It's a bit confusing to see it's config in the menu at > > > > some separated place with no reference to the platform code. Let's move the > > > > config definition to be below the I2C_DESIGNWARE_PLATFORM config and mark > > > > it with "depends on I2C_DESIGNWARE_PLATFORM" statement. By doing so the > > > > config menu will display the feature right below the DW I2C platform > > > > driver item and will indent it to the right so signifying its belonging. > > ... > > > > > config I2C_DESIGNWARE_BAYTRAIL > > > > bool "Intel Baytrail I2C semaphore support" > > > > depends on ACPI > > > > + depends on I2C_DESIGNWARE_PLATFORM > > > > depends on (I2C_DESIGNWARE_PLATFORM=m && IOSF_MBI) || \ > > > > (I2C_DESIGNWARE_PLATFORM=y && IOSF_MBI=y) > > > > > > I didn't get this. What is broken now with existing dependencies? > > > > With no explicit "depends on I2C_DESIGNWARE_PLATFORM" the entry isn't right > > shifted with respect to the I2C_DESIGNWARE_PLATFORM config entry in the kernel > > menuconfig. So it looks like a normal no-yes driver without it. > > I didn't get. Is there problems with current case? (I don't see it). > If there is a problem, it should have a separate patch and commit message. > > As for now above excerpt seems redundant and unneeded churn. Please read the commit log more carefully. Without explicit "depends on I2C_DESIGNWARE_PLATFORM" you'd see the DW I2C-related menuconfig as: [*] Synopsys DesignWare Platform [ ] Intel Baytrail I2C semaphore support with that "depends on I2C_DESIGNWARE_PLATFORM" added: [*] Synopsys DesignWare Platform [ ] Intel Baytrail I2C semaphore support The second case presents the Baytrail semaphore as the DW I2C platform feature. Otherwise it's just a simple menuentry. As I see it without adding the explicit "depends on I2C_DESIGNWARE_PLATFORM" there is no need in moving the config at all. So if you think it's a churn. Well, I'll wait for Jarkko' comment in this regard. BTW Jarkko asked in v3 whether it would work with just explicit "depends on" without if-endif enclosing the config. -Sergey > > -- > With Best Regards, > Andy Shevchenko > > ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency 2020-05-27 16:00 ` Serge Semin @ 2020-05-27 16:43 ` Andy Shevchenko 0 siblings, 0 replies; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 16:43 UTC (permalink / raw) To: Serge Semin Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Alexey Malahov, Thomas Bogendoerfer, Mika Westerberg, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 07:00:56PM +0300, Serge Semin wrote: > On Wed, May 27, 2020 at 06:46:32PM +0300, Andy Shevchenko wrote: > > On Wed, May 27, 2020 at 05:24:06PM +0300, Serge Semin wrote: > > > On Wed, May 27, 2020 at 04:42:20PM +0300, Andy Shevchenko wrote: > > > > On Wed, May 27, 2020 at 03:01:06PM +0300, Serge Semin wrote: > > > > > Currently Intel Baytrail I2C semaphore is a feature of the DW APB I2C > > > > > platform driver. It's a bit confusing to see it's config in the menu at > > > > > some separated place with no reference to the platform code. Let's move the > > > > > config definition to be below the I2C_DESIGNWARE_PLATFORM config and mark > > > > > it with "depends on I2C_DESIGNWARE_PLATFORM" statement. By doing so the > > > > > config menu will display the feature right below the DW I2C platform > > > > > driver item and will indent it to the right so signifying its belonging. > > > > ... > > > > > > > config I2C_DESIGNWARE_BAYTRAIL > > > > > bool "Intel Baytrail I2C semaphore support" > > > > > depends on ACPI > > > > > + depends on I2C_DESIGNWARE_PLATFORM > > > > > depends on (I2C_DESIGNWARE_PLATFORM=m && IOSF_MBI) || \ > > > > > (I2C_DESIGNWARE_PLATFORM=y && IOSF_MBI=y) > > > > > > > > I didn't get this. What is broken now with existing dependencies? > > > > > > With no explicit "depends on I2C_DESIGNWARE_PLATFORM" the entry isn't right > > > shifted with respect to the I2C_DESIGNWARE_PLATFORM config entry in the kernel > > > menuconfig. So it looks like a normal no-yes driver without it. > > > > I didn't get. Is there problems with current case? (I don't see it). > > If there is a problem, it should have a separate patch and commit message. > > > > As for now above excerpt seems redundant and unneeded churn. > > Please read the commit log more carefully. > > Without explicit "depends on I2C_DESIGNWARE_PLATFORM" you'd see the DW > I2C-related menuconfig as: > [*] Synopsys DesignWare Platform > [ ] Intel Baytrail I2C semaphore support > with that "depends on I2C_DESIGNWARE_PLATFORM" added: > [*] Synopsys DesignWare Platform > [ ] Intel Baytrail I2C semaphore support > The second case presents the Baytrail semaphore as the DW I2C platform > feature. Otherwise it's just a simple menuentry. As I see it without adding > the explicit "depends on I2C_DESIGNWARE_PLATFORM" there is no need in moving > the config at all. Thanks for explanation, this makes sense. > So if you think it's a churn. Well, I'll wait for > Jarkko' comment in this regard. > > BTW Jarkko asked in v3 whether it would work with just explicit "depends on" > without if-endif enclosing the config. > > -Sergey > > > > > -- > > With Best Regards, > > Andy Shevchenko > > > > -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v4 07/11] i2c: designware: Discard Cherry Trail model flag 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin ` (5 preceding siblings ...) 2020-05-27 12:01 ` [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 13:43 ` Andy Shevchenko 2020-05-27 12:01 ` [PATCH v4 08/11] i2c: designware: Convert driver to using regmap API Serge Semin ` (3 subsequent siblings) 10 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang, Andy Shevchenko, Mika Westerberg Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel A PM workaround activated by the flag MODEL_CHERRYTRAIL has been removed since commit 9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C bus pm_disabled workaround"), but the flag most likely by mistake has been left in the Dw I2C drivers. Let's remove it. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: linux-mips@vger.kernel.org Cc: devicetree@vger.kernel.org --- Changelog v3: - Since MSCC and Baikal-T1 will be a part of the platform driver code, we have to preserve the MODEL_MASK macro to use it to filter the model flags during the IP-specific quirks activation. --- drivers/i2c/busses/i2c-designware-core.h | 3 +-- drivers/i2c/busses/i2c-designware-pcidrv.c | 1 - drivers/i2c/busses/i2c-designware-platdrv.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index 150de5e5c31b..b9ef9b0deef0 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -289,8 +289,7 @@ struct dw_i2c_dev { #define ACCESS_INTR_MASK 0x00000004 #define ACCESS_NO_IRQ_SUSPEND 0x00000008 -#define MODEL_CHERRYTRAIL 0x00000100 -#define MODEL_MSCC_OCELOT 0x00000200 +#define MODEL_MSCC_OCELOT 0x00000100 #define MODEL_MASK 0x00000f00 u32 dw_readl(struct dw_i2c_dev *dev, int offset); diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c index 11a5e4751eab..947c096f86e3 100644 --- a/drivers/i2c/busses/i2c-designware-pcidrv.c +++ b/drivers/i2c/busses/i2c-designware-pcidrv.c @@ -149,7 +149,6 @@ static struct dw_pci_controller dw_pci_controllers[] = { }, [cherrytrail] = { .bus_num = -1, - .flags = MODEL_CHERRYTRAIL, .scl_sda_cfg = &byt_config, }, [elkhartlake] = { diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index f6d2c96e35ce..ca057aa9eac4 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -44,7 +44,7 @@ static const struct acpi_device_id dw_i2c_acpi_match[] = { { "INT3432", 0 }, { "INT3433", 0 }, { "80860F41", ACCESS_NO_IRQ_SUSPEND }, - { "808622C1", ACCESS_NO_IRQ_SUSPEND | MODEL_CHERRYTRAIL }, + { "808622C1", ACCESS_NO_IRQ_SUSPEND }, { "AMD0010", ACCESS_INTR_MASK }, { "AMDI0010", ACCESS_INTR_MASK }, { "AMDI0510", 0 }, -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH v4 07/11] i2c: designware: Discard Cherry Trail model flag 2020-05-27 12:01 ` [PATCH v4 07/11] i2c: designware: Discard Cherry Trail model flag Serge Semin @ 2020-05-27 13:43 ` Andy Shevchenko 2020-05-27 14:29 ` Serge Semin 0 siblings, 1 reply; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 13:43 UTC (permalink / raw) To: Serge Semin Cc: Jarkko Nikula, Wolfram Sang, Mika Westerberg, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 03:01:07PM +0300, Serge Semin wrote: > A PM workaround activated by the flag MODEL_CHERRYTRAIL has been removed > since commit 9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C > bus pm_disabled workaround"), but the flag most likely by mistake has been > left in the Dw I2C drivers. Let's remove it. ... > -#define MODEL_MSCC_OCELOT 0x00000200 > +#define MODEL_MSCC_OCELOT 0x00000100 But why? Does 0x200 work or not? I didn't see this in commit message. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 07/11] i2c: designware: Discard Cherry Trail model flag 2020-05-27 13:43 ` Andy Shevchenko @ 2020-05-27 14:29 ` Serge Semin 2020-05-27 15:48 ` Andy Shevchenko 0 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 14:29 UTC (permalink / raw) To: Andy Shevchenko Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Mika Westerberg, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 04:43:39PM +0300, Andy Shevchenko wrote: > On Wed, May 27, 2020 at 03:01:07PM +0300, Serge Semin wrote: > > A PM workaround activated by the flag MODEL_CHERRYTRAIL has been removed > > since commit 9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C > > bus pm_disabled workaround"), but the flag most likely by mistake has been > > left in the Dw I2C drivers. Let's remove it. > > ... > > > -#define MODEL_MSCC_OCELOT 0x00000200 > > +#define MODEL_MSCC_OCELOT 0x00000100 > > But why? > > Does 0x200 work or not? I didn't see this in commit message. I removed the MODEL_CHERRYTRAIL flag and redefined the only left MODEL_MSCC_OCELOT flag to set the very first bit allocated for the model flags. Isn't that obvious? -Sergey > > -- > With Best Regards, > Andy Shevchenko > > ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 07/11] i2c: designware: Discard Cherry Trail model flag 2020-05-27 14:29 ` Serge Semin @ 2020-05-27 15:48 ` Andy Shevchenko 0 siblings, 0 replies; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 15:48 UTC (permalink / raw) To: Serge Semin Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Mika Westerberg, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 05:29:02PM +0300, Serge Semin wrote: > On Wed, May 27, 2020 at 04:43:39PM +0300, Andy Shevchenko wrote: > > On Wed, May 27, 2020 at 03:01:07PM +0300, Serge Semin wrote: > > > A PM workaround activated by the flag MODEL_CHERRYTRAIL has been removed > > > since commit 9cbeeca05049 ("i2c: designware: Remove Cherry Trail PMIC I2C > > > bus pm_disabled workaround"), but the flag most likely by mistake has been > > > left in the Dw I2C drivers. Let's remove it. > > > > ... > > > > > -#define MODEL_MSCC_OCELOT 0x00000200 > > > +#define MODEL_MSCC_OCELOT 0x00000100 > > > > But why? > > > > Does 0x200 work or not? I didn't see this in commit message. > > I removed the MODEL_CHERRYTRAIL flag and redefined the only left > MODEL_MSCC_OCELOT flag to set the very first bit allocated for the model > flags. Isn't that obvious? Yes, but how it's related to the MSCC_OCELOT? Can't you simple put your define later to that number if absence of 0x100 provokes an exception when reading this code. Again, unneeded churn. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v4 08/11] i2c: designware: Convert driver to using regmap API 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin ` (6 preceding siblings ...) 2020-05-27 12:01 ` [PATCH v4 07/11] i2c: designware: Discard Cherry Trail model flag Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 13:50 ` Andy Shevchenko 2020-05-27 12:01 ` [PATCH v4 09/11] i2c: designware: Retrieve quirk flags as early as possible Serge Semin ` (2 subsequent siblings) 10 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang, Andy Shevchenko, Mika Westerberg Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, devicetree, linux-mips, linux-i2c, linux-kernel Seeing the DW I2C driver is using flags-based accessors with two conditional clauses it would be better to replace them with the regmap API IO methods and to initialize the regmap object with read/write callbacks specific to the controller registers map implementation. This will be also handy for the drivers with non-standard registers mapping (like an embedded into the Baikal-T1 System Controller DW I2C block, which glue-driver is a part of this series). As before the driver tries to detect the mapping setup at probe stage and creates a regmap object accordingly, which will be used by the rest of the code to correctly access the controller registers. In two places it was appropriate to convert the hand-written read-modify-write and read-poll-loop design patterns to the corresponding regmap API ready-to-use methods. Note the regmap IO methods return value is checked only at the probe stage. The rest of the code won't do this because basically we have MMIO-based regmap so non of the read/write methods can fail (this also won't be needed for the Baikal-T1-specific I2C controller). Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: devicetree@vger.kernel.org Cc: linux-mips@vger.kernel.org --- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-designware-common.c | 178 +++++++++++++++------ drivers/i2c/busses/i2c-designware-core.h | 22 ++- drivers/i2c/busses/i2c-designware-master.c | 125 ++++++++------- drivers/i2c/busses/i2c-designware-slave.c | 77 ++++----- 5 files changed, 248 insertions(+), 155 deletions(-) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 7cd279c36898..259e2325712a 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -526,6 +526,7 @@ config I2C_DAVINCI config I2C_DESIGNWARE_CORE tristate + select REGMAP config I2C_DESIGNWARE_SLAVE bool "Synopsys DesignWare Slave" diff --git a/drivers/i2c/busses/i2c-designware-common.c b/drivers/i2c/busses/i2c-designware-common.c index ed302342f8db..04c4cffb1987 100644 --- a/drivers/i2c/busses/i2c-designware-common.c +++ b/drivers/i2c/busses/i2c-designware-common.c @@ -17,6 +17,7 @@ #include <linux/export.h> #include <linux/i2c.h> #include <linux/interrupt.h> +#include <linux/regmap.h> #include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> @@ -57,66 +58,123 @@ static char *abort_sources[] = { "incorrect slave-transmitter mode configuration", }; -u32 dw_readl(struct dw_i2c_dev *dev, int offset) +static int dw_reg_read(void *context, unsigned int reg, unsigned int *val) { - u32 value; + struct dw_i2c_dev *dev = context; - if (dev->flags & ACCESS_16BIT) - value = readw_relaxed(dev->base + offset) | - (readw_relaxed(dev->base + offset + 2) << 16); - else - value = readl_relaxed(dev->base + offset); + *val = readl_relaxed(dev->base + reg); - if (dev->flags & ACCESS_SWAP) - return swab32(value); - else - return value; + return 0; } -void dw_writel(struct dw_i2c_dev *dev, u32 b, int offset) +static int dw_reg_write(void *context, unsigned int reg, unsigned int val) { - if (dev->flags & ACCESS_SWAP) - b = swab32(b); - - if (dev->flags & ACCESS_16BIT) { - writew_relaxed((u16)b, dev->base + offset); - writew_relaxed((u16)(b >> 16), dev->base + offset + 2); - } else { - writel_relaxed(b, dev->base + offset); - } + struct dw_i2c_dev *dev = context; + + writel_relaxed(val, dev->base + reg); + + return 0; +} + +static int dw_reg_read_swab(void *context, unsigned int reg, unsigned int *val) +{ + struct dw_i2c_dev *dev = context; + + *val = swab32(readl_relaxed(dev->base + reg)); + + return 0; +} + +static int dw_reg_write_swab(void *context, unsigned int reg, unsigned int val) +{ + struct dw_i2c_dev *dev = context; + + writel_relaxed(swab32(val), dev->base + reg); + + return 0; +} + +static int dw_reg_read_word(void *context, unsigned int reg, unsigned int *val) +{ + struct dw_i2c_dev *dev = context; + + *val = readw_relaxed(dev->base + reg) | + (readw_relaxed(dev->base + reg + 2) << 16); + + return 0; +} + +static int dw_reg_write_word(void *context, unsigned int reg, unsigned int val) +{ + struct dw_i2c_dev *dev = context; + + writew_relaxed((u16)val, dev->base + reg); + writew_relaxed((u16)(val >> 16), dev->base + reg + 2); + + return 0; } /** - * i2c_dw_set_reg_access() - Set register access flags + * i2c_dw_init_regmap() - Initialize registers map * @dev: device private data + * @base: Registers map base address * - * Autodetects needed register access mode and sets access flags accordingly. - * This must be called before doing any other register access. + * Autodetects needed register access mode and creates the regmap with + * corresponding read/write callbacks. This must be called before doing any + * other register access. */ -int i2c_dw_set_reg_access(struct dw_i2c_dev *dev) +int i2c_dw_init_regmap(struct dw_i2c_dev *dev) { + struct regmap_config map_cfg = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .disable_locking = true, + .reg_read = dw_reg_read, + .reg_write = dw_reg_write, + .max_register = DW_IC_COMP_TYPE + }; u32 reg; int ret; + /* + * Skip detecting the registers map configuration if the regmap has + * already been provided by a higher code. + */ + if (dev->map) + return 0; + ret = i2c_dw_acquire_lock(dev); if (ret) return ret; - reg = dw_readl(dev, DW_IC_COMP_TYPE); + reg = readl(dev->base + DW_IC_COMP_TYPE); i2c_dw_release_lock(dev); if (reg == swab32(DW_IC_COMP_TYPE_VALUE)) { - /* Configure register endianness access */ - dev->flags |= ACCESS_SWAP; + map_cfg.reg_read = dw_reg_read_swab; + map_cfg.reg_write = dw_reg_write_swab; } else if (reg == (DW_IC_COMP_TYPE_VALUE & 0x0000ffff)) { - /* Configure register access mode 16bit */ - dev->flags |= ACCESS_16BIT; + map_cfg.reg_read = dw_reg_read_word; + map_cfg.reg_write = dw_reg_write_word; } else if (reg != DW_IC_COMP_TYPE_VALUE) { dev_err(dev->dev, "Unknown Synopsys component type: 0x%08x\n", reg); return -ENODEV; } + /* + * Note we'll check the return value of the regmap IO accessors only + * at the probe stage. The rest of the code won't do this because + * basically we have MMIO-based regmap so non of the read/write methods + * can fail. + */ + dev->map = devm_regmap_init(dev->dev, NULL, dev, &map_cfg); + if (IS_ERR(dev->map)) { + dev_err(dev->dev, "Failed to init the registers map\n"); + return PTR_ERR(dev->map); + } + return 0; } @@ -327,11 +385,17 @@ int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev) return ret; /* Configure SDA Hold Time if required */ - reg = dw_readl(dev, DW_IC_COMP_VERSION); + ret = regmap_read(dev->map, DW_IC_COMP_VERSION, ®); + if (ret) + goto err_release_lock; + if (reg >= DW_IC_SDA_HOLD_MIN_VERS) { if (!dev->sda_hold_time) { /* Keep previous hold time setting if no one set it */ - dev->sda_hold_time = dw_readl(dev, DW_IC_SDA_HOLD); + ret = regmap_read(dev->map, DW_IC_SDA_HOLD, + &dev->sda_hold_time); + if (ret) + goto err_release_lock; } /* @@ -355,14 +419,16 @@ int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev) dev->sda_hold_time = 0; } +err_release_lock: i2c_dw_release_lock(dev); - return 0; + return ret; } void __i2c_dw_disable(struct dw_i2c_dev *dev) { int timeout = 100; + u32 status; do { __i2c_dw_disable_nowait(dev); @@ -370,7 +436,8 @@ void __i2c_dw_disable(struct dw_i2c_dev *dev) * The enable status register may be unimplemented, but * in that case this test reads zero and exits the loop. */ - if ((dw_readl(dev, DW_IC_ENABLE_STATUS) & 1) == 0) + regmap_read(dev->map, DW_IC_ENABLE_STATUS, &status); + if ((status & 1) == 0) return; /* @@ -449,22 +516,23 @@ void i2c_dw_release_lock(struct dw_i2c_dev *dev) */ int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev) { - int timeout = TIMEOUT; + u32 status; + int ret; - while (dw_readl(dev, DW_IC_STATUS) & DW_IC_STATUS_ACTIVITY) { - if (timeout <= 0) { - dev_warn(dev->dev, "timeout waiting for bus ready\n"); - i2c_recover_bus(&dev->adapter); + ret = regmap_read_poll_timeout(dev->map, DW_IC_STATUS, status, + !(status & DW_IC_STATUS_ACTIVITY), + 1100, 20000); + if (ret) { + dev_warn(dev->dev, "timeout waiting for bus ready\n"); - if (dw_readl(dev, DW_IC_STATUS) & DW_IC_STATUS_ACTIVITY) - return -ETIMEDOUT; - return 0; - } - timeout--; - usleep_range(1000, 1100); + i2c_recover_bus(&dev->adapter); + + regmap_read(dev->map, DW_IC_STATUS, &status); + if (!(status & DW_IC_STATUS_ACTIVITY)) + ret = 0; } - return 0; + return ret; } int i2c_dw_handle_tx_abort(struct dw_i2c_dev *dev) @@ -490,15 +558,19 @@ int i2c_dw_handle_tx_abort(struct dw_i2c_dev *dev) return -EIO; } -void i2c_dw_set_fifo_size(struct dw_i2c_dev *dev) +int i2c_dw_set_fifo_size(struct dw_i2c_dev *dev) { u32 param, tx_fifo_depth, rx_fifo_depth; + int ret; /* * Try to detect the FIFO depth if not set by interface driver, * the depth could be from 2 to 256 from HW spec. */ - param = dw_readl(dev, DW_IC_COMP_PARAM_1); + ret = regmap_read(dev->map, DW_IC_COMP_PARAM_1, ¶m); + if (ret) + return ret; + tx_fifo_depth = ((param >> 16) & 0xff) + 1; rx_fifo_depth = ((param >> 8) & 0xff) + 1; if (!dev->tx_fifo_depth) { @@ -510,6 +582,8 @@ void i2c_dw_set_fifo_size(struct dw_i2c_dev *dev) dev->rx_fifo_depth = min_t(u32, dev->rx_fifo_depth, rx_fifo_depth); } + + return 0; } u32 i2c_dw_func(struct i2c_adapter *adap) @@ -521,17 +595,19 @@ u32 i2c_dw_func(struct i2c_adapter *adap) void i2c_dw_disable(struct dw_i2c_dev *dev) { + u32 dummy; + /* Disable controller */ __i2c_dw_disable(dev); /* Disable all interrupts */ - dw_writel(dev, 0, DW_IC_INTR_MASK); - dw_readl(dev, DW_IC_CLR_INTR); + regmap_write(dev->map, DW_IC_INTR_MASK, 0); + regmap_read(dev->map, DW_IC_CLR_INTR, &dummy); } void i2c_dw_disable_int(struct dw_i2c_dev *dev) { - dw_writel(dev, 0, DW_IC_INTR_MASK); + regmap_write(dev->map, DW_IC_INTR_MASK, 0); } MODULE_DESCRIPTION("Synopsys DesignWare I2C bus adapter core"); diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index b9ef9b0deef0..f5bbe3d6bcf8 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -15,6 +15,7 @@ #include <linux/dev_printk.h> #include <linux/errno.h> #include <linux/i2c.h> +#include <linux/regmap.h> #include <linux/types.h> #define DW_IC_DEFAULT_FUNCTIONALITY (I2C_FUNC_I2C | \ @@ -126,8 +127,6 @@ #define STATUS_WRITE_IN_PROGRESS 0x1 #define STATUS_READ_IN_PROGRESS 0x2 -#define TIMEOUT 20 /* ms */ - /* * operation modes */ @@ -183,7 +182,9 @@ struct reset_control; /** * struct dw_i2c_dev - private i2c-designware data * @dev: driver model device node + * @map: IO registers map * @base: IO registers pointer + * @ext: Extended IO registers pointer * @cmd_complete: tx completion indicator * @clk: input reference clock * @pclk: clock required to access the registers @@ -233,6 +234,7 @@ struct reset_control; */ struct dw_i2c_dev { struct device *dev; + struct regmap *map; void __iomem *base; void __iomem *ext; struct completion cmd_complete; @@ -284,17 +286,13 @@ struct dw_i2c_dev { bool suspended; }; -#define ACCESS_SWAP 0x00000001 -#define ACCESS_16BIT 0x00000002 -#define ACCESS_INTR_MASK 0x00000004 -#define ACCESS_NO_IRQ_SUSPEND 0x00000008 +#define ACCESS_INTR_MASK 0x00000001 +#define ACCESS_NO_IRQ_SUSPEND 0x00000002 #define MODEL_MSCC_OCELOT 0x00000100 #define MODEL_MASK 0x00000f00 -u32 dw_readl(struct dw_i2c_dev *dev, int offset); -void dw_writel(struct dw_i2c_dev *dev, u32 b, int offset); -int i2c_dw_set_reg_access(struct dw_i2c_dev *dev); +int i2c_dw_init_regmap(struct dw_i2c_dev *dev); u32 i2c_dw_scl_hcnt(u32 ic_clk, u32 tSYMBOL, u32 tf, int cond, int offset); u32 i2c_dw_scl_lcnt(u32 ic_clk, u32 tLOW, u32 tf, int offset); int i2c_dw_set_sda_hold(struct dw_i2c_dev *dev); @@ -304,19 +302,19 @@ int i2c_dw_acquire_lock(struct dw_i2c_dev *dev); void i2c_dw_release_lock(struct dw_i2c_dev *dev); int i2c_dw_wait_bus_not_busy(struct dw_i2c_dev *dev); int i2c_dw_handle_tx_abort(struct dw_i2c_dev *dev); -void i2c_dw_set_fifo_size(struct dw_i2c_dev *dev); +int i2c_dw_set_fifo_size(struct dw_i2c_dev *dev); u32 i2c_dw_func(struct i2c_adapter *adap); void i2c_dw_disable(struct dw_i2c_dev *dev); void i2c_dw_disable_int(struct dw_i2c_dev *dev); static inline void __i2c_dw_enable(struct dw_i2c_dev *dev) { - dw_writel(dev, 1, DW_IC_ENABLE); + regmap_write(dev->map, DW_IC_ENABLE, 1); } static inline void __i2c_dw_disable_nowait(struct dw_i2c_dev *dev) { - dw_writel(dev, 0, DW_IC_ENABLE); + regmap_write(dev->map, DW_IC_ENABLE, 0); } void __i2c_dw_disable(struct dw_i2c_dev *dev); diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c index 95eeec53c744..18e94fdc43f6 100644 --- a/drivers/i2c/busses/i2c-designware-master.c +++ b/drivers/i2c/busses/i2c-designware-master.c @@ -15,6 +15,7 @@ #include <linux/gpio/consumer.h> #include <linux/i2c.h> #include <linux/interrupt.h> +#include <linux/regmap.h> #include <linux/io.h> #include <linux/module.h> #include <linux/pm_runtime.h> @@ -25,11 +26,11 @@ static void i2c_dw_configure_fifo_master(struct dw_i2c_dev *dev) { /* Configure Tx/Rx FIFO threshold levels */ - dw_writel(dev, dev->tx_fifo_depth / 2, DW_IC_TX_TL); - dw_writel(dev, 0, DW_IC_RX_TL); + regmap_write(dev->map, DW_IC_TX_TL, dev->tx_fifo_depth / 2); + regmap_write(dev->map, DW_IC_RX_TL, 0); /* Configure the I2C master */ - dw_writel(dev, dev->master_cfg, DW_IC_CON); + regmap_write(dev->map, DW_IC_CON, dev->master_cfg); } static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) @@ -44,8 +45,11 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev) ret = i2c_dw_acquire_lock(dev); if (ret) return ret; - comp_param1 = dw_readl(dev, DW_IC_COMP_PARAM_1); + + ret = regmap_read(dev->map, DW_IC_COMP_PARAM_1, &comp_param1); i2c_dw_release_lock(dev); + if (ret) + return ret; /* Set standard and fast speed dividers for high/low periods */ sda_falling_time = t->sda_fall_ns ?: 300; /* ns */ @@ -187,22 +191,22 @@ static int i2c_dw_init_master(struct dw_i2c_dev *dev) __i2c_dw_disable(dev); /* Write standard speed timing parameters */ - dw_writel(dev, dev->ss_hcnt, DW_IC_SS_SCL_HCNT); - dw_writel(dev, dev->ss_lcnt, DW_IC_SS_SCL_LCNT); + regmap_write(dev->map, DW_IC_SS_SCL_HCNT, dev->ss_hcnt); + regmap_write(dev->map, DW_IC_SS_SCL_LCNT, dev->ss_lcnt); /* Write fast mode/fast mode plus timing parameters */ - dw_writel(dev, dev->fs_hcnt, DW_IC_FS_SCL_HCNT); - dw_writel(dev, dev->fs_lcnt, DW_IC_FS_SCL_LCNT); + regmap_write(dev->map, DW_IC_FS_SCL_HCNT, dev->fs_hcnt); + regmap_write(dev->map, DW_IC_FS_SCL_LCNT, dev->fs_lcnt); /* Write high speed timing parameters if supported */ if (dev->hs_hcnt && dev->hs_lcnt) { - dw_writel(dev, dev->hs_hcnt, DW_IC_HS_SCL_HCNT); - dw_writel(dev, dev->hs_lcnt, DW_IC_HS_SCL_LCNT); + regmap_write(dev->map, DW_IC_HS_SCL_HCNT, dev->hs_hcnt); + regmap_write(dev->map, DW_IC_HS_SCL_LCNT, dev->hs_lcnt); } /* Write SDA hold time if supported */ if (dev->sda_hold_time) - dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD); + regmap_write(dev->map, DW_IC_SDA_HOLD, dev->sda_hold_time); i2c_dw_configure_fifo_master(dev); i2c_dw_release_lock(dev); @@ -213,15 +217,15 @@ static int i2c_dw_init_master(struct dw_i2c_dev *dev) static void i2c_dw_xfer_init(struct dw_i2c_dev *dev) { struct i2c_msg *msgs = dev->msgs; - u32 ic_con, ic_tar = 0; + u32 ic_con = 0, ic_tar = 0; + u32 dummy; /* Disable the adapter */ __i2c_dw_disable(dev); /* If the slave address is ten bit address, enable 10BITADDR */ - ic_con = dw_readl(dev, DW_IC_CON); if (msgs[dev->msg_write_idx].flags & I2C_M_TEN) { - ic_con |= DW_IC_CON_10BITADDR_MASTER; + ic_con = DW_IC_CON_10BITADDR_MASTER; /* * If I2C_DYNAMIC_TAR_UPDATE is set, the 10-bit addressing * mode has to be enabled via bit 12 of IC_TAR register. @@ -229,17 +233,17 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev) * detected from registers. */ ic_tar = DW_IC_TAR_10BITADDR_MASTER; - } else { - ic_con &= ~DW_IC_CON_10BITADDR_MASTER; } - dw_writel(dev, ic_con, DW_IC_CON); + regmap_update_bits(dev->map, DW_IC_CON, DW_IC_CON_10BITADDR_MASTER, + ic_con); /* * Set the slave (target) address and enable 10-bit addressing mode * if applicable. */ - dw_writel(dev, msgs[dev->msg_write_idx].addr | ic_tar, DW_IC_TAR); + regmap_write(dev->map, DW_IC_TAR, + msgs[dev->msg_write_idx].addr | ic_tar); /* Enforce disabled interrupts (due to HW issues) */ i2c_dw_disable_int(dev); @@ -248,11 +252,11 @@ static void i2c_dw_xfer_init(struct dw_i2c_dev *dev) __i2c_dw_enable(dev); /* Dummy read to avoid the register getting stuck on Bay Trail */ - dw_readl(dev, DW_IC_ENABLE_STATUS); + regmap_read(dev->map, DW_IC_ENABLE_STATUS, &dummy); /* Clear and enable interrupts */ - dw_readl(dev, DW_IC_CLR_INTR); - dw_writel(dev, DW_IC_INTR_MASTER_MASK, DW_IC_INTR_MASK); + regmap_read(dev->map, DW_IC_CLR_INTR, &dummy); + regmap_write(dev->map, DW_IC_INTR_MASK, DW_IC_INTR_MASTER_MASK); } /* @@ -271,6 +275,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) u32 buf_len = dev->tx_buf_len; u8 *buf = dev->tx_buf; bool need_restart = false; + unsigned int flr; intr_mask = DW_IC_INTR_MASTER_MASK; @@ -303,8 +308,11 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) need_restart = true; } - tx_limit = dev->tx_fifo_depth - dw_readl(dev, DW_IC_TXFLR); - rx_limit = dev->rx_fifo_depth - dw_readl(dev, DW_IC_RXFLR); + regmap_read(dev->map, DW_IC_TXFLR, &flr); + tx_limit = dev->tx_fifo_depth - flr; + + regmap_read(dev->map, DW_IC_RXFLR, &flr); + rx_limit = dev->rx_fifo_depth - flr; while (buf_len > 0 && tx_limit > 0 && rx_limit > 0) { u32 cmd = 0; @@ -337,11 +345,14 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) if (dev->rx_outstanding >= dev->rx_fifo_depth) break; - dw_writel(dev, cmd | 0x100, DW_IC_DATA_CMD); + regmap_write(dev->map, DW_IC_DATA_CMD, + cmd | 0x100); rx_limit--; dev->rx_outstanding++; - } else - dw_writel(dev, cmd | *buf++, DW_IC_DATA_CMD); + } else { + regmap_write(dev->map, DW_IC_DATA_CMD, + cmd | *buf++); + } tx_limit--; buf_len--; } @@ -371,7 +382,7 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) if (dev->msg_err) intr_mask = 0; - dw_writel(dev, intr_mask, DW_IC_INTR_MASK); + regmap_write(dev->map, DW_IC_INTR_MASK, intr_mask); } static u8 @@ -399,7 +410,7 @@ i2c_dw_read(struct dw_i2c_dev *dev) int rx_valid; for (; dev->msg_read_idx < dev->msgs_num; dev->msg_read_idx++) { - u32 len; + u32 len, tmp; u8 *buf; if (!(msgs[dev->msg_read_idx].flags & I2C_M_RD)) @@ -413,18 +424,18 @@ i2c_dw_read(struct dw_i2c_dev *dev) buf = dev->rx_buf; } - rx_valid = dw_readl(dev, DW_IC_RXFLR); + regmap_read(dev->map, DW_IC_RXFLR, &rx_valid); for (; len > 0 && rx_valid > 0; len--, rx_valid--) { u32 flags = msgs[dev->msg_read_idx].flags; - *buf = dw_readl(dev, DW_IC_DATA_CMD); + regmap_read(dev->map, DW_IC_DATA_CMD, &tmp); /* Ensure length byte is a valid value */ if (flags & I2C_M_RECV_LEN && - *buf <= I2C_SMBUS_BLOCK_MAX && *buf > 0) { - len = i2c_dw_recv_len(dev, *buf); + tmp <= I2C_SMBUS_BLOCK_MAX && tmp > 0) { + len = i2c_dw_recv_len(dev, tmp); } - buf++; + *buf++ = tmp; dev->rx_outstanding--; } @@ -542,7 +553,7 @@ static const struct i2c_adapter_quirks i2c_dw_quirks = { static u32 i2c_dw_read_clear_intrbits(struct dw_i2c_dev *dev) { - u32 stat; + u32 stat, dummy; /* * The IC_INTR_STAT register just indicates "enabled" interrupts. @@ -550,47 +561,47 @@ static u32 i2c_dw_read_clear_intrbits(struct dw_i2c_dev *dev) * in the IC_RAW_INTR_STAT register. * * That is, - * stat = dw_readl(IC_INTR_STAT); + * stat = readl(IC_INTR_STAT); * equals to, - * stat = dw_readl(IC_RAW_INTR_STAT) & dw_readl(IC_INTR_MASK); + * stat = readl(IC_RAW_INTR_STAT) & readl(IC_INTR_MASK); * * The raw version might be useful for debugging purposes. */ - stat = dw_readl(dev, DW_IC_INTR_STAT); + regmap_read(dev->map, DW_IC_INTR_STAT, &stat); /* * Do not use the IC_CLR_INTR register to clear interrupts, or * you'll miss some interrupts, triggered during the period from - * dw_readl(IC_INTR_STAT) to dw_readl(IC_CLR_INTR). + * readl(IC_INTR_STAT) to readl(IC_CLR_INTR). * * Instead, use the separately-prepared IC_CLR_* registers. */ if (stat & DW_IC_INTR_RX_UNDER) - dw_readl(dev, DW_IC_CLR_RX_UNDER); + regmap_read(dev->map, DW_IC_CLR_RX_UNDER, &dummy); if (stat & DW_IC_INTR_RX_OVER) - dw_readl(dev, DW_IC_CLR_RX_OVER); + regmap_read(dev->map, DW_IC_CLR_RX_OVER, &dummy); if (stat & DW_IC_INTR_TX_OVER) - dw_readl(dev, DW_IC_CLR_TX_OVER); + regmap_read(dev->map, DW_IC_CLR_TX_OVER, &dummy); if (stat & DW_IC_INTR_RD_REQ) - dw_readl(dev, DW_IC_CLR_RD_REQ); + regmap_read(dev->map, DW_IC_CLR_RD_REQ, &dummy); if (stat & DW_IC_INTR_TX_ABRT) { /* * The IC_TX_ABRT_SOURCE register is cleared whenever * the IC_CLR_TX_ABRT is read. Preserve it beforehand. */ - dev->abort_source = dw_readl(dev, DW_IC_TX_ABRT_SOURCE); - dw_readl(dev, DW_IC_CLR_TX_ABRT); + regmap_read(dev->map, DW_IC_TX_ABRT_SOURCE, &dev->abort_source); + regmap_read(dev->map, DW_IC_CLR_TX_ABRT, &dummy); } if (stat & DW_IC_INTR_RX_DONE) - dw_readl(dev, DW_IC_CLR_RX_DONE); + regmap_read(dev->map, DW_IC_CLR_RX_DONE, &dummy); if (stat & DW_IC_INTR_ACTIVITY) - dw_readl(dev, DW_IC_CLR_ACTIVITY); + regmap_read(dev->map, DW_IC_CLR_ACTIVITY, &dummy); if (stat & DW_IC_INTR_STOP_DET) - dw_readl(dev, DW_IC_CLR_STOP_DET); + regmap_read(dev->map, DW_IC_CLR_STOP_DET, &dummy); if (stat & DW_IC_INTR_START_DET) - dw_readl(dev, DW_IC_CLR_START_DET); + regmap_read(dev->map, DW_IC_CLR_START_DET, &dummy); if (stat & DW_IC_INTR_GEN_CALL) - dw_readl(dev, DW_IC_CLR_GEN_CALL); + regmap_read(dev->map, DW_IC_CLR_GEN_CALL, &dummy); return stat; } @@ -612,7 +623,7 @@ static int i2c_dw_irq_handler_master(struct dw_i2c_dev *dev) * Anytime TX_ABRT is set, the contents of the tx/rx * buffers are flushed. Make sure to skip them. */ - dw_writel(dev, 0, DW_IC_INTR_MASK); + regmap_write(dev->map, DW_IC_INTR_MASK, 0); goto tx_aborted; } @@ -633,9 +644,9 @@ static int i2c_dw_irq_handler_master(struct dw_i2c_dev *dev) complete(&dev->cmd_complete); else if (unlikely(dev->flags & ACCESS_INTR_MASK)) { /* Workaround to trigger pending interrupt */ - stat = dw_readl(dev, DW_IC_INTR_MASK); + regmap_read(dev->map, DW_IC_INTR_MASK, &stat); i2c_dw_disable_int(dev); - dw_writel(dev, stat, DW_IC_INTR_MASK); + regmap_write(dev->map, DW_IC_INTR_MASK, stat); } return 0; @@ -646,8 +657,8 @@ static irqreturn_t i2c_dw_isr(int this_irq, void *dev_id) struct dw_i2c_dev *dev = dev_id; u32 stat, enabled; - enabled = dw_readl(dev, DW_IC_ENABLE); - stat = dw_readl(dev, DW_IC_RAW_INTR_STAT); + regmap_read(dev->map, DW_IC_ENABLE, &enabled); + regmap_read(dev->map, DW_IC_RAW_INTR_STAT, &stat); dev_dbg(dev->dev, "enabled=%#x stat=%#x\n", enabled, stat); if (!enabled || !(stat & ~DW_IC_INTR_ACTIVITY)) return IRQ_NONE; @@ -739,7 +750,7 @@ int i2c_dw_probe_master(struct dw_i2c_dev *dev) dev->disable = i2c_dw_disable; dev->disable_int = i2c_dw_disable_int; - ret = i2c_dw_set_reg_access(dev); + ret = i2c_dw_init_regmap(dev); if (ret) return ret; @@ -747,7 +758,9 @@ int i2c_dw_probe_master(struct dw_i2c_dev *dev) if (ret) return ret; - i2c_dw_set_fifo_size(dev); + ret = i2c_dw_set_fifo_size(dev); + if (ret) + return ret; ret = dev->init(dev); if (ret) diff --git a/drivers/i2c/busses/i2c-designware-slave.c b/drivers/i2c/busses/i2c-designware-slave.c index 576e7af4e94b..465d0f1bb751 100644 --- a/drivers/i2c/busses/i2c-designware-slave.c +++ b/drivers/i2c/busses/i2c-designware-slave.c @@ -11,6 +11,7 @@ #include <linux/errno.h> #include <linux/i2c.h> #include <linux/interrupt.h> +#include <linux/regmap.h> #include <linux/io.h> #include <linux/module.h> #include <linux/pm_runtime.h> @@ -20,12 +21,12 @@ static void i2c_dw_configure_fifo_slave(struct dw_i2c_dev *dev) { /* Configure Tx/Rx FIFO threshold levels. */ - dw_writel(dev, 0, DW_IC_TX_TL); - dw_writel(dev, 0, DW_IC_RX_TL); + regmap_write(dev->map, DW_IC_TX_TL, 0); + regmap_write(dev->map, DW_IC_RX_TL, 0); /* Configure the I2C slave. */ - dw_writel(dev, dev->slave_cfg, DW_IC_CON); - dw_writel(dev, DW_IC_INTR_SLAVE_MASK, DW_IC_INTR_MASK); + regmap_write(dev->map, DW_IC_CON, dev->slave_cfg); + regmap_write(dev->map, DW_IC_INTR_MASK, DW_IC_INTR_SLAVE_MASK); } /** @@ -49,7 +50,7 @@ static int i2c_dw_init_slave(struct dw_i2c_dev *dev) /* Write SDA hold time if supported */ if (dev->sda_hold_time) - dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD); + regmap_write(dev->map, DW_IC_SDA_HOLD, dev->sda_hold_time); i2c_dw_configure_fifo_slave(dev); i2c_dw_release_lock(dev); @@ -72,7 +73,7 @@ static int i2c_dw_reg_slave(struct i2c_client *slave) * the address to which the DW_apb_i2c responds. */ __i2c_dw_disable_nowait(dev); - dw_writel(dev, slave->addr, DW_IC_SAR); + regmap_write(dev->map, DW_IC_SAR, slave->addr); dev->slave = slave; __i2c_dw_enable(dev); @@ -103,7 +104,7 @@ static int i2c_dw_unreg_slave(struct i2c_client *slave) static u32 i2c_dw_read_clear_intrbits_slave(struct dw_i2c_dev *dev) { - u32 stat; + u32 stat, dummy; /* * The IC_INTR_STAT register just indicates "enabled" interrupts. @@ -111,39 +112,39 @@ static u32 i2c_dw_read_clear_intrbits_slave(struct dw_i2c_dev *dev) * in the IC_RAW_INTR_STAT register. * * That is, - * stat = dw_readl(IC_INTR_STAT); + * stat = readl(IC_INTR_STAT); * equals to, - * stat = dw_readl(IC_RAW_INTR_STAT) & dw_readl(IC_INTR_MASK); + * stat = readl(IC_RAW_INTR_STAT) & readl(IC_INTR_MASK); * * The raw version might be useful for debugging purposes. */ - stat = dw_readl(dev, DW_IC_INTR_STAT); + regmap_read(dev->map, DW_IC_INTR_STAT, &stat); /* * Do not use the IC_CLR_INTR register to clear interrupts, or * you'll miss some interrupts, triggered during the period from - * dw_readl(IC_INTR_STAT) to dw_readl(IC_CLR_INTR). + * readl(IC_INTR_STAT) to readl(IC_CLR_INTR). * * Instead, use the separately-prepared IC_CLR_* registers. */ if (stat & DW_IC_INTR_TX_ABRT) - dw_readl(dev, DW_IC_CLR_TX_ABRT); + regmap_read(dev->map, DW_IC_CLR_TX_ABRT, &dummy); if (stat & DW_IC_INTR_RX_UNDER) - dw_readl(dev, DW_IC_CLR_RX_UNDER); + regmap_read(dev->map, DW_IC_CLR_RX_UNDER, &dummy); if (stat & DW_IC_INTR_RX_OVER) - dw_readl(dev, DW_IC_CLR_RX_OVER); + regmap_read(dev->map, DW_IC_CLR_RX_OVER, &dummy); if (stat & DW_IC_INTR_TX_OVER) - dw_readl(dev, DW_IC_CLR_TX_OVER); + regmap_read(dev->map, DW_IC_CLR_TX_OVER, &dummy); if (stat & DW_IC_INTR_RX_DONE) - dw_readl(dev, DW_IC_CLR_RX_DONE); + regmap_read(dev->map, DW_IC_CLR_RX_DONE, &dummy); if (stat & DW_IC_INTR_ACTIVITY) - dw_readl(dev, DW_IC_CLR_ACTIVITY); + regmap_read(dev->map, DW_IC_CLR_ACTIVITY, &dummy); if (stat & DW_IC_INTR_STOP_DET) - dw_readl(dev, DW_IC_CLR_STOP_DET); + regmap_read(dev->map, DW_IC_CLR_STOP_DET, &dummy); if (stat & DW_IC_INTR_START_DET) - dw_readl(dev, DW_IC_CLR_START_DET); + regmap_read(dev->map, DW_IC_CLR_START_DET, &dummy); if (stat & DW_IC_INTR_GEN_CALL) - dw_readl(dev, DW_IC_CLR_GEN_CALL); + regmap_read(dev->map, DW_IC_CLR_GEN_CALL, &dummy); return stat; } @@ -155,14 +156,14 @@ static u32 i2c_dw_read_clear_intrbits_slave(struct dw_i2c_dev *dev) static int i2c_dw_irq_handler_slave(struct dw_i2c_dev *dev) { - u32 raw_stat, stat, enabled; - u8 val, slave_activity; + u32 raw_stat, stat, enabled, tmp; + u8 val = 0, slave_activity; - stat = dw_readl(dev, DW_IC_INTR_STAT); - enabled = dw_readl(dev, DW_IC_ENABLE); - raw_stat = dw_readl(dev, DW_IC_RAW_INTR_STAT); - slave_activity = ((dw_readl(dev, DW_IC_STATUS) & - DW_IC_STATUS_SLAVE_ACTIVITY) >> 6); + regmap_read(dev->map, DW_IC_INTR_STAT, &stat); + regmap_read(dev->map, DW_IC_ENABLE, &enabled); + regmap_read(dev->map, DW_IC_RAW_INTR_STAT, &raw_stat); + regmap_read(dev->map, DW_IC_STATUS, &tmp); + slave_activity = ((tmp & DW_IC_STATUS_SLAVE_ACTIVITY) >> 6); if (!enabled || !(raw_stat & ~DW_IC_INTR_ACTIVITY) || !dev->slave) return 0; @@ -177,7 +178,8 @@ static int i2c_dw_irq_handler_slave(struct dw_i2c_dev *dev) if (stat & DW_IC_INTR_RD_REQ) { if (slave_activity) { if (stat & DW_IC_INTR_RX_FULL) { - val = dw_readl(dev, DW_IC_DATA_CMD); + regmap_read(dev->map, DW_IC_DATA_CMD, &tmp); + val = tmp; if (!i2c_slave_event(dev->slave, I2C_SLAVE_WRITE_RECEIVED, @@ -185,24 +187,24 @@ static int i2c_dw_irq_handler_slave(struct dw_i2c_dev *dev) dev_vdbg(dev->dev, "Byte %X acked!", val); } - dw_readl(dev, DW_IC_CLR_RD_REQ); + regmap_read(dev->map, DW_IC_CLR_RD_REQ, &tmp); stat = i2c_dw_read_clear_intrbits_slave(dev); } else { - dw_readl(dev, DW_IC_CLR_RD_REQ); - dw_readl(dev, DW_IC_CLR_RX_UNDER); + regmap_read(dev->map, DW_IC_CLR_RD_REQ, &tmp); + regmap_read(dev->map, DW_IC_CLR_RX_UNDER, &tmp); stat = i2c_dw_read_clear_intrbits_slave(dev); } if (!i2c_slave_event(dev->slave, I2C_SLAVE_READ_REQUESTED, &val)) - dw_writel(dev, val, DW_IC_DATA_CMD); + regmap_write(dev->map, DW_IC_DATA_CMD, val); } } if (stat & DW_IC_INTR_RX_DONE) { if (!i2c_slave_event(dev->slave, I2C_SLAVE_READ_PROCESSED, &val)) - dw_readl(dev, DW_IC_CLR_RX_DONE); + regmap_read(dev->map, DW_IC_CLR_RX_DONE, &tmp); i2c_slave_event(dev->slave, I2C_SLAVE_STOP, &val); stat = i2c_dw_read_clear_intrbits_slave(dev); @@ -210,7 +212,8 @@ static int i2c_dw_irq_handler_slave(struct dw_i2c_dev *dev) } if (stat & DW_IC_INTR_RX_FULL) { - val = dw_readl(dev, DW_IC_DATA_CMD); + regmap_read(dev->map, DW_IC_DATA_CMD, &tmp); + val = tmp; if (!i2c_slave_event(dev->slave, I2C_SLAVE_WRITE_RECEIVED, &val)) dev_vdbg(dev->dev, "Byte %X acked!", val); @@ -263,7 +266,7 @@ int i2c_dw_probe_slave(struct dw_i2c_dev *dev) dev->disable = i2c_dw_disable; dev->disable_int = i2c_dw_disable_int; - ret = i2c_dw_set_reg_access(dev); + ret = i2c_dw_init_regmap(dev); if (ret) return ret; @@ -271,7 +274,9 @@ int i2c_dw_probe_slave(struct dw_i2c_dev *dev) if (ret) return ret; - i2c_dw_set_fifo_size(dev); + ret = i2c_dw_set_fifo_size(dev); + if (ret) + return ret; ret = dev->init(dev); if (ret) -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH v4 08/11] i2c: designware: Convert driver to using regmap API 2020-05-27 12:01 ` [PATCH v4 08/11] i2c: designware: Convert driver to using regmap API Serge Semin @ 2020-05-27 13:50 ` Andy Shevchenko 2020-05-27 14:39 ` Serge Semin 0 siblings, 1 reply; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 13:50 UTC (permalink / raw) To: Serge Semin Cc: Jarkko Nikula, Wolfram Sang, Mika Westerberg, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, devicetree, linux-mips, linux-i2c, linux-kernel On Wed, May 27, 2020 at 03:01:08PM +0300, Serge Semin wrote: > Seeing the DW I2C driver is using flags-based accessors with two > conditional clauses it would be better to replace them with the regmap > API IO methods and to initialize the regmap object with read/write > callbacks specific to the controller registers map implementation. This > will be also handy for the drivers with non-standard registers mapping > (like an embedded into the Baikal-T1 System Controller DW I2C block, which > glue-driver is a part of this series). > > As before the driver tries to detect the mapping setup at probe stage and > creates a regmap object accordingly, which will be used by the rest of the > code to correctly access the controller registers. In two places it was > appropriate to convert the hand-written read-modify-write and > read-poll-loop design patterns to the corresponding regmap API > ready-to-use methods. > > Note the regmap IO methods return value is checked only at the probe > stage. The rest of the code won't do this because basically we have > MMIO-based regmap so non of the read/write methods can fail (this also > won't be needed for the Baikal-T1-specific I2C controller). Thanks! My comments below. ... > #include <linux/export.h> > #include <linux/i2c.h> > #include <linux/interrupt.h> > +#include <linux/regmap.h> > #include <linux/io.h> > #include <linux/kernel.h> > #include <linux/module.h> Please, keep ordered. ... > +static int dw_reg_write_word(void *context, unsigned int reg, unsigned int val) > +{ > + struct dw_i2c_dev *dev = context; > + > + writew_relaxed((u16)val, dev->base + reg); > + writew_relaxed((u16)(val >> 16), dev->base + reg + 2); What does explicit casting here help to? I think you may drop it. > + return 0; > } ... > #include <linux/errno.h> > #include <linux/i2c.h> > #include <linux/interrupt.h> > +#include <linux/regmap.h> > #include <linux/io.h> > #include <linux/module.h> > #include <linux/pm_runtime.h> Order? -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 08/11] i2c: designware: Convert driver to using regmap API 2020-05-27 13:50 ` Andy Shevchenko @ 2020-05-27 14:39 ` Serge Semin 0 siblings, 0 replies; 33+ messages in thread From: Serge Semin @ 2020-05-27 14:39 UTC (permalink / raw) To: Andy Shevchenko Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Mika Westerberg, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, devicetree, linux-mips, linux-i2c, linux-kernel On Wed, May 27, 2020 at 04:50:23PM +0300, Andy Shevchenko wrote: > On Wed, May 27, 2020 at 03:01:08PM +0300, Serge Semin wrote: > > Seeing the DW I2C driver is using flags-based accessors with two > > conditional clauses it would be better to replace them with the regmap > > API IO methods and to initialize the regmap object with read/write > > callbacks specific to the controller registers map implementation. This > > will be also handy for the drivers with non-standard registers mapping > > (like an embedded into the Baikal-T1 System Controller DW I2C block, which > > glue-driver is a part of this series). > > > > As before the driver tries to detect the mapping setup at probe stage and > > creates a regmap object accordingly, which will be used by the rest of the > > code to correctly access the controller registers. In two places it was > > appropriate to convert the hand-written read-modify-write and > > read-poll-loop design patterns to the corresponding regmap API > > ready-to-use methods. > > > > Note the regmap IO methods return value is checked only at the probe > > stage. The rest of the code won't do this because basically we have > > MMIO-based regmap so non of the read/write methods can fail (this also > > won't be needed for the Baikal-T1-specific I2C controller). > > Thanks! My comments below. > > ... > > > #include <linux/export.h> > > #include <linux/i2c.h> > > #include <linux/interrupt.h> > > +#include <linux/regmap.h> > > #include <linux/io.h> > > #include <linux/kernel.h> > > #include <linux/module.h> > > Please, keep ordered. Thanks. I'll fix the order. It must have been shifted after rebase. I made sure the order was ok before that. > > ... > > > +static int dw_reg_write_word(void *context, unsigned int reg, unsigned int val) > > +{ > > + struct dw_i2c_dev *dev = context; > > + > > > + writew_relaxed((u16)val, dev->base + reg); > > + writew_relaxed((u16)(val >> 16), dev->base + reg + 2); > > What does explicit casting here help to? > I think you may drop it. Good question. It has been there originally. I'll remove it in the next patchset version. > > > + return 0; > > } > > ... > > > #include <linux/errno.h> > > #include <linux/i2c.h> > > #include <linux/interrupt.h> > > +#include <linux/regmap.h> > > #include <linux/io.h> > > #include <linux/module.h> > > #include <linux/pm_runtime.h> > > Order? Ok. -Sergey > > -- > With Best Regards, > Andy Shevchenko > > ^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v4 09/11] i2c: designware: Retrieve quirk flags as early as possible 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin ` (7 preceding siblings ...) 2020-05-27 12:01 ` [PATCH v4 08/11] i2c: designware: Convert driver to using regmap API Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 13:51 ` Andy Shevchenko 2020-05-27 12:01 ` [PATCH v4 10/11] i2c: designware: Move reg-space remapping into a dedicated function Serge Semin 2020-05-27 12:01 ` [PATCH v4 11/11] i2c: designware: Add Baikal-T1 System I2C support Serge Semin 10 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang, Andy Shevchenko, Mika Westerberg Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel Some platforms might need to activate the driver quirks at a very early probe stage. For instance, Baikal-T1 System I2C doesn't need to map the registers space as ones belong to the system controller. Instead it will request the syscon regmap from the parental DT node. In order to be able to do so let's retrieve the model flags right after the DW I2C private data is created. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: linux-mips@vger.kernel.org Cc: devicetree@vger.kernel.org --- Changelog v3: - This is a new patch, which has been created due to declining the glue-layer approach. --- drivers/i2c/busses/i2c-designware-platdrv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index ca057aa9eac4..ad292de2d260 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -124,6 +124,8 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) if (!dev) return -ENOMEM; + dev->flags |= (uintptr_t)device_get_match_data(&pdev->dev); + dev->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(dev->base)) return PTR_ERR(dev->base); @@ -146,8 +148,6 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) i2c_dw_acpi_adjust_bus_speed(&pdev->dev); - dev->flags |= (uintptr_t)device_get_match_data(&pdev->dev); - if (pdev->dev.of_node) dw_i2c_of_configure(pdev); -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH v4 09/11] i2c: designware: Retrieve quirk flags as early as possible 2020-05-27 12:01 ` [PATCH v4 09/11] i2c: designware: Retrieve quirk flags as early as possible Serge Semin @ 2020-05-27 13:51 ` Andy Shevchenko 0 siblings, 0 replies; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 13:51 UTC (permalink / raw) To: Serge Semin Cc: Jarkko Nikula, Wolfram Sang, Mika Westerberg, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 03:01:09PM +0300, Serge Semin wrote: > Some platforms might need to activate the driver quirks at a very early > probe stage. For instance, Baikal-T1 System I2C doesn't need to map the > registers space as ones belong to the system controller. Instead it will > request the syscon regmap from the parental DT node. In order to be able > to do so let's retrieve the model flags right after the DW I2C private > data is created. Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: linux-mips@vger.kernel.org > Cc: devicetree@vger.kernel.org > > --- > > Changelog v3: > - This is a new patch, which has been created due to declining the > glue-layer approach. > --- > drivers/i2c/busses/i2c-designware-platdrv.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c > index ca057aa9eac4..ad292de2d260 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -124,6 +124,8 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) > if (!dev) > return -ENOMEM; > > + dev->flags |= (uintptr_t)device_get_match_data(&pdev->dev); > + > dev->base = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(dev->base)) > return PTR_ERR(dev->base); > @@ -146,8 +148,6 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) > > i2c_dw_acpi_adjust_bus_speed(&pdev->dev); > > - dev->flags |= (uintptr_t)device_get_match_data(&pdev->dev); > - > if (pdev->dev.of_node) > dw_i2c_of_configure(pdev); > > -- > 2.26.2 > -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v4 10/11] i2c: designware: Move reg-space remapping into a dedicated function 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin ` (8 preceding siblings ...) 2020-05-27 12:01 ` [PATCH v4 09/11] i2c: designware: Retrieve quirk flags as early as possible Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 13:58 ` Andy Shevchenko 2020-05-27 12:01 ` [PATCH v4 11/11] i2c: designware: Add Baikal-T1 System I2C support Serge Semin 10 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang, Andy Shevchenko, Mika Westerberg Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel This is a preparation patch before adding a quirk with custom registers map creation required for the Baikal-T1 System I2C support. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: linux-mips@vger.kernel.org Cc: devicetree@vger.kernel.org --- Changelog v3: - This is a new patch, which has been created due to declining the glue-layer approach. Changelog v4: - Use PTR_ERR_OR_ZERO() helper in the bt1_i2c_request_regs() method. - Discard devm_platform_get_and_ioremap_resource() utilization. --- drivers/i2c/busses/i2c-designware-platdrv.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index ad292de2d260..061c8d506c7c 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -108,6 +108,15 @@ static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev) pm_runtime_put_noidle(dev->dev); } +static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev) +{ + struct platform_device *pdev = to_platform_device(dev->dev); + + dev->base = devm_platform_ioremap_resource(pdev, 0); + + return PTR_ERR_OR_ZERO(dev->base); +} + static int dw_i2c_plat_probe(struct platform_device *pdev) { struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev); @@ -125,15 +134,14 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) return -ENOMEM; dev->flags |= (uintptr_t)device_get_match_data(&pdev->dev); - - dev->base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(dev->base)) - return PTR_ERR(dev->base); - dev->dev = &pdev->dev; dev->irq = irq; platform_set_drvdata(pdev, dev); + ret = dw_i2c_plat_request_regs(dev); + if (ret) + return ret; + dev->rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL); if (IS_ERR(dev->rst)) return PTR_ERR(dev->rst); -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH v4 10/11] i2c: designware: Move reg-space remapping into a dedicated function 2020-05-27 12:01 ` [PATCH v4 10/11] i2c: designware: Move reg-space remapping into a dedicated function Serge Semin @ 2020-05-27 13:58 ` Andy Shevchenko 2020-05-27 14:54 ` Serge Semin 0 siblings, 1 reply; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 13:58 UTC (permalink / raw) To: Serge Semin Cc: Jarkko Nikula, Wolfram Sang, Mika Westerberg, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 03:01:10PM +0300, Serge Semin wrote: > This is a preparation patch before adding a quirk with custom registers > map creation required for the Baikal-T1 System I2C support. Looks good. Though one nit below. Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: linux-mips@vger.kernel.org > Cc: devicetree@vger.kernel.org > > --- > > Changelog v3: > - This is a new patch, which has been created due to declining the > glue-layer approach. > > Changelog v4: > - Use PTR_ERR_OR_ZERO() helper in the bt1_i2c_request_regs() method. > - Discard devm_platform_get_and_ioremap_resource() utilization. > --- > drivers/i2c/busses/i2c-designware-platdrv.c | 18 +++++++++++++----- > 1 file changed, 13 insertions(+), 5 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c > index ad292de2d260..061c8d506c7c 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -108,6 +108,15 @@ static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev) > pm_runtime_put_noidle(dev->dev); > } > > +static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev) > +{ > + struct platform_device *pdev = to_platform_device(dev->dev); > + > + dev->base = devm_platform_ioremap_resource(pdev, 0); > + > + return PTR_ERR_OR_ZERO(dev->base); > +} > + > static int dw_i2c_plat_probe(struct platform_device *pdev) > { > struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev); > @@ -125,15 +134,14 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) > return -ENOMEM; > > dev->flags |= (uintptr_t)device_get_match_data(&pdev->dev); It's related to previous patch, but I just realized that '|' is not needed here. Care to amend in the previous patch? > - > - dev->base = devm_platform_ioremap_resource(pdev, 0); > - if (IS_ERR(dev->base)) > - return PTR_ERR(dev->base); > - > dev->dev = &pdev->dev; > dev->irq = irq; > platform_set_drvdata(pdev, dev); > > + ret = dw_i2c_plat_request_regs(dev); > + if (ret) > + return ret; > + > dev->rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL); > if (IS_ERR(dev->rst)) > return PTR_ERR(dev->rst); > -- > 2.26.2 > -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 10/11] i2c: designware: Move reg-space remapping into a dedicated function 2020-05-27 13:58 ` Andy Shevchenko @ 2020-05-27 14:54 ` Serge Semin 0 siblings, 0 replies; 33+ messages in thread From: Serge Semin @ 2020-05-27 14:54 UTC (permalink / raw) To: Andy Shevchenko Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Mika Westerberg, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 04:58:01PM +0300, Andy Shevchenko wrote: > On Wed, May 27, 2020 at 03:01:10PM +0300, Serge Semin wrote: > > This is a preparation patch before adding a quirk with custom registers > > map creation required for the Baikal-T1 System I2C support. > > Looks good. Though one nit below. > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > > Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> > > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > > Cc: Rob Herring <robh+dt@kernel.org> > > Cc: linux-mips@vger.kernel.org > > Cc: devicetree@vger.kernel.org > > > > --- > > > > Changelog v3: > > - This is a new patch, which has been created due to declining the > > glue-layer approach. > > > > Changelog v4: > > - Use PTR_ERR_OR_ZERO() helper in the bt1_i2c_request_regs() method. > > - Discard devm_platform_get_and_ioremap_resource() utilization. > > --- > > drivers/i2c/busses/i2c-designware-platdrv.c | 18 +++++++++++++----- > > 1 file changed, 13 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c > > index ad292de2d260..061c8d506c7c 100644 > > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > > @@ -108,6 +108,15 @@ static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev) > > pm_runtime_put_noidle(dev->dev); > > } > > > > +static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev) > > +{ > > + struct platform_device *pdev = to_platform_device(dev->dev); > > + > > + dev->base = devm_platform_ioremap_resource(pdev, 0); > > + > > + return PTR_ERR_OR_ZERO(dev->base); > > +} > > + > > static int dw_i2c_plat_probe(struct platform_device *pdev) > > { > > struct dw_i2c_platform_data *pdata = dev_get_platdata(&pdev->dev); > > @@ -125,15 +134,14 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) > > return -ENOMEM; > > > > > dev->flags |= (uintptr_t)device_get_match_data(&pdev->dev); > > It's related to previous patch, but I just realized that '|' is not needed > here. Care to amend in the previous patch? Agreed. Thanks. -Sergey > > > - > > - dev->base = devm_platform_ioremap_resource(pdev, 0); > > - if (IS_ERR(dev->base)) > > - return PTR_ERR(dev->base); > > - > > dev->dev = &pdev->dev; > > dev->irq = irq; > > platform_set_drvdata(pdev, dev); > > > > + ret = dw_i2c_plat_request_regs(dev); > > + if (ret) > > + return ret; > > + > > dev->rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL); > > if (IS_ERR(dev->rst)) > > return PTR_ERR(dev->rst); > > -- > > 2.26.2 > > > > -- > With Best Regards, > Andy Shevchenko > > ^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v4 11/11] i2c: designware: Add Baikal-T1 System I2C support 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin ` (9 preceding siblings ...) 2020-05-27 12:01 ` [PATCH v4 10/11] i2c: designware: Move reg-space remapping into a dedicated function Serge Semin @ 2020-05-27 12:01 ` Serge Semin 2020-05-27 14:03 ` Andy Shevchenko 10 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 12:01 UTC (permalink / raw) To: Jarkko Nikula, Wolfram Sang, Andy Shevchenko, Mika Westerberg Cc: Serge Semin, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel Baikal-T1 System Controller is equipped with a dedicated I2C Controller which functionality is based on the DW APB I2C IP-core, the only difference in a way it' registers are accessed. There are three access register provided in the System Controller registers map, which indirectly address the normal DW APB I2C registers space. So in order to have the Baikal-T1 System I2C Controller supported by the common DW APB I2C driver we created a dedicated Dw I2C controller model quirk, which retrieves the syscon regmap from the parental dt node and creates a new regmap based on it. Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Rob Herring <robh+dt@kernel.org> Cc: linux-mips@vger.kernel.org Cc: devicetree@vger.kernel.org --- Changelog v3: - This is a new patch, which has been created due to declining the glue-layer approach. Changelog v4: - Use PTR_ERR_OR_ZERO() helper in the bt1_i2c_request_regs() method. --- drivers/i2c/busses/Kconfig | 3 +- drivers/i2c/busses/i2c-designware-core.h | 3 + drivers/i2c/busses/i2c-designware-platdrv.c | 78 ++++++++++++++++++++- 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 259e2325712a..0cf7aea30138 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -541,8 +541,9 @@ config I2C_DESIGNWARE_SLAVE config I2C_DESIGNWARE_PLATFORM tristate "Synopsys DesignWare Platform" - select I2C_DESIGNWARE_CORE depends on (ACPI && COMMON_CLK) || !ACPI + select I2C_DESIGNWARE_CORE + select MFD_SYSCON if MIPS_BAIKAL_T1 help If you say yes to this option, support will be included for the Synopsys DesignWare I2C adapter. diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h index f5bbe3d6bcf8..556673a1f61b 100644 --- a/drivers/i2c/busses/i2c-designware-core.h +++ b/drivers/i2c/busses/i2c-designware-core.h @@ -183,6 +183,7 @@ struct reset_control; * struct dw_i2c_dev - private i2c-designware data * @dev: driver model device node * @map: IO registers map + * @sysmap: System controller registers map * @base: IO registers pointer * @ext: Extended IO registers pointer * @cmd_complete: tx completion indicator @@ -235,6 +236,7 @@ struct reset_control; struct dw_i2c_dev { struct device *dev; struct regmap *map; + struct regmap *sysmap; void __iomem *base; void __iomem *ext; struct completion cmd_complete; @@ -290,6 +292,7 @@ struct dw_i2c_dev { #define ACCESS_NO_IRQ_SUSPEND 0x00000002 #define MODEL_MSCC_OCELOT 0x00000100 +#define MODEL_BAIKAL_BT1 0x00000200 #define MODEL_MASK 0x00000f00 int i2c_dw_init_regmap(struct dw_i2c_dev *dev); diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 061c8d506c7c..d9c5337bb22b 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -18,6 +18,7 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/kernel.h> +#include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of.h> #include <linux/platform_data/i2c-designware.h> @@ -25,6 +26,7 @@ #include <linux/pm.h> #include <linux/pm_runtime.h> #include <linux/property.h> +#include <linux/regmap.h> #include <linux/reset.h> #include <linux/sched.h> #include <linux/slab.h> @@ -58,6 +60,63 @@ MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match); #endif #ifdef CONFIG_OF +#define BT1_I2C_CTL 0x100 +#define BT1_I2C_CTL_ADDR_MASK GENMASK(7, 0) +#define BT1_I2C_CTL_WR BIT(8) +#define BT1_I2C_CTL_GO BIT(31) +#define BT1_I2C_DI 0x104 +#define BT1_I2C_DO 0x108 + +static int bt1_i2c_read(void *context, unsigned int reg, unsigned int *val) +{ + struct dw_i2c_dev *dev = context; + int ret; + + /* + * Note these methods shouldn't ever fail because the system controller + * registers are memory mapped. We check the return value just in case. + */ + ret = regmap_write(dev->sysmap, BT1_I2C_CTL, + BT1_I2C_CTL_GO | (reg & BT1_I2C_CTL_ADDR_MASK)); + if (ret) + return ret; + + return regmap_read(dev->sysmap, BT1_I2C_DO, val); +} + +static int bt1_i2c_write(void *context, unsigned int reg, unsigned int val) +{ + struct dw_i2c_dev *dev = context; + int ret; + + ret = regmap_write(dev->sysmap, BT1_I2C_DI, val); + if (ret) + return ret; + + return regmap_write(dev->sysmap, BT1_I2C_CTL, + BT1_I2C_CTL_GO | BT1_I2C_CTL_WR | (reg & BT1_I2C_CTL_ADDR_MASK)); +} + +static struct regmap_config bt1_i2c_cfg = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .fast_io = true, + .reg_read = bt1_i2c_read, + .reg_write = bt1_i2c_write, + .max_register = DW_IC_COMP_TYPE +}; + +static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) +{ + dev->sysmap = syscon_node_to_regmap(dev->dev->of_node->parent); + if (IS_ERR(dev->sysmap)) + return PTR_ERR(dev->sysmap); + + dev->map = devm_regmap_init(dev->dev, NULL, dev, &bt1_i2c_cfg); + return PTR_ERR_OR_ZERO(dev->map); +} + #define MSCC_ICPU_CFG_TWI_DELAY 0x0 #define MSCC_ICPU_CFG_TWI_DELAY_ENABLE BIT(0) #define MSCC_ICPU_CFG_TWI_SPIKE_FILTER 0x4 @@ -90,10 +149,16 @@ static int dw_i2c_of_configure(struct platform_device *pdev) static const struct of_device_id dw_i2c_of_match[] = { { .compatible = "snps,designware-i2c", }, { .compatible = "mscc,ocelot-i2c", .data = (void *)MODEL_MSCC_OCELOT }, + { .compatible = "baikal,bt1-sys-i2c", .data = (void *)MODEL_BAIKAL_BT1 }, {}, }; MODULE_DEVICE_TABLE(of, dw_i2c_of_match); #else +static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) +{ + return -ENODEV; +} + static inline int dw_i2c_of_configure(struct platform_device *pdev) { return -ENODEV; @@ -111,10 +176,19 @@ static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev) static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev) { struct platform_device *pdev = to_platform_device(dev->dev); + int ret; - dev->base = devm_platform_ioremap_resource(pdev, 0); + switch (dev->flags & MODEL_MASK) { + case MODEL_BAIKAL_BT1: + ret = bt1_i2c_request_regs(dev); + break; + default: + dev->base = devm_platform_ioremap_resource(pdev, 0); + ret = PTR_ERR_OR_ZERO(dev->base); + break; + } - return PTR_ERR_OR_ZERO(dev->base); + return ret; } static int dw_i2c_plat_probe(struct platform_device *pdev) -- 2.26.2 ^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH v4 11/11] i2c: designware: Add Baikal-T1 System I2C support 2020-05-27 12:01 ` [PATCH v4 11/11] i2c: designware: Add Baikal-T1 System I2C support Serge Semin @ 2020-05-27 14:03 ` Andy Shevchenko 2020-05-27 15:04 ` Serge Semin 0 siblings, 1 reply; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 14:03 UTC (permalink / raw) To: Serge Semin Cc: Jarkko Nikula, Wolfram Sang, Mika Westerberg, Serge Semin, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 03:01:11PM +0300, Serge Semin wrote: > Baikal-T1 System Controller is equipped with a dedicated I2C Controller > which functionality is based on the DW APB I2C IP-core, the only > difference in a way it' registers are accessed. There are three access > register provided in the System Controller registers map, which indirectly > address the normal DW APB I2C registers space. So in order to have the > Baikal-T1 System I2C Controller supported by the common DW APB I2C driver > we created a dedicated Dw I2C controller model quirk, which retrieves the > syscon regmap from the parental dt node and creates a new regmap based on > it. Yes, you see how cool it is now! FWIW, Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: linux-mips@vger.kernel.org > Cc: devicetree@vger.kernel.org > > --- > > Changelog v3: > - This is a new patch, which has been created due to declining the > glue-layer approach. > > Changelog v4: > - Use PTR_ERR_OR_ZERO() helper in the bt1_i2c_request_regs() method. > --- > drivers/i2c/busses/Kconfig | 3 +- > drivers/i2c/busses/i2c-designware-core.h | 3 + > drivers/i2c/busses/i2c-designware-platdrv.c | 78 ++++++++++++++++++++- > 3 files changed, 81 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig > index 259e2325712a..0cf7aea30138 100644 > --- a/drivers/i2c/busses/Kconfig > +++ b/drivers/i2c/busses/Kconfig > @@ -541,8 +541,9 @@ config I2C_DESIGNWARE_SLAVE > > config I2C_DESIGNWARE_PLATFORM > tristate "Synopsys DesignWare Platform" > - select I2C_DESIGNWARE_CORE > depends on (ACPI && COMMON_CLK) || !ACPI > + select I2C_DESIGNWARE_CORE > + select MFD_SYSCON if MIPS_BAIKAL_T1 > help > If you say yes to this option, support will be included for the > Synopsys DesignWare I2C adapter. > diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h > index f5bbe3d6bcf8..556673a1f61b 100644 > --- a/drivers/i2c/busses/i2c-designware-core.h > +++ b/drivers/i2c/busses/i2c-designware-core.h > @@ -183,6 +183,7 @@ struct reset_control; > * struct dw_i2c_dev - private i2c-designware data > * @dev: driver model device node > * @map: IO registers map > + * @sysmap: System controller registers map > * @base: IO registers pointer > * @ext: Extended IO registers pointer > * @cmd_complete: tx completion indicator > @@ -235,6 +236,7 @@ struct reset_control; > struct dw_i2c_dev { > struct device *dev; > struct regmap *map; > + struct regmap *sysmap; > void __iomem *base; > void __iomem *ext; > struct completion cmd_complete; > @@ -290,6 +292,7 @@ struct dw_i2c_dev { > #define ACCESS_NO_IRQ_SUSPEND 0x00000002 > > #define MODEL_MSCC_OCELOT 0x00000100 > +#define MODEL_BAIKAL_BT1 0x00000200 > #define MODEL_MASK 0x00000f00 > > int i2c_dw_init_regmap(struct dw_i2c_dev *dev); > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c > index 061c8d506c7c..d9c5337bb22b 100644 > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > @@ -18,6 +18,7 @@ > #include <linux/interrupt.h> > #include <linux/io.h> > #include <linux/kernel.h> > +#include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/of.h> > #include <linux/platform_data/i2c-designware.h> > @@ -25,6 +26,7 @@ > #include <linux/pm.h> > #include <linux/pm_runtime.h> > #include <linux/property.h> > +#include <linux/regmap.h> > #include <linux/reset.h> > #include <linux/sched.h> > #include <linux/slab.h> > @@ -58,6 +60,63 @@ MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match); > #endif > > #ifdef CONFIG_OF > +#define BT1_I2C_CTL 0x100 > +#define BT1_I2C_CTL_ADDR_MASK GENMASK(7, 0) > +#define BT1_I2C_CTL_WR BIT(8) > +#define BT1_I2C_CTL_GO BIT(31) > +#define BT1_I2C_DI 0x104 > +#define BT1_I2C_DO 0x108 > + > +static int bt1_i2c_read(void *context, unsigned int reg, unsigned int *val) > +{ > + struct dw_i2c_dev *dev = context; > + int ret; > + > + /* > + * Note these methods shouldn't ever fail because the system controller > + * registers are memory mapped. We check the return value just in case. > + */ > + ret = regmap_write(dev->sysmap, BT1_I2C_CTL, > + BT1_I2C_CTL_GO | (reg & BT1_I2C_CTL_ADDR_MASK)); > + if (ret) > + return ret; > + > + return regmap_read(dev->sysmap, BT1_I2C_DO, val); > +} > + > +static int bt1_i2c_write(void *context, unsigned int reg, unsigned int val) > +{ > + struct dw_i2c_dev *dev = context; > + int ret; > + > + ret = regmap_write(dev->sysmap, BT1_I2C_DI, val); > + if (ret) > + return ret; > + > + return regmap_write(dev->sysmap, BT1_I2C_CTL, > + BT1_I2C_CTL_GO | BT1_I2C_CTL_WR | (reg & BT1_I2C_CTL_ADDR_MASK)); > +} > + > +static struct regmap_config bt1_i2c_cfg = { > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > + .fast_io = true, > + .reg_read = bt1_i2c_read, > + .reg_write = bt1_i2c_write, > + .max_register = DW_IC_COMP_TYPE > +}; > + > +static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) > +{ > + dev->sysmap = syscon_node_to_regmap(dev->dev->of_node->parent); > + if (IS_ERR(dev->sysmap)) > + return PTR_ERR(dev->sysmap); > + > + dev->map = devm_regmap_init(dev->dev, NULL, dev, &bt1_i2c_cfg); > + return PTR_ERR_OR_ZERO(dev->map); > +} > + > #define MSCC_ICPU_CFG_TWI_DELAY 0x0 > #define MSCC_ICPU_CFG_TWI_DELAY_ENABLE BIT(0) > #define MSCC_ICPU_CFG_TWI_SPIKE_FILTER 0x4 > @@ -90,10 +149,16 @@ static int dw_i2c_of_configure(struct platform_device *pdev) > static const struct of_device_id dw_i2c_of_match[] = { > { .compatible = "snps,designware-i2c", }, > { .compatible = "mscc,ocelot-i2c", .data = (void *)MODEL_MSCC_OCELOT }, > + { .compatible = "baikal,bt1-sys-i2c", .data = (void *)MODEL_BAIKAL_BT1 }, > {}, > }; > MODULE_DEVICE_TABLE(of, dw_i2c_of_match); > #else > +static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) > +{ > + return -ENODEV; > +} > + > static inline int dw_i2c_of_configure(struct platform_device *pdev) > { > return -ENODEV; > @@ -111,10 +176,19 @@ static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev) > static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev) > { > struct platform_device *pdev = to_platform_device(dev->dev); > + int ret; > > - dev->base = devm_platform_ioremap_resource(pdev, 0); > + switch (dev->flags & MODEL_MASK) { > + case MODEL_BAIKAL_BT1: > + ret = bt1_i2c_request_regs(dev); > + break; > + default: > + dev->base = devm_platform_ioremap_resource(pdev, 0); > + ret = PTR_ERR_OR_ZERO(dev->base); > + break; > + } > > - return PTR_ERR_OR_ZERO(dev->base); > + return ret; > } > > static int dw_i2c_plat_probe(struct platform_device *pdev) > -- > 2.26.2 > -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 11/11] i2c: designware: Add Baikal-T1 System I2C support 2020-05-27 14:03 ` Andy Shevchenko @ 2020-05-27 15:04 ` Serge Semin 2020-05-27 15:52 ` Andy Shevchenko 0 siblings, 1 reply; 33+ messages in thread From: Serge Semin @ 2020-05-27 15:04 UTC (permalink / raw) To: Andy Shevchenko Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Mika Westerberg, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 05:03:03PM +0300, Andy Shevchenko wrote: > On Wed, May 27, 2020 at 03:01:11PM +0300, Serge Semin wrote: > > Baikal-T1 System Controller is equipped with a dedicated I2C Controller > > which functionality is based on the DW APB I2C IP-core, the only > > difference in a way it' registers are accessed. There are three access > > register provided in the System Controller registers map, which indirectly > > address the normal DW APB I2C registers space. So in order to have the > > Baikal-T1 System I2C Controller supported by the common DW APB I2C driver > > we created a dedicated Dw I2C controller model quirk, which retrieves the > > syscon regmap from the parental dt node and creates a new regmap based on > > it. > > Yes, you see how cool it is now! FWIW, Well, solution with glue-layers I liked more than this one. If your were talking regarding the regmap conversion itself. I admit, it's neater.) -Sergey > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > > Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru> > > Cc: Alexey Malahov <Alexey.Malahov@baikalelectronics.ru> > > Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> > > Cc: Rob Herring <robh+dt@kernel.org> > > Cc: linux-mips@vger.kernel.org > > Cc: devicetree@vger.kernel.org > > > > --- > > > > Changelog v3: > > - This is a new patch, which has been created due to declining the > > glue-layer approach. > > > > Changelog v4: > > - Use PTR_ERR_OR_ZERO() helper in the bt1_i2c_request_regs() method. > > --- > > drivers/i2c/busses/Kconfig | 3 +- > > drivers/i2c/busses/i2c-designware-core.h | 3 + > > drivers/i2c/busses/i2c-designware-platdrv.c | 78 ++++++++++++++++++++- > > 3 files changed, 81 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig > > index 259e2325712a..0cf7aea30138 100644 > > --- a/drivers/i2c/busses/Kconfig > > +++ b/drivers/i2c/busses/Kconfig > > @@ -541,8 +541,9 @@ config I2C_DESIGNWARE_SLAVE > > > > config I2C_DESIGNWARE_PLATFORM > > tristate "Synopsys DesignWare Platform" > > - select I2C_DESIGNWARE_CORE > > depends on (ACPI && COMMON_CLK) || !ACPI > > + select I2C_DESIGNWARE_CORE > > + select MFD_SYSCON if MIPS_BAIKAL_T1 > > help > > If you say yes to this option, support will be included for the > > Synopsys DesignWare I2C adapter. > > diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h > > index f5bbe3d6bcf8..556673a1f61b 100644 > > --- a/drivers/i2c/busses/i2c-designware-core.h > > +++ b/drivers/i2c/busses/i2c-designware-core.h > > @@ -183,6 +183,7 @@ struct reset_control; > > * struct dw_i2c_dev - private i2c-designware data > > * @dev: driver model device node > > * @map: IO registers map > > + * @sysmap: System controller registers map > > * @base: IO registers pointer > > * @ext: Extended IO registers pointer > > * @cmd_complete: tx completion indicator > > @@ -235,6 +236,7 @@ struct reset_control; > > struct dw_i2c_dev { > > struct device *dev; > > struct regmap *map; > > + struct regmap *sysmap; > > void __iomem *base; > > void __iomem *ext; > > struct completion cmd_complete; > > @@ -290,6 +292,7 @@ struct dw_i2c_dev { > > #define ACCESS_NO_IRQ_SUSPEND 0x00000002 > > > > #define MODEL_MSCC_OCELOT 0x00000100 > > +#define MODEL_BAIKAL_BT1 0x00000200 > > #define MODEL_MASK 0x00000f00 > > > > int i2c_dw_init_regmap(struct dw_i2c_dev *dev); > > diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c > > index 061c8d506c7c..d9c5337bb22b 100644 > > --- a/drivers/i2c/busses/i2c-designware-platdrv.c > > +++ b/drivers/i2c/busses/i2c-designware-platdrv.c > > @@ -18,6 +18,7 @@ > > #include <linux/interrupt.h> > > #include <linux/io.h> > > #include <linux/kernel.h> > > +#include <linux/mfd/syscon.h> > > #include <linux/module.h> > > #include <linux/of.h> > > #include <linux/platform_data/i2c-designware.h> > > @@ -25,6 +26,7 @@ > > #include <linux/pm.h> > > #include <linux/pm_runtime.h> > > #include <linux/property.h> > > +#include <linux/regmap.h> > > #include <linux/reset.h> > > #include <linux/sched.h> > > #include <linux/slab.h> > > @@ -58,6 +60,63 @@ MODULE_DEVICE_TABLE(acpi, dw_i2c_acpi_match); > > #endif > > > > #ifdef CONFIG_OF > > +#define BT1_I2C_CTL 0x100 > > +#define BT1_I2C_CTL_ADDR_MASK GENMASK(7, 0) > > +#define BT1_I2C_CTL_WR BIT(8) > > +#define BT1_I2C_CTL_GO BIT(31) > > +#define BT1_I2C_DI 0x104 > > +#define BT1_I2C_DO 0x108 > > + > > +static int bt1_i2c_read(void *context, unsigned int reg, unsigned int *val) > > +{ > > + struct dw_i2c_dev *dev = context; > > + int ret; > > + > > + /* > > + * Note these methods shouldn't ever fail because the system controller > > + * registers are memory mapped. We check the return value just in case. > > + */ > > + ret = regmap_write(dev->sysmap, BT1_I2C_CTL, > > + BT1_I2C_CTL_GO | (reg & BT1_I2C_CTL_ADDR_MASK)); > > + if (ret) > > + return ret; > > + > > + return regmap_read(dev->sysmap, BT1_I2C_DO, val); > > +} > > + > > +static int bt1_i2c_write(void *context, unsigned int reg, unsigned int val) > > +{ > > + struct dw_i2c_dev *dev = context; > > + int ret; > > + > > + ret = regmap_write(dev->sysmap, BT1_I2C_DI, val); > > + if (ret) > > + return ret; > > + > > + return regmap_write(dev->sysmap, BT1_I2C_CTL, > > + BT1_I2C_CTL_GO | BT1_I2C_CTL_WR | (reg & BT1_I2C_CTL_ADDR_MASK)); > > +} > > + > > +static struct regmap_config bt1_i2c_cfg = { > > + .reg_bits = 32, > > + .val_bits = 32, > > + .reg_stride = 4, > > + .fast_io = true, > > + .reg_read = bt1_i2c_read, > > + .reg_write = bt1_i2c_write, > > + .max_register = DW_IC_COMP_TYPE > > +}; > > + > > +static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) > > +{ > > + dev->sysmap = syscon_node_to_regmap(dev->dev->of_node->parent); > > + if (IS_ERR(dev->sysmap)) > > + return PTR_ERR(dev->sysmap); > > + > > + dev->map = devm_regmap_init(dev->dev, NULL, dev, &bt1_i2c_cfg); > > + return PTR_ERR_OR_ZERO(dev->map); > > +} > > + > > #define MSCC_ICPU_CFG_TWI_DELAY 0x0 > > #define MSCC_ICPU_CFG_TWI_DELAY_ENABLE BIT(0) > > #define MSCC_ICPU_CFG_TWI_SPIKE_FILTER 0x4 > > @@ -90,10 +149,16 @@ static int dw_i2c_of_configure(struct platform_device *pdev) > > static const struct of_device_id dw_i2c_of_match[] = { > > { .compatible = "snps,designware-i2c", }, > > { .compatible = "mscc,ocelot-i2c", .data = (void *)MODEL_MSCC_OCELOT }, > > + { .compatible = "baikal,bt1-sys-i2c", .data = (void *)MODEL_BAIKAL_BT1 }, > > {}, > > }; > > MODULE_DEVICE_TABLE(of, dw_i2c_of_match); > > #else > > +static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) > > +{ > > + return -ENODEV; > > +} > > + > > static inline int dw_i2c_of_configure(struct platform_device *pdev) > > { > > return -ENODEV; > > @@ -111,10 +176,19 @@ static void dw_i2c_plat_pm_cleanup(struct dw_i2c_dev *dev) > > static int dw_i2c_plat_request_regs(struct dw_i2c_dev *dev) > > { > > struct platform_device *pdev = to_platform_device(dev->dev); > > + int ret; > > > > - dev->base = devm_platform_ioremap_resource(pdev, 0); > > + switch (dev->flags & MODEL_MASK) { > > + case MODEL_BAIKAL_BT1: > > + ret = bt1_i2c_request_regs(dev); > > + break; > > + default: > > + dev->base = devm_platform_ioremap_resource(pdev, 0); > > + ret = PTR_ERR_OR_ZERO(dev->base); > > + break; > > + } > > > > - return PTR_ERR_OR_ZERO(dev->base); > > + return ret; > > } > > > > static int dw_i2c_plat_probe(struct platform_device *pdev) > > -- > > 2.26.2 > > > > -- > With Best Regards, > Andy Shevchenko > > ^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v4 11/11] i2c: designware: Add Baikal-T1 System I2C support 2020-05-27 15:04 ` Serge Semin @ 2020-05-27 15:52 ` Andy Shevchenko 0 siblings, 0 replies; 33+ messages in thread From: Andy Shevchenko @ 2020-05-27 15:52 UTC (permalink / raw) To: Serge Semin Cc: Serge Semin, Jarkko Nikula, Wolfram Sang, Mika Westerberg, Alexey Malahov, Thomas Bogendoerfer, Rob Herring, linux-mips, devicetree, linux-i2c, linux-kernel On Wed, May 27, 2020 at 06:04:31PM +0300, Serge Semin wrote: > On Wed, May 27, 2020 at 05:03:03PM +0300, Andy Shevchenko wrote: > > On Wed, May 27, 2020 at 03:01:11PM +0300, Serge Semin wrote: ... > > > +static struct regmap_config bt1_i2c_cfg = { > > > + .reg_bits = 32, > > > + .val_bits = 32, > > > + .reg_stride = 4, > > > + .fast_io = true, > > > + .reg_read = bt1_i2c_read, > > > + .reg_write = bt1_i2c_write, > > > + .max_register = DW_IC_COMP_TYPE And perhaps add a comma? > > > +}; -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2020-05-28 10:00 UTC | newest] Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-27 12:01 [PATCH v4 00/11] i2c: designeware: Add Baikal-T1 System I2C support Serge Semin 2020-05-27 12:01 ` [PATCH v4 01/11] dt-bindings: i2c: Convert DW I2C binding to DT schema Serge Semin 2020-05-27 12:01 ` [PATCH v4 02/11] dt-bindings: i2c: Discard i2c-slave flag from the DW I2C example Serge Semin 2020-05-27 17:12 ` Rob Herring 2020-05-27 17:18 ` Serge Semin 2020-05-27 17:56 ` Andy Shevchenko 2020-05-28 8:39 ` Serge Semin 2020-05-28 10:00 ` Andy Shevchenko 2020-05-27 12:01 ` [PATCH v4 03/11] dt-bindings: i2c: dw: Add Baikal-T1 SoC I2C controller Serge Semin 2020-05-27 12:01 ` [PATCH v4 04/11] i2c: designware: Use `-y` to build multi-object modules Serge Semin 2020-05-27 12:01 ` [PATCH v4 05/11] i2c: designware: slave: Set DW I2C core module dependency Serge Semin 2020-05-27 12:01 ` [PATCH v4 06/11] i2c: designware: Add Baytrail sem config DW I2C platform dependency Serge Semin 2020-05-27 13:42 ` Andy Shevchenko 2020-05-27 14:24 ` Serge Semin 2020-05-27 15:46 ` Andy Shevchenko 2020-05-27 16:00 ` Serge Semin 2020-05-27 16:43 ` Andy Shevchenko 2020-05-27 12:01 ` [PATCH v4 07/11] i2c: designware: Discard Cherry Trail model flag Serge Semin 2020-05-27 13:43 ` Andy Shevchenko 2020-05-27 14:29 ` Serge Semin 2020-05-27 15:48 ` Andy Shevchenko 2020-05-27 12:01 ` [PATCH v4 08/11] i2c: designware: Convert driver to using regmap API Serge Semin 2020-05-27 13:50 ` Andy Shevchenko 2020-05-27 14:39 ` Serge Semin 2020-05-27 12:01 ` [PATCH v4 09/11] i2c: designware: Retrieve quirk flags as early as possible Serge Semin 2020-05-27 13:51 ` Andy Shevchenko 2020-05-27 12:01 ` [PATCH v4 10/11] i2c: designware: Move reg-space remapping into a dedicated function Serge Semin 2020-05-27 13:58 ` Andy Shevchenko 2020-05-27 14:54 ` Serge Semin 2020-05-27 12:01 ` [PATCH v4 11/11] i2c: designware: Add Baikal-T1 System I2C support Serge Semin 2020-05-27 14:03 ` Andy Shevchenko 2020-05-27 15:04 ` Serge Semin 2020-05-27 15:52 ` Andy Shevchenko
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).