Merge branch 'v4.18/nand-cs-simplification' into v4.18/soc (ccfadbb7) · Commits · 戴 / test

arch/arm/mach-davinci/aemif.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@ int davinci_aemif_setup(struct platform_device *pdev)
		* Setup Async configuration register in case we did not boot
		* from NAND and so bootloader did not bother to set it up.
		*/
		val = davinci_aemif_readl(base, A1CR_OFFSET + pdev->id * 4);
		val = davinci_aemif_readl(base, A1CR_OFFSET + pdata->core_chipsel * 4);
		/*
		* Extended Wait is not valid and Select Strobe mode is not
		* used
		@@ -198,13 +198,13 @@ int davinci_aemif_setup(struct platform_device *pdev)
		if (pdata->options & NAND_BUSWIDTH_16)
		val \|= 0x1;

		davinci_aemif_writel(base, A1CR_OFFSET + pdev->id * 4, val);
		davinci_aemif_writel(base, A1CR_OFFSET + pdata->core_chipsel * 4, val);

		clkrate = clk_get_rate(clk);

		if (pdata->timing)
		ret = davinci_aemif_setup_timing(pdata->timing, base, pdev->id,
		clkrate);
		ret = davinci_aemif_setup_timing(pdata->timing, base,
		pdata->core_chipsel, clkrate);

		if (ret < 0)
		dev_dbg(&pdev->dev, "NAND timing values setup fail\n");

+1 −0

Original line number	Diff line number	Diff line
		@@ -310,6 +310,7 @@ static struct davinci_aemif_timing da830_evm_nandflash_timing = {
		};

		static struct davinci_nand_pdata da830_evm_nand_pdata = {
		.core_chipsel = 1,
		.parts = da830_evm_nand_partitions,
		.nr_parts = ARRAY_SIZE(da830_evm_nand_partitions),
		.ecc_mode = NAND_ECC_HW,

+1 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,7 @@ static struct davinci_aemif_timing da850_evm_nandflash_timing = {
		};

		static struct davinci_nand_pdata da850_evm_nandflash_data = {
		.core_chipsel = 1,
		.parts = da850_evm_nandflash_partition,
		.nr_parts = ARRAY_SIZE(da850_evm_nandflash_partition),
		.ecc_mode = NAND_ECC_HW,

+1 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,7 @@ static struct mtd_partition davinci_nand_partitions[] = {
		};

		static struct davinci_nand_pdata davinci_nand_data = {
		.core_chipsel = 0,
		.mask_chipsel = BIT(14),
		.parts = davinci_nand_partitions,
		.nr_parts = ARRAY_SIZE(davinci_nand_partitions),

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,6 +72,7 @@ static struct mtd_partition davinci_nand_partitions[] = {
		};

		static struct davinci_nand_pdata davinci_nand_data = {
		.core_chipsel = 0,
		.mask_chipsel = BIT(14),
		.parts = davinci_nand_partitions,
		.nr_parts = ARRAY_SIZE(davinci_nand_partitions),