@@ -570,7 +570,8 @@ static int xgpio_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, chip);
/* First, check if the device is dual-channel */
- of_property_read_u32(np, "xlnx,is-dual", &is_dual);
+ if (of_property_read_u32(np, "xlnx,is-dual", &is_dual))
+ is_dual = 0;
/* Setup defaults */
memset32(width, 0, ARRAY_SIZE(width));
@@ -578,14 +579,18 @@ static int xgpio_probe(struct platform_device *pdev)
memset32(dir, 0xFFFFFFFF, ARRAY_SIZE(dir));
/* Update GPIO state shadow register with default value */
- of_property_read_u32(np, "xlnx,dout-default", &state[0]);
- of_property_read_u32(np, "xlnx,dout-default-2", &state[1]);
+ if (of_property_read_u32(np, "xlnx,dout-default", &state[0]))
+ state[0] = 0x0;
+ if (of_property_read_u32(np, "xlnx,dout-default-2", &state[1]))
+ state[1] = 0x0;
bitmap_from_arr32(chip->state, state, 64);
/* Update GPIO direction shadow register with default value */
- of_property_read_u32(np, "xlnx,tri-default", &dir[0]);
- of_property_read_u32(np, "xlnx,tri-default-2", &dir[1]);
+ if (of_property_read_u32(np, "xlnx,tri-default", &dir[0]))
+ dir[0] = 0xFFFFFFFF;
+ if (of_property_read_u32(np, "xlnx,tri-default-2", &dir[1]))
+ dir[1] = 0xFFFFFFFF;
bitmap_from_arr32(chip->dir, dir, 64);