Commit 963b0c35 authored by Simon Horman's avatar Simon Horman
Browse files

Merge branch 'clock-for-v3.17' into dt-for-v3.17

parents cb9a2b12 ff4ce48e

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

+6 −0
Original line number Diff line number Diff line
@@ -574,11 +574,17 @@ static struct clk_lookup lookups[] = { 


	/* MSTP */

	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]),

	CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]),

	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]),

	CLKDEV_DEV_ID("e6c50000.serial", &mstp_clks[MSTP203]),

	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP206]),

	CLKDEV_DEV_ID("e6c20000.serial", &mstp_clks[MSTP206]),

	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP207]),

	CLKDEV_DEV_ID("e6c30000.serial", &mstp_clks[MSTP207]),

	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]),

	CLKDEV_DEV_ID("e6ce0000.serial", &mstp_clks[MSTP216]),

	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP217]),

	CLKDEV_DEV_ID("e6cf0000.serial", &mstp_clks[MSTP217]),

	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]),

	CLKDEV_DEV_ID("e6700020.dma-controller", &mstp_clks[MSTP218]),

	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),

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

+9 −9
Original line number Diff line number Diff line
@@ -555,27 +555,27 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh_mobile_ceu.1",	&mstp_clks[MSTP128]),



	CLKDEV_DEV_ID("sh-sci.4",		&mstp_clks[MSTP200]),

	CLKDEV_DEV_ID("e6c80000.sci",		&mstp_clks[MSTP200]),

	CLKDEV_DEV_ID("e6c80000.serial",	&mstp_clks[MSTP200]),

	CLKDEV_DEV_ID("sh-sci.3",		&mstp_clks[MSTP201]),

	CLKDEV_DEV_ID("e6c70000.sci",		&mstp_clks[MSTP201]),

	CLKDEV_DEV_ID("e6c70000.serial",	&mstp_clks[MSTP201]),

	CLKDEV_DEV_ID("sh-sci.2",		&mstp_clks[MSTP202]),

	CLKDEV_DEV_ID("e6c60000.sci",		&mstp_clks[MSTP202]),

	CLKDEV_DEV_ID("e6c60000.serial",	&mstp_clks[MSTP202]),

	CLKDEV_DEV_ID("sh-sci.1",		&mstp_clks[MSTP203]),

	CLKDEV_DEV_ID("e6c50000.sci",		&mstp_clks[MSTP203]),

	CLKDEV_DEV_ID("e6c50000.serial",	&mstp_clks[MSTP203]),

	CLKDEV_DEV_ID("sh-sci.0",		&mstp_clks[MSTP204]),

	CLKDEV_DEV_ID("e6c40000.sci",		&mstp_clks[MSTP204]),

	CLKDEV_DEV_ID("e6c40000.serial",	&mstp_clks[MSTP204]),

	CLKDEV_DEV_ID("sh-sci.8",		&mstp_clks[MSTP206]),

	CLKDEV_DEV_ID("e6c30000.sci",		&mstp_clks[MSTP206]),

	CLKDEV_DEV_ID("e6c30000.serial",	&mstp_clks[MSTP206]),

	CLKDEV_DEV_ID("sh-sci.5",		&mstp_clks[MSTP207]),

	CLKDEV_DEV_ID("e6cb0000.sci",		&mstp_clks[MSTP207]),

	CLKDEV_DEV_ID("e6cb0000.serial",	&mstp_clks[MSTP207]),

	CLKDEV_DEV_ID("sh-dma-engine.3",	&mstp_clks[MSTP214]),

	CLKDEV_DEV_ID("sh-dma-engine.2",	&mstp_clks[MSTP216]),

	CLKDEV_DEV_ID("sh-dma-engine.1",	&mstp_clks[MSTP217]),

	CLKDEV_DEV_ID("sh-dma-engine.0",	&mstp_clks[MSTP218]),

	CLKDEV_DEV_ID("sh-sci.7",		&mstp_clks[MSTP222]),

	CLKDEV_DEV_ID("e6cd0000.sci",		&mstp_clks[MSTP222]),

	CLKDEV_DEV_ID("e6cd0000.serial",	&mstp_clks[MSTP222]),

	CLKDEV_DEV_ID("sh-sci.6",		&mstp_clks[MSTP230]),

	CLKDEV_DEV_ID("e6cc0000.sci",		&mstp_clks[MSTP230]),

	CLKDEV_DEV_ID("e6cc0000.serial",	&mstp_clks[MSTP230]),



	CLKDEV_DEV_ID("sh_fsi2",		&mstp_clks[MSTP328]),

	CLKDEV_DEV_ID("fe1f0000.sound",		&mstp_clks[MSTP328]),

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

+6 −0
Original line number Diff line number Diff line
@@ -202,11 +202,17 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP027]), /* I2C3 */

	CLKDEV_DEV_ID("ffc73000.i2c", &mstp_clks[MSTP027]), /* I2C3 */

	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP026]), /* SCIF0 */

	CLKDEV_DEV_ID("ffe40000.serial", &mstp_clks[MSTP026]), /* SCIF0 */

	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP025]), /* SCIF1 */

	CLKDEV_DEV_ID("ffe41000.serial", &mstp_clks[MSTP025]), /* SCIF1 */

	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP024]), /* SCIF2 */

	CLKDEV_DEV_ID("ffe42000.serial", &mstp_clks[MSTP024]), /* SCIF2 */

	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP023]), /* SCIF3 */

	CLKDEV_DEV_ID("ffe43000.serial", &mstp_clks[MSTP023]), /* SCIF3 */

	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP022]), /* SCIF4 */

	CLKDEV_DEV_ID("ffe44000.serial", &mstp_clks[MSTP022]), /* SCIF4 */

	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP021]), /* SCIF6 */

	CLKDEV_DEV_ID("ffe45000.serial", &mstp_clks[MSTP021]), /* SCIF5 */

	CLKDEV_DEV_ID("sh-hspi.0", &mstp_clks[MSTP007]), /* HSPI0 */

	CLKDEV_DEV_ID("fffc7000.spi", &mstp_clks[MSTP007]), /* HSPI0 */

	CLKDEV_DEV_ID("sh-hspi.1", &mstp_clks[MSTP007]), /* HSPI1 */

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

+9 −0
Original line number Diff line number Diff line
@@ -638,16 +638,25 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("e6820000.i2c", &mstp_clks[MSTP116]), /* I2C0 */

	CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */

	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */

	CLKDEV_DEV_ID("e6cd0000.serial", &mstp_clks[MSTP219]), /* SCIFA7 */

	CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */

	CLKDEV_DEV_ID("sh-dma-engine.1", &mstp_clks[MSTP217]), /* MP-DMAC */

	CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */

	CLKDEV_DEV_ID("e6cb0000.serial", &mstp_clks[MSTP207]), /* SCIFA5 */

	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */

	CLKDEV_DEV_ID("0xe6c3000.serial", &mstp_clks[MSTP206]), /* SCIFB */

	CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */

	CLKDEV_DEV_ID("e6c40000.serial", &mstp_clks[MSTP204]), /* SCIFA0 */

	CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */

	CLKDEV_DEV_ID("e6c50000.serial", &mstp_clks[MSTP203]), /* SCIFA1 */

	CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP202]), /* SCIFA2 */

	CLKDEV_DEV_ID("e6c60000.serial", &mstp_clks[MSTP202]), /* SCIFA2 */

	CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP201]), /* SCIFA3 */

	CLKDEV_DEV_ID("e6c70000.serial", &mstp_clks[MSTP201]), /* SCIFA3 */

	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */

	CLKDEV_DEV_ID("e6c80000.serial", &mstp_clks[MSTP200]), /* SCIFA4 */

	CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP331]), /* SCIFA6 */

	CLKDEV_DEV_ID("e6cc0000.serial", &mstp_clks[MSTP331]), /* SCIFA6 */

	CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI */

	CLKDEV_DEV_ID("ec230000.sound", &mstp_clks[MSTP328]), /* FSI */

	CLKDEV_DEV_ID("sh_irda.0", &mstp_clks[MSTP325]), /* IrDA */

arch/arm/mach-shmobile/timer.c

+29 −21
Original line number Diff line number Diff line
@@ -59,30 +59,38 @@ void __init shmobile_setup_delay(unsigned int max_cpu_core_mhz, 


void __init shmobile_init_delay(void)

{

	struct device_node *np, *parent;

	u32 max_freq, freq;

	struct device_node *np, *cpus;

	bool is_a8_a9 = false;

	bool is_a15 = false;

	u32 max_freq = 0;



	max_freq = 0;

	cpus = of_find_node_by_path("/cpus");

	if (!cpus)

		return;



	for_each_child_of_node(cpus, np) {

		u32 freq;



	parent = of_find_node_by_path("/cpus");

	if (parent) {

		for_each_child_of_node(parent, np) {

		if (!of_property_read_u32(np, "clock-frequency", &freq))

			max_freq = max(max_freq, freq);

		}

		of_node_put(parent);



		if (of_device_is_compatible(np, "arm,cortex-a8") ||

		    of_device_is_compatible(np, "arm,cortex-a9"))

			is_a8_a9 = true;

		else if (of_device_is_compatible(np, "arm,cortex-a15"))

			is_a15 = true;

	}



	if (max_freq) {

		if (of_find_compatible_node(NULL, NULL, "arm,cortex-a8"))

			shmobile_setup_delay_hz(max_freq, 1, 3);

		else if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9"))

	of_node_put(cpus);



	if (!max_freq)

		return;



	if (is_a8_a9)

		shmobile_setup_delay_hz(max_freq, 1, 3);

		else if (of_find_compatible_node(NULL, NULL, "arm,cortex-a15"))

			if (!IS_ENABLED(CONFIG_ARM_ARCH_TIMER))

	else if (is_a15 && !IS_ENABLED(CONFIG_ARM_ARCH_TIMER))

		shmobile_setup_delay_hz(max_freq, 2, 4);

}

}



static void __init shmobile_late_time_init(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE