i2c: designware: Avoid using static data

Drivers are not allowed to use static data since they may be used in SPL
where BSS is not available.

It is possible that driver model may provide support for numbering devices
in the future. But for now, move this to global_data.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h
index 7f3ada0..0e7b946 100644 (file)
--- a/arch/x86/include/asm/global_data.h
+++ b/arch/x86/include/asm/global_data.h
@@ -96,6 +96,7 @@ struct arch_global_data {
        ulong table;                    /* Table pointer from previous loader */
        int turbo_state;                /* Current turbo state */
        struct irq_routing_table *pirq_routing_table;
+       int dw_i2c_num_cards;           /* Used by designware i2c driver */
 #ifdef CONFIG_SEABIOS
        u32 high_table_ptr;
        u32 high_table_limit;

diff --git a/drivers/i2c/designware_i2c_pci.c b/drivers/i2c/designware_i2c_pci.c
index e8fc6f2..8d6bb37 100644 (file)
--- a/drivers/i2c/designware_i2c_pci.c
+++ b/drivers/i2c/designware_i2c_pci.c
@@ -34,7 +34,6 @@ static int designware_i2c_pci_probe(struct udevice *dev)
 
 static int designware_i2c_pci_bind(struct udevice *dev)
 {
-       static int num_cards;
        char name[20];
 
        /*
@@ -45,9 +44,13 @@ static int designware_i2c_pci_bind(struct udevice *dev)
         * using this driver is impossible for PCIe I2C devices.
         * This can be removed, once a better (correct) way for this
         * is found and implemented.
+        *
+        * TODO(sjg@chromium.org): Perhaps if uclasses had platdata this would
+        * be possible. We cannot use static data in drivers since they may be
+        * used in SPL or before relocation.
         */
-       dev->req_seq = num_cards;
-       sprintf(name, "i2c_designware#%u", num_cards++);
+       dev->req_seq = gd->arch.dw_i2c_num_cards++;
+       sprintf(name, "i2c_designware#%u", dev->req_seq);
        device_set_name(dev, name);
 
        return 0;