linux-next: manual merge of the arm-soc tree with the tree

linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

[-- Attachment #1.1: Type: text/plain, Size: 484 bytes --]

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/boot/dts/qcom-msm8960.dtsi, arch/arm/boot/dts/qcom-msm8974.dtsi,
arch/arm/mach-omap2/pdata-quirks.c, arch/arm/mach-zynq/Kconfig,
drivers/watchdog/Kconfig and sound/soc/kirkwood/Kconfig between various
merge commits from Linus' tree and various merge commits from the arm-soc
tree.

I used the versions from Linus' tree.

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

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

[-- Attachment #2: Type: text/plain, Size: 176 bytes --]

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: linux-next: manual merge of the arm-soc tree with the tree

[Tony Lindgren]

* Stephen Rothwell <sfr@canb.auug.org.au> [140526 17:46]:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap2/omap-mpuss-lowpower.c between commit 4e4bb5c72f6b
> ("ARM: l2c: omap2: avoid reading directly from the L2 registers in
> platform code") from the arm tree and commit edfaf05c2fcb ("ARM:
> OMAP2+: raw read and write endian fix") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

OK thanks. FYI, looks like for this one the subject is missing which
tree it conflicts with.

Regards,

Tony
 
> --- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
> +++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
> @@@ -187,15 -187,19 +187,15 @@@ static void l2x0_pwrst_prepare(unsigne
>    * in every restore MPUSS OFF path.
>    */
>   #ifdef CONFIG_CACHE_L2X0
>  -static void save_l2x0_context(void)
>  +static void __init save_l2x0_context(void)
>   {
> - 	__raw_writel(l2x0_saved_regs.aux_ctrl,
> - 		     sar_base + L2X0_AUXCTRL_OFFSET);
> - 	__raw_writel(l2x0_saved_regs.prefetch_ctrl,
> - 		     sar_base + L2X0_PREFETCH_CTRL_OFFSET);
>  -	u32 val;
>  -	void __iomem *l2x0_base = omap4_get_l2cache_base();
>  -	if (l2x0_base) {
>  -		val = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
>  -		writel_relaxed(val, sar_base + L2X0_AUXCTRL_OFFSET);
>  -		val = readl_relaxed(l2x0_base + L2X0_PREFETCH_CTRL);
>  -		writel_relaxed(val, sar_base + L2X0_PREFETCH_CTRL_OFFSET);
>  -	}
> ++	writel_relaxed(l2x0_saved_regs.aux_ctrl,
> ++		       sar_base + L2X0_AUXCTRL_OFFSET);
> ++	writel_relaxed(l2x0_saved_regs.prefetch_ctrl,
> ++		       sar_base + L2X0_PREFETCH_CTRL_OFFSET);
>   }
>   #else
>  -static void save_l2x0_context(void)
>  +static void __init save_l2x0_context(void)
>   {}
>   #endif
>   

linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/omap-mpuss-lowpower.c between commit 4e4bb5c72f6b
("ARM: l2c: omap2: avoid reading directly from the L2 registers in
platform code") from the arm tree and commit edfaf05c2fcb ("ARM:
OMAP2+: raw read and write endian fix") from the arm-soc 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/mach-omap2/omap-mpuss-lowpower.c
index 61cb77f8cf12,eb76e47091ad..000000000000
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@@ -187,15 -187,19 +187,15 @@@ static void l2x0_pwrst_prepare(unsigne
   * in every restore MPUSS OFF path.
   */
  #ifdef CONFIG_CACHE_L2X0
 -static void save_l2x0_context(void)
 +static void __init save_l2x0_context(void)
  {
- 	__raw_writel(l2x0_saved_regs.aux_ctrl,
- 		     sar_base + L2X0_AUXCTRL_OFFSET);
- 	__raw_writel(l2x0_saved_regs.prefetch_ctrl,
- 		     sar_base + L2X0_PREFETCH_CTRL_OFFSET);
 -	u32 val;
 -	void __iomem *l2x0_base = omap4_get_l2cache_base();
 -	if (l2x0_base) {
 -		val = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
 -		writel_relaxed(val, sar_base + L2X0_AUXCTRL_OFFSET);
 -		val = readl_relaxed(l2x0_base + L2X0_PREFETCH_CTRL);
 -		writel_relaxed(val, sar_base + L2X0_PREFETCH_CTRL_OFFSET);
 -	}
++	writel_relaxed(l2x0_saved_regs.aux_ctrl,
++		       sar_base + L2X0_AUXCTRL_OFFSET);
++	writel_relaxed(l2x0_saved_regs.prefetch_ctrl,
++		       sar_base + L2X0_PREFETCH_CTRL_OFFSET);
  }
  #else
 -static void save_l2x0_context(void)
 +static void __init save_l2x0_context(void)
  {}
  #endif
  

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

linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit 85649711a895 ("ARM: gemini: delete
<mach/gpio.h>") from the gpio tree and commit f3372c01816e ("ARM: gemini:
convert to GENERIC_CLOCKEVENTS") from the arm-soc 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/Kconfig
index 55be62c92b60,04163fece49f..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -391,8 -385,10 +390,9 @@@ config ARCH_CLPS711
  config ARCH_GEMINI
  	bool "Cortina Systems Gemini"
  	select ARCH_REQUIRE_GPIOLIB
- 	select ARCH_USES_GETTIMEOFFSET
+ 	select CLKSRC_MMIO
  	select CPU_FA526
+ 	select GENERIC_CLOCKEVENTS
 -	select NEED_MACH_GPIO_H
  	help
  	  Support for the Cortina Systems Gemini family SoCs
  

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

linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
include/linux/mfd/davinci_voicecodec.h between commit 997174705458 ("mfd:
davinci_voicecodec: Fix build breakage") from the mfd tree and commit
3ad7a42d5a9c ("ARM: davinci: move private EDMA API to arm/common") from
the arm-soc 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/linux/mfd/davinci_voicecodec.h
index 810aee7,7dd6524..0000000
--- a/include/linux/mfd/davinci_voicecodec.h
+++ b/include/linux/mfd/davinci_voicecodec.h
@@@ -26,10 -26,8 +26,10 @@@
  #include <linux/kernel.h>
  #include <linux/platform_device.h>
  #include <linux/mfd/core.h>
+ #include <linux/platform_data/edma.h>
  
- #include <mach/edma.h>
 +#include <mach/hardware.h>
 +
  /*
   * Register values.
   */

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

linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-spear13xx/spear13xx.c between commit b47394911c26 ("ARM:
SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree
and commit 3e270ba6e915 ("ARM: SPEAr13xx: Remove fields not required for
ssp controller") from the arm-soc 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/mach-spear13xx/spear13xx.c
index 0e166fa,c4af775..0000000
--- a/arch/arm/mach-spear13xx/spear13xx.c
+++ b/arch/arm/mach-spear13xx/spear13xx.c
@@@ -25,14 -25,60 +25,12 @@@
  #include <mach/generic.h>
  #include <mach/spear.h>
  
 -/* common dw_dma filter routine to be used by peripherals */
 -bool dw_dma_filter(struct dma_chan *chan, void *slave)
 -{
 -	struct dw_dma_slave *dws = (struct dw_dma_slave *)slave;
 -
 -	if (chan->device->dev == dws->dma_dev) {
 -		chan->private = slave;
 -		return true;
 -	} else {
 -		return false;
 -	}
 -}
 -
  /* ssp device registration */
 -static struct dw_dma_slave ssp_dma_param[] = {
 -	{
 -		/* Tx */
 -		.cfg_hi = DWC_CFGH_DST_PER(DMA_REQ_SSP0_TX),
 -		.cfg_lo = 0,
 -		.src_master = DMA_MASTER_MEMORY,
 -		.dst_master = DMA_MASTER_SSP0,
 -	}, {
 -		/* Rx */
 -		.cfg_hi = DWC_CFGH_SRC_PER(DMA_REQ_SSP0_RX),
 -		.cfg_lo = 0,
 -		.src_master = DMA_MASTER_SSP0,
 -		.dst_master = DMA_MASTER_MEMORY,
 -	}
 -};
 -
  struct pl022_ssp_controller pl022_plat_data = {
- 	.bus_id = 0,
  	.enable_dma = 1,
 -	.dma_filter = dw_dma_filter,
 -	.dma_rx_param = &ssp_dma_param[1],
 -	.dma_tx_param = &ssp_dma_param[0],
 -};
 -
 -/* CF device registration */
 -struct dw_dma_slave cf_dma_priv = {
 -	.cfg_hi = 0,
 -	.cfg_lo = 0,
 -	.src_master = 0,
 -	.dst_master = 0,
 -};
 -
 -/* dmac device registeration */
 -struct dw_dma_platform_data dmac_plat_data = {
 -	.nr_channels = 8,
 -	.chan_allocation_order = CHAN_ALLOCATION_DESCENDING,
 -	.chan_priority = CHAN_PRIORITY_DESCENDING,
 -	.block_size = 4095U,
 -	.nr_masters = 2,
 -	.data_width = { 3, 3, 0, 0 },
 +	.dma_filter = dw_dma_generic_filter,
 +	.dma_rx_param = "ssp0_rx",
 +	.dma_tx_param = "ssp0_tx",
- 	.num_chipselect = 3,
  };
  
  void __init spear13xx_l2x0_init(void)

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

Re: linux-next: manual merge of the arm-soc tree with the tree

[Tony Prisk]

On Tue, 2012-09-25 at 16:37 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in
> Documentation/devicetree/bindings/usb/platform-uhci.txt between commit
> 100d45970327 ("ARM: vt8500: Add support for UHCI companion controller")
> from the usb tree and commit 95e9fd10f06c ("arm: vt8500: doc: Add device
> tree bindings for arch-vt8500 devices") from the arm-soc tree.
> 
> I used the version from the arm-soc tree and can carry the fix as
> necessary (no action is required).
> 

Both versions were the same (my bad for not removing it from the arm-soc
patch).
Thanks Stephen

Regards

Tony P

linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
Documentation/devicetree/bindings/usb/platform-uhci.txt between commit
100d45970327 ("ARM: vt8500: Add support for UHCI companion controller")
from the usb tree and commit 95e9fd10f06c ("arm: vt8500: doc: Add device
tree bindings for arch-vt8500 devices") from the arm-soc tree.

I used the version from the arm-soc tree 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 --]

linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-imx/clk-imx51-imx53.c between commit 75453a08e365 ("ARM:
i.MX5: Add nand oftree support") from the mtd tree and commit
a745f039b901 ("ARM i.MX53: register CAN clocks") from the arm-soc 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/mach-imx/clk-imx51-imx53.c
index e81f17a,e5165a8..0000000
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@@ -456,7 -461,10 +462,11 @@@ int __init mx53_clocks_init(unsigned lo
  	clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi");
  	clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi");
  	clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi");
 +	clk_register_clkdev(clk[nfc_gate], NULL, "63fdb000.nand");
+ 	clk_register_clkdev(clk[can1_ipg_gate], "ipg", "53fc8000.can");
+ 	clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can");
+ 	clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can");
+ 	clk_register_clkdev(clk[can2_serial_gate], "per", "53fcc000.can");
  
  	/* set SDHC root clock to 200MHZ*/
  	clk_set_rate(clk[esdhc_a_podf], 200000000);

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

Re: linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

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

Hi guys,

Sorry for the cut and paste mess ... :-(

On Thu, 8 Mar 2012 17:03:03 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
> 
> Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap1/board-palmz71.c between commit  ("") from the  tree and commit  ("") from the arm-soc tree.
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-omap1/board-palmz71.c between commit ddba6c7f7ec6 ("OMAP1:
> pass LCD config with omapfb_set_lcd_config()") from the omap_dss2 tree
> and commit 2e3ee9f45b3c ("ARM: OMAP1: Move most of plat/io.h into local
> iomap.h") from the arm-soc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-omap1/board-palmz71.c
> index 9924c70,c1cd0f2..0000000
> --- a/arch/arm/mach-omap1/board-palmz71.c
> +++ b/arch/arm/mach-omap1/board-palmz71.c
> @@@ -27,9 -27,9 +27,10 @@@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>  +#include <linux/omapfb.h>
> + #include <linux/spi/spi.h>
> + #include <linux/spi/ads7846.h>
>   
> - #include <mach/hardware.h>
>   #include <asm/mach-types.h>
>   #include <asm/mach/arch.h>
>   #include <asm/mach/map.h>


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

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

linux-next: manual merge of the arm-soc tree with the tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-omap1/board-palmz71.c between commit  ("") from the  tree and commit  ("") from the arm-soc tree.
Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap1/board-palmz71.c between commit ddba6c7f7ec6 ("OMAP1:
pass LCD config with omapfb_set_lcd_config()") from the omap_dss2 tree
and commit 2e3ee9f45b3c ("ARM: OMAP1: Move most of plat/io.h into local
iomap.h") from the arm-soc tree.

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

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

diff --cc arch/arm/mach-omap1/board-palmz71.c
index 9924c70,c1cd0f2..0000000
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@@ -27,9 -27,9 +27,10 @@@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
  #include <linux/mtd/physmap.h>
 +#include <linux/omapfb.h>
+ #include <linux/spi/spi.h>
+ #include <linux/spi/ads7846.h>
  
- #include <mach/hardware.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>

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