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

Commit 47061eda authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull non-critical ARM soc bug fixes from Olof Johansson:
 "These were submitted as bug fixes before v3.6 but not considered
  important enough to be included in it.  Some of them cross over to
  cleanup territory as well, and aren't strictly bugfixes."

* tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
  ARM: nomadik: remove NAND_NO_READRDY use
  ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
  ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()
  ARM: S3C24XX: removes unnecessary semicolon
  ARM: S3C24xx: delete double assignment
  ARM: EXYNOS: fix address for EXYNOS4 MDMA1
  ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name
  ARM: ep93xx: Move ts72xx.h out of include/mach
  ARM: ep93xx: use __iomem pointers for MMIO
  ARM: msm: Fix early debug uart mapping on some memory configs
  ARM: msm: io: Change the default static iomappings to be shared
  ARM: msm: io: Remove 7x30 iomap region from 7x00
  ARM: msm: Remove call to missing FPGA init on 8660
  ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
  ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
  dma: tegra: make data used as *of_device_id.data const
  can: mpc5xxx_can: make data used as *of_device_id.data const
  macintosh/mediabay: make data used as *of_device_id.data const
  i2c/mpc: make data used as *of_device_id.data const
  mfd/da9052: make i2c_device_id array const
  ...
parents 797b9e5a b10dcdca

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2312,7 +2312,7 @@ menu "Power management options" 
source "kernel/power/Kconfig"



config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5PC100 && !ARCH_TEGRA

	depends on !ARCH_S5PC100

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK

	def_bool y

arch/arm/mach-ep93xx/adssphere.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/sizes.h>



#include <mach/hardware.h>

arch/arm/mach-ep93xx/gesbc9312.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/sizes.h>



#include <mach/hardware.h>

arch/arm/mach-ep93xx/ts72xx.c

+6 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/mtd/partitions.h>



#include <mach/hardware.h>

#include <mach/ts72xx.h>



#include <asm/hardware/vic.h>

#include <asm/mach-types.h>
@@ -29,30 +28,31 @@ 
#include <asm/mach/arch.h>



#include "soc.h"

#include "ts72xx.h"



static struct map_desc ts72xx_io_desc[] __initdata = {

	{

		.virtual	= TS72XX_MODEL_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_MODEL_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_MODEL_PHYS_BASE),

		.length		= TS72XX_MODEL_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_OPTIONS_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_OPTIONS_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE),

		.length		= TS72XX_OPTIONS_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_OPTIONS2_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_OPTIONS2_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),

		.length		= TS72XX_OPTIONS2_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_RTC_INDEX_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_RTC_INDEX_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE),

		.length		= TS72XX_RTC_INDEX_SIZE,

		.type		= MT_DEVICE,

	}, {

		.virtual	= TS72XX_RTC_DATA_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_RTC_DATA_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE),

		.length		= TS72XX_RTC_DATA_SIZE,

		.type		= MT_DEVICE,

arch/arm/mach-ep93xx/include/mach/ts72xx.h→arch/arm/mach-ep93xx/ts72xx.h

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 */



#define TS72XX_MODEL_PHYS_BASE		0x22000000

#define TS72XX_MODEL_VIRT_BASE		0xfebff000

#define TS72XX_MODEL_VIRT_BASE		IOMEM(0xfebff000)

#define TS72XX_MODEL_SIZE		0x00001000



#define TS72XX_MODEL_TS7200		0x00
@@ -26,7 +26,7 @@ 




#define TS72XX_OPTIONS_PHYS_BASE	0x22400000

#define TS72XX_OPTIONS_VIRT_BASE	0xfebfe000

#define TS72XX_OPTIONS_VIRT_BASE	IOMEM(0xfebfe000)

#define TS72XX_OPTIONS_SIZE		0x00001000



#define TS72XX_OPTIONS_COM2_RS485	0x02
@@ -34,18 +34,18 @@ 




#define TS72XX_OPTIONS2_PHYS_BASE	0x22800000

#define TS72XX_OPTIONS2_VIRT_BASE	0xfebfd000

#define TS72XX_OPTIONS2_VIRT_BASE	IOMEM(0xfebfd000)

#define TS72XX_OPTIONS2_SIZE		0x00001000



#define TS72XX_OPTIONS2_TS9420		0x04

#define TS72XX_OPTIONS2_TS9420_BOOT	0x02





#define TS72XX_RTC_INDEX_VIRT_BASE	0xfebf9000

#define TS72XX_RTC_INDEX_VIRT_BASE	IOMEM(0xfebf9000)

#define TS72XX_RTC_INDEX_PHYS_BASE	0x10800000

#define TS72XX_RTC_INDEX_SIZE		0x00001000



#define TS72XX_RTC_DATA_VIRT_BASE	0xfebf8000

#define TS72XX_RTC_DATA_VIRT_BASE	IOMEM(0xfebf8000)

#define TS72XX_RTC_DATA_PHYS_BASE	0x11700000

#define TS72XX_RTC_DATA_SIZE		0x00001000