summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2012-10-10 12:27:25 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-04-16 12:36:52 (GMT)
commit8b5f0ee5b4ff25e2d33db563f190cc891b40163f (patch)
treef50dd96c01cd4b6eeaef37ec124f6d547217df72
parent1dd020f3b45f406d522cb5f0e66eb95a1b94a654 (diff)
downloadlinux-3.10-8b5f0ee5b4ff25e2d33db563f190cc891b40163f.zip
linux-3.10-8b5f0ee5b4ff25e2d33db563f190cc891b40163f.tar.gz
linux-3.10-8b5f0ee5b4ff25e2d33db563f190cc891b40163f.tar.bz2
amba-clcd: Remove check for 'reg' value in clcdfb_probe
This check was attempting to ensure only one clcd device in the device-tree was probed, however the check fails in the valid case where the device is a child of another device and the 'reg' value is a offset from the start of that other device, not an absolute address. This occurs on vexpress with the motherboard clcd being a child of iofga. For now, we will just have to rely on there only being one display device specified in device-tree. Signed-off-by: Jon Medhurst <tixy@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
-rw-r--r--drivers/video/amba-clcd.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c
index 01dbad1..04fa00f 100644
--- a/drivers/video/amba-clcd.c
+++ b/drivers/video/amba-clcd.c
@@ -771,21 +771,6 @@ static int clcdfb_probe(struct amba_device *dev, const struct amba_id *id)
#ifdef CONFIG_OF
if (dev->dev.of_node) {
- const __be32 *prop;
- int len, na, ns;
- phys_addr_t reg_base;
-
- na = of_n_addr_cells(dev->dev.of_node);
- ns = of_n_size_cells(dev->dev.of_node);
-
- prop = of_get_property(dev->dev.of_node, "reg", &len);
- if (WARN_ON(!prop || len < (na + ns) * sizeof(*prop)))
- return -EINVAL;
- reg_base = of_read_number(prop, na);
-
- if (dev->res.start != reg_base)
- return -EINVAL;
-
if (!board) {
board = kzalloc(sizeof(struct clcd_board), GFP_KERNEL);
if (!board)