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

Commit 541e40ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 

* 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
  sh: Silence unintialized variable warnings in dwarf unwinder.
  sh: Tidy up a couple of section mismatches.
  sh: Fix build after dynamic PMB rework
  sh: Replace unsafe manipulation of MMUCR
  sh: Flush ITLB too in PTEAEX's flush_tlb_page()
  sh64: Remove long unused mid_sched macro
  SH: remove superfluous warning from the serial driver
  SH: fix SCIFA SCASCR register bit definitions
  serial: sh-sci: fix SH-Mobile SH breakage
  sh: Add watch-dog register address for SH7722/SH7723/SH7724
  sh: ms7724: Add tiny-document for sound
  sh: mach-ecovec24: Add i2c_put_adapter on sh_eth_init
parents 1147d0f9 4e1a2594

arch/sh/boards/mach-ecovec24/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -836,6 +836,8 @@ static void __init sh_eth_init(struct sh_eth_plat_data *pd) 
		pd->mac_addr[i] = mac_read(a, 0x10 + i);

		msleep(10);

	}



	i2c_put_adapter(a);

}

#else

static void __init sh_eth_init(struct sh_eth_plat_data *pd)

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

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,13 @@ 
 * and change SW41 to use 720p

 */



/*

 * about sound

 *

 * This setup.c supports FSI slave mode.

 * Please change J20, J21, J22 pin to 1-2 connection.

 */



/* Heartbeat */

static struct resource heartbeat_resource = {

	.start  = PA_LED,
@@ -276,6 +283,7 @@ static struct clk fsimcka_clk = { 
	.rate		= 0, /* unknown */

};



/* change J20, J21, J22 pin to 1-2 connection to use slave mode */

struct sh_fsi_platform_info fsi_info = {

	.porta_flags = SH_FSI_BRS_INV |

		       SH_FSI_OUT_SLAVE_MODE |

arch/sh/include/cpu-sh4/cpu/mmu_context.h

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


#define MMUCR		0xFF000010	/* MMU Control Register */



#define MMU_ITLB_ADDRESS_ARRAY  0xF2000000

#define MMU_ITLB_ADDRESS_ARRAY2	0xF2800000

#define MMU_UTLB_ADDRESS_ARRAY	0xF6000000

#define MMU_UTLB_ADDRESS_ARRAY2	0xF6800000

#define MMU_PAGE_ASSOC_BIT	0x80

arch/sh/include/cpu-sh4/cpu/watchdog.h

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,12 @@ 
#define WTCNT		0xffcc0000 /*WDTST*/

#define WTST		WTCNT

#define WTBST		0xffcc0008 /*WDTBST*/

/* Register definitions */

#elif	defined(CONFIG_CPU_SUBTYPE_SH7722) || \

	defined(CONFIG_CPU_SUBTYPE_SH7723) || \

	defined(CONFIG_CPU_SUBTYPE_SH7724)

#define WTCNT		0xa4520000

#define WTCSR		0xa4520004

#else

/* Register definitions */

#define WTCNT		0xffc00008

arch/sh/kernel/dwarf.c

+2 −2
Original line number Diff line number Diff line
@@ -727,7 +727,7 @@ static int dwarf_parse_cie(void *entry, void *p, unsigned long len, 
			   unsigned char *end, struct module *mod)

{

	struct rb_node **rb_node = &cie_root.rb_node;

	struct rb_node *parent;

	struct rb_node *parent = *rb_node;

	struct dwarf_cie *cie;

	unsigned long flags;

	int count;
@@ -856,7 +856,7 @@ static int dwarf_parse_fde(void *entry, u32 entry_type, 
			   unsigned char *end, struct module *mod)

{

	struct rb_node **rb_node = &fde_root.rb_node;

	struct rb_node *parent;

	struct rb_node *parent = *rb_node;

	struct dwarf_fde *fde;

	struct dwarf_cie *cie;

	unsigned long flags;