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

Commit 7c0a57d5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.marvell.com/orion 

* 'fixes' of git://git.marvell.com/orion:
  [ARM] Orion NAND: Make asm volatile avoid GCC pushing ldrd out of the loop
  [ARM] Kirkwood: enable eSATA on QNAP TS-219P
  [ARM] Kirkwood: __init requires linux/init.h
parents 353d5c30 94da210a

arch/arm/configs/kirkwood_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -629,7 +629,7 @@ CONFIG_SCSI_LOWLEVEL=y 
CONFIG_ATA=y

# CONFIG_ATA_NONSTANDARD is not set

CONFIG_SATA_PMP=y

# CONFIG_SATA_AHCI is not set

CONFIG_SATA_AHCI=y

# CONFIG_SATA_SIL24 is not set

CONFIG_ATA_SFF=y

# CONFIG_SATA_SVW is not set

arch/arm/mach-kirkwood/ts219-setup.c

+9 −0
Original line number Diff line number Diff line
@@ -206,6 +206,15 @@ static void __init qnap_ts219_init(void) 


}



static int __init ts219_pci_init(void)

{

   if (machine_is_ts219())

           kirkwood_pcie_init();



   return 0;

}

subsys_initcall(ts219_pci_init);



MACHINE_START(TS219, "QNAP TS-119/TS-219")

	/* Maintainer: Martin Michlmayr <tbm@cyrius.com> */

	.phys_io	= KIRKWOOD_REGS_PHYS_BASE,

arch/arm/plat-orion/include/plat/gpio.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#ifndef __PLAT_GPIO_H

#define __PLAT_GPIO_H



#include <linux/init.h>



/*

 * GENERIC_GPIO primitives.

 */

drivers/mtd/nand/orion_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static void orion_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) 
	buf64 = (uint64_t *)buf;

	while (i < len/8) {

		uint64_t x;

		asm ("ldrd\t%0, [%1]" : "=r" (x) : "r" (io_base));

		asm volatile ("ldrd\t%0, [%1]" : "=&r" (x) : "r" (io_base));

		buf64[i++] = x;

	}

	i *= 8;