Commit 51bbd7de authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents c5dece37 133e0011

arch/arm/mach-at91/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -163,6 +163,7 @@ config MACH_SAMA5_DT 
	bool "Atmel SAMA5 Evaluation Kits with device-tree support"

	bool "Atmel SAMA5 Evaluation Kits with device-tree support"

	depends on SOC_SAMA5

	depends on SOC_SAMA5

	select USE_OF

	select USE_OF

	select PHYLIB if NETDEVICES

	help

	help

	  Select this if you want to experiment device-tree with

	  Select this if you want to experiment device-tree with

	  an Atmel Evaluation Kit.

	  an Atmel Evaluation Kit.

arch/arm/mach-at91/board-dt-sama5.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,8 @@ static int ksz9021rn_phy_fixup(struct phy_device *phy) 




static void __init sama5_dt_device_init(void)

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,

		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,

			ksz9021rn_phy_fixup);

			ksz9021rn_phy_fixup);

arch/arm/mach-at91/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length) 




	desc->pfn = __phys_to_pfn(base);

	desc->pfn = __phys_to_pfn(base);

	desc->length = length;

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

	pr_info("AT91: sram at 0x%lx of 0x%x mapped at 0x%lx\n",

		base, length, desc->virtual);

		base, length, desc->virtual);