From mboxrd@z Thu Jan 1 00:00:00 1970 From: lee.jones@linaro.org (Lee Jones) Date: Fri, 7 Sep 2012 12:14:52 +0100 Subject: [PATCH 12/19] i2c-nomadik: Register sub-devices when passed via Device Tree In-Reply-To: <1347016499-29354-1-git-send-email-lee.jones@linaro.org> References: <1347016499-29354-1-git-send-email-lee.jones@linaro.org> Message-ID: <1347016499-29354-13-git-send-email-lee.jones@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Each I2C device can be correctly probed already using Device Tree, but the sub-devices still have to be registered by calls to i2c_register_board_info(). After this patch, each sub-device can be registered directly from Device Tree instead, removing the requirement for the aforementioned calls from platform code. CC: linux-i2c at vger.kernel.org CC: Wolfram Sang Signed-off-by: Lee Jones --- drivers/i2c/busses/i2c-nomadik.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 5d1a970..01231c2 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -26,6 +26,7 @@ #include #include #include +#include #define DRIVER_NAME "nmk-i2c" @@ -998,6 +999,7 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) } adap = &dev->adap; + adap->dev.of_node = np; adap->dev.parent = &adev->dev; adap->owner = THIS_MODULE; adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; @@ -1027,6 +1029,8 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) goto err_add_adap; } + of_i2c_register_devices(adap); + pm_runtime_put(&adev->dev); return 0; -- 1.7.9.5