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

Commit 4c752782 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc 

* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
  ARM: CSR: add missing sentinels to of_device_id tables
  ARM: cns3xxx: Fix newly introduced warnings in the PCIe code
  ARM: cns3xxx: Fix compile error caused by hardware.h removed
  ARM: davinci: fix cache flush build error
  ARM: davinci: correct MDSTAT_STATE_MASK
  ARM: davinci: da850 EVM: read mac address from SPI flash
  OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers
  OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]
  OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
  OMAP4: clock: fix compile warning
  OMAP4: clock: re-enable previous clockdomain enable/disable sequence
  OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup
  OMAP: powerdomains: Make all powerdomain target states as ON at init
parents 14d01ff5 15ce9286

arch/arm/mach-cns3xxx/include/mach/entry-macro.S

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 * published by the Free Software Foundation.

 */



#include <mach/hardware.h>

#include <asm/hardware/entry-macro-gic.S>



		.macro	disable_fiq

arch/arm/mach-cns3xxx/include/mach/system.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include <linux/io.h>

#include <asm/proc-fns.h>

#include <mach/hardware.h>



static inline void arch_idle(void)

{

arch/arm/mach-cns3xxx/include/mach/uncompress.h

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
 */



#include <asm/mach-types.h>

#include <mach/hardware.h>

#include <mach/cns3xxx.h>



#define AMBA_UART_DR(base)	(*(volatile unsigned char *)((base) + 0x00))

arch/arm/mach-cns3xxx/pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static struct cns3xxx_pcie *sysdata_to_cnspci(void *sysdata) 
	return &cns3xxx_pcie[root->domain];

}



static struct cns3xxx_pcie *pdev_to_cnspci(struct pci_dev *dev)

static struct cns3xxx_pcie *pdev_to_cnspci(const struct pci_dev *dev)

{

	return sysdata_to_cnspci(dev->sysdata);

}

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

+28 −0
Original line number Diff line number Diff line
@@ -115,6 +115,32 @@ static struct spi_board_info da850evm_spi_info[] = { 
	},

};



#ifdef CONFIG_MTD

static void da850_evm_m25p80_notify_add(struct mtd_info *mtd)

{

	char *mac_addr = davinci_soc_info.emac_pdata->mac_addr;

	size_t retlen;



	if (!strcmp(mtd->name, "MAC-Address")) {

		mtd->read(mtd, 0, ETH_ALEN, &retlen, mac_addr);

		if (retlen == ETH_ALEN)

			pr_info("Read MAC addr from SPI Flash: %pM\n",

				mac_addr);

	}

}



static struct mtd_notifier da850evm_spi_notifier = {

	.add	= da850_evm_m25p80_notify_add,

};



static void da850_evm_setup_mac_addr(void)

{

	register_mtd_user(&da850evm_spi_notifier);

}

#else

static void da850_evm_setup_mac_addr(void) { }

#endif



static struct mtd_partition da850_evm_norflash_partition[] = {

	{

		.name           = "bootloaders + env",
@@ -1244,6 +1270,8 @@ static __init void da850_evm_init(void) 
	if (ret)

		pr_warning("da850_evm_init: sata registration failed: %d\n",

				ret);



	da850_evm_setup_mac_addr();

}



#ifdef CONFIG_SERIAL_8250_CONSOLE