Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd8eb629 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v4.13/gpmc-signed' of... 

Merge tag 'omap-for-v4.13/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/drivers

Few improvments for GPMC (General Purpose Memory Controller)
found on TI SoCs to produce an error for missing bank-width
and to make the bootloader timing debug output usable for
device tree timings.

* tag 'omap-for-v4.13/gpmc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  memory: omap-gpmc: add error message if bank-width property is absent
  memory: omap-gpmc: make dts snippet include semicolon

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5ed02dbb c9eabf40

drivers/memory/omap-gpmc.c

+6 −3
Original line number Diff line number Diff line
@@ -460,12 +460,12 @@ static int get_gpmc_timing_reg( 
		if (l)

			time_ns_min = gpmc_clk_ticks_to_ns(l - 1, cs, cd) + 1;

		time_ns = gpmc_clk_ticks_to_ns(l, cs, cd);

		pr_info("gpmc,%s = <%u> /* %u ns - %u ns; %i ticks%s*/\n",

		pr_info("gpmc,%s = <%u>; /* %u ns - %u ns; %i ticks%s*/\n",

			name, time_ns, time_ns_min, time_ns, l,

			invalid ? "; invalid " : " ");

	} else {

		/* raw format */

		pr_info("gpmc,%s = <%u>%s\n", name, l,

		pr_info("gpmc,%s = <%u>;%s\n", name, l,

			invalid ? " /* invalid */" : "");

	}
@@ -2083,9 +2083,12 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, 
	} else {

		ret = of_property_read_u32(child, "bank-width",

					   &gpmc_s.device_width);

		if (ret < 0)

		if (ret < 0) {

			dev_err(&pdev->dev, "%s has no 'bank-width' property\n",

				child->full_name);

			goto err;

		}

	}



	/* Reserve wait pin if it is required and valid */

	if (gpmc_s.wait_on_read || gpmc_s.wait_on_write) {