Merge tags 'renesas-clock-for-v3.16' and 'renesas-boards-for-v3.16' of... (86327bb8) · Commits · e / devices / android_kernel_fairphone_FP5

arch/arm/boot/dts/r8a7790.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -673,7 +673,7 @@
	renesas,clock-indices = <		renesas,clock-indices = <
	R8A7790_CLK_TMU1 R8A7790_CLK_TMU3 R8A7790_CLK_TMU2		R8A7790_CLK_TMU1 R8A7790_CLK_TMU3 R8A7790_CLK_TMU2
	R8A7790_CLK_CMT0 R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1		R8A7790_CLK_CMT0 R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1
	R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_RT R8A7790_CLK_VSP1_SY		R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_R R8A7790_CLK_VSP1_S
	>;		>;
	clock-output-names =		clock-output-names =
	"tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",		"tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",

arch/arm/boot/dts/r8a7791.dtsi

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -688,7 +688,7 @@
	renesas,clock-indices = <		renesas,clock-indices = <
	R8A7791_CLK_TMU1 R8A7791_CLK_TMU3 R8A7791_CLK_TMU2		R8A7791_CLK_TMU1 R8A7791_CLK_TMU3 R8A7791_CLK_TMU2
	R8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1		R8A7791_CLK_CMT0 R8A7791_CLK_TMU0 R8A7791_CLK_VSP1_DU1
	R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_SY		R8A7791_CLK_VSP1_DU0 R8A7791_CLK_VSP1_S
	>;		>;
	clock-output-names =		clock-output-names =
	"tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",		"tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",

arch/arm/mach-shmobile/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,8 +21,8 @@ obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
	obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o		obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o

	# Clock objects		# Clock objects
	ifndef CONFIG_COMMON_CLK
	obj-y += clock.o		obj-y += clock.o
			ifndef CONFIG_COMMON_CLK
	obj-$(CONFIG_ARCH_SH7372) += clock-sh7372.o		obj-$(CONFIG_ARCH_SH7372) += clock-sh7372.o
	obj-$(CONFIG_ARCH_SH73A0) += clock-sh73a0.o		obj-$(CONFIG_ARCH_SH73A0) += clock-sh73a0.o
	obj-$(CONFIG_ARCH_R8A73A4) += clock-r8a73a4.o		obj-$(CONFIG_ARCH_R8A73A4) += clock-r8a73a4.o

arch/arm/mach-shmobile/board-bockw.c

+41 −22

Original line number	Original line	Diff line number	Diff line
	@@ -345,24 +345,39 @@ static struct rsnd_ssi_platform_info rsnd_ssi[] = {
	RSND_SSI_UNUSED, /* SSI 0 */		RSND_SSI_UNUSED, /* SSI 0 */
	RSND_SSI_UNUSED, /* SSI 1 */		RSND_SSI_UNUSED, /* SSI 1 */
	RSND_SSI_UNUSED, /* SSI 2 */		RSND_SSI_UNUSED, /* SSI 2 */
	RSND_SSI_SET(1, HPBDMA_SLAVE_HPBIF3_TX, gic_iid(0x85), RSND_SSI_PLAY),		RSND_SSI(HPBDMA_SLAVE_HPBIF3_TX, gic_iid(0x85), 0),
	RSND_SSI_SET(2, HPBDMA_SLAVE_HPBIF4_RX, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE),		RSND_SSI(HPBDMA_SLAVE_HPBIF4_RX, gic_iid(0x85), RSND_SSI_CLK_PIN_SHARE),
	RSND_SSI_SET(0, HPBDMA_SLAVE_HPBIF5_TX, gic_iid(0x86), RSND_SSI_PLAY),		RSND_SSI(HPBDMA_SLAVE_HPBIF5_TX, gic_iid(0x86), 0),
	RSND_SSI_SET(0, HPBDMA_SLAVE_HPBIF6_RX, gic_iid(0x86), 0),		RSND_SSI(HPBDMA_SLAVE_HPBIF6_RX, gic_iid(0x86), 0),
	RSND_SSI_SET(3, HPBDMA_SLAVE_HPBIF7_TX, gic_iid(0x86), RSND_SSI_PLAY),		RSND_SSI(HPBDMA_SLAVE_HPBIF7_TX, gic_iid(0x86), 0),
	RSND_SSI_SET(4, HPBDMA_SLAVE_HPBIF8_RX, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE),		RSND_SSI(HPBDMA_SLAVE_HPBIF8_RX, gic_iid(0x86), RSND_SSI_CLK_PIN_SHARE),
	};		};

	static struct rsnd_scu_platform_info rsnd_scu[9] = {		static struct rsnd_src_platform_info rsnd_src[9] = {
	{ .flags = 0, }, /* SRU 0 */		RSND_SRC_UNUSED, /* SRU 0 */
	{ .flags = 0, }, /* SRU 1 */		RSND_SRC_UNUSED, /* SRU 1 */
	{ .flags = 0, }, /* SRU 2 */		RSND_SRC_UNUSED, /* SRU 2 */
	{ .flags = RSND_SCU_USE_HPBIF, },		RSND_SRC(0, 0),
	{ .flags = RSND_SCU_USE_HPBIF, },		RSND_SRC(0, 0),
	{ .flags = RSND_SCU_USE_HPBIF, },		RSND_SRC(0, 0),
	{ .flags = RSND_SCU_USE_HPBIF, },		RSND_SRC(0, 0),
	{ .flags = RSND_SCU_USE_HPBIF, },		RSND_SRC(0, 0),
	{ .flags = RSND_SCU_USE_HPBIF, },		RSND_SRC(0, 0),
			};

			static struct rsnd_dai_platform_info rsnd_dai[] = {
			{
			.playback = { .ssi = &rsnd_ssi[5], .src = &rsnd_src[5] },
			.capture = { .ssi = &rsnd_ssi[6], .src = &rsnd_src[6] },
			}, {
			.playback = { .ssi = &rsnd_ssi[3], .src = &rsnd_src[3] },
			}, {
			.capture = { .ssi = &rsnd_ssi[4], .src = &rsnd_src[4] },
			}, {
			.playback = { .ssi = &rsnd_ssi[7], .src = &rsnd_src[7] },
			}, {
			.capture = { .ssi = &rsnd_ssi[8], .src = &rsnd_src[8] },
			},
	};		};

	enum {		enum {
	@@ -437,8 +452,10 @@ static struct rcar_snd_info rsnd_info = {
	.flags = RSND_GEN1,		.flags = RSND_GEN1,
	.ssi_info = rsnd_ssi,		.ssi_info = rsnd_ssi,
	.ssi_info_nr = ARRAY_SIZE(rsnd_ssi),		.ssi_info_nr = ARRAY_SIZE(rsnd_ssi),
	.scu_info = rsnd_scu,		.src_info = rsnd_src,
	.scu_info_nr = ARRAY_SIZE(rsnd_scu),		.src_info_nr = ARRAY_SIZE(rsnd_src),
			.dai_info = rsnd_dai,
			.dai_info_nr = ARRAY_SIZE(rsnd_dai),
	.start = rsnd_start,		.start = rsnd_start,
	.stop = rsnd_stop,		.stop = rsnd_stop,
	};		};
	@@ -591,6 +608,7 @@ static void __init bockw_init(void)
	{		{
	void __iomem *base;		void __iomem *base;
	struct clk *clk;		struct clk *clk;
			struct platform_device *pdev;
	int i;		int i;

	r8a7778_clock_init();		r8a7778_clock_init();
	@@ -673,9 +691,6 @@ static void __init bockw_init(void)
	}		}

	/* for Audio */		/* for Audio */
	clk = clk_get(NULL, "audio_clk_b");
	clk_set_rate(clk, 24576000);
	clk_put(clk);
	rsnd_codec_power(5, 1); /* enable ak4642 */		rsnd_codec_power(5, 1); /* enable ak4642 */

	platform_device_register_simple(		platform_device_register_simple(
	@@ -684,11 +699,15 @@ static void __init bockw_init(void)
	platform_device_register_simple(		platform_device_register_simple(
	"ak4554-adc-dac", 1, NULL, 0);		"ak4554-adc-dac", 1, NULL, 0);

	platform_device_register_resndata(		pdev = platform_device_register_resndata(
	&platform_bus, "rcar_sound", -1,		&platform_bus, "rcar_sound", -1,
	rsnd_resources, ARRAY_SIZE(rsnd_resources),		rsnd_resources, ARRAY_SIZE(rsnd_resources),
	&rsnd_info, sizeof(rsnd_info));		&rsnd_info, sizeof(rsnd_info));

			clk = clk_get(&pdev->dev, "clk_b");
			clk_set_rate(clk, 24576000);
			clk_put(clk);

	for (i = 0; i < ARRAY_SIZE(rsnd_card_info); i++) {		for (i = 0; i < ARRAY_SIZE(rsnd_card_info); i++) {
	struct platform_device_info cardinfo = {		struct platform_device_info cardinfo = {
	.parent = &platform_bus,		.parent = &platform_bus,

arch/arm/mach-shmobile/board-koelsch-reference.c

+43 −43

Original line number	Original line	Diff line number	Diff line
	@@ -19,12 +19,11 @@
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/		*/

	#include <linux/clk.h>
	#include <linux/clkdev.h>
	#include <linux/dma-mapping.h>		#include <linux/dma-mapping.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/of_platform.h>		#include <linux/of_platform.h>
	#include <linux/platform_data/rcar-du.h>		#include <linux/platform_data/rcar-du.h>
			#include <mach/clock.h>
	#include <mach/common.h>		#include <mach/common.h>
	#include <mach/irqs.h>		#include <mach/irqs.h>
	#include <mach/rcar-gen2.h>		#include <mach/rcar-gen2.h>
	@@ -82,17 +81,11 @@ static void __init koelsch_add_du_device(void)
	platform_device_register_full(&info);		platform_device_register_full(&info);
	}		}

	static void __init koelsch_add_standard_devices(void)
	{
	/*		/*
	* This is a really crude hack to provide clkdev support to the CMT and		* This is a really crude hack to provide clkdev support to platform
	* DU devices until they get moved to DT.		* devices until they get moved to DT.
	*/		*/
	static const struct clk_name {		static const struct clk_name clk_names[] __initconst = {
	const char *clk;
	const char *con_id;
	const char *dev_id;
	} clk_names[] = {
	{ "cmt0", NULL, "sh_cmt.0" },		{ "cmt0", NULL, "sh_cmt.0" },
	{ "scifa0", NULL, "sh-sci.0" },		{ "scifa0", NULL, "sh-sci.0" },
	{ "scifa1", NULL, "sh-sci.1" },		{ "scifa1", NULL, "sh-sci.1" },
	@@ -113,18 +106,25 @@ static void __init koelsch_add_standard_devices(void)
	{ "du1", "du.1", "rcar-du-r8a7791" },		{ "du1", "du.1", "rcar-du-r8a7791" },
	{ "lvds0", "lvds.0", "rcar-du-r8a7791" },		{ "lvds0", "lvds.0", "rcar-du-r8a7791" },
	};		};
	struct clk *clk;
	unsigned int i;

	for (i = 0; i < ARRAY_SIZE(clk_names); ++i) {		/*
	clk = clk_get(NULL, clk_names[i].clk);		* This is a really crude hack to work around core platform clock issues
	if (!IS_ERR(clk)) {		*/
	clk_register_clkdev(clk, clk_names[i].con_id,		static const struct clk_name clk_enables[] __initconst = {
	clk_names[i].dev_id);		{ "ether", NULL, "ee700000.ethernet" },
	clk_put(clk);		{ "i2c2", NULL, "e6530000.i2c" },
	}		{ "msiof0", NULL, "e6e20000.spi" },
	}		{ "qspi_mod", NULL, "e6b10000.spi" },
			{ "sdhi0", NULL, "ee100000.sd" },
			{ "sdhi1", NULL, "ee140000.sd" },
			{ "sdhi2", NULL, "ee160000.sd" },
			{ "thermal", NULL, "e61f0000.thermal" },
			};

			static void __init koelsch_add_standard_devices(void)
			{
			shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
			shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
	r8a7791_add_dt_devices();		r8a7791_add_dt_devices();
	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);		of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);