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

Commit 8787ad35 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v4.18/soc' of... 

Merge tag 'davinci-for-v4.18/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

DaVinci SoC support updates for v4.18

Mainly contains patches to move NAND chipselect to platform data
(currently platform device id is being used). These patches have
been acked by NAND maintainer and because of the driver dependency
an immutable branch has been provided to Boris.

The other patch is to remove an unnecessary postcore_initcall() on
DM644x which is needed for common clock framework conversion.

* tag 'davinci-for-v4.18/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: dm644x: remove unnecessary postcore_initcall()
  ARM: davinci: aemif: stop using pdev->id as nand chipselect
  mtd: rawnand: davinci: stop using pdev->id as chipselect
  ARM: davinci: neuros-osd2: specify the chipselect in davinci_nand_pdata
  ARM: davinci: dm646x-evm: specify the chipselect in davinci_nand_pdata
  ARM: davinci: mityomapl138: specify the chipselect in davinci_nand_pdata
  ARM: davinci: dm644x-evm: specify the chipselect in davinci_nand_pdata
  ARM: davinci: dm365-evm: specify the chipselect in davinci_nand_pdata
  ARM: davinci: dm355-leopard: specify the chipselect in davinci_nand_pdata
  ARM: davinci: dm355-evm: specify the chipselect in davinci_nand_pdata
  ARM: davinci: da850-evm: specify the chipselect in davinci_nand_pdata
  ARM: davinci: da830-evm: specify the chipselect in davinci_nand_pdata
  mtd: rawnand: davinci: store the core chipselect number in platform data

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3a19f20c ccfadbb7

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");

arch/arm/mach-davinci/board-da830-evm.c

+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,

arch/arm/mach-davinci/board-da850-evm.c

+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,

arch/arm/mach-davinci/board-dm355-evm.c

+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),

arch/arm/mach-davinci/board-dm355-leopard.c

+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),