leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add platform support needed for the

Browse Source 
newly introduced PalmChip PATA driver.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJY4z+ZAAoJEGFBu2jqvgRNgmUP/0np1YGmV3FdxlK4GDEYo6hu
 KrYtuo7GElMoOSN21iXvLGI7YCrtO5uf1DXSZJ+4PhVu8OEulKVkbtULGzOPrYhm
 a0YWWukyXpP4tJXFi625SBmzVzecZ/hJPXaVoooYNhjmvf5SA3QrcMjS06kzyURA
 1WI5qCGSmSZa14ST1rPyRZGKzDRH7R0v/DM/mg+1LG/qnvwAkLFunQTu7XMZfRLk
 TsSN4Ckcihypzg8xzVxYnE/BAZYvk/2KWFg5ObGcHxQahbXigIP+sW5/a1YSUaTR
 BUMFvVmXRRKnicTsyMIQwYQJQBl6JP9C+II/BL91xLZrNfndDIOnH1AlxmrzUxJk
 bNz4z5Ds7yblZlz4aJgHv2ysHvM35aCErbg/DPa6DDpfIz9IVV461K1gmMHxktTl
 PlPfzWXsLmeTN+eJVmBnVs6hvWpwQo2TJpyStHJ3c42sgH/mqm2w5zl69mWkNG+E
 2ikAzc3qs2DoFoKKlK98VFfUCZgPS0X1qoYR8VRWeLG+qPVDxDRxCYhFfVVB0HGd
 CRp04q/EjDUCbYAjSJ1VPA7fUvPTIWly3xVbGpcUjrtbzlSQLeilCnlKA8FMGTR5
 CCKG4BzJI5RXFUU2YY+xUc344taCcfEivjPbn/zwXecSmgxvr/2AXzCLXhrTqO7F
 9aIFU0dL3fdnLkR3QrE/
 =WICX
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-04-19 05:27:39 -07:00
commit 3384d2f651
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/mach-davinci/board-dm644x-evm.c
View File

@ -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)

3
arch/arm/mach-davinci/board-dm646x-evm.c
View File

@ -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 */

3
arch/arm/mach-davinci/board-neuros-osd2.c
View File

@ -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)