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

Commit 212ad2f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh 

Pull SuperH fixes from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh:
  sh-sci / PM: Avoid deadlocking runtime PM
  sh: fix up the ubc clock definition for sh7785.
  sh: add parameter for RSPI in clock-sh7757
  sh: Fix sh2a vbr table for more than 255 irqs
parents a10a8543 048be431

arch/sh/kernel/cpu/sh2a/ex.S

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ vector = 0 
	.long	exception_entry0 + vector * 6

vector	=	vector + 1

	.endr

vector	=	0

	.rept	256

	.long	exception_entry1 + vector * 6

vector	=	vector + 1

arch/sh/kernel/cpu/sh4a/clock-sh7757.c

+3 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct clk div4_clks[DIV4_NR] = { 
#define MSTPCR1		0xffc80034

#define MSTPCR2		0xffc10028



enum { MSTP004, MSTP000, MSTP114, MSTP113, MSTP112,

enum { MSTP004, MSTP000, MSTP127, MSTP114, MSTP113, MSTP112,

       MSTP111, MSTP110, MSTP103, MSTP102, MSTP220,

       MSTP_NR };
@@ -89,6 +89,7 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP000] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR0, 0, 0),



	/* MSTPCR1 */

	[MSTP127] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 27, 0),

	[MSTP114] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 14, 0),

	[MSTP113] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 13, 0),

	[MSTP112] = SH_CLK_MSTP32(&div4_clks[DIV4_P], MSTPCR1, 12, 0),
@@ -131,6 +132,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP103]),

	CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP102]),

	CLKDEV_CON_ID("mmc0", &mstp_clks[MSTP220]),

	CLKDEV_CON_ID("rspi2", &mstp_clks[MSTP127]),

};



int __init arch_clk_init(void)

arch/sh/kernel/cpu/sh4a/clock-sh7785.c

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_CON_ID("siof_fck", &mstp_clks[MSTP003]),

	CLKDEV_CON_ID("hspi_fck", &mstp_clks[MSTP002]),

	CLKDEV_CON_ID("hudi_fck", &mstp_clks[MSTP119]),

	CLKDEV_CON_ID("ubc_fck", &mstp_clks[MSTP117]),

	CLKDEV_CON_ID("ubc0", &mstp_clks[MSTP117]),

	CLKDEV_CON_ID("dmac_11_6_fck", &mstp_clks[MSTP105]),

	CLKDEV_CON_ID("dmac_5_0_fck", &mstp_clks[MSTP104]),

	CLKDEV_CON_ID("gdta_fck", &mstp_clks[MSTP100]),

drivers/tty/serial/sh-sci.c

+5 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,8 @@ static int sci_startup(struct uart_port *port) 


	dev_dbg(port->dev, "%s(%d)\n", __func__, port->line);



	pm_runtime_put_noidle(port->dev);



	sci_port_enable(s);



	ret = sci_request_irq(s);
@@ -1737,6 +1739,8 @@ static void sci_shutdown(struct uart_port *port) 
	sci_free_irq(s);



	sci_port_disable(s);



	pm_runtime_get_noresume(port->dev);

}



static unsigned int sci_scbrr_calc(unsigned int algo_id, unsigned int bps,
@@ -2075,6 +2079,7 @@ static int __devinit sci_init_single(struct platform_device *dev, 
		sci_init_gpios(sci_port);



		pm_runtime_irq_safe(&dev->dev);

		pm_runtime_get_noresume(&dev->dev);

		pm_runtime_enable(&dev->dev);

	}