Merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git (84e48b6d) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/arm/boot/compressed/head.S

+22 −83

Original line number	Diff line number	Diff line
		@@ -18,48 +18,30 @@
		* Please select one of the following when turning on debugging.
		*/
		#ifdef DEBUG
		#if defined(CONFIG_DEBUG_DC21285_PORT)
		.macro loadsp, rb
		mov \rb, #0x42000000
		.endm
		.macro writeb, rb
		str \rb, [r3, #0x160]
		.endm
		#elif defined(CONFIG_DEBUG_ICEDCC)
		.macro loadsp, rb
		.endm
		.macro writeb, rb
		mcr p14, 0, \rb, c0, c1, 0
		.endm
		#elif defined(CONFIG_FOOTBRIDGE)
		.macro loadsp, rb
		mov \rb, #0x7c000000
		.endm
		.macro writeb, rb
		strb \rb, [r3, #0x3f8]
		.endm
		#elif defined(CONFIG_ARCH_RPC)

		#include <asm/arch/debug-macro.S>

		#if defined(CONFIG_DEBUG_ICEDCC)
		.macro loadsp, rb
		mov \rb, #0x03000000
		orr \rb, \rb, #0x00010000
		.endm
		.macro writeb, rb
		strb \rb, [r3, #0x3f8 << 2]
		.endm
		#elif defined(CONFIG_ARCH_INTEGRATOR)
		.macro loadsp, rb
		mov \rb, #0x16000000
		.macro writeb, ch, rb
		mcr p14, 0, \ch, c0, c1, 0
		.endm
		.macro writeb, rb
		strb \rb, [r3, #0]
		#else
		.macro writeb, ch, rb
		senduart \ch, \rb
		.endm
		#elif defined(CONFIG_ARCH_PXA) /* Xscale-type */

		#if defined(CONFIG_FOOTBRIDGE) \|\| \
		defined(CONFIG_ARCH_RPC) \|\| \
		defined(CONFIG_ARCH_INTEGRATOR) \|\| \
		defined(CONFIG_ARCH_PXA) \|\| \
		defined(CONFIG_ARCH_IXP4XX) \|\| \
		defined(CONFIG_ARCH_IXP2000) \|\| \
		defined(CONFIG_ARCH_LH7A40X) \|\| \
		defined(CONFIG_ARCH_OMAP)
		.macro loadsp, rb
		mov \rb, #0x40000000
		orr \rb, \rb, #0x00100000
		.endm
		.macro writeb, rb
		strb \rb, [r3, #0]
		addruart \rb
		.endm
		#elif defined(CONFIG_ARCH_SA1100)
		.macro loadsp, rb
		@@ -70,64 +52,21 @@
		add \rb, \rb, #0x00010000 @ Ser1
		# endif
		.endm
		.macro writeb, rb
		str \rb, [r3, #0x14] @ UTDR
		.endm
		#elif defined(CONFIG_ARCH_IXP4XX)
		.macro loadsp, rb
		mov \rb, #0xc8000000
		.endm
		.macro writeb, rb
		str \rb, [r3, #0]
		#elif defined(CONFIG_ARCH_IXP2000)
		.macro loadsp, rb
		mov \rb, #0xc0000000
		orr \rb, \rb, #0x00030000
		.endm
		.macro writeb, rb
		str \rb, [r3, #0]
		.endm
		#elif defined(CONFIG_ARCH_LH7A40X)
		.macro loadsp, rb
		ldr \rb, =0x80000700 @ UART2 UARTBASE
		.endm
		.macro writeb, rb
		strb \rb, [r3, #0]
		.endm
		#elif defined(CONFIG_ARCH_OMAP)
		.macro loadsp, rb
		mov \rb, #0xff000000 @ physical base address
		add \rb, \rb, #0x00fb0000
		#if defined(CONFIG_OMAP_LL_DEBUG_UART2) \|\| defined(CONFIG_OMAP_LL_DEBUG_UART3)
		add \rb, \rb, #0x00000800
		#endif
		#ifdef CONFIG_OMAP_LL_DEBUG_UART3
		add \rb, \rb, #0x00009000
		#endif
		.endm
		.macro writeb, rb
		strb \rb, [r3]
		.endm
		#elif defined(CONFIG_ARCH_IOP331)
		.macro loadsp, rb
		mov \rb, #0xff000000
		orr \rb, \rb, #0x00ff0000
		orr \rb, \rb, #0x0000f700 @ location of the UART
		.endm
		.macro writeb, rb
		str \rb, [r3, #0]
		.endm
		#elif defined(CONFIG_ARCH_S3C2410)
		.macro loadsp, rb
		mov \rb, #0x50000000
		add \rb, \rb, #0x4000 * CONFIG_S3C2410_LOWLEVEL_UART_PORT
		.endm
		.macro writeb, rb
		strb \rb, [r3, #0x20]
		.endm
		#else
		#error no serial architecture defined
		#endif
		#endif
		#endif

		.macro kputc,val
		@@ -734,7 +673,7 @@ puts: loadsp r3
		1: ldrb r2, [r0], #1
		teq r2, #0
		moveq pc, lr
		2: writeb r2
		2: writeb r2, r3
		mov r1, #0x00020000
		3: subs r1, r1, #1
		bne 3b

arch/arm/mach-imx/generic.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <linux/init.h>
		#include <linux/kernel.h>
		#include <linux/module.h>
		#include <asm/arch/imxfb.h>
		#include <asm/hardware.h>

		#include <asm/mach/map.h>
		@@ -228,6 +229,14 @@ static struct platform_device imx_uart2_device = {
		.resource = imx_uart2_resources,
		};

		static struct imxfb_mach_info imx_fb_info;

		void __init set_imx_fb_info(struct imxfb_mach_info *hard_imx_fb_info)
		{
		memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imxfb_mach_info));
		}
		EXPORT_SYMBOL(set_imx_fb_info);

		static struct resource imxfb_resources[] = {
		[0] = {
		.start = 0x00205000,
		@@ -241,9 +250,16 @@ static struct resource imxfb_resources[] = {
		},
		};

		static u64 fb_dma_mask = ~(u64)0;

		static struct platform_device imxfb_device = {
		.name = "imx-fb",
		.id = 0,
		.dev = {
		.platform_data = &imx_fb_info,
		.dma_mask = &fb_dma_mask,
		.coherent_dma_mask = 0xffffffff,
		},
		.num_resources = ARRAY_SIZE(imxfb_resources),
		.resource = imxfb_resources,
		};

arch/arm/mach-integrator/core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -216,7 +216,9 @@ integrator_timer_interrupt(int irq, void dev_id, struct pt_regs regs)

		write_seqlock(&xtime_lock);

		// ...clear the interrupt
		/*
		* clear the interrupt
		*/
		timer1->TimerClear = 1;

		timer_tick(regs);

arch/arm/mm/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -413,6 +413,7 @@ config CPU_BPREDICT_DISABLE
		config HAS_TLS_REG
		bool
		depends on CPU_32v6 && !CPU_32v5 && !CPU_32v4 && !CPU_32v3
		default y
		help
		This selects support for the CP15 thread register.
		It is defined to be available on ARMv6 or later. However

drivers/video/cyber2000fb.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -90,6 +90,8 @@ struct cfb_info {
		*/
		u_char ramdac_ctrl;
		u_char ramdac_powerdown;

		u32 pseudo_palette[16];
		};

		static char *default_font = "Acorn8x8";
		@@ -1223,9 +1225,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)
		{
		struct cfb_info *cfb;

		cfb = kmalloc(sizeof(struct cfb_info) +
		sizeof(u32) * 16, GFP_KERNEL);

		cfb = kmalloc(sizeof(struct cfb_info), GFP_KERNEL);
		if (!cfb)
		return NULL;

		@@ -1281,7 +1281,7 @@ cyberpro_alloc_fb_info(unsigned int id, char *name)

		cfb->fb.fbops = &cyber2000fb_ops;
		cfb->fb.flags = FBINFO_DEFAULT \| FBINFO_HWACCEL_YPAN;
		cfb->fb.pseudo_palette = (void *)(cfb + 1);
		cfb->fb.pseudo_palette = cfb->pseudo_palette;

		fb_alloc_cmap(&cfb->fb.cmap, NR_PALETTE, 0);