renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

Two non critical fixes that can go in 3.11.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJRwBmFAAoJEAf03oE53VmQ66wH/Rs/7NV9kJZgpkLALi04Sw23
 Mee2+wyu0NHPtJCu95FxsnP2JZD2NcoCA08iHiRg256BIFj/w62T5wgW672bt0oo
 nuniLsqjPhbl7+j9mZPVZ2aWJtoo8gptKIuZxKIMsr4jfKd876CL3QoA/zjUNK5I
 WAkYd6HOGRKPhIUy95sN0u4v6Clj43GNNp2RTsTnvUKg0v/gJJjERete0VDew/+P
 WGK8VlHyvP/n5weSKIUTzFEBhBqfAYcqINejPCo6IzuUNseclJFcrnQBSKZb6KLP
 RRMoB9kU4j2en9q7tpOFEtz/s1knc+c93YMkmjCkoDSRbgOENcppfYYdnVAznWk=
 =gkn4
 -----END PGP SIGNATURE-----

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into next/fixes-non-critical

From Nicolas Ferre:

Two non critical fixes that can go in 3.11.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: Change the internal SRAM memory type MT_MEMORY_NONCACHED
  ARM: at91: Fix link breakage when !CONFIG_PHYLIB

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2013-06-20 15:13:31 +02:00
commit 51bbd7de49
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-at91/Kconfig
View File

@ -163,6 +163,7 @@ config MACH_SAMA5_DT
bool "Atmel SAMA5 Evaluation Kits with device-tree support"
depends on SOC_SAMA5
select USE_OF
select PHYLIB if NETDEVICES
help
Select this if you want to experiment device-tree with
an Atmel Evaluation Kit.

3
arch/arm/mach-at91/board-dt-sama5.c
View File

@ -62,7 +62,8 @@ static int ksz9021rn_phy_fixup(struct phy_device *phy)
static void __init sama5_dt_device_init(void)
{
if (of_machine_is_compatible("atmel,sama5d3xcm"))
if (of_machine_is_compatible("atmel,sama5d3xcm") &&
IS_ENABLED(CONFIG_PHYLIB))
phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
ksz9021rn_phy_fixup);

2
arch/arm/mach-at91/setup.c
View File

@ -80,7 +80,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
desc->pfn = __phys_to_pfn(base);
desc->length = length;
desc->type = MT_DEVICE;
desc->type = MT_MEMORY_NONCACHED;
pr_info("AT91: sram at 0x%lx of 0x%x mapped at 0x%lx\n",
base, length, desc->virtual);