i2c: eeprom: Use reg property instead of offset and size

Remove adhoc dt binding for fixed-partition definition for i2c eeprom.
fixed-partition are using reg property instead of offset/size pair.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/dts/imx53-ppd-uboot.dtsi b/arch/arm/dts/imx53-ppd-uboot.dtsi
index d38a1bc..d61b7cb 100644 (file)
--- a/arch/arm/dts/imx53-ppd-uboot.dtsi
+++ b/arch/arm/dts/imx53-ppd-uboot.dtsi
@@ -24,15 +24,15 @@
 &eeprom {
        partitions {
                compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-               vpd {
-                       offset = <0>;
-                       size = <1022>;
+               vpd@0 {
+                       reg = <0 1022>;
                };
 
-               bootcount: bootcount {
-                       offset = <1022>;
-                       size = <2>;
+               bootcount: bootcount@1022 {
+                       reg = <1022 2>;
                };
        };
 };

diff --git a/arch/arm/dts/imx6q-bx50v3-uboot.dtsi b/arch/arm/dts/imx6q-bx50v3-uboot.dtsi
index df446e0..01321ca 100644 (file)
--- a/arch/arm/dts/imx6q-bx50v3-uboot.dtsi
+++ b/arch/arm/dts/imx6q-bx50v3-uboot.dtsi
@@ -23,15 +23,15 @@
 &eeprom {
        partitions {
                compatible = "fixed-partitions";
+               #address-cells = <1>;
+               #size-cells = <1>;
 
-               vpd {
-                       offset = <0>;
-                       size = <1022>;
+               vpd@0 {
+                       reg = <0 1022>;
                };
 
                bootcount: bootcount {
-                       offset = <1022>;
-                       size = <2>;
+                       reg = <1022 2>;
                };
        };
 };

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 491893a..692c377 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -415,6 +415,14 @@
                        reg = <0x2c>;
                        compatible = "i2c-eeprom";
                        sandbox,emul = <&emul_eeprom>;
+                       partitions {
+                               compatible = "fixed-partitions";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                               bootcount_i2c: bootcount@10 {
+                                       reg = <10 2>;
+                               };
+                       };
                };
 
                rtc_0: rtc@43 {
@@ -462,6 +470,11 @@
                offset = <0x13>;
        };
 
+       bootcount {
+               compatible = "u-boot,bootcount-i2c-eeprom";
+               i2c-eeprom = <&bootcount_i2c>;
+       };
+
        adc@0 {
                compatible = "sandbox,adc";
                vdd-supply = <&buck2>;

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index fe11128..acd7093 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -119,6 +119,7 @@ CONFIG_DM_BOOTCOUNT=y
 CONFIG_DM_BOOTCOUNT_RTC=y
 CONFIG_BUTTON=y
 CONFIG_BUTTON_GPIO=y
+CONFIG_DM_BOOTCOUNT_I2C_EEPROM=y
 CONFIG_CLK=y
 CONFIG_CLK_COMPOSITE_CCF=y
 CONFIG_SANDBOX_CLK_CCF=y

diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index 45c34d3..3651ba4 100644 (file)
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -301,19 +301,20 @@ static int i2c_eeprom_partition_probe(struct udevice *dev)
 static int i2c_eeprom_partition_ofdata_to_platdata(struct udevice *dev)
 {
        struct i2c_eeprom_partition *priv = dev_get_priv(dev);
-       u32 offset, size;
+       u32 reg[2];
        int ret;
 
-       ret = dev_read_u32(dev, "offset", &offset);
+       ret = dev_read_u32_array(dev, "reg", reg, 2);
        if (ret)
                return ret;
 
-       ret = dev_read_u32(dev, "size", &size);
-       if (ret)
-               return ret;
+       if (!reg[1])
+               return -EINVAL;
+
+       priv->offset = reg[0];
+       priv->size = reg[1];
 
-       priv->offset = offset;
-       priv->size = size;
+       debug("%s: base %x, size %x\n", __func__, priv->offset, priv->size);
 
        return 0;
 }

diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c
index f911984..e0c47b5 100644 (file)
--- a/test/dm/bootcount.c
+++ b/test/dm/bootcount.c
@@ -25,6 +25,14 @@ static int dm_test_bootcount(struct unit_test_state *uts)
        ut_assertok(dm_bootcount_get(dev, &val));
        ut_assert(val == 0xab);
 
+       ut_assertok(uclass_get_device(UCLASS_BOOTCOUNT, 1, &dev));
+       ut_assertok(dm_bootcount_set(dev, 0));
+       ut_assertok(dm_bootcount_get(dev, &val));
+       ut_assert(val == 0);
+       ut_assertok(dm_bootcount_set(dev, 0xab));
+       ut_assertok(dm_bootcount_get(dev, &val));
+       ut_assert(val == 0xab);
+
        return 0;
 }