linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2013-04-19  7:27 Stephen Rothwell
  2013-04-19  9:47 ` Pawel Moll
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2013-04-19  7:27 UTC (permalink / raw)
  To: Mike Turquette
  Cc: linux-next, linux-kernel, Pawel Moll, Rob Herring,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 2082 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-vexpress/v2m.c between commit dabfd8fb84ab ("ARM: vexpress:
remove sp804 OF init") from the arm-soc tree and commit 6e973d2c4385
("clk: vexpress: Add separate SP810 driver") from the clk tree.

I fixed it up (I thnk - see below) and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-vexpress/v2m.c
index d8e2954,c5e20b5..0000000
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@@ -23,9 -21,13 +23,11 @@@
  #include <linux/regulator/fixed.h>
  #include <linux/regulator/machine.h>
  #include <linux/vexpress.h>
+ #include <linux/clk-provider.h>
+ #include <linux/clkdev.h>
  
 -#include <asm/arch_timer.h>
  #include <asm/mach-types.h>
  #include <asm/sizes.h>
 -#include <asm/smp_twd.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
  #include <asm/mach/time.h>
@@@ -425,11 -433,29 +427,11 @@@ void __init v2m_dt_init_early(void
  
  static void __init v2m_dt_timer_init(void)
  {
- 	vexpress_clk_of_init();
 -	struct device_node *node = NULL;
 -
+ 	of_clk_init(NULL);
  
 -	do {
 -		node = of_find_compatible_node(node, NULL, "arm,sp804");
 -	} while (node && vexpress_get_site_by_node(node) != VEXPRESS_SITE_MB);
 -	if (node) {
 -		pr_info("Using SP804 '%s' as a clock & events source\n",
 -				node->full_name);
 -		WARN_ON(clk_register_clkdev(of_clk_get_by_name(node,
 -				"timclken1"), "v2m-timer0", "sp804"));
 -		WARN_ON(clk_register_clkdev(of_clk_get_by_name(node,
 -				"timclken2"), "v2m-timer1", "sp804"));
 -		v2m_sp804_init(of_iomap(node, 0),
 -				irq_of_parse_and_map(node, 0));
 -	}
 -
 -	if (arch_timer_of_register() != 0)
 -		twd_local_timer_of_register();
 +	clocksource_of_init();
  
 -	if (arch_timer_sched_clock_init() != 0)
 -		versatile_sched_clock_init(vexpress_get_24mhz_clock_base(),
 +	versatile_sched_clock_init(vexpress_get_24mhz_clock_base(),
  				24000000);
  }
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2016-11-22  8:41 Stephen Rothwell
  2016-11-22  9:36 ` Geert Uytterhoeven
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2016-11-22  8:41 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd, Olof Johansson, Arnd Bergmann, ARM
  Cc: linux-next, linux-kernel, Geert Uytterhoeven

Hi all,

Today's linux-next merge of the clk tree got conflicts in:

  arch/arm/boot/dts/r8a7779.dtsi
  arch/arm/boot/dts/r8a7790.dtsi
  arch/arm/boot/dts/r8a7791.dtsi
  arch/arm/boot/dts/r8a7792.dtsi
  arch/arm/boot/dts/r8a7793.dtsi
  arch/arm/boot/dts/r8a7794.dtsi
  arch/arm/mach-shmobile/setup-rcar-gen2.c
  arch/arm64/boot/dts/renesas/r8a7795.dtsi
  arch/arm64/boot/dts/renesas/r8a7796.dtsi
  drivers/soc/renesas/Makefile

between various commits from the arm-soc tree and commits from the
clk tree.

It was just too much at this time of day, so please talk to each other
and figure out how to fix these up.  I have used the clk tree from
next-20161117 for today.

-- 
Cheers,
Stephen Rothwell

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2016-03-01  3:57 Stephen Rothwell
  2016-03-01  4:00 ` Stephen Rothwell
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2016-03-01  3:57 UTC (permalink / raw)
  To: Mike Turquette, Stephen Boyd, Olof Johansson, Arnd Bergmann,
	linux-arm-kernel
  Cc: linux-next, linux-kernel, Alexandre Belloni

Hi all,

Today's linux-next merge of the clk tree got a conflict in:

  drivers/clk/at91/clk-main.c

between commit:

  99a81706526f ("clk: at91: remove IRQ handling and use polling")

from the arm-soc tree and commit:

  8c1b1e54faed ("clk: at91: Remove impossible checks for of_clk_get_parent_count()")

from the clk tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/clk/at91/clk-main.c
index 4bfc94d6c26e,b85f43529396..000000000000
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@@ -572,12 -611,12 +572,12 @@@ static void __init of_at91sam9x5_clk_ma
  {
  	struct clk *clk;
  	const char *parent_names[2];
- 	int num_parents;
+ 	unsigned int num_parents;
 -	unsigned int irq;
  	const char *name = np->name;
 +	struct regmap *regmap;
  
  	num_parents = of_clk_get_parent_count(np);
- 	if (num_parents <= 0 || num_parents > 2)
+ 	if (num_parents == 0 || num_parents > 2)
  		return;
  
  	of_clk_parent_fill(np, parent_names, num_parents);

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2015-02-03  5:31 Stephen Rothwell
  2015-02-03 18:25 ` Mike Turquette
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2015-02-03  5:31 UTC (permalink / raw)
  To: Mike Turquette, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Tero Kristo, Tony Lindgren

[-- Attachment #1: Type: text/plain, Size: 502 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-omap2/cclock3xxx_data.c between commit ca662ee7b8a8
("ARM: OMAP2+: Remove unused ti81xx platform init code") from the
arm-soc tree and commit d6540b193719 ("ARM: OMAP3: remove legacy clock
data") from the clk tree.

I fixed it up (the latter removed the file, so I did that) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2015-02-03  5:28 Stephen Rothwell
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2015-02-03  5:28 UTC (permalink / raw)
  To: Mike Turquette, Olof Johansson, Arnd Bergmann, linux-arm-kernel
  Cc: linux-next, linux-kernel, Tero Kristo

[-- Attachment #1: Type: text/plain, Size: 529 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-omap2/io.c between commit c27964b5d2f3 ("ARM: OMAP2+: Fix
ti81xx class type") from the arm-soc tree and commit eded36fe29e1
("ARM: OMAP3: use clock data from TI clock driver for legacy boot")
from the clk tree.

I fixed it up (the former seems to have incorporated the conflicting
part of the latter) and can carry the fix as necessary (no action is
required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2014-01-13  5:06 Stephen Rothwell
  2014-01-26 20:59 ` Tomasz Figa
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2014-01-13  5:06 UTC (permalink / raw)
  To: Mike Turquette, Olof Johansson, Arnd Bergmann, linux-arm-kernel,
	Kukjin Kim
  Cc: linux-next, linux-kernel, Tomasz Figa, Andrzej Hajda

[-- Attachment #1: Type: text/plain, Size: 7376 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
drivers/clk/samsung/clk-exynos4.c between commit 86576fbe201b ("clk:
samsung: exynos4: Fix definition of div_mmc_pre4 divider") from the
arm-soc tree and commit 2d7382375054 ("clk: exynos4: replace clock ID
private enums with IDs from DT header") from the clk tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/clk/samsung/clk-exynos4.c
index 3852e44db0f8,2f7e440aebf8..000000000000
--- a/drivers/clk/samsung/clk-exynos4.c
+++ b/drivers/clk/samsung/clk-exynos4.c
@@@ -498,64 -437,63 +437,64 @@@ static struct samsung_mux_clock exynos4
  
  /* list of divider clocks supported in all exynos4 soc's */
  static struct samsung_div_clock exynos4_div_clks[] __initdata = {
- 	DIV(none, "div_core", "mout_core", DIV_CPU0, 0, 3),
- 	DIV(none, "div_core2", "div_core", DIV_CPU0, 28, 3),
- 	DIV(none, "div_fimc0", "mout_fimc0", DIV_CAM, 0, 4),
- 	DIV(none, "div_fimc1", "mout_fimc1", DIV_CAM, 4, 4),
- 	DIV(none, "div_fimc2", "mout_fimc2", DIV_CAM, 8, 4),
- 	DIV(none, "div_fimc3", "mout_fimc3", DIV_CAM, 12, 4),
- 	DIV(none, "div_cam0", "mout_cam0", DIV_CAM, 16, 4),
- 	DIV(none, "div_cam1", "mout_cam1", DIV_CAM, 20, 4),
- 	DIV(none, "div_csis0", "mout_csis0", DIV_CAM, 24, 4),
- 	DIV(none, "div_csis1", "mout_csis1", DIV_CAM, 28, 4),
- 	DIV(sclk_mfc, "sclk_mfc", "mout_mfc", DIV_MFC, 0, 4),
- 	DIV_F(none, "div_g3d", "mout_g3d", DIV_G3D, 0, 4,
+ 	DIV(0, "div_core", "mout_core", DIV_CPU0, 0, 3),
+ 	DIV(0, "div_core2", "div_core", DIV_CPU0, 28, 3),
+ 	DIV(0, "div_fimc0", "mout_fimc0", DIV_CAM, 0, 4),
+ 	DIV(0, "div_fimc1", "mout_fimc1", DIV_CAM, 4, 4),
+ 	DIV(0, "div_fimc2", "mout_fimc2", DIV_CAM, 8, 4),
+ 	DIV(0, "div_fimc3", "mout_fimc3", DIV_CAM, 12, 4),
+ 	DIV(0, "div_cam0", "mout_cam0", DIV_CAM, 16, 4),
+ 	DIV(0, "div_cam1", "mout_cam1", DIV_CAM, 20, 4),
+ 	DIV(0, "div_csis0", "mout_csis0", DIV_CAM, 24, 4),
+ 	DIV(0, "div_csis1", "mout_csis1", DIV_CAM, 28, 4),
+ 	DIV(CLK_SCLK_MFC, "sclk_mfc", "mout_mfc", DIV_MFC, 0, 4),
+ 	DIV_F(0, "div_g3d", "mout_g3d", DIV_G3D, 0, 4,
  			CLK_SET_RATE_PARENT, 0),
- 	DIV(none, "div_fimd0", "mout_fimd0", DIV_LCD0, 0, 4),
- 	DIV(none, "div_mipi0", "mout_mipi0", DIV_LCD0, 16, 4),
- 	DIV(none, "div_audio0", "mout_audio0", DIV_MAUDIO, 0, 4),
- 	DIV(sclk_pcm0, "sclk_pcm0", "sclk_audio0", DIV_MAUDIO, 4, 8),
- 	DIV(none, "div_mmc0", "mout_mmc0", DIV_FSYS1, 0, 4),
- 	DIV(none, "div_mmc1", "mout_mmc1", DIV_FSYS1, 16, 4),
- 	DIV(none, "div_mmc2", "mout_mmc2", DIV_FSYS2, 0, 4),
- 	DIV(none, "div_mmc3", "mout_mmc3", DIV_FSYS2, 16, 4),
- 	DIV(sclk_pixel, "sclk_pixel", "sclk_vpll", DIV_TV, 0, 4),
- 	DIV(aclk100, "aclk100", "mout_aclk100", DIV_TOP, 4, 4),
- 	DIV(aclk160, "aclk160", "mout_aclk160", DIV_TOP, 8, 3),
- 	DIV(aclk133, "aclk133", "mout_aclk133", DIV_TOP, 12, 3),
- 	DIV(none, "div_onenand", "mout_onenand1", DIV_TOP, 16, 3),
- 	DIV(sclk_slimbus, "sclk_slimbus", "sclk_epll", DIV_PERIL3, 4, 4),
- 	DIV(sclk_pcm1, "sclk_pcm1", "sclk_audio1", DIV_PERIL4, 4, 8),
- 	DIV(sclk_pcm2, "sclk_pcm2", "sclk_audio2", DIV_PERIL4, 20, 8),
- 	DIV(sclk_i2s1, "sclk_i2s1", "sclk_audio1", DIV_PERIL5, 0, 6),
- 	DIV(sclk_i2s2, "sclk_i2s2", "sclk_audio2", DIV_PERIL5, 8, 6),
- 	DIV(none, "div_mmc4", "mout_mmc4", DIV_FSYS3, 0, 4),
- 	DIV_F(none, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8,
+ 	DIV(0, "div_fimd0", "mout_fimd0", DIV_LCD0, 0, 4),
+ 	DIV(0, "div_mipi0", "mout_mipi0", DIV_LCD0, 16, 4),
+ 	DIV(0, "div_audio0", "mout_audio0", DIV_MAUDIO, 0, 4),
+ 	DIV(CLK_SCLK_PCM0, "sclk_pcm0", "sclk_audio0", DIV_MAUDIO, 4, 8),
+ 	DIV(0, "div_mmc0", "mout_mmc0", DIV_FSYS1, 0, 4),
+ 	DIV(0, "div_mmc1", "mout_mmc1", DIV_FSYS1, 16, 4),
+ 	DIV(0, "div_mmc2", "mout_mmc2", DIV_FSYS2, 0, 4),
+ 	DIV(0, "div_mmc3", "mout_mmc3", DIV_FSYS2, 16, 4),
+ 	DIV(CLK_SCLK_PIXEL, "sclk_pixel", "sclk_vpll", DIV_TV, 0, 4),
+ 	DIV(CLK_ACLK100, "aclk100", "mout_aclk100", DIV_TOP, 4, 4),
+ 	DIV(CLK_ACLK160, "aclk160", "mout_aclk160", DIV_TOP, 8, 3),
+ 	DIV(CLK_ACLK133, "aclk133", "mout_aclk133", DIV_TOP, 12, 3),
+ 	DIV(0, "div_onenand", "mout_onenand1", DIV_TOP, 16, 3),
+ 	DIV(CLK_SCLK_SLIMBUS, "sclk_slimbus", "sclk_epll", DIV_PERIL3, 4, 4),
+ 	DIV(CLK_SCLK_PCM1, "sclk_pcm1", "sclk_audio1", DIV_PERIL4, 4, 8),
+ 	DIV(CLK_SCLK_PCM2, "sclk_pcm2", "sclk_audio2", DIV_PERIL4, 20, 8),
+ 	DIV(CLK_SCLK_I2S1, "sclk_i2s1", "sclk_audio1", DIV_PERIL5, 0, 6),
+ 	DIV(CLK_SCLK_I2S2, "sclk_i2s2", "sclk_audio2", DIV_PERIL5, 8, 6),
+ 	DIV(0, "div_mmc4", "mout_mmc4", DIV_FSYS3, 0, 4),
 -	DIV(0, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8),
++	DIV_F(0, "div_mmc_pre4", "div_mmc4", DIV_FSYS3, 8, 8,
 +			CLK_SET_RATE_PARENT, 0),
- 	DIV(none, "div_uart0", "mout_uart0", DIV_PERIL0, 0, 4),
- 	DIV(none, "div_uart1", "mout_uart1", DIV_PERIL0, 4, 4),
- 	DIV(none, "div_uart2", "mout_uart2", DIV_PERIL0, 8, 4),
- 	DIV(none, "div_uart3", "mout_uart3", DIV_PERIL0, 12, 4),
- 	DIV(none, "div_uart4", "mout_uart4", DIV_PERIL0, 16, 4),
- 	DIV(none, "div_spi0", "mout_spi0", DIV_PERIL1, 0, 4),
- 	DIV(none, "div_spi_pre0", "div_spi0", DIV_PERIL1, 8, 8),
- 	DIV(none, "div_spi1", "mout_spi1", DIV_PERIL1, 16, 4),
- 	DIV(none, "div_spi_pre1", "div_spi1", DIV_PERIL1, 24, 8),
- 	DIV(none, "div_spi2", "mout_spi2", DIV_PERIL2, 0, 4),
- 	DIV(none, "div_spi_pre2", "div_spi2", DIV_PERIL2, 8, 8),
- 	DIV(none, "div_audio1", "mout_audio1", DIV_PERIL4, 0, 4),
- 	DIV(none, "div_audio2", "mout_audio2", DIV_PERIL4, 16, 4),
- 	DIV(arm_clk, "arm_clk", "div_core2", DIV_CPU0, 28, 3),
- 	DIV(sclk_apll, "sclk_apll", "mout_apll", DIV_CPU0, 24, 3),
- 	DIV_F(none, "div_mipi_pre0", "div_mipi0", DIV_LCD0, 20, 4,
+ 	DIV(0, "div_uart0", "mout_uart0", DIV_PERIL0, 0, 4),
+ 	DIV(0, "div_uart1", "mout_uart1", DIV_PERIL0, 4, 4),
+ 	DIV(0, "div_uart2", "mout_uart2", DIV_PERIL0, 8, 4),
+ 	DIV(0, "div_uart3", "mout_uart3", DIV_PERIL0, 12, 4),
+ 	DIV(0, "div_uart4", "mout_uart4", DIV_PERIL0, 16, 4),
+ 	DIV(0, "div_spi0", "mout_spi0", DIV_PERIL1, 0, 4),
+ 	DIV(0, "div_spi_pre0", "div_spi0", DIV_PERIL1, 8, 8),
+ 	DIV(0, "div_spi1", "mout_spi1", DIV_PERIL1, 16, 4),
+ 	DIV(0, "div_spi_pre1", "div_spi1", DIV_PERIL1, 24, 8),
+ 	DIV(0, "div_spi2", "mout_spi2", DIV_PERIL2, 0, 4),
+ 	DIV(0, "div_spi_pre2", "div_spi2", DIV_PERIL2, 8, 8),
+ 	DIV(0, "div_audio1", "mout_audio1", DIV_PERIL4, 0, 4),
+ 	DIV(0, "div_audio2", "mout_audio2", DIV_PERIL4, 16, 4),
+ 	DIV(CLK_ARM_CLK, "arm_clk", "div_core2", DIV_CPU0, 28, 3),
+ 	DIV(CLK_SCLK_APLL, "sclk_apll", "mout_apll", DIV_CPU0, 24, 3),
+ 	DIV_F(0, "div_mipi_pre0", "div_mipi0", DIV_LCD0, 20, 4,
  			CLK_SET_RATE_PARENT, 0),
- 	DIV_F(none, "div_mmc_pre0", "div_mmc0", DIV_FSYS1, 8, 8,
+ 	DIV_F(0, "div_mmc_pre0", "div_mmc0", DIV_FSYS1, 8, 8,
  			CLK_SET_RATE_PARENT, 0),
- 	DIV_F(none, "div_mmc_pre1", "div_mmc1", DIV_FSYS1, 24, 8,
+ 	DIV_F(0, "div_mmc_pre1", "div_mmc1", DIV_FSYS1, 24, 8,
  			CLK_SET_RATE_PARENT, 0),
- 	DIV_F(none, "div_mmc_pre2", "div_mmc2", DIV_FSYS2, 8, 8,
+ 	DIV_F(0, "div_mmc_pre2", "div_mmc2", DIV_FSYS2, 8, 8,
  			CLK_SET_RATE_PARENT, 0),
- 	DIV_F(none, "div_mmc_pre3", "div_mmc3", DIV_FSYS2, 24, 8,
+ 	DIV_F(0, "div_mmc_pre3", "div_mmc3", DIV_FSYS2, 24, 8,
  			CLK_SET_RATE_PARENT, 0),
  };
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2013-06-17  7:27 Stephen Rothwell
  2013-06-17 18:49 ` Mike Turquette
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2013-06-17  7:27 UTC (permalink / raw)
  To: Mike Turquette
  Cc: linux-next, linux-kernel, Joseph Lo, Stephen Warren,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel,
	Peter De Schrijver

[-- Attachment #1: Type: text/plain, Size: 1084 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
drivers/clk/tegra/clk-tegra114.c between commit 31972fd95527 ("clk:
tegra114: implement wait_for_reset and disable_clock for
tegra_cpu_car_ops") from the arm-soc tree and commit d53442e94db0 ("clk:
tegra: override bits for Tegra114 PLLM") from the clk tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/clk/tegra/clk-tegra114.c
index 40d939d,7fe36ea..0000000
--- a/drivers/clk/tegra/clk-tegra114.c
+++ b/drivers/clk/tegra/clk-tegra114.c
@@@ -250,9 -251,10 +251,13 @@@
  #define CLK_SOURCE_XUSB_DEV_SRC 0x60c
  #define CLK_SOURCE_EMC 0x19c
  
 +/* Tegra CPU clock and reset control regs */
 +#define CLK_RST_CONTROLLER_CPU_CMPLX_STATUS	0x470
 +
+ /* PLLM override registers */
+ #define PMC_PLLM_WB0_OVERRIDE 0x1dc
+ #define PMC_PLLM_WB0_OVERRIDE_2 0x2b0
+ 
  static int periph_clk_enb_refcnt[CLK_OUT_ENB_NUM * 32];
  
  static void __iomem *clk_base;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2013-02-02 12:27 Stephen Rothwell
  2013-02-04 17:54 ` Mike Turquette
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2013-02-02 12:27 UTC (permalink / raw)
  To: Mike Turquette
  Cc: linux-next, linux-kernel, Stephen Warren, Olof Johansson,
	Arnd Bergmann, linux-arm-kernel, Prashant Gaikwad

[-- Attachment #1: Type: text/plain, Size: 1855 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
include/asm-generic/vmlinux.lds.h between commit ae278a935f08
("clocksource: add common of_clksrc_init() function") from the arm-soc
tree and commit f2f6c2556dcc ("clk: add common of_clk_init() function")
from the clk tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc include/asm-generic/vmlinux.lds.h
index fc62ac5,c1fe60a..0000000
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@ -149,25 -149,16 +149,34 @@@
  #define TRACE_SYSCALLS()
  #endif
  
 +#ifdef CONFIG_CLKSRC_OF
 +#define CLKSRC_OF_TABLES() . = ALIGN(8);				\
 +			   VMLINUX_SYMBOL(__clksrc_of_table) = .;	\
 +			   *(__clksrc_of_table)				\
 +			   *(__clksrc_of_table_end)
 +#else
 +#define CLKSRC_OF_TABLES()
 +#endif
 +
 +#ifdef CONFIG_IRQCHIP
 +#define IRQCHIP_OF_MATCH_TABLE()					\
 +	. = ALIGN(8);							\
 +	VMLINUX_SYMBOL(__irqchip_begin) = .;				\
 +	*(__irqchip_of_table)		  				\
 +	*(__irqchip_of_end)
 +#else
 +#define IRQCHIP_OF_MATCH_TABLE()
 +#endif
  
+ #ifdef CONFIG_COMMON_CLK
+ #define CLK_OF_TABLES() . = ALIGN(8);				\
+ 			VMLINUX_SYMBOL(__clk_of_table) = .;	\
+ 			*(__clk_of_table)			\
+ 			*(__clk_of_table_end)
+ #else
+ #define CLK_OF_TABLES()
+ #endif
+ 
  #define KERNEL_DTB()							\
  	STRUCT_ALIGN();							\
  	VMLINUX_SYMBOL(__dtb_start) = .;				\
@@@ -511,9 -502,8 +520,10 @@@
  	DEV_DISCARD(init.rodata)					\
  	CPU_DISCARD(init.rodata)					\
  	MEM_DISCARD(init.rodata)					\
 +	CLKSRC_OF_TABLES()						\
+ 	CLK_OF_TABLES()							\
 -	KERNEL_DTB()
 +	KERNEL_DTB()							\
 +	IRQCHIP_OF_MATCH_TABLE()
  
  #define INIT_TEXT							\
  	*(.init.text)							\

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2012-11-28  6:12 Stephen Rothwell
  0 siblings, 0 replies; 28+ messages in thread
From: Stephen Rothwell @ 2012-11-28  6:12 UTC (permalink / raw)
  To: Mike Turquette
  Cc: linux-next, linux-kernel, Ulf Hansson, Lee Jones, Olof Johansson,
	Arnd Bergmann, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 561 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-ux500/cpu-db8500.c between commit e13316d60658 ("ARM:
ux500: Rename dbx500 cpufreq code to be more generic") from the arm-soc
tree and commit 50545e1d237b ("ARM: ux500: Remove cpufreq platform
device") from the clk tree.

I fixed it up (I used the clk tree version since that removed the code
that the arm-soc tree version modified) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2012-10-30  4:06 Stephen Rothwell
  2012-10-30 10:11 ` Mike Turquette
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2012-10-30  4:06 UTC (permalink / raw)
  To: Mike Turquette
  Cc: linux-next, linux-kernel, Pawel Moll, Olof Johansson,
	Arnd Bergmann, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 1113 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
arch/arm/include/asm/hardware/sp810.h between commit 0891642cf117 ("ARM:
vexpress: Start using new Versatile Express infrastructure") from the
arm-soc tree and commit 05e3659135a4 ("clk: Common clocks implementation
for Versatile Express") from the clk tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/include/asm/hardware/sp810.h
index 2cdcf44,afd7e91..0000000
--- a/arch/arm/include/asm/hardware/sp810.h
+++ b/arch/arm/include/asm/hardware/sp810.h
@@@ -50,6 -50,14 +50,8 @@@
  #define SCPCELLID2		0xFF8
  #define SCPCELLID3		0xFFC
  
 -#define SCCTRL_TIMEREN0SEL_REFCLK	(0 << 15)
 -#define SCCTRL_TIMEREN0SEL_TIMCLK	(1 << 15)
 -
 -#define SCCTRL_TIMEREN1SEL_REFCLK	(0 << 17)
 -#define SCCTRL_TIMEREN1SEL_TIMCLK	(1 << 17)
 -
+ #define SCCTRL_TIMERENnSEL_SHIFT(n)	(15 + ((n) * 2))
+ 
  static inline void sysctl_soft_reset(void __iomem *base)
  {
  	/* switch to slow mode */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2012-09-10  6:14 Stephen Rothwell
  2012-09-10 15:24 ` Linus Walleij
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2012-09-10  6:14 UTC (permalink / raw)
  To: Mike Turquette
  Cc: linux-next, linux-kernel, Ulf Hansson, Loic PALLARDY,
	Olof Johansson, Arnd Bergmann, linux-arm-kernel, Linus Walleij

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
arch/arm/mach-ux500/clock.c between commit 79964bcd792f ("ARM: ux500:
Correct Ux500 family names usage") from the arm-soc tree and commit
ebc96db7632f ("ARM: ux500: Switch to use common clock framework") from
the clk tree.

The latter removed the file so I did that - there may be more fixup
required.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
* linux-next: manual merge of the clk tree with the arm-soc tree
@ 2012-07-13  5:14 Stephen Rothwell
  2012-07-13 15:10 ` Rob Herring
  0 siblings, 1 reply; 28+ messages in thread
From: Stephen Rothwell @ 2012-07-13  5:14 UTC (permalink / raw)
  To: Mike Turquette
  Cc: linux-next, linux-kernel, Linus Walleij, Olof Johansson,
	Arnd Bergmann, linux-arm-kernel, Rob Herring

[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]

Hi Mike,

Today's linux-next merge of the clk tree got a conflict in
drivers/clk/Makefile between commit 4a31bd28e86a ("ARM: nomadik: convert
to generic clock") from the arm-soc tree and commit 8d4d9f52081c ("clk:
add highbank clock support") from the clk tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/clk/Makefile
index 26b6b92,02ffdf6..0000000
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -3,6 -3,11 +3,12 @@@ obj-$(CONFIG_CLKDEV_LOOKUP)	+= clkdev.
  obj-$(CONFIG_COMMON_CLK)	+= clk.o clk-fixed-rate.o clk-gate.o \
  				   clk-mux.o clk-divider.o clk-fixed-factor.o
  # SoCs specific
 +obj-$(CONFIG_ARCH_NOMADIK)	+= clk-nomadik.o
+ obj-$(CONFIG_ARCH_HIGHBANK)	+= clk-highbank.o
  obj-$(CONFIG_ARCH_MXS)		+= mxs/
  obj-$(CONFIG_PLAT_SPEAR)	+= spear/
+ obj-$(CONFIG_ARCH_U300)		+= clk-u300.o
+ obj-$(CONFIG_ARCH_INTEGRATOR)	+= versatile/
+ 
+ # Chip specific
+ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 28+ messages in thread
end of thread, other threads:[~2016-11-22 23:59 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-19  7:27 linux-next: manual merge of the clk tree with the arm-soc tree Stephen Rothwell
2013-04-19  9:47 ` Pawel Moll
  -- strict thread matches above, loose matches on Subject: below --
2016-11-22  8:41 Stephen Rothwell
2016-11-22  9:36 ` Geert Uytterhoeven
2016-11-22 23:59   ` Stephen Rothwell
2016-03-01  3:57 Stephen Rothwell
2016-03-01  4:00 ` Stephen Rothwell
2016-03-01  8:38   ` Nicolas Ferre
2015-02-03  5:31 Stephen Rothwell
2015-02-03 18:25 ` Mike Turquette
2015-02-03  5:28 Stephen Rothwell
2014-01-13  5:06 Stephen Rothwell
2014-01-26 20:59 ` Tomasz Figa
2014-01-26 21:05   ` Tomasz Figa
2013-06-17  7:27 Stephen Rothwell
2013-06-17 18:49 ` Mike Turquette
2013-02-02 12:27 Stephen Rothwell
2013-02-04 17:54 ` Mike Turquette
2012-11-28  6:12 Stephen Rothwell
2012-10-30  4:06 Stephen Rothwell
2012-10-30 10:11 ` Mike Turquette
2012-10-30 10:39   ` Pawel Moll
2012-09-10  6:14 Stephen Rothwell
2012-09-10 15:24 ` Linus Walleij
2012-09-10 16:51   ` Mike Turquette
2012-07-13  5:14 Stephen Rothwell
2012-07-13 15:10 ` Rob Herring
2012-07-13 17:27   ` Mike Turquette

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).