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

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

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

at24 updates for v6.15-rc1

- add two new compatible entries to the DT binding document
- drop of_match_ptr() and ACPI_PTR() macros
parents fbc54ae4 f25f405d

Documentation/devicetree/bindings/eeprom/at24.yaml

+4 −1
Original line number Diff line number Diff line
@@ -130,10 +130,13 @@ properties: 
          - const: giantec,gt24c32a

          - const: atmel,24c32

      - items:

          - const: onnn,n24s64b

          - enum:

              - onnn,n24s64b

              - puya,p24c64f

          - const: atmel,24c64

      - items:

          - enum:

              - giantec,gt24p128e

              - giantec,gt24p128f

              - renesas,r1ex24128

              - samsung,s524ad0xd1

drivers/misc/eeprom/at24.c

+4 −6
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/nvmem-provider.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/pm_runtime.h>

#include <linux/property.h>

#include <linux/regmap.h>
@@ -252,7 +250,7 @@ static const struct i2c_device_id at24_ids[] = { 
};

MODULE_DEVICE_TABLE(i2c, at24_ids);



static const struct of_device_id __maybe_unused at24_of_match[] = {

static const struct of_device_id at24_of_match[] = {

	{ .compatible = "atmel,24c00",		.data = &at24_data_24c00 },

	{ .compatible = "atmel,24c01",		.data = &at24_data_24c01 },

	{ .compatible = "atmel,24cs01",		.data = &at24_data_24cs01 },
@@ -286,7 +284,7 @@ static const struct of_device_id __maybe_unused at24_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, at24_of_match);



static const struct acpi_device_id __maybe_unused at24_acpi_ids[] = {

static const struct acpi_device_id at24_acpi_ids[] = {

	{ "INT3499",	(kernel_ulong_t)&at24_data_INT3499 },

	{ "TPF0001",	(kernel_ulong_t)&at24_data_24c1024 },

	{ /* END OF LIST */ }
@@ -848,8 +846,8 @@ static struct i2c_driver at24_driver = { 
	.driver = {

		.name = "at24",

		.pm = &at24_pm_ops,

		.of_match_table = of_match_ptr(at24_of_match),

		.acpi_match_table = ACPI_PTR(at24_acpi_ids),

		.of_match_table = at24_of_match,

		.acpi_match_table = at24_acpi_ids,

	},

	.probe = at24_probe,

	.remove = at24_remove,