Commit 71170301 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

Merge tag 'at24-updates-for-v6.11-rc1' of... 

Merge tag 'at24-updates-for-v6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into i2c/for-mergewindow

at24 updates for v6.11-rc1

- add support for two new Microchip models
- document even more new models in DT bindings (those use fallback
  compatibles so no code changes)
parents 97ca843f 3a9ba4e3

Documentation/devicetree/bindings/eeprom/at24.yaml

+13 −5
Original line number Diff line number Diff line
@@ -18,7 +18,9 @@ select: 
  properties:

    compatible:

      contains:

        pattern: "^atmel,(24(c|cs|mac)[0-9]+|spd)$"

        anyOf:

          - pattern: "^atmel,(24(c|cs|mac)[0-9]+|spd)$"

          - enum: ["microchip,24aa025e48", "microchip,24aa025e64"]

  required:

    - compatible
@@ -102,9 +104,6 @@ properties: 
                  pattern: spd$

      # These are special cases that don't conform to the above pattern.

      # Each requires a standard at24 model as fallback.

      - items:

          - const: belling,bl24c16a

          - const: atmel,24c16

      - items:

          - enum:

              - rohm,br24g01
@@ -122,16 +121,25 @@ properties: 
              - rohm,br24g04

          - const: atmel,24c04

      - items:

          - const: renesas,r1ex24016

          - enum:

              - belling,bl24c16a

              - renesas,r1ex24016

          - const: atmel,24c16

      - items:

          - const: giantec,gt24c32a

          - const: atmel,24c32

      - items:

          - const: onnn,n24s64b

          - const: atmel,24c64

      - items:

          - enum:

              - renesas,r1ex24128

              - samsung,s524ad0xd1

          - const: atmel,24c128

      - items:

          - const: microchip,24aa025e48

      - items:

          - const: microchip,24aa025e64

      - pattern: '^atmel,24c(32|64)d-wl$' # Actual vendor is st



  label:

drivers/misc/eeprom/at24.c

+8 −0
Original line number Diff line number Diff line
@@ -174,6 +174,10 @@ AT24_CHIP_DATA(at24_data_24mac402, 48 / 8, 
	AT24_FLAG_MAC | AT24_FLAG_READONLY);

AT24_CHIP_DATA(at24_data_24mac602, 64 / 8,

	AT24_FLAG_MAC | AT24_FLAG_READONLY);

AT24_CHIP_DATA(at24_data_24aa025e48, 48 / 8,

	AT24_FLAG_READONLY);

AT24_CHIP_DATA(at24_data_24aa025e64, 64 / 8,

	AT24_FLAG_READONLY);

/* spd is a 24c02 in memory DIMMs */

AT24_CHIP_DATA(at24_data_spd, 2048 / 8,

	AT24_FLAG_READONLY | AT24_FLAG_IRUGO);
@@ -218,6 +222,8 @@ static const struct i2c_device_id at24_ids[] = { 
	{ "24cs02",	(kernel_ulong_t)&at24_data_24cs02 },

	{ "24mac402",	(kernel_ulong_t)&at24_data_24mac402 },

	{ "24mac602",	(kernel_ulong_t)&at24_data_24mac602 },

	{ "24aa025e48",	(kernel_ulong_t)&at24_data_24aa025e48 },

	{ "24aa025e64",	(kernel_ulong_t)&at24_data_24aa025e64 },

	{ "spd",	(kernel_ulong_t)&at24_data_spd },

	{ "24c02-vaio",	(kernel_ulong_t)&at24_data_24c02_vaio },

	{ "24c04",	(kernel_ulong_t)&at24_data_24c04 },
@@ -270,6 +276,8 @@ static const struct of_device_id __maybe_unused at24_of_match[] = { 
	{ .compatible = "atmel,24c1024",	.data = &at24_data_24c1024 },

	{ .compatible = "atmel,24c1025",	.data = &at24_data_24c1025 },

	{ .compatible = "atmel,24c2048",	.data = &at24_data_24c2048 },

	{ .compatible = "microchip,24aa025e48",	.data = &at24_data_24aa025e48 },

	{ .compatible = "microchip,24aa025e64",	.data = &at24_data_24aa025e64 },

	{ /* END OF LIST */ },

};

MODULE_DEVICE_TABLE(of, at24_of_match);