Commit 3265568d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 

Pull i2c updates from Wolfram Sang:
 "I2C has mostly driver updates this time.

  The few noteworthy changes are: the core has now support for analog
  and digital filters with at91 being the first user, a core addition to
  replace the NULL returning i2c_new_probed_device() with an ERR_PTR
  variant, and the pxa driver has finally being moved to use the generic
  I2C slave interface. We have quite a significant number of reviews per
  patch this time, so thank you to all involved!"

* 'i2c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (37 commits)
  video: fbdev: matrox: convert to i2c_new_scanned_device
  i2c: icy: convert to i2c_new_scanned_device
  i2c: replace i2c_new_probed_device with an ERR_PTR variant
  i2c: Fix Kconfig indentation
  i2c: smbus: Don't filter out duplicate alerts
  i2c: i801: Correct Intel Jasper Lake SOC naming
  i2c: i2c-stm32f7: fix 10-bits check in slave free id search loop
  i2c: iproc: Add i2c repeated start capability
  i2c: remove helpers for ref-counting clients
  i2c: tegra: Use dma_request_chan() directly for channel request
  i2c: sh_mobile: Use dma_request_chan() directly for channel request
  i2c: qup: Use dma_request_chan() directly for channel request
  i2c: at91: Use dma_request_chan() directly for channel request
  i2c: rcar: Remove superfluous call to clk_get_rate()
  i2c: pxa: remove unused i2c-slave APIs
  i2c: pxa: migrate to new i2c_slave APIs
  i2c: cros-ec-tunnel: Make the device acpi compatible
  i2c: stm32f7: report dma error during probe
  i2c: icy: no need to populate address for scanned device
  i2c: xiic: Fix kerneldoc warnings
  ...
parents 31764f1b a72e27f7

Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml

0 → 100644
+53 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)

# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/i2c/amlogic,meson6-i2c.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Amlogic Meson I2C Controller



maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>

  - Beniamino Galvani <b.galvani@gmail.com>



allOf:

  - $ref: /schemas/i2c/i2c-controller.yaml#



properties:

  compatible:

    enum:

      - amlogic,meson6-i2c # Meson6, Meson8 and compatible SoCs

      - amlogic,meson-gxbb-i2c # GXBB and compatible SoCs

      - amlogic,meson-axg-i2c # AXG and compatible SoCs



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    minItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks



examples:

  - |

    i2c@c8100500 {

        compatible = "amlogic,meson6-i2c";

        reg = <0xc8100500 0x20>;

        interrupts = <92>;

        clocks = <&clk81>;

        #address-cells = <1>;

        #size-cells = <0>;



        eeprom@52 {

            compatible = "atmel,24c32";

            reg = <0x52>;

        };

    };

Documentation/devicetree/bindings/i2c/i2c-aspeed.txt

+2 −1
Original line number Diff line number Diff line 
Device tree configuration for the I2C busses on the AST24XX and AST25XX SoCs.

Device tree configuration for the I2C busses on the AST24XX, AST25XX, and AST26XX SoCs.



Required Properties:

- #address-cells	: should be 1
@@ -6,6 +6,7 @@ Required Properties: 
- reg			: address offset and range of bus

- compatible		: should be "aspeed,ast2400-i2c-bus"

			  or "aspeed,ast2500-i2c-bus"

			  or "aspeed,ast2600-i2c-bus"

- clocks		: root clock of bus, should reference the APB

			  clock in the second cell

- resets		: phandle to reset controller with the reset number in

Documentation/devicetree/bindings/i2c/i2c-at91.txt

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,8 @@ I2C for Atmel platforms 
Required properties :

- compatible : Must be "atmel,at91rm9200-i2c", "atmel,at91sam9261-i2c",

     "atmel,at91sam9260-i2c", "atmel,at91sam9g20-i2c", "atmel,at91sam9g10-i2c",

     "atmel,at91sam9x5-i2c", "atmel,sama5d4-i2c" or "atmel,sama5d2-i2c"

     "atmel,at91sam9x5-i2c", "atmel,sama5d4-i2c", "atmel,sama5d2-i2c" or

     "microchip,sam9x60-i2c"

- reg: physical base address of the controller and length of memory mapped

     region.

- interrupts: interrupt number to the cpu.

Documentation/devicetree/bindings/i2c/i2c-meson.txt

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
Amlogic Meson I2C controller



Required properties:

 - compatible: must be:

	"amlogic,meson6-i2c" for Meson8 and compatible SoCs

	"amlogic,meson-gxbb-i2c" for GXBB and compatible SoCs

	"amlogic,meson-axg-i2c"for AXG and compatible SoCs



 - reg: physical address and length of the device registers

 - interrupts: a single interrupt specifier

 - clocks: clock for the device

 - #address-cells: should be <1>

 - #size-cells: should be <0>



For details regarding the following core I2C bindings see also i2c.txt.



Optional properties:

- clock-frequency: the desired I2C bus clock frequency in Hz; in

  absence of this property the default value is used (100 kHz).



Examples:



	i2c@c8100500 {

		compatible = "amlogic,meson6-i2c";

		reg = <0xc8100500 0x20>;

		interrupts = <0 92 1>;

		clocks = <&clk81>;

		#address-cells = <1>;

		#size-cells = <0>;

	};

Documentation/devicetree/bindings/i2c/i2c.txt

+18 −0
Original line number Diff line number Diff line
@@ -55,6 +55,24 @@ wants to support one of the below features, it should adapt the bindings below. 
	Number of nanoseconds the SDA signal takes to fall; t(f) in the I2C

	specification.



- i2c-analog-filter

	Enable analog filter for i2c lines.



- i2c-digital-filter

	Enable digital filter for i2c lines.



- i2c-digital-filter-width-ns

	Width of spikes which can be filtered by digital filter

	(i2c-digital-filter). This width is specified in nanoseconds.



- i2c-analog-filter-cutoff-frequency

	Frequency that the analog filter (i2c-analog-filter) uses to distinguish

	which signal to filter. Signal with higher frequency than specified will

	be filtered out. Only lower frequency will pass (this is applicable to

	a low-pass analog filter). Typical value should be above the normal

	i2c bus clock frequency (clock-frequency).

	Specified in Hz.



- interrupts

	interrupts used by the device.

CRA Git | Maintained and supported by SUSTech CRA and CCSE