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

Commit f40739fa authored by Jon Hunter's avatar Jon Hunter Committed by Tony Lindgren
Browse files

ARM: dts: OMAP2+: Simplify NAND support 



Commit 8c8a7771 (ARM: OMAP2+: Add function to read GPMC settings from
device-tree) added a device-tree property "gpmc,device-nand" to indicate
is the GPMC child device is NAND. This commit should have updated the
GPMC NAND documentation (Documentation/devicetree/bindings/mtd/gpmc-nand.txt)
to list the property "gpmc,device-nand" as a required property and also
updated the example. However, this property is redundant and not needed
because the GPMC child device node for NAND is called "nand". Therefore,
remove this property.

Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 496c8a0b

Documentation/devicetree/bindings/bus/ti-gpmc.txt

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ GPMC chip-select settings properties for child nodes. All are optional. 
- gpmc,burst-wrap	Enables wrap bursting

- gpmc,burst-read	Enables read page/burst mode

- gpmc,burst-write	Enables write page/burst mode

- gpmc,device-nand	Device is NAND

- gpmc,device-width	Total width of device(s) connected to a GPMC

			chip-select in bytes. The GPMC supports 8-bit

			and 16-bit devices and so this property must be

arch/arm/boot/dts/omap3430-sdp.dts

+0 −1
Original line number Diff line number Diff line
@@ -105,7 +105,6 @@ 
		nand-bus-width = <8>;



		ti,nand-ecc-opt = "sw";

		gpmc,device-nand;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <36>;

		gpmc,cs-wr-off-ns = <36>;

arch/arm/mach-omap2/gpmc-nand.c

+2 −2
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, 
		if (gpmc_nand_data->of_node) {

			gpmc_read_settings_dt(gpmc_nand_data->of_node, &s);

		} else {

			s.device_nand = true;



			/* Enable RD PIN Monitoring Reg */

			if (gpmc_nand_data->dev_ready) {

				s.wait_on_read = true;
@@ -111,6 +109,8 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data, 
			}

		}



		s.device_nand = true;



		if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)

			s.device_width = GPMC_DEVWIDTH_16BIT;

		else

arch/arm/mach-omap2/gpmc.c

+0 −1
Original line number Diff line number Diff line
@@ -1245,7 +1245,6 @@ void gpmc_read_settings_dt(struct device_node *np, struct gpmc_settings *p) 


	p->sync_read = of_property_read_bool(np, "gpmc,sync-read");

	p->sync_write = of_property_read_bool(np, "gpmc,sync-write");

	p->device_nand = of_property_read_bool(np, "gpmc,device-nand");

	of_property_read_u32(np, "gpmc,device-width", &p->device_width);

	of_property_read_u32(np, "gpmc,mux-add-data", &p->mux_add_data);