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

Commit 3384d2f6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-for-v4.12/soc-2' of... 

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

Add platform support needed for the
newly introduced PalmChip PATA driver.

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

:
  ARM: davinci: add pata_bk3710 libata driver support

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f0008e9b 28d4d1d0

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

+2 −1
Original line number Diff line number Diff line
@@ -744,7 +744,8 @@ static int davinci_phy_fixup(struct phy_device *phydev) 
	return 0;

}



#define HAS_ATA		IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)

#define HAS_ATA		(IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \

			 IS_ENABLED(CONFIG_PATA_BK3710))



#define HAS_NOR		IS_ENABLED(CONFIG_MTD_PHYSMAP)

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

+2 −1
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ static struct platform_device davinci_nand_device = { 
	},

};



#define HAS_ATA		IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)

#define HAS_ATA		(IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \

			 IS_ENABLED(CONFIG_PATA_BK3710))



#ifdef CONFIG_I2C

/* CPLD Register 0 bits to control ATA */

arch/arm/mach-davinci/board-neuros-osd2.c

+2 −1
Original line number Diff line number Diff line
@@ -163,7 +163,8 @@ static struct davinci_mmc_config davinci_ntosd2_mmc_config = { 
	.wires		= 4,

};



#define HAS_ATA		IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710)

#define HAS_ATA		(IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \

			 IS_ENABLED(CONFIG_PATA_BK3710))



#define HAS_NAND	IS_ENABLED(CONFIG_MTD_NAND_DAVINCI)