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

Commit ee8365f2 authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge branch 'master' into sh/cachetlb 

Conflicts:
	arch/sh/kernel/Makefile_64
parents 1b3edd97 e174d130

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 31

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Man-Eating Seals of Antiquity



# *DOCUMENTATION*

arch/sh/boards/mach-se/7724/setup.c

+5 −4
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static struct platform_device ceu1_device = { 
	},

};



/* KEYSC */

/* KEYSC in SoC (Needs SW33-2 set to ON) */

static struct sh_keysc_info keysc_info = {

	.mode = SH_KEYSC_MODE_1,

	.scan_timing = 10,
@@ -263,12 +263,13 @@ static struct sh_keysc_info keysc_info = { 


static struct resource keysc_resources[] = {

	[0] = {

		.start  = 0x1a204000,

		.end    = 0x1a20400f,

		.name	= "KEYSC",

		.start  = 0x044b0000,

		.end    = 0x044b000f,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = IRQ0_KEY,

		.start  = 79,

		.flags  = IORESOURCE_IRQ,

	},

};

arch/sh/drivers/heartbeat.c

+10 −0
Original line number Diff line number Diff line
@@ -40,14 +40,19 @@ static inline void heartbeat_toggle_bit(struct heartbeat_data *hd, 
	if (inverted)

		new = ~new;



	new &= hd->mask;



	switch (hd->regsize) {

	case 32:

		new |= ioread32(hd->base) & ~hd->mask;

		iowrite32(new, hd->base);

		break;

	case 16:

		new |= ioread16(hd->base) & ~hd->mask;

		iowrite16(new, hd->base);

		break;

	default:

		new |= ioread8(hd->base) & ~hd->mask;

		iowrite8(new, hd->base);

		break;

	}
@@ -72,6 +77,7 @@ static int heartbeat_drv_probe(struct platform_device *pdev) 
{

	struct resource *res;

	struct heartbeat_data *hd;

	int i;



	if (unlikely(pdev->num_resources != 1)) {

		dev_err(&pdev->dev, "invalid number of resources\n");
@@ -107,6 +113,10 @@ static int heartbeat_drv_probe(struct platform_device *pdev) 
		hd->nr_bits = ARRAY_SIZE(default_bit_pos);

	}



	hd->mask = 0;

	for (i = 0; i < hd->nr_bits; i++)

		hd->mask |= (1 << hd->bit_pos[i]);



	if (!hd->regsize)

		hd->regsize = 8;	/* default access size */

arch/sh/include/asm/dwarf.h

+4 −0
Original line number Diff line number Diff line
@@ -340,6 +340,10 @@ struct dwarf_stack { 
#define DW_CFA_lo_user		0x1c

#define DW_CFA_hi_user		0x3f



/* GNU extension opcodes  */

#define DW_CFA_GNU_args_size	0x2e

#define DW_CFA_GNU_negative_offset_extended 0x2f



/*

 * Some call frame instructions encode their operands in the opcode. We

 * need some helper functions to extract both the opcode and operands

arch/sh/include/asm/heartbeat.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ struct heartbeat_data { 
	unsigned int nr_bits;

	struct timer_list timer;

	unsigned int regsize;

	unsigned int mask;

	unsigned long flags;

};