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

Commit e10b87d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x 

* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x: (39 commits)
  SH: static should be at beginning of declaration
  sh: move CLKDEV_xxx_ID macro to sh_clk.h
  sh: clock-shx3: add CLKDEV_ICK_ID for cleanup
  sh: clock-sh7786: add CLKDEV_ICK_ID for cleanup
  sh: clock-sh7785: add CLKDEV_ICK_ID for cleanup
  sh: clock-sh7757: add CLKDEV_ICK_ID for cleanup
  sh: clock-sh7366: add CLKDEV_ICK_ID for cleanup
  sh: clock-sh7343: add CLKDEV_ICK_ID for cleanup
  sh: clock-sh7722: add CLKDEV_ICK_ID for cleanup
  sh: clock-sh7724: add CLKDEV_ICK_ID for cleanup
  sh: clock-sh7366: modify I2C clock settings
  sh: clock-sh7343: modify I2C clock settings
  sh: clock-sh7723: modify I2C clock settings
  sh: clock-sh7722: modify I2C clock settings
  sh: clock-sh7724: modify I2C clock settings
  serial: sh-sci: Fix up pretty name printing for port IRQs.
  serial: sh-sci: Kill off per-port enable/disable callbacks.
  serial: sh-sci: Add missing module description/author bits.
  serial: sh-sci: Regtype probing doesn't need to be fatal.
  sh: Tidy up pre-clkdev clk_get() error handling.
  ...
parents 3da3f872 536628d0

arch/arm/mach-shmobile/clock-sh7367.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -259,9 +259,6 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[CMMSTP003] = MSTP(&r_clk, CMMSTPCR0, 3, 0), /* KEYSC */

	[CMMSTP003] = MSTP(&r_clk, CMMSTPCR0, 3, 0), /* KEYSC */

};

};





#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }

#define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk }



static struct clk_lookup lookups[] = {

static struct clk_lookup lookups[] = {

	/* main clocks */

	/* main clocks */

	CLKDEV_CON_ID("r_clk", &r_clk),

	CLKDEV_CON_ID("r_clk", &r_clk),

arch/arm/mach-shmobile/clock-sh7372.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -561,10 +561,6 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */

	[MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */

};

};





#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }

#define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk }

#define CLKDEV_ICK_ID(_cid, _did, _clk) { .con_id = _cid, .dev_id = _did, .clk = _clk }



static struct clk_lookup lookups[] = {

static struct clk_lookup lookups[] = {

	/* main clocks */

	/* main clocks */

	CLKDEV_CON_ID("dv_clki_div2_clk", &sh7372_dv_clki_div2_clk),

	CLKDEV_CON_ID("dv_clki_div2_clk", &sh7372_dv_clki_div2_clk),

arch/arm/mach-shmobile/clock-sh7377.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -267,9 +267,6 @@ static struct clk mstp_clks[] = { 
	[MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */

	[MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */

};

};





#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }

#define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk }



static struct clk_lookup lookups[] = {

static struct clk_lookup lookups[] = {

	/* main clocks */

	/* main clocks */

	CLKDEV_CON_ID("r_clk", &r_clk),

	CLKDEV_CON_ID("r_clk", &r_clk),

arch/arm/mach-shmobile/clock-sh73a0.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -306,10 +306,6 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */

	[MSTP403] = MSTP(&r_clk, SMSTPCR4, 3, 0), /* KEYSC */

};

};





#define CLKDEV_CON_ID(_id, _clk) { .con_id = _id, .clk = _clk }

#define CLKDEV_DEV_ID(_id, _clk) { .dev_id = _id, .clk = _clk }

#define CLKDEV_ICK_ID(_cid, _did, _clk) { .con_id = _cid, .dev_id = _did, .clk = _clk }



static struct clk_lookup lookups[] = {

static struct clk_lookup lookups[] = {

	/* main clocks */

	/* main clocks */

	CLKDEV_CON_ID("r_clk", &r_clk),

	CLKDEV_CON_ID("r_clk", &r_clk),

arch/sh/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -173,6 +173,7 @@ core-$(CONFIG_HD6446X_SERIES) += arch/sh/cchips/hd6446x/ 
cpuincdir-$(CONFIG_CPU_SH2A)	+= cpu-sh2a

cpuincdir-$(CONFIG_CPU_SH2A)	+= cpu-sh2a

cpuincdir-$(CONFIG_CPU_SH2)	+= cpu-sh2

cpuincdir-$(CONFIG_CPU_SH2)	+= cpu-sh2

cpuincdir-$(CONFIG_CPU_SH3)	+= cpu-sh3

cpuincdir-$(CONFIG_CPU_SH3)	+= cpu-sh3

cpuincdir-$(CONFIG_CPU_SH4A)	+= cpu-sh4a

cpuincdir-$(CONFIG_CPU_SH4)	+= cpu-sh4

cpuincdir-$(CONFIG_CPU_SH4)	+= cpu-sh4

cpuincdir-$(CONFIG_CPU_SH5)	+= cpu-sh5

cpuincdir-$(CONFIG_CPU_SH5)	+= cpu-sh5

cpuincdir-y			+= cpu-common	# Must be last

cpuincdir-y			+= cpu-common	# Must be last