On Friday 04 May 2012, Lee Jones wrote:

+static const struct nmk_i2c_controller *
+nmk_i2c_find_pdata_from_compatible(struct device_node *np)
+{
+       /*
+        * The u8500 is currently our only user. As more SoCs are added,
+        * search for the correct value set using of_machine_is_compatible
+        * and return a 'struct nmk_i2c_controller *' which contains the
+        * correct information for the given SoC, whilst leaving u8500_i2c
+        * as the default/fall-back value set.
+        */
+       return &u8500_i2c;
+}

Why not just put this pointer ...

+static const struct of_device_id nmk_gpio_match[] = {
+       { .compatible = "st,nomadik-i2c", },
+       {}
+};

into the .data field after the .compatible match, and make it more specific
to the soc, i.e.

static const struct of_device_id nmk_gpio_match[] = {
	{ .compatible = "st-ericsson,u8500-i2c", .data = &u8500_i2c },
	{ .compatible = "st,nomadik-i2c", .data = &default_i2c_controller },
};

	Arnd