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

Commit 17a505ed authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/fixes-non-critical' into HEAD

parents d9a80746 b10dcdca

arch/arm/Kconfig

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

source "kernel/power/Kconfig"





config ARCH_SUSPEND_POSSIBLE

config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5PC100 && !ARCH_TEGRA

	depends on !ARCH_S5PC100

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

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

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

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

	def_bool y

	def_bool y

arch/arm/mach-ep93xx/adssphere.c

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

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/sizes.h>





#include <mach/hardware.h>

#include <mach/hardware.h>

arch/arm/mach-ep93xx/gesbc9312.c

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

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/sizes.h>





#include <mach/hardware.h>

#include <mach/hardware.h>

arch/arm/mach-ep93xx/ts72xx.c

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

#include <linux/mtd/partitions.h>





#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/ts72xx.h>





#include <asm/hardware/vic.h>

#include <asm/hardware/vic.h>

#include <asm/mach-types.h>

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

#include <asm/mach/arch.h>





#include "soc.h"

#include "soc.h"

#include "ts72xx.h"





static struct map_desc ts72xx_io_desc[] __initdata = {

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

		.pfn		= __phys_to_pfn(TS72XX_MODEL_PHYS_BASE),

		.length		= TS72XX_MODEL_SIZE,

		.length		= TS72XX_MODEL_SIZE,

		.type		= MT_DEVICE,

		.type		= MT_DEVICE,

	}, {

	}, {

		.virtual	= TS72XX_OPTIONS_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_OPTIONS_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE),

		.pfn		= __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE),

		.length		= TS72XX_OPTIONS_SIZE,

		.length		= TS72XX_OPTIONS_SIZE,

		.type		= MT_DEVICE,

		.type		= MT_DEVICE,

	}, {

	}, {

		.virtual	= TS72XX_OPTIONS2_VIRT_BASE,

		.virtual	= (unsigned long)TS72XX_OPTIONS2_VIRT_BASE,

		.pfn		= __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),

		.pfn		= __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),

		.length		= TS72XX_OPTIONS2_SIZE,

		.length		= TS72XX_OPTIONS2_SIZE,

		.type		= MT_DEVICE,

		.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),

		.pfn		= __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE),

		.length		= TS72XX_RTC_INDEX_SIZE,

		.length		= TS72XX_RTC_INDEX_SIZE,

		.type		= MT_DEVICE,

		.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),

		.pfn		= __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE),

		.length		= TS72XX_RTC_DATA_SIZE,

		.length		= TS72XX_RTC_DATA_SIZE,

		.type		= MT_DEVICE,

		.type		= MT_DEVICE,

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

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

 */





#define TS72XX_MODEL_PHYS_BASE		0x22000000

#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_SIZE		0x00001000





#define TS72XX_MODEL_TS7200		0x00

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








#define TS72XX_OPTIONS_PHYS_BASE	0x22400000

#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_SIZE		0x00001000





#define TS72XX_OPTIONS_COM2_RS485	0x02

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








#define TS72XX_OPTIONS2_PHYS_BASE	0x22800000

#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_SIZE		0x00001000





#define TS72XX_OPTIONS2_TS9420		0x04

#define TS72XX_OPTIONS2_TS9420		0x04

#define TS72XX_OPTIONS2_TS9420_BOOT	0x02

#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_PHYS_BASE	0x10800000

#define TS72XX_RTC_INDEX_SIZE		0x00001000

#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_PHYS_BASE	0x11700000

#define TS72XX_RTC_DATA_SIZE		0x00001000

#define TS72XX_RTC_DATA_SIZE		0x00001000