linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-02-09 23:50 Stephen Rothwell
  2012-02-10  0:25 ` Olof Johansson
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2012-02-09 23:50 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-at91/at91cap9.c between commit fa23e771d863 ("Merge branch
'fixes' into for-next") from the arm tree and commit 9918ceafd4a9 ("ARM:
at91: code removal of CAP9 SoC") from the arm-soc tree.

The latter removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120210/3cdd3487/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2022-02-28  0:16 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2022-02-28  0:16 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, ARM, Russell King
  Cc: Ard Biesheuvel, Linus Walleij, Linux Kernel Mailing List,
	Linux Next Mailing List


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

Hi all,

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

  arch/arm/Kconfig

between commit:

  54f481a2308e ("ARM: remove old-style irq entry")

from the arm tree and commit:

  00ba9357d189 ("ARM: ixp4xx: Drop custom DMA coherency and bouncing")

from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/Kconfig
index 72150cb8db02,d9142ad18c52..000000000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -389,10 -379,10 +386,9 @@@ config ARCH_IOP32
  config ARCH_IXP4XX
  	bool "IXP4xx-based"
  	depends on MMU
- 	select ARCH_HAS_DMA_SET_COHERENT_MASK
  	select ARCH_SUPPORTS_BIG_ENDIAN
+ 	select ARM_PATCH_PHYS_VIRT
  	select CPU_XSCALE
- 	select DMABOUNCE if PCI
 -	select GENERIC_IRQ_MULTI_HANDLER
  	select GPIO_IXP4XX
  	select GPIOLIB
  	select HAVE_PCI

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 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

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2021-02-01 22:01 Stephen Rothwell
  2021-02-14 22:14 ` Stephen Rothwell
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2021-02-01 22:01 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, ARM, Russell King
  Cc: Linux Next Mailing List, Linux Kernel Mailing List, Alain VOLMAT


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

Hi all,

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

  arch/arm/Kconfig.debug

between commits:

  9ca4efec0aba ("ARM: 9040/1: use DEBUG_UART_PHYS and DEBUG_UART_VIRT for sti LL_UART")
  6e959ad8bb90 ("ARM: 9041/1: sti LL_UART: add STiH418 SBC UART0 support")

from the arm tree and commits:

  f3a732843acc ("ARM: remove sirf prima2/atlas platforms")
  89d4f98ae90d ("ARM: remove zte zx platform")

from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/Kconfig.debug
index 7a8697a97c98,c36c5d4c6e9c..000000000000
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1623,10 -1546,7 +1550,9 @@@ config DEBUG_LL_INCLUD
  	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
  	default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART || DEBUG_S3C64XX_UART
  	default "debug/s5pv210.S" if DEBUG_S5PV210_UART
- 	default "debug/sirf.S" if DEBUG_SIRFSOC_UART
 -	default "debug/sti.S" if DEBUG_STI_UART
 +	default "debug/sti.S" if DEBUG_STIH41X_ASC2
 +	default "debug/sti.S" if DEBUG_STIH41X_SBC_ASC1
 +	default "debug/sti.S" if DEBUG_STIH418_SBC_ASC0
  	default "debug/stm32.S" if DEBUG_STM32_UART
  	default "debug/tegra.S" if DEBUG_TEGRA_UART
  	default "debug/ux500.S" if DEBUG_UX500_UART
@@@ -1659,8 -1579,6 +1585,7 @@@ config DEBUG_UART_PHY
  	default 0x02531000 if DEBUG_KEYSTONE_UART1
  	default 0x03010fe0 if ARCH_RPC
  	default 0x07000000 if DEBUG_SUN9I_UART0
- 	default 0x09405000 if DEBUG_ZTE_ZX
 +	default 0x09530000 if DEBUG_STIH418_SBC_ASC0
  	default 0x10009000 if DEBUG_REALVIEW_STD_PORT || \
  				DEBUG_VEXPRESS_UART0_CA9
  	default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
@@@ -1789,10 -1698,8 +1707,10 @@@
  		DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
  		DEBUG_S3C64XX_UART || \
  		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
- 		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
+ 		DEBUG_DIGICOLOR_UA0 || \
 -		DEBUG_AT91_UART || DEBUG_STM32_UART
 +		DEBUG_AT91_UART || DEBUG_STM32_UART || \
 +		DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
 +		DEBUG_STIH418_SBC_ASC0
  
  config DEBUG_UART_VIRT
  	hex "Virtual base address of debug UART"
@@@ -1854,12 -1760,9 +1772,11 @@@
  	default 0xfb020000 if DEBUG_OMAP3UART3
  	default 0xfb042000 if DEBUG_OMAP3UART4
  	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
- 	default 0xfc705000 if DEBUG_ZTE_ZX
  	default 0xfcfe8600 if DEBUG_BCM63XX_UART
  	default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
 +	default 0xfd531000 if DEBUG_STIH41X_SBC_ASC1
  	default 0xfd883000 if DEBUG_ALPINE_UART0
 +	default 0xfdd32000 if DEBUG_STIH41X_ASC2
  	default 0xfe010000 if STM32MP1_DEBUG_UART
  	default 0xfe017000 if DEBUG_MMP_UART2
  	default 0xfe018000 if DEBUG_MMP_UART3
@@@ -1904,10 -1802,8 +1816,10 @@@
  		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
  		DEBUG_S3C64XX_UART || \
  		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
- 		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
+ 		DEBUG_DIGICOLOR_UA0 || \
 -		DEBUG_AT91_UART || DEBUG_STM32_UART
 +		DEBUG_AT91_UART || DEBUG_STM32_UART || \
 +		DEBUG_STIH41X_ASC2 || DEBUG_STIH41X_SBC_ASC1 || \
 +		DEBUG_STIH418_SBC_ASC0
  
  config DEBUG_UART_8250_SHIFT
  	int "Register offset shift for the 8250 debug UART"

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 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

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2019-08-29 23:27 Stephen Rothwell
  2019-08-30 12:29 ` Arnd Bergmann
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2019-08-29 23:27 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, ARM, Russell King
  Cc: Nathan Chancellor, Linux Next Mailing List,
	Linux Kernel Mailing List


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

Hi all,

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

  arch/arm/mach-iop13xx/pci.c

between commit:

  4af014984273 ("ARM: 8871/1: iop13xx: Simplify iop13xx_atu{e,x}_pci_status checks")

from the arm tree and commit:

  59d3ae9a5bf6 ("ARM: remove Intel iop33x and iop13xx support")

from the arm-soc tree.

I fixed it up (the latter removed the file, so I did that) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 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

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2018-05-29 23:40 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2018-05-29 23:40 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

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

  arch/arm/include/asm/cputype.h

between commit:

  1067a8130b17 ("ARM: add more CPU part numbers for Cortex and Brahma B15 CPUs")

from the arm tree and commits:

  9e35ddc962a6 ("ARM: add Broadcom Brahma-B53 main ID definition")
  842fa17d6c95 ("ARM: add Broadcom Brahma-B15 main ID definition")

from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/include/asm/cputype.h
index 26021980504d,d1b62ee69f3b..000000000000
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@@ -77,15 -75,11 +75,16 @@@
  #define ARM_CPU_PART_CORTEX_A12		0x4100c0d0
  #define ARM_CPU_PART_CORTEX_A17		0x4100c0e0
  #define ARM_CPU_PART_CORTEX_A15		0x4100c0f0
 +#define ARM_CPU_PART_CORTEX_A53		0x4100d030
 +#define ARM_CPU_PART_CORTEX_A57		0x4100d070
 +#define ARM_CPU_PART_CORTEX_A72		0x4100d080
 +#define ARM_CPU_PART_CORTEX_A73		0x4100d090
 +#define ARM_CPU_PART_CORTEX_A75		0x4100d0a0
  #define ARM_CPU_PART_MASK		0xff00fff0
  
- /* Broadcom cores */
+ /* Broadcom implemented processors */
  #define ARM_CPU_PART_BRAHMA_B15		0x420000f0
+ #define ARM_CPU_PART_BRAHMA_B53		0x42001000
  
  /* DEC implemented cores */
  #define ARM_CPU_PART_SA1100		0x4400a110
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180530/9058fefc/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2018-05-23 12:25 Mark Brown
  0 siblings, 0 replies; 70+ messages in thread
From: Mark Brown @ 2018-05-23 12:25 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

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

  arch/arm/include/asm/cputype.h

between commit:

  b2ccaa851e9882c10 ("ARM: add CPU part numbers for Cortex A73, A75 and Brahma B15")

from the arm tree and several commits from the arm-soc tree:

  842fa17d6c95368d7 ("ARM: add Broadcom Brahma-B15 main ID definition")
  9e35ddc962a656bf4 ("ARM: add Broadcom Brahma-B53 main ID definition")

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc arch/arm/include/asm/cputype.h
index adc4a3eef815,d1b62ee69f3b..000000000000
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@@ -77,12 -75,11 +75,13 @@@
  #define ARM_CPU_PART_CORTEX_A12		0x4100c0d0
  #define ARM_CPU_PART_CORTEX_A17		0x4100c0e0
  #define ARM_CPU_PART_CORTEX_A15		0x4100c0f0
 +#define ARM_CPU_PART_CORTEX_A73		0x4100d090
 +#define ARM_CPU_PART_CORTEX_A75		0x4100d0a0
  #define ARM_CPU_PART_MASK		0xff00fff0
  
 -/* Broadcom implemented processors */
 +/* Broadcom cores */
  #define ARM_CPU_PART_BRAHMA_B15		0x420000f0
+ #define ARM_CPU_PART_BRAHMA_B53		0x42001000
  
  /* DEC implemented cores */
  #define ARM_CPU_PART_SA1100		0x4400a110
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180523/54e23a7b/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2017-01-17 22:49 Stephen Rothwell
  2017-01-17 22:53 ` Florian Fainelli
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2017-01-17 22:49 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

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

  arch/arm/mach-ux500/platsmp.c

between commit:

  6996cbb23721 ("ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol")

from the arm tree and commit:

  9e634cae7256 ("ARM: ux500: simplify secondary boot")

from the arm-soc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm/mach-ux500/platsmp.c
index 8c8f26389067,e0ee139fdebf..000000000000
--- a/arch/arm/mach-ux500/platsmp.c
+++ b/arch/arm/mach-ux500/platsmp.c
@@@ -92,7 -73,19 +73,19 @@@ static void __init ux500_smp_prepare_cp
  
  static int ux500_boot_secondary(unsigned int cpu, struct task_struct *idle)
  {
- 	wakeup_secondary();
+ 	/*
+ 	 * write the address of secondary startup into the backup ram register
+ 	 * at offset 0x1FF4, then write the magic number 0xA1FEED01 to the
+ 	 * backup ram register at offset 0x1FF0, which is what boot rom code
+ 	 * is waiting for. This will wake up the secondary core from WFE.
+ 	 */
 -	writel(virt_to_phys(secondary_startup),
++	writel(__pa_symbol(secondary_startup),
+ 	       backupram + UX500_CPU1_JUMPADDR_OFFSET);
+ 	writel(0xA1FEED01,
+ 	       backupram + UX500_CPU1_WAKEMAGIC_OFFSET);
+ 
+ 	/* make sure write buffer is drained */
+ 	mb();
  	arch_send_wakeup_ipi_mask(cpumask_of(cpu));
  	return 0;
  }

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2015-08-11 23:48 Stephen Rothwell
  2015-08-11 23:53 ` Nicolas Pitre
  2015-09-02  0:47 ` Stephen Rothwell
  0 siblings, 2 replies; 70+ messages in thread
From: Stephen Rothwell @ 2015-08-11 23:48 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

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

  arch/arm/kernel/psci.c

between commit:

  be120397e770 ("ARM: migrate to common PSCI client code")

from the arm tree and commit:

  19c233b79d1a ("ARM: appropriate __init annotation for const data")

from the arm-soc tree.

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

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Aug 2015 09:39:15 +1000
Subject: [PATCH] ARM: fix for PSCI code movement

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/firmware/psci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index a6956007dd38..42700f09a8c5 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -337,7 +337,7 @@ out_put_node:
 	return err;
 }
 
-static const struct of_device_id psci_of_match[] __initconst = {
+static const struct of_device_id const psci_of_match[] __initconst = {
 	{ .compatible = "arm,psci",	.data = psci_0_1_init},
 	{ .compatible = "arm,psci-0.2",	.data = psci_0_2_init},
 	{},
-- 
2.5.0

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

^ permalink raw reply related	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2015-06-01 22:47 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2015-06-01 22:47 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-socfpga/core.h between commit 02b4e2756e01 ("ARM: v7
setup function should invalidate L1 cache") from the arm tree and
commit 122694a0c712 ("ARM: socfpga: use of_iomap to map the SCU") 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 at canb.auug.org.au

diff --cc arch/arm/mach-socfpga/core.h
index 767c09e954a0,5913bbb50036..000000000000
--- a/arch/arm/mach-socfpga/core.h
+++ b/arch/arm/mach-socfpga/core.h
@@@ -31,8 -31,8 +31,6 @@@
  
  #define RSTMGR_MPUMODRST_CPU1		0x2     /* CPU1 Reset */
  
- extern void __iomem *socfpga_scu_base_addr;
 -extern void socfpga_secondary_startup(void);
--
  extern void socfpga_init_clocks(void);
  extern void socfpga_sysmgr_init(void);
  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150602/90494ea3/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2015-01-29 22:55 Stephen Rothwell
  2015-01-29 23:05 ` Russell King - ARM Linux
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2015-01-29 22:55 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig.debug between commit 4d31e6641295 ("ARM: 8272/1: netx:
Migrate DEBUG_LL macros to shared directory") from the  tree and
commits 01ea63d99397 ("ARM: sirf: add two debug ports for CSRatlas7
SoC") and e23814da8262 ("ARM: digicolor: add low level debug support")
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 at canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index a324ecdfeb21,b6a073de1559..000000000000
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1448,17 -1461,15 +1517,19 @@@ config DEBUG_UART_VIR
  	default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
  	default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
  	default 0xfef36000 if DEBUG_HIGHBANK_UART
 +	default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
 +	default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
 +	default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
  	default 0xfefff700 if ARCH_IOP33X
  	default 0xff003000 if DEBUG_U300_UART
+ 	default 0xffd01000 if DEBUG_HIP01_UART
  	default DEBUG_UART_PHYS if !MMU
  	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
  		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
 -		DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
 +		DEBUG_MSM_UART || DEBUG_NETX_UART || \
 +		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
- 		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART
+ 		DEBUG_UART_BCM63XX || DEBUG_ASM9260_UART || \
+ 		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0
  
  config DEBUG_UART_8250_SHIFT
  	int "Register offset shift for the 8250 debug UART"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150130/8fc8fd65/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2014-09-26  1:23 Stephen Rothwell
  2014-09-26  8:18 ` Russell King - ARM Linux
  2014-09-26  8:19 ` Carlo Caione
  0 siblings, 2 replies; 70+ messages in thread
From: Stephen Rothwell @ 2014-09-26  1:23 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig.debug between commits 0889a9e35bd3 ("ARM: 8142/1:
ks8695: Migrate debug_ll macros to shared directory"), e38c399ca584
("ARM: 8144/2: netx: Migrate DEBUG_LL macros to shared directory"),
6741cacfa3f1 ("ARM: 8145/1: sa1100: Migrate DEBUG_LL macros to shared
directory") and debf843bf7ee ("ARM: 8146/1: Seperate DEBUG_UART_PHYS
from DEBUG_LL on EP93XX") from the arm tree and commits d8a00916b303
("ARM: meson: debug: add debug UART for earlyprintk support"),
b125170a39ea ("CNS3xxx: Fix debug UART") and b51312bebfa4 ("ARM:
BCM63XX: add low-level UART debug support") from the arm-soc tree.

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

You may be able to clean some of this up by using intermediate config
symbols that are selected by the low level symbols and depended upon by
the higher level config symbols.

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

diff --cc arch/arm/Kconfig.debug
index 4fcff7737dd1,0d714e10f0a2..000000000000
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -348,13 -365,13 +365,20 @@@ choic
  		  Say Y here if you want the debug print routines to direct
  		  their output to UART1 serial port on KEYSTONE2 devices.
  
 +	config DEBUG_KS8695_UART
 +		bool "KS8695 Debug UART"
 +		depends on ARCH_KS8695
 +		help
 +		  Say Y here if you want kernel low-level debugging support
 +		  on KS8695.
 +
+ 	config DEBUG_MESON_UARTAO
+ 		bool "Kernel low-level debugging via Meson6 UARTAO"
+ 		depends on ARCH_MESON
+ 		help
+ 		  Say Y here if you want kernel low-lever debugging support
+ 		  on Amlogic Meson6 based platforms on the UARTAO.
+ 
  	config DEBUG_MMP_UART2
  		bool "Kernel low-level debugging message via MMP UART2"
  		depends on ARCH_MMP
@@@ -1136,9 -1091,12 +1170,13 @@@ config DEBUG_UART_825
  		ARCH_IOP33X || ARCH_IXP4XX || \
  		ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
  
+ # Compatibility options for BCM63xx
+ config DEBUG_UART_BCM63XX
+ 	def_bool ARCH_BCM_63XX
+ 
  config DEBUG_UART_PHYS
  	hex "Physical base address of debug UART"
 +	default 0x00100a00 if DEBUG_NETX_UART
  	default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0
  	default 0x01c28000 if DEBUG_SUNXI_UART0
  	default 0x01c28400 if DEBUG_SUNXI_UART1
@@@ -1174,9 -1133,7 +1213,10 @@@
  	default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
  				DEBUG_S3C2410_UART2)
  	default 0x7c0003f8 if FOOTBRIDGE
 +	default 0x80010000 if DEBUG_SA1100_UART1
 +	default 0x80030000 if DEBUG_SA1100_UART2
 +	default 0x80050000 if DEBUG_SA1100_UART3
+ 	default 0x78000000 if DEBUG_CNS3XXX
  	default 0x80070000 if DEBUG_IMX23_UART
  	default 0x80074000 if DEBUG_IMX28_UART
  	default 0x80230000 if DEBUG_PICOXCELL_UART
@@@ -1204,17 -1163,14 +1246,18 @@@
  	default 0xff690000 if DEBUG_RK32_UART2
  	default 0xffc02000 if DEBUG_SOCFPGA_UART
  	default 0xffd82340 if ARCH_IOP13XX
 +	default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
 +	default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
 +	default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
  	default 0xfff36000 if DEBUG_HIGHBANK_UART
+ 	default 0xfffe8600 if DEBUG_UART_BCM63XX
  	default 0xfffff700 if ARCH_IOP33X
  	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
  		DEBUG_LL_UART_EFM32 || \
- 		DEBUG_UART_8250 || DEBUG_UART_PL01X || \
+ 		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
 -		DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
 -		DEBUG_UART_BCM63XX
 +		DEBUG_MSM_UART || DEBUG_NETX_UART || DEBUG_QCOM_UARTDM || \
 +		DEBUG_S3C24XX_UART || DEBUG_SA1100_UART || \
- 		ARCH_EP93XX
++		ARCH_EP93XX || DEBUG_UART_BCM63XX
  
  config DEBUG_UART_VIRT
  	hex "Virtual base address of debug UART"
@@@ -1241,14 -1196,14 +1284,17 @@@
  	default 0xf7008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
  				DEBUG_S3C2410_UART2)
  	default 0xf7fc9000 if DEBUG_BERLIN_UART
+ 	default 0xf8007000 if DEBUG_HIP04_UART
  	default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9
 +	default 0xf8010000 if DEBUG_SA1100_UART1
 +	default 0xf8030000 if DEBUG_SA1100_UART2
 +	default 0xf8050000 if DEBUG_SA1100_UART3
  	default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
  	default 0xfa71e000 if DEBUG_QCOM_UARTDM
+ 	default 0xfb002000 if DEBUG_CNS3XXX
  	default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
  	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
+ 	default 0xfcfe8600 if DEBUG_UART_BCM63XX
  	default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
  	default 0xfd000000 if ARCH_SPEAR13XX
  	default 0xfd012000 if ARCH_MV78XX0
@@@ -1288,9 -1241,9 +1335,9 @@@
  	default 0xff003000 if DEBUG_U300_UART
  	default DEBUG_UART_PHYS if !MMU
  	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
- 		DEBUG_UART_8250 || DEBUG_UART_PL01X || \
+ 		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
 -		DEBUG_MSM_UART || DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
 -		DEBUG_UART_BCM63XX
 +		DEBUG_MSM_UART || DEBUG_NETX_UART || DEBUG_QCOM_UARTDM || \
- 		DEBUG_S3C24XX_UART || DEBUG_SA1100_UART
++		DEBUG_S3C24XX_UART || DEBUG_SA1100_UART || DEBUG_UART_BCM63XX
  
  config DEBUG_UART_8250_SHIFT
  	int "Register offset shift for the 8250 debug UART"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140926/ab5fce19/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2014-07-25  0:13 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2014-07-25  0:13 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-integrator/include/mach/memory.h between commit
3ae4e9812941 ("ARM: 8113/1: remove remaining definitions of
PLAT_PHYS_OFFSET from <mach/memory.h>") from the arm tree and commit
e6dc195c1c69 ("ARM: integrator: get rid of <mach/memory.h>") from the
arm-soc tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140725/407f7426/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2014-06-02  0:49 Stephen Rothwell
  2014-06-02  3:28 ` Olof Johansson
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2014-06-02  0:49 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-exynos/exynos.c between commits dfbdd3d55403 ("ARM: l2c:
exynos: remove cache size override"), 25a9ef63cd2b ("ARM: l2c: exynos:
convert to common l2c310 early resume functionality") and 15b0bc4041ba
("ARM: l2c: exynos: convert to generic l2c OF initialisation (and
thereby fix it)") from the arm tree and commit b5b9324a6296 ("ARM:
exynos: don't run exynos4 l2x0 setup on other platforms") from the
arm-soc tree.

I fixed it up (the former removes the code updated by the latter) and
can carry the fix as necessary (no action is required).

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

diff --cc arch/arm/mach-exynos/exynos.c
index a763c0862da9,bc43e22693b7..000000000000
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@@ -305,17 -246,25 +243,6 @@@ void __init exynos_init_io(void
  	exynos_map_io();
  }
  
- struct bus_type exynos_subsys = {
- 	.name		= "exynos-core",
- 	.dev_name	= "exynos-core",
- };
- 
- static int __init exynos_core_init(void)
 -static int __init exynos4_l2x0_cache_init(void)
--{
- 	return subsys_system_register(&exynos_subsys, NULL);
 -	int ret;
 -
 -	if (!soc_is_exynos4())
 -		return 0;
 -
 -	ret = l2x0_of_init(L2_AUX_VAL, L2_AUX_MASK);
 -	if (ret)
 -		return ret;
 -
 -	if (IS_ENABLED(CONFIG_S5P_SLEEP)) {
 -		l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
 -		clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));
 -	}
 -	return 0;
--}
- core_initcall(exynos_core_init);
 -early_initcall(exynos4_l2x0_cache_init);
--
  static void __init exynos_dt_machine_init(void)
  {
  	struct device_node *i2c_np;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140602/83e7bc5f/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2014-05-27  0:52 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2014-05-27  0:52 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-zynq/common.c between commit e1e4ccb5b1b6 ("ARM: l2c:
zynq: convert to generic l2c OF initialisation") from the arm tree and
commit 00f7dc636366 ("ARM: zynq: Add support for SOC_BUS") 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 at canb.auug.org.au

diff --cc arch/arm/mach-zynq/common.c
index d1e992e6403e,edbd9d83f407..000000000000
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@@ -66,8 -105,43 +105,38 @@@ static int __init zynq_get_revision(voi
  static void __init zynq_init_machine(void)
  {
  	struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
+ 	struct soc_device_attribute *soc_dev_attr;
+ 	struct soc_device *soc_dev;
+ 	struct device *parent = NULL;
+ 
 -	/*
 -	 * 64KB way size, 8-way associativity, parity disabled
 -	 */
 -	l2x0_of_init(0x02060000, 0xF0F0FFFF);
 -
+ 	soc_dev_attr = kzalloc(sizeof(*soc_dev_attr), GFP_KERNEL);
+ 	if (!soc_dev_attr)
+ 		goto out;
+ 
+ 	system_rev = zynq_get_revision();
+ 
+ 	soc_dev_attr->family = kasprintf(GFP_KERNEL, "Xilinx Zynq");
+ 	soc_dev_attr->revision = kasprintf(GFP_KERNEL, "0x%x", system_rev);
+ 	soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "0x%x",
+ 					 zynq_slcr_get_device_id());
+ 
+ 	soc_dev = soc_device_register(soc_dev_attr);
+ 	if (IS_ERR(soc_dev)) {
+ 		kfree(soc_dev_attr->family);
+ 		kfree(soc_dev_attr->revision);
+ 		kfree(soc_dev_attr->soc_id);
+ 		kfree(soc_dev_attr);
+ 		goto out;
+ 	}
+ 
+ 	parent = soc_device_to_device(soc_dev);
  
- 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+ out:
+ 	/*
+ 	 * Finished with the static registrations now; fill in the missing
+ 	 * devices
+ 	 */
+ 	of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
  
  	platform_device_register(&zynq_cpuidle_device);
  	platform_device_register_full(&devinfo);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140527/29b40634/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2014-05-27  0:48 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2014-05-27  0:48 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-rockchip/rockchip.c between commit fc2553457ccd ("ARM:
l2c: rockchip: convert to generic l2c OF initialisation") from the arm
tree and commit 26ab69cb4c1f ("ARM: rockchip: convert smp bringup to
CPU_METHOD_OF_DECLARE") 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 at canb.auug.org.au

diff --cc arch/arm/mach-rockchip/rockchip.c
index 138b9975313a,4499b0a31a27..000000000000
--- a/arch/arm/mach-rockchip/rockchip.c
+++ b/arch/arm/mach-rockchip/rockchip.c
@@@ -33,8 -39,6 +33,7 @@@ static const char * const rockchip_boar
  };
  
  DT_MACHINE_START(ROCKCHIP_DT, "Rockchip Cortex-A9 (Device Tree)")
 -	.init_machine	= rockchip_dt_init,
 +	.l2c_aux_val	= 0,
 +	.l2c_aux_mask	= ~0,
- 	.smp		= smp_ops(rockchip_smp_ops),
  	.dt_compat	= rockchip_board_dt_compat,
  MACHINE_END
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140527/e9902405/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2014-05-23  0:53 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2014-05-23  0:53 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-vexpress/v2m.c between commit 86cb8830d957 ("ARM: l2c:
vexpress: convert to generic l2c OF initialisation") from the arm tree
and commits 3b9334ac835b ("mfd: vexpress: Convert custom func API to
regmap") and d2606f81d563 ("ARM: vexpress: Simplify SMP operations for
DT-powered system") 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 at canb.auug.org.au

diff --cc arch/arm/mach-vexpress/v2m.c
index b2fea70d412d,38f4f6f37770..000000000000
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@@ -369,70 -370,10 +370,9 @@@ MACHINE_START(VEXPRESS, "ARM-Versatile 
  	.init_machine	= v2m_init,
  MACHINE_END
  
- static struct map_desc v2m_rs1_io_desc __initdata = {
- 	.virtual	= V2M_PERIPH,
- 	.pfn		= __phys_to_pfn(0x1c000000),
- 	.length		= SZ_2M,
- 	.type		= MT_DEVICE,
- };
- 
- static int __init v2m_dt_scan_memory_map(unsigned long node, const char *uname,
- 		int depth, void *data)
- {
- 	const char **map = data;
- 
- 	if (strcmp(uname, "motherboard") != 0)
- 		return 0;
- 
- 	*map = of_get_flat_dt_prop(node, "arm,v2m-memory-map", NULL);
- 
- 	return 1;
- }
- 
- void __init v2m_dt_map_io(void)
- {
- 	const char *map = NULL;
- 
- 	of_scan_flat_dt(v2m_dt_scan_memory_map, &map);
- 
- 	if (map && strcmp(map, "rs1") == 0)
- 		iotable_init(&v2m_rs1_io_desc, 1);
- 	else
- 		iotable_init(v2m_io_desc, ARRAY_SIZE(v2m_io_desc));
- 
- #if defined(CONFIG_SMP)
- 	vexpress_dt_smp_map_io();
- #endif
- }
- 
- void __init v2m_dt_init_early(void)
- {
- 	u32 dt_hbi;
- 
- 	vexpress_sysreg_of_early_init();
- 
- 	/* Confirm board type against DT property, if available */
- 	if (of_property_read_u32(of_allnodes, "arm,hbi", &dt_hbi) == 0) {
- 		u32 hbi = vexpress_get_hbi(VEXPRESS_SITE_MASTER);
- 
- 		if (WARN_ON(dt_hbi != hbi))
- 			pr_warning("vexpress: DT HBI (%x) is not matching "
- 					"hardware (%x)!\n", dt_hbi, hbi);
- 	}
- 
- 	versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), 24000000);
- }
- 
- static const struct of_device_id v2m_dt_bus_match[] __initconst = {
- 	{ .compatible = "simple-bus", },
- 	{ .compatible = "arm,amba-bus", },
- 	{ .compatible = "arm,vexpress,config-bus", },
- 	{}
- };
- 
  static void __init v2m_dt_init(void)
  {
- 	of_platform_populate(NULL, v2m_dt_bus_match, NULL, NULL);
 -	l2x0_of_init(0x00400000, 0xfe0fffff);
+ 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  }
  
  static const char * const v2m_dt_match[] __initconst = {
@@@ -442,11 -383,7 +382,9 @@@
  
  DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
  	.dt_compat	= v2m_dt_match,
 +	.l2c_aux_val	= 0x00400000,
 +	.l2c_aux_mask	= 0xfe0fffff,
- 	.smp		= smp_ops(vexpress_smp_ops),
+ 	.smp		= smp_ops(vexpress_smp_dt_ops),
  	.smp_init	= smp_init_ops(vexpress_smp_init_ops),
- 	.map_io		= v2m_dt_map_io,
- 	.init_early	= v2m_dt_init_early,
  	.init_machine	= v2m_dt_init,
  MACHINE_END
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/08c29dd2/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2014-05-23  0:45 Stephen Rothwell
  2014-05-23 13:08 ` Gregory CLEMENT
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2014-05-23  0:45 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-mvebu/board-v7.c between commit 8ae2473d96f1 ("ARM: l2c:
mvebu: convert to generic l2c OF initialisation") from the arm tree and
commit 5686a1e5aa43 ("bus: mvebu: pass the coherency availability
information at init time") 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 at canb.auug.org.au

diff --cc arch/arm/mach-mvebu/board-v7.c
index 48169caa56ea,01cfce6ac20b..000000000000
--- a/arch/arm/mach-mvebu/board-v7.c
+++ b/arch/arm/mach-mvebu/board-v7.c
@@@ -57,8 -75,10 +75,9 @@@ static void __init mvebu_timer_and_clk_
  {
  	of_clk_init(NULL);
  	clocksource_of_init();
+ 	mvebu_scu_enable();
  	coherency_init();
- 	BUG_ON(mvebu_mbus_dt_init());
+ 	BUG_ON(mvebu_mbus_dt_init(coherency_available()));
 -	l2x0_of_init(0, ~0UL);
  
  	if (of_machine_is_compatible("marvell,armada375"))
  		hook_fault_code(16 + 6, armada_375_external_abort_wa, SIGBUS, 0,
@@@ -121,9 -195,8 +196,10 @@@ static const char * const armada_375_dt
  };
  
  DT_MACHINE_START(ARMADA_375_DT, "Marvell Armada 375 (Device Tree)")
 +	.l2c_aux_val	= 0,
 +	.l2c_aux_mask	= ~0,
  	.init_time	= mvebu_timer_and_clk_init,
+ 	.init_machine	= mvebu_dt_init,
  	.restart	= mvebu_restart,
  	.dt_compat	= armada_375_dt_compat,
  MACHINE_END
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/0f19e078/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2014-01-05 23:20 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2014-01-05 23:20 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig.debug between commit 753d12434da3 ("ARM: 7932/1: bcm:
Add DEBUG_LL console support") from the arm tree and commit caad0b41de69
("ARM: add Marvell Berlin UART0 lowlevel debug") 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.debug
index 9afabbb5e798,bda94e46e8d6..000000000000
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -106,17 -94,14 +106,25 @@@ choic
  		depends on ARCH_BCM2835
  		select DEBUG_UART_PL01X
  
 +	config DEBUG_BCM_KONA_UART
 +		bool "Kernel low-level debugging messages via BCM KONA UART"
 +		depends on ARCH_BCM
 +		select DEBUG_UART_8250
 +		help
 +		  Say Y here if you want kernel low-level debugging support
 +		  on Broadcom SoC platforms.
 +		  This low level debug works for Broadcom
 +		  mobile SoCs in the Kona family of chips (e.g. bcm28155,
 +		  bcm11351, etc...)
 +
+ 	config DEBUG_BERLIN_UART
+ 		bool "Marvell Berlin SoC Debug UART"
+ 		depends on ARCH_BERLIN
+ 		select DEBUG_UART_8250
+ 		help
+ 		  Say Y here if you want kernel low-level debugging support
+ 		  on Marvell Berlin SoC based platforms.
+ 
  	config DEBUG_CLPS711X_UART1
  		bool "Kernel low-level debugging messages via UART1"
  		depends on ARCH_CLPS711X
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140106/f5ad351e/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2013-08-15  4:36 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2013-08-15  4:36 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/include/debug/highbank.S between commits df917c8c18b4 ("ARM:
debug: provide PL01x debug uart phys/virt address configuration options")
and 5e33abe38413 ("ARM: debug: move PL01X debug include into
arch/arm/include/debug/") from the arm tree and commit 0af6614cb0dd
("ARM: highbank: fix debug uart virtual address for LPAE") from the
arm-soc tree.

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

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

diff --cc arch/arm/Kconfig.debug
index 2d57da3,1533783..0000000
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -879,165 -775,41 +879,170 @@@ config DEBUG_LL_INCLUD
  				 DEBUG_IMX53_UART ||\
  				 DEBUG_IMX6Q_UART || \
  				 DEBUG_IMX6SL_UART
 -	default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
 -				      DEBUG_KEYSTONE_UART1
+ 	default "debug/msm.S" if DEBUG_MSM_UART1 || \
+ 				 DEBUG_MSM_UART2 || \
+ 				 DEBUG_MSM_UART3 || \
+ 				 DEBUG_MSM8660_UART || \
+ 				 DEBUG_MSM8960_UART
 -	default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
 -				   DEBUG_MVEBU_UART_ALTERNATE
 -	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
 -	default "debug/nomadik.S" if DEBUG_NOMADIK_UART
 -	default "debug/nspire.S" if 	DEBUG_NSPIRE_CX_UART || \
 -					DEBUG_NSPIRE_CLASSIC_UART
  	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
 -	default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
 -	default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
 -				 DEBUG_MMP_UART3
 -	default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
  	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
 -	default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
  	default "debug/sti.S" if DEBUG_STI_UART
 -	default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
  	default "debug/tegra.S" if DEBUG_TEGRA_UART
 -	default "debug/u300.S" if DEBUG_U300_UART
  	default "debug/ux500.S" if DEBUG_UX500_UART
 -	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
 -		DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 || \
 -		DEBUG_VEXPRESS_UART0_CRX
 +	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT
  	default "debug/vt8500.S" if DEBUG_VT8500_UART0
  	default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
  	default "mach/debug-macro.S"
  
 +# Compatibility options for PL01x
 +config DEBUG_UART_PL01X
 +	def_bool ARCH_EP93XX || \
 +		ARCH_INTEGRATOR || \
 +		ARCH_SPEAR3XX || \
 +		ARCH_SPEAR6XX || \
 +		ARCH_SPEAR13XX || \
 +		ARCH_VERSATILE
 +
 +# Compatibility options for 8250
 +config DEBUG_UART_8250
 +	def_bool ARCH_DOVE || ARCH_EBSA110 || \
 +		(FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
 +		ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
 +		ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \
 +		ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
 +
 +config DEBUG_UART_PHYS
 +	hex "Physical base address of debug UART"
 +	default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0
 +	default 0x01c28000 if DEBUG_SUNXI_UART0
 +	default 0x01c28400 if DEBUG_SUNXI_UART1
 +	default 0x01d0c000 if DEBUG_DAVINCI_DA8XX_UART1
 +	default 0x01d0d000 if DEBUG_DAVINCI_DA8XX_UART2
 +	default 0x02530c00 if DEBUG_KEYSTONE_UART0
 +	default 0x02531000 if DEBUG_KEYSTONE_UART1
 +	default 0x03010fe0 if ARCH_RPC
 +	default 0x08108300 if DEBUG_DAVINCI_TNETV107X_UART1
 +	default 0x10009000 if DEBUG_REALVIEW_STD_PORT || DEBUG_CNS3XXX || \
 +				DEBUG_VEXPRESS_UART0_CA9
 +	default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
 +	default 0x10124000 if DEBUG_RK3X_UART0
 +	default 0x10126000 if DEBUG_RK3X_UART1
 +	default 0x101f1000 if ARCH_VERSATILE
 +	default 0x101fb000 if DEBUG_NOMADIK_UART
 +	default 0x16000000 if ARCH_INTEGRATOR
 +	default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
 +	default 0x20060000 if DEBUG_RK29_UART0
 +	default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
 +	default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
 +	default 0x20201000 if DEBUG_BCM2835
 +	default 0x40090000 if ARCH_LPC32XX
 +	default 0x40100000 if DEBUG_PXA_UART1
 +	default 0x42000000 if ARCH_GEMINI
 +	default 0x7c0003f8 if FOOTBRIDGE
 +	default 0x80230000 if DEBUG_PICOXCELL_UART
 +	default 0x80070000 if DEBUG_IMX23_UART
 +	default 0x80074000 if DEBUG_IMX28_UART
 +	default 0x808c0000 if ARCH_EP93XX
 +	default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
 +	default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
 +	default 0xc0013000 if DEBUG_U300_UART
 +	default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
 +	default 0xc8000003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
 +	default 0xd0000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
 +	default 0xd0012000 if DEBUG_MVEBU_UART
 +	default 0xd4017000 if DEBUG_MMP_UART2
 +	default 0xd4018000 if DEBUG_MMP_UART3
 +	default 0xe0000000 if ARCH_SPEAR13XX
 +	default 0xf0000be0 if ARCH_EBSA110
 +	default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE
 +	default 0xf1012000 if ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
 +				ARCH_ORION5X
 +	default 0xfe800000 if ARCH_IOP32X
 +	default 0xffc02000 if DEBUG_SOCFPGA_UART
 +	default 0xffd82340 if ARCH_IOP13XX
 +	default 0xfff36000 if DEBUG_HIGHBANK_UART
 +	default 0xfffff700 if ARCH_IOP33X
 +	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
 +		DEBUG_UART_8250 || DEBUG_UART_PL01X
 +
 +config DEBUG_UART_VIRT
 +	hex "Virtual base address of debug UART"
 +	default 0xe0010fe0 if ARCH_RPC
 +	default 0xf0000be0 if ARCH_EBSA110
 +	default 0xf0009000 if DEBUG_CNS3XXX
 +	default 0xf01fb000 if DEBUG_NOMADIK_UART
 +	default 0xf0201000 if DEBUG_BCM2835
 +	default 0xf11f1000 if ARCH_VERSATILE
 +	default 0xf1600000 if ARCH_INTEGRATOR
 +	default 0xf1c28000 if DEBUG_SUNXI_UART0
 +	default 0xf1c28400 if DEBUG_SUNXI_UART1
 +	default 0xf2100000 if DEBUG_PXA_UART1
 +	default 0xf4090000 if ARCH_LPC32XX
 +	default 0xf4200000 if ARCH_GEMINI
 +	default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9
 +	default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
 +	default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
 +	default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
 +	default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
 +	default 0xfd000000 if ARCH_SPEAR13XX
 +	default 0xfd012000 if ARCH_MV78XX0
 +	default 0xfde12000 if ARCH_DOVE
 +	default 0xfe012000 if ARCH_ORION5X
 +	default 0xfe017000 if DEBUG_MMP_UART2
 +	default 0xfe018000 if DEBUG_MMP_UART3
 +	default 0xfe100000 if DEBUG_IMX23_UART || DEBUG_IMX28_UART
 +	default 0xfe230000 if DEBUG_PICOXCELL_UART
 +	default 0xfe800000 if ARCH_IOP32X
 +	default 0xfeb24000 if DEBUG_RK3X_UART0
 +	default 0xfeb26000 if DEBUG_RK3X_UART1
 +	default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
 +	default 0xfeb31000 if DEBUG_KEYSTONE_UART1
 +	default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
 +	default 0xfed60000 if DEBUG_RK29_UART0
 +	default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
 +	default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
 +	default 0xfec02000 if DEBUG_SOCFPGA_UART
 +	default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
 +	default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
 +	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
 +	default 0xfed12000 if ARCH_KIRKWOOD
 +	default 0xfedc0000 if ARCH_EP93XX
 +	default 0xfee003f8 if FOOTBRIDGE
 +	default 0xfee08300 if DEBUG_DAVINCI_TNETV107X_UART1
 +	default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
- 	default 0xfee36000 if DEBUG_HIGHBANK_UART
++	default 0xfef36000 if DEBUG_HIGHBANK_UART
 +	default 0xfee82340 if ARCH_IOP13XX
 +	default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
 +	default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
 +	default 0xfefff700 if ARCH_IOP33X
 +	default 0xff003000 if DEBUG_U300_UART
 +	default DEBUG_UART_PHYS if !MMU
 +	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
 +		DEBUG_UART_8250 || DEBUG_UART_PL01X
 +
 +config DEBUG_UART_8250_SHIFT
 +	int "Register offset shift for the 8250 debug UART"
 +	depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
 +	default 0 if FOOTBRIDGE || ARCH_IOP32X
 +	default 2
 +
 +config DEBUG_UART_8250_WORD
 +	bool "Use 32-bit accesses for 8250 UART"
 +	depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
 +	depends on DEBUG_UART_8250_SHIFT >= 2
 +	default y if DEBUG_PICOXCELL_UART || DEBUG_SOCFPGA_UART || \
 +		ARCH_KEYSTONE || \
 +		DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \
 +		DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_DAVINCI_TNETV107X_UART1
 +
 +config DEBUG_UART_8250_FLOW_CONTROL
 +	bool "Enable flow control for 8250 UART"
 +	depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
 +	default y if ARCH_EBSA110 || FOOTBRIDGE || ARCH_GEMINI || ARCH_RPC
 +
  config DEBUG_UNCOMPRESS
  	bool
- 	depends on ARCH_MULTIPLATFORM
+ 	depends on ARCH_MULTIPLATFORM || ARCH_MSM
  	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
  		     !DEBUG_TEGRA_UART
  	help
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130815/c0f273cb/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2013-05-01  6:44 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2013-05-01  6:44 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-tegra/hotplug.c between commit da2265b130f6 ("ARM: tegra:
remove tegra specific cpu_disable()") from the arm tree and commit
7469688e832e ("ARM: tegra: Unify tegra{20,30,114}_init_early()") 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 at canb.auug.org.au

diff --cc arch/arm/mach-tegra/hotplug.c
index e8323bc,8da9f78..0000000
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@@ -12,8 -11,10 +11,9 @@@
  #include <linux/smp.h>
  #include <linux/clk/tegra.h>
  
 -#include <asm/cacheflush.h>
  #include <asm/smp_plat.h>
  
+ #include "fuse.h"
  #include "sleep.h"
  
  static void (*tegra_hotplug_shutdown)(void);
@@@ -46,18 -47,22 +46,13 @@@ void __ref tegra_cpu_die(unsigned int c
  	BUG();
  }
  
- #ifdef CONFIG_ARCH_TEGRA_2x_SOC
- extern void tegra20_hotplug_shutdown(void);
- void __init tegra20_hotplug_init(void)
 -int tegra_cpu_disable(unsigned int cpu)
 -{
 -	/*
 -	 * we don't allow CPU 0 to be shutdown (it is still too special
 -	 * e.g. clock tick interrupts)
 -	 */
 -	return cpu == 0 ? -EPERM : 0;
 -}
 -
+ void __init tegra_hotplug_init(void)
  {
- 	tegra_hotplug_shutdown = tegra20_hotplug_shutdown;
- }
- #endif
+ 	if (!IS_ENABLED(CONFIG_HOTPLUG_CPU))
+ 		return;
  
- #ifdef CONFIG_ARCH_TEGRA_3x_SOC
- extern void tegra30_hotplug_shutdown(void);
- void __init tegra30_hotplug_init(void)
- {
- 	tegra_hotplug_shutdown = tegra30_hotplug_shutdown;
+ 	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && tegra_chip_id == TEGRA20)
+ 		tegra_hotplug_shutdown = tegra20_hotplug_shutdown;
+ 	if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC) && tegra_chip_id == TEGRA30)
+ 		tegra_hotplug_shutdown = tegra30_hotplug_shutdown;
  }
- #endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130501/69c65567/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-11-26 10:31 Stephen Rothwell
  2012-11-26 10:39 ` Nicolas Ferre
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2012-11-26 10:31 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/tty/serial/atmel_serial.c between commit 95e629b761ce
("ARM/AVR32: get rid of serial_at91.h") from the arm tree and commit
bcd2360c1ff9 ("arm: at91: move platfarm_data to
include/linux/platform_data/atmel.h") 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 at canb.auug.org.au

diff --cc drivers/tty/serial/atmel_serial.c
index 1a8a271,5660ec2..0000000
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@@ -39,13 -39,13 +39,12 @@@
  #include <linux/atmel_pdc.h>
  #include <linux/atmel_serial.h>
  #include <linux/uaccess.h>
 +#include <linux/pinctrl/consumer.h>
+ #include <linux/platform_data/atmel.h>
  
  #include <asm/io.h>
  #include <asm/ioctls.h>
  
- #include <mach/board.h>
- 
 -#include <asm/mach/serial_at91.h>
 -
  #ifdef CONFIG_ARM
  #include <mach/cpu.h>
  #include <asm/gpio.h>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121126/7ad920e4/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-09-27  5:48 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-09-27  5:48 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/include/asm/timex.h between commit 56942fec06ef ("ARM: 7538/1:
delay: add registration mechanism for delay timer sources") from the arm
tree and commit 387798b37c8d ("ARM: initial multiplatform support") 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 at canb.auug.org.au

diff --cc arch/arm/include/asm/timex.h
index 9acc135,963342a..0000000
--- a/arch/arm/include/asm/timex.h
+++ b/arch/arm/include/asm/timex.h
@@@ -12,9 -12,19 +12,13 @@@
  #ifndef _ASMARM_TIMEX_H
  #define _ASMARM_TIMEX_H
  
 -#include <asm/arch_timer.h>
+ #ifdef CONFIG_ARCH_MULTIPLATFORM
+ #define CLOCK_TICK_RATE 1000000
+ #else
  #include <mach/timex.h>
+ #endif
  
  typedef unsigned long cycles_t;
 -
 -#ifdef ARCH_HAS_READ_CURRENT_TIMER
  #define get_cycles()	({ cycles_t c; read_current_timer(&c) ? 0 : c; })
 -#else
 -#define get_cycles()	(0)
 -#endif
  
  #endif
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120927/156292f6/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-09-20  6:03 Stephen Rothwell
  2012-09-20  7:04 ` Linus Walleij
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2012-09-20  6:03 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-integrator/integrator_cp.c between commit 73efd53012af
("ARM: 7519/1: integrator: convert platform devices to Device Tree") from
the arm tree and commit b7a3f8db07c1 ("ARM: integrator: use __iomem
pointers for MMIO") 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 at canb.auug.org.au

diff --cc arch/arm/mach-integrator/integrator_cp.c
index f51363e,3df5fc3..0000000
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@@ -55,7 -52,14 +55,7 @@@
  
  #define INTCP_PA_CLCD_BASE		0xc0000000
  
- #define INTCP_VA_CTRL_BASE		IO_ADDRESS(INTEGRATOR_CP_CTL_BASE)
 -#define INTCP_VA_CIC_BASE		__io_address(INTEGRATOR_HDR_BASE + 0x40)
 -#define INTCP_VA_PIC_BASE		__io_address(INTEGRATOR_IC_BASE)
 -#define INTCP_VA_SIC_BASE		__io_address(INTEGRATOR_CP_SIC_BASE)
 -
 -#define INTCP_ETH_SIZE			0x10
 -
+ #define INTCP_VA_CTRL_BASE		__io_address(INTEGRATOR_CP_CTL_BASE)
  #define INTCP_FLASHPROG			0x04
  #define CINTEGRATOR_FLASHPROG_FLVPPEN	(1 << 0)
  #define CINTEGRATOR_FLASHPROG_FLWREN	(1 << 1)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120920/f4dd3c5c/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-05-16  8:50 Stephen Rothwell
  2012-05-16  9:36 ` Haojian Zhuang
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2012-05-16  8:50 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit 98fab064d321 ("ARM: Remove unnecessary
selection of TICK_ONESHOT") from the arm tree and commit c24b31147a06
("ARM: mmp: support DT in irq") from the arm-soc tree.

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

diff --cc arch/arm/Kconfig
index b1a717c,852b12b..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -627,6 -616,8 +611,7 @@@ config ARCH_MM
  	select CLKDEV_LOOKUP
  	select GENERIC_CLOCKEVENTS
  	select GPIO_PXA
+ 	select IRQ_DOMAIN
 -	select TICK_ONESHOT
  	select PLAT_PXA
  	select SPARSE_IRQ
  	select GENERIC_ALLOCATOR
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120516/5c5e389c/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-05-14  8:39 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-05-14  8:39 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-omap/counter_32k.c between commit bd0493eaaf5c ("ARM:
7413/1: move read_{boot,persistent}_clock to the architecture level")
from the arm tree and commit 1fe97c8f6a1d ("ARM: OMAP: Make OMAP
clocksource source selection using kernel param") from the arm-soc tree.

I attempted to fix it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/plat-omap/counter_32k.c
index 44ae077,b2f634b..0000000
--- a/arch/arm/plat-omap/counter_32k.c
+++ b/arch/arm/plat-omap/counter_32k.c
@@@ -69,55 -69,40 +70,41 @@@ static void omap_read_persistent_clock(
  	*ts = *tsp;
  }
  
- int __init omap_init_clocksource_32k(void)
+ /**
+  * omap_init_clocksource_32k - setup and register counter 32k as a
+  * kernel clocksource
+  * @pbase: base addr of counter_32k module
+  * @size: size of counter_32k to map
+  *
+  * Returns 0 upon success or negative error code upon failure.
+  *
+  */
+ int __init omap_init_clocksource_32k(void __iomem *vbase)
  {
- 	static char err[] __initdata = KERN_ERR
- 			"%s: can't register clocksource!\n";
- 
- 	if (cpu_is_omap16xx() || cpu_class_is_omap2()) {
- 		u32 pbase;
- 		unsigned long size = SZ_4K;
- 		void __iomem *base;
- 		struct clk *sync_32k_ick;
- 
- 		if (cpu_is_omap16xx()) {
- 			pbase = OMAP16XX_TIMER_32K_SYNCHRONIZED;
- 			size = SZ_1K;
- 		} else if (cpu_is_omap2420())
- 			pbase = OMAP2420_32KSYNCT_BASE + 0x10;
- 		else if (cpu_is_omap2430())
- 			pbase = OMAP2430_32KSYNCT_BASE + 0x10;
- 		else if (cpu_is_omap34xx())
- 			pbase = OMAP3430_32KSYNCT_BASE + 0x10;
- 		else if (cpu_is_omap44xx())
- 			pbase = OMAP4430_32KSYNCT_BASE + 0x10;
- 		else
- 			return -ENODEV;
- 
- 		/* For this to work we must have a static mapping in io.c for this area */
- 		base = ioremap(pbase, size);
- 		if (!base)
- 			return -ENODEV;
- 
- 		sync_32k_ick = clk_get(NULL, "omap_32ksync_ick");
- 		if (!IS_ERR(sync_32k_ick))
- 			clk_enable(sync_32k_ick);
- 
- 		timer_32k_base = base;
- 
- 		/*
- 		 * 120000 rough estimate from the calculations in
- 		 * __clocksource_updatefreq_scale.
- 		 */
- 		clocks_calc_mult_shift(&persistent_mult, &persistent_shift,
- 				32768, NSEC_PER_SEC, 120000);
- 
- 		if (clocksource_mmio_init(base, "32k_counter", 32768, 250, 32,
- 					  clocksource_mmio_readl_up))
- 			printk(err, "32k_counter");
- 
- 		setup_sched_clock(omap_32k_read_sched_clock, 32, 32768);
- 		register_persistent_clock(NULL, omap_read_persistent_clock);
+ 	int ret;
+ 
+ 	/*
+ 	 * 32k sync Counter register offset is at 0x10
+ 	 */
+ 	sync32k_cnt_reg = vbase + OMAP2_32KSYNCNT_CR_OFF;
+ 
+ 	/*
+ 	 * 120000 rough estimate from the calculations in
+ 	 * __clocksource_updatefreq_scale.
+ 	 */
+ 	clocks_calc_mult_shift(&persistent_mult, &persistent_shift,
+ 			32768, NSEC_PER_SEC, 120000);
+ 
+ 	ret = clocksource_mmio_init(sync32k_cnt_reg, "32k_counter", 32768,
+ 				250, 32, clocksource_mmio_readl_up);
+ 	if (ret) {
+ 		pr_err("32k_counter: can't register clocksource\n");
+ 		return ret;
  	}
+ 
+ 	setup_sched_clock(omap_32k_read_sched_clock, 32, 32768);
++	register_persistent_clock(NULL, omap_read_persistent_clock);
+ 	pr_info("OMAP clocksource: 32k_counter at 32768 Hz\n");
+ 
  	return 0;
  }
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120514/8f9c7194/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-05-03  5:35 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-05-03  5:35 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/mach-ixp2000 and arch/arm/mach-ixp23xx between commits from the
arm tree and commits from the arm-soc tree.

On Russell's advise, I just removed those two directories completely.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120503/fb625be6/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-03-16  6:49 Stephen Rothwell
  2012-03-16  8:31 ` Arnd Bergmann
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2012-03-16  6:49 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-msm/timer.c between commit f8e56c42e4e3 ("msm: timer:
Support sched_clock()") from the arm tree and commit 5ca709c16d0f ("ARM:
local timers: convert MSM to runtime registration interface") from the
arm-soc tree.

I fixed it up (see below) and can carry the fax as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/mach-msm/timer.c
index 61983da,75f4be4..0000000
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@@ -128,11 -127,45 +128,50 @@@ static struct clocksource msm_clocksour
  	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,
  };
  
 +static notrace u32 msm_sched_clock_read(void)
 +{
 +	return msm_clocksource.read(&msm_clocksource);
 +}
 +
+ #ifdef CONFIG_LOCAL_TIMERS
+ static int __cpuinit msm_local_timer_setup(struct clock_event_device *evt)
+ {
+ 	/* Use existing clock_event for cpu 0 */
+ 	if (!smp_processor_id())
+ 		return 0;
+ 
+ 	writel_relaxed(0, event_base + TIMER_ENABLE);
+ 	writel_relaxed(0, event_base + TIMER_CLEAR);
+ 	writel_relaxed(~0, event_base + TIMER_MATCH_VAL);
+ 	evt->irq = msm_clockevent.irq;
+ 	evt->name = "local_timer";
+ 	evt->features = msm_clockevent.features;
+ 	evt->rating = msm_clockevent.rating;
+ 	evt->set_mode = msm_timer_set_mode;
+ 	evt->set_next_event = msm_timer_set_next_event;
+ 	evt->shift = msm_clockevent.shift;
+ 	evt->mult = div_sc(GPT_HZ, NSEC_PER_SEC, evt->shift);
+ 	evt->max_delta_ns = clockevent_delta2ns(0xf0000000, evt);
+ 	evt->min_delta_ns = clockevent_delta2ns(4, evt);
+ 
+ 	*__this_cpu_ptr(msm_evt.percpu_evt) = evt;
+ 	clockevents_register_device(evt);
+ 	enable_percpu_irq(evt->irq, 0);
+ 	return 0;
+ }
+ 
+ static void msm_local_timer_stop(struct clock_event_device *evt)
+ {
+ 	evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
+ 	disable_percpu_irq(evt->irq);
+ }
+ 
+ static struct local_timer_ops msm_local_timer_ops __cpuinitdata = {
+ 	.setup	= msm_local_timer_setup,
+ 	.stop	= msm_local_timer_stop,
+ };
+ #endif /* CONFIG_LOCAL_TIMERS */
+ 
  static void __init msm_timer_init(void)
  {
  	struct clock_event_device *ce = &msm_clockevent;
@@@ -195,44 -232,8 +238,10 @@@ err
  	res = clocksource_register_hz(cs, dgt_hz);
  	if (res)
  		pr_err("clocksource_register failed\n");
 +	setup_sched_clock(msm_sched_clock_read,
 +			cpu_is_msm7x01() ? 32 - MSM_DGT_SHIFT : 32, dgt_hz);
  }
  
- #ifdef CONFIG_LOCAL_TIMERS
- int __cpuinit local_timer_setup(struct clock_event_device *evt)
- {
- 	/* Use existing clock_event for cpu 0 */
- 	if (!smp_processor_id())
- 		return 0;
- 
- 	writel_relaxed(0, event_base + TIMER_ENABLE);
- 	writel_relaxed(0, event_base + TIMER_CLEAR);
- 	writel_relaxed(~0, event_base + TIMER_MATCH_VAL);
- 	evt->irq = msm_clockevent.irq;
- 	evt->name = "local_timer";
- 	evt->features = msm_clockevent.features;
- 	evt->rating = msm_clockevent.rating;
- 	evt->set_mode = msm_timer_set_mode;
- 	evt->set_next_event = msm_timer_set_next_event;
- 	evt->shift = msm_clockevent.shift;
- 	evt->mult = div_sc(GPT_HZ, NSEC_PER_SEC, evt->shift);
- 	evt->max_delta_ns = clockevent_delta2ns(0xf0000000, evt);
- 	evt->min_delta_ns = clockevent_delta2ns(4, evt);
- 
- 	*__this_cpu_ptr(msm_evt.percpu_evt) = evt;
- 	clockevents_register_device(evt);
- 	enable_percpu_irq(evt->irq, 0);
- 	return 0;
- }
- 
- void local_timer_stop(struct clock_event_device *evt)
- {
- 	evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
- 	disable_percpu_irq(evt->irq);
- }
- #endif /* CONFIG_LOCAL_TIMERS */
- 
  struct sys_timer msm_timer = {
  	.init = msm_timer_init
  };
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120316/09540dd9/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-03-15  7:06 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-03-15  7:06 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/setup-sh7377.c between commit 250a27237e0e ("ARM:
shmobile: remove NR_IRQS") from the arm tree and commit bfc46f3ef838
("ARM: mach-shmobile: sh7377 map_io and init_early update") from the
arm-soc tree.

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

diff --cc arch/arm/mach-shmobile/setup-sh7377.c
index 747ed8e,9f14609..0000000
--- a/arch/arm/mach-shmobile/setup-sh7377.c
+++ b/arch/arm/mach-shmobile/setup-sh7377.c
@@@ -30,9 -30,28 +30,29 @@@
  #include <linux/sh_intc.h>
  #include <linux/sh_timer.h>
  #include <mach/hardware.h>
 +#include <mach/irqs.h>
+ #include <mach/common.h>
+ #include <asm/mach/map.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
+ #include <asm/mach/time.h>
+ 
+ static struct map_desc sh7377_io_desc[] __initdata = {
+ 	/* create a 1:1 entity map for 0xe6xxxxxx
+ 	 * used by CPGA, INTC and PFC.
+ 	 */
+ 	{
+ 		.virtual	= 0xe6000000,
+ 		.pfn		= __phys_to_pfn(0xe6000000),
+ 		.length		= 256 << 20,
+ 		.type		= MT_DEVICE_NONSHARED
+ 	},
+ };
+ 
+ void __init sh7377_map_io(void)
+ {
+ 	iotable_init(sh7377_io_desc, ARRAY_SIZE(sh7377_io_desc));
+ }
  
  /* SCIFA0 */
  static struct plat_sci_port scif0_platform_data = {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120315/7cd0236d/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-03-15  7:06 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-03-15  7:06 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/setup-sh7367.c between commit 250a27237e0e ("ARM:
shmobile: remove NR_IRQS") from the arm tree and commit 237caf9e6b0c
("ARM: mach-shmobile: sh7367 map_io and init_early update") from the
arm-soc tree.

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

diff --cc arch/arm/mach-shmobile/setup-sh7367.c
index 8e848198,a51e1a1..0000000
--- a/arch/arm/mach-shmobile/setup-sh7367.c
+++ b/arch/arm/mach-shmobile/setup-sh7367.c
@@@ -29,9 -29,28 +29,29 @@@
  #include <linux/serial_sci.h>
  #include <linux/sh_timer.h>
  #include <mach/hardware.h>
 +#include <mach/irqs.h>
+ #include <mach/common.h>
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
+ #include <asm/mach/map.h>
+ #include <asm/mach/time.h>
+ 
+ static struct map_desc sh7367_io_desc[] __initdata = {
+ 	/* create a 1:1 entity map for 0xe6xxxxxx
+ 	 * used by CPGA, INTC and PFC.
+ 	 */
+ 	{
+ 		.virtual	= 0xe6000000,
+ 		.pfn		= __phys_to_pfn(0xe6000000),
+ 		.length		= 256 << 20,
+ 		.type		= MT_DEVICE_NONSHARED
+ 	},
+ };
+ 
+ void __init sh7367_map_io(void)
+ {
+ 	iotable_init(sh7367_io_desc, ARRAY_SIZE(sh7367_io_desc));
+ }
  
  /* SCIFA0 */
  static struct plat_sci_port scif0_platform_data = {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120315/32f13eae/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-03-15  6:56 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-03-15  6:56 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-shmobile/setup-r8a7740.c between commit 250a27237e0e ("ARM:
shmobile: remove NR_IRQS") from the arm tree and commit d3ab7221489f
("ARM: mach-shmobile: r8a7740 map_io and init_early update") from the
arm-soc tree.

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

diff --cc arch/arm/mach-shmobile/setup-r8a7740.c
index fa15d81,74e5234..0000000
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@@ -25,9 -25,41 +25,42 @@@
  #include <linux/serial_sci.h>
  #include <linux/sh_timer.h>
  #include <mach/r8a7740.h>
 +#include <mach/irqs.h>
+ #include <mach/common.h>
  #include <asm/mach-types.h>
+ #include <asm/mach/map.h>
  #include <asm/mach/arch.h>
+ #include <asm/mach/time.h>
+ 
+ static struct map_desc r8a7740_io_desc[] __initdata = {
+ 	 /*
+ 	  * for CPGA/INTC/PFC
+ 	  * 0xe6000000-0xefffffff -> 0xe6000000-0xefffffff
+ 	  */
+ 	{
+ 		.virtual	= 0xe6000000,
+ 		.pfn		= __phys_to_pfn(0xe6000000),
+ 		.length		= 160 << 20,
+ 		.type		= MT_DEVICE_NONSHARED
+ 	},
+ #ifdef CONFIG_CACHE_L2X0
+ 	/*
+ 	 * for l2x0_init()
+ 	 * 0xf0100000-0xf0101000 -> 0xf0002000-0xf0003000
+ 	 */
+ 	{
+ 		.virtual	= 0xf0002000,
+ 		.pfn		= __phys_to_pfn(0xf0100000),
+ 		.length		= PAGE_SIZE,
+ 		.type		= MT_DEVICE_NONSHARED
+ 	},
+ #endif
+ };
+ 
+ void __init r8a7740_map_io(void)
+ {
+ 	iotable_init(r8a7740_io_desc, ARRAY_SIZE(r8a7740_io_desc));
+ }
  
  /* SCIFA0 */
  static struct plat_sci_port scif0_platform_data = {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120315/d0bcf050/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-03-13  8:47 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-03-13  8:47 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/plat-versatile/localtimer.c between commit e9f07fbc5f5b ("ARM:
plat-versatile: convert to twd_local_timer_register() interface") from
the arm tree and commit e129440af638 ("ARM: versatile: Map local timers
using Device Tree when possible") from the arm-soc tree.

I did the obvious thing and removed the file (as the former does), but
there is probably more to be fixed up.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120313/6a619335/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-03-13  8:42 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-03-13  8:42 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-vexpress/ct-ca9x4.c between commit e9f07fbc5f5b ("ARM:
plat-versatile: convert to twd_local_timer_register() interface") from
the arm tree and commit 98ed4ceb93ba ("ARM: vexpress: Get rid of
MMIO_P2V") from the arm-soc tree.

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

diff --cc arch/arm/mach-vexpress/ct-ca9x4.c
index b391538,73791f0..0000000
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/arch/arm/mach-vexpress/ct-ca9x4.c
@@@ -54,44 -42,17 +42,28 @@@ static struct map_desc ct_ca9x4_io_desc
  static void __init ct_ca9x4_map_io(void)
  {
  	iotable_init(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
 -#ifdef CONFIG_LOCAL_TIMERS
 -	twd_base = ioremap(A9_MPCORE_TWD, SZ_32);
 -#endif
  }
  
 +#ifdef CONFIG_HAVE_ARM_TWD
 +static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, A9_MPCORE_TWD, IRQ_LOCALTIMER);
 +
 +static void __init ca9x4_twd_init(void)
 +{
 +	int err = twd_local_timer_register(&twd_local_timer);
 +	if (err)
 +		pr_err("twd_local_timer_register failed %d\n", err);
 +}
 +#else
 +#define ca9x4_twd_init()	do {} while(0)
 +#endif
 +
  static void __init ct_ca9x4_init_irq(void)
  {
- 	gic_init(0, 29, MMIO_P2V(A9_MPCORE_GIC_DIST),
- 		 MMIO_P2V(A9_MPCORE_GIC_CPU));
+ 	gic_init(0, 29, ioremap(A9_MPCORE_GIC_DIST, SZ_4K),
+ 		 ioremap(A9_MPCORE_GIC_CPU, SZ_256));
 +	ca9x4_twd_init();
  }
  
- #if 0
- static void __init ct_ca9x4_timer_init(void)
- {
- 	writel(0, MMIO_P2V(CT_CA9X4_TIMER0) + TIMER_CTRL);
- 	writel(0, MMIO_P2V(CT_CA9X4_TIMER1) + TIMER_CTRL);
- 
- 	sp804_clocksource_init(MMIO_P2V(CT_CA9X4_TIMER1), "ct-timer1");
- 	sp804_clockevents_init(MMIO_P2V(CT_CA9X4_TIMER0), IRQ_CT_CA9X4_TIMER0,
- 		"ct-timer0");
- }
- 
- static struct sys_timer ct_ca9x4_timer = {
- 	.init	= ct_ca9x4_timer_init,
- };
- #endif
- 
  static void ct_ca9x4_clcd_enable(struct clcd_fb *fb)
  {
  	v2m_cfg_write(SYS_CFG_MUXFPGA | SYS_CFG_SITE_DB1, 0);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120313/6f4ef4c5/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-03-13  8:36 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-03-13  8:36 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-ux500/timer.c between commit 8eed6eac103b ("ARM: ux500:
convert to twd_local_timer_register() interface") from the arm tree and
commit b9576623c421 ("ARM: plat-nomadik: get rid of global mtu base
pointer") from the arm-soc tree.

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

diff --cc arch/arm/mach-ux500/timer.c
index cadf982,fd00024..0000000
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@@ -15,38 -15,22 +15,39 @@@
  #include <mach/setup.h>
  #include <mach/hardware.h>
  
 +#ifdef CONFIG_HAVE_ARM_TWD
 +static DEFINE_TWD_LOCAL_TIMER(u5500_twd_local_timer,
 +			      U5500_TWD_BASE, IRQ_LOCALTIMER);
 +static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer,
 +			      U8500_TWD_BASE, IRQ_LOCALTIMER);
 +
 +static void __init ux500_twd_init(void)
 +{
 +	struct twd_local_timer *twd_local_timer;
 +	int err;
 +
 +	twd_local_timer = cpu_is_u5500() ? &u5500_twd_local_timer :
 +					   &u8500_twd_local_timer;
 +
 +	err = twd_local_timer_register(twd_local_timer);
 +	if (err)
 +		pr_err("twd_local_timer_register failed %d\n", err);
 +}
 +#else
 +#define ux500_twd_init()	do { } while(0)
 +#endif
 +
  static void __init ux500_timer_init(void)
  {
+ 	void __iomem *mtu_timer_base;
  	void __iomem *prcmu_timer_base;
 +	int err;
  
  	if (cpu_is_u5500()) {
- 		mtu_base = __io_address(U5500_MTU0_BASE);
 -#ifdef CONFIG_LOCAL_TIMERS
 -		twd_base = __io_address(U5500_TWD_BASE);
 -#endif
+ 		mtu_timer_base = __io_address(U5500_MTU0_BASE);
  		prcmu_timer_base = __io_address(U5500_PRCMU_TIMER_3_BASE);
  	} else if (cpu_is_u8500()) {
- 		mtu_base = __io_address(U8500_MTU0_BASE);
 -#ifdef CONFIG_LOCAL_TIMERS
 -		twd_base = __io_address(U8500_TWD_BASE);
 -#endif
+ 		mtu_timer_base = __io_address(U8500_MTU0_BASE);
  		prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
  	} else {
  		ux500_unknown_soc();
@@@ -69,9 -53,8 +70,9 @@@
  	 *
  	 */
  
- 	nmdk_timer_init();
+ 	nmdk_timer_init(mtu_timer_base);
  	clksrc_dbx500_prcmu_init(prcmu_timer_base);
 +	ux500_twd_init();
  }
  
  static void ux500_timer_reset(void)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120313/de01efab/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-02-29  5:16 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-02-29  5:16 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/Kconfig between commit 6905a65879b5 ("ARM: Make the sched_clock
framework mandatory") from the arm tree and commit 4a8f83409da6 ("ARM:
sa1100: clean up clock support") from the arm-soc tree.

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

diff --cc arch/arm/Kconfig
index 5130989,9f134c4..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -753,7 -760,8 +753,7 @@@ config ARCH_SA110
  	select ARCH_HAS_CPUFREQ
  	select CPU_FREQ
  	select GENERIC_CLOCKEVENTS
- 	select HAVE_CLK
+ 	select CLKDEV_LOOKUP
 -	select HAVE_SCHED_CLOCK
  	select TICK_ONESHOT
  	select ARCH_REQUIRE_GPIOLIB
  	select HAVE_IDE
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120229/14bcdab1/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-01-24  1:20 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-01-24  1:20 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-exynos/dma.c between commit 20df8641cc1a ("ARM: amba:
samsung: get rid of NO_IRQ initializers") from the arm tree and commits
2b7841baf665 ("ARM: EXYNOS: Enable MDMA driver") and  bf2f272ad446 ("ARM:
EXYNOS: Support DMA for EXYNOS4X12 SoCs") from the arm-soc tree.

I fixed it up (there may be more required - see below) and can carry the
fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au

diff --cc arch/arm/mach-exynos/dma.c
index 91370de,ce645ba..0000000
--- a/arch/arm/mach-exynos/dma.c
+++ b/arch/arm/mach-exynos/dma.c
@@@ -69,15 -70,60 +70,47 @@@ u8 exynos4210_pdma0_peri[] = 
  	DMACH_AC97_PCMOUT,
  };
  
- struct dma_pl330_platdata exynos4_pdma0_pdata = {
- 	.nr_valid_peri = ARRAY_SIZE(pdma0_peri),
- 	.peri_id = pdma0_peri,
+ u8 exynos4212_pdma0_peri[] = {
+ 	DMACH_PCM0_RX,
+ 	DMACH_PCM0_TX,
+ 	DMACH_PCM2_RX,
+ 	DMACH_PCM2_TX,
+ 	DMACH_MIPI_HSI0,
+ 	DMACH_MIPI_HSI1,
+ 	DMACH_SPI0_RX,
+ 	DMACH_SPI0_TX,
+ 	DMACH_SPI2_RX,
+ 	DMACH_SPI2_TX,
+ 	DMACH_I2S0S_TX,
+ 	DMACH_I2S0_RX,
+ 	DMACH_I2S0_TX,
+ 	DMACH_I2S2_RX,
+ 	DMACH_I2S2_TX,
+ 	DMACH_UART0_RX,
+ 	DMACH_UART0_TX,
+ 	DMACH_UART2_RX,
+ 	DMACH_UART2_TX,
+ 	DMACH_UART4_RX,
+ 	DMACH_UART4_TX,
+ 	DMACH_SLIMBUS0_RX,
+ 	DMACH_SLIMBUS0_TX,
+ 	DMACH_SLIMBUS2_RX,
+ 	DMACH_SLIMBUS2_TX,
+ 	DMACH_SLIMBUS4_RX,
+ 	DMACH_SLIMBUS4_TX,
+ 	DMACH_AC97_MICIN,
+ 	DMACH_AC97_PCMIN,
+ 	DMACH_AC97_PCMOUT,
+ 	DMACH_MIPI_HSI4,
+ 	DMACH_MIPI_HSI5,
  };
  
+ struct dma_pl330_platdata exynos4_pdma0_pdata;
+ 
 -struct amba_device exynos4_device_pdma0 = {
 -	.dev = {
 -		.init_name = "dma-pl330.0",
 -		.dma_mask = &dma_dmamask,
 -		.coherent_dma_mask = DMA_BIT_MASK(32),
 -		.platform_data = &exynos4_pdma0_pdata,
 -	},
 -	.res = {
 -		.start = EXYNOS4_PA_PDMA0,
 -		.end = EXYNOS4_PA_PDMA0 + SZ_4K,
 -		.flags = IORESOURCE_MEM,
 -	},
 -	.irq = {IRQ_PDMA0, NO_IRQ},
 -	.periphid = 0x00041330,
 -};
 +AMBA_AHB_DEVICE(exynos4_pdma0, "dma-pl330.0", 0x00041330, EXYNOS4_PA_PDMA0,
 +	{IRQ_PDMA0}, &exynos4_pdma0_pdata);
  
- u8 pdma1_peri[] = {
+ u8 exynos4210_pdma1_peri[] = {
  	DMACH_PCM0_RX,
  	DMACH_PCM0_TX,
  	DMACH_PCM1_RX,
@@@ -105,27 -151,121 +138,108 @@@
  	DMACH_SLIMBUS5_TX,
  };
  
- struct dma_pl330_platdata exynos4_pdma1_pdata = {
- 	.nr_valid_peri = ARRAY_SIZE(pdma1_peri),
- 	.peri_id = pdma1_peri,
+ u8 exynos4212_pdma1_peri[] = {
+ 	DMACH_PCM0_RX,
+ 	DMACH_PCM0_TX,
+ 	DMACH_PCM1_RX,
+ 	DMACH_PCM1_TX,
+ 	DMACH_MIPI_HSI2,
+ 	DMACH_MIPI_HSI3,
+ 	DMACH_SPI1_RX,
+ 	DMACH_SPI1_TX,
+ 	DMACH_I2S0S_TX,
+ 	DMACH_I2S0_RX,
+ 	DMACH_I2S0_TX,
+ 	DMACH_I2S1_RX,
+ 	DMACH_I2S1_TX,
+ 	DMACH_UART0_RX,
+ 	DMACH_UART0_TX,
+ 	DMACH_UART1_RX,
+ 	DMACH_UART1_TX,
+ 	DMACH_UART3_RX,
+ 	DMACH_UART3_TX,
+ 	DMACH_SLIMBUS1_RX,
+ 	DMACH_SLIMBUS1_TX,
+ 	DMACH_SLIMBUS3_RX,
+ 	DMACH_SLIMBUS3_TX,
+ 	DMACH_SLIMBUS5_RX,
+ 	DMACH_SLIMBUS5_TX,
+ 	DMACH_SLIMBUS0AUX_RX,
+ 	DMACH_SLIMBUS0AUX_TX,
+ 	DMACH_SPDIF,
+ 	DMACH_MIPI_HSI6,
+ 	DMACH_MIPI_HSI7,
  };
  
+ struct dma_pl330_platdata exynos4_pdma1_pdata;
+ 
 -struct amba_device exynos4_device_pdma1 = {
 -	.dev = {
 -		.init_name = "dma-pl330.1",
 -		.dma_mask = &dma_dmamask,
 -		.coherent_dma_mask = DMA_BIT_MASK(32),
 -		.platform_data = &exynos4_pdma1_pdata,
 -	},
 -	.res = {
 -		.start = EXYNOS4_PA_PDMA1,
 -		.end = EXYNOS4_PA_PDMA1 + SZ_4K,
 -		.flags = IORESOURCE_MEM,
 -	},
 -	.irq = {IRQ_PDMA1, NO_IRQ},
 -	.periphid = 0x00041330,
 -};
 +AMBA_AHB_DEVICE(exynos4_pdma1,  "dma-pl330.1", 0x00041330, EXYNOS4_PA_PDMA1,
 +	{IRQ_PDMA1}, &exynos4_pdma1_pdata);
  
+ u8 mdma_peri[] = {
+ 	DMACH_MTOM_0,
+ 	DMACH_MTOM_1,
+ 	DMACH_MTOM_2,
+ 	DMACH_MTOM_3,
+ 	DMACH_MTOM_4,
+ 	DMACH_MTOM_5,
+ 	DMACH_MTOM_6,
+ 	DMACH_MTOM_7,
+ };
+ 
+ struct dma_pl330_platdata exynos4_mdma_pdata = {
+ 	.nr_valid_peri = ARRAY_SIZE(mdma_peri),
+ 	.peri_id = mdma_peri,
+ };
+ 
+ struct amba_device exynos4_device_mdma = {
+ 	.dev = {
+ 		.init_name = "dma-pl330.2",
+ 		.dma_mask = &dma_dmamask,
+ 		.coherent_dma_mask = DMA_BIT_MASK(32),
+ 		.platform_data = &exynos4_mdma_pdata,
+ 	},
+ 	.res = {
+ 		.start = EXYNOS4_PA_MDMA1,
+ 		.end = EXYNOS4_PA_MDMA1 + SZ_4K,
+ 		.flags = IORESOURCE_MEM,
+ 	},
 -	.irq = {IRQ_MDMA1, NO_IRQ},
++	.irq = {IRQ_MDMA1},
+ 	.periphid = 0x00041330,
+ };
+ 
  static int __init exynos4_dma_init(void)
  {
  	if (of_have_populated_dt())
  		return 0;
  
+ 	if (soc_is_exynos4210()) {
+ 		exynos4_pdma0_pdata.nr_valid_peri =
+ 			ARRAY_SIZE(exynos4210_pdma0_peri);
+ 		exynos4_pdma0_pdata.peri_id = exynos4210_pdma0_peri;
+ 		exynos4_pdma1_pdata.nr_valid_peri =
+ 			ARRAY_SIZE(exynos4210_pdma1_peri);
+ 		exynos4_pdma1_pdata.peri_id = exynos4210_pdma1_peri;
+ 	} else if (soc_is_exynos4212() || soc_is_exynos4412()) {
+ 		exynos4_pdma0_pdata.nr_valid_peri =
+ 			ARRAY_SIZE(exynos4212_pdma0_peri);
+ 		exynos4_pdma0_pdata.peri_id = exynos4212_pdma0_peri;
+ 		exynos4_pdma1_pdata.nr_valid_peri =
+ 			ARRAY_SIZE(exynos4212_pdma1_peri);
+ 		exynos4_pdma1_pdata.peri_id = exynos4212_pdma1_peri;
+ 	}
+ 
  	dma_cap_set(DMA_SLAVE, exynos4_pdma0_pdata.cap_mask);
  	dma_cap_set(DMA_CYCLIC, exynos4_pdma0_pdata.cap_mask);
 -	amba_device_register(&exynos4_device_pdma0, &iomem_resource);
 +	amba_device_register(&exynos4_pdma0_device, &iomem_resource);
  
  	dma_cap_set(DMA_SLAVE, exynos4_pdma1_pdata.cap_mask);
  	dma_cap_set(DMA_CYCLIC, exynos4_pdma1_pdata.cap_mask);
 -	amba_device_register(&exynos4_device_pdma1, &iomem_resource);
 +	amba_device_register(&exynos4_pdma1_device, &iomem_resource);
  
+ 	dma_cap_set(DMA_MEMCPY, exynos4_mdma_pdata.cap_mask);
+ 	amba_device_register(&exynos4_device_mdma, &iomem_resource);
+ 
  	return 0;
  }
  arch_initcall(exynos4_dma_init);
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120124/79ccdc44/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-01-06  1:03 Stephen Rothwell
  2012-01-07  4:44 ` Shawn Guo
  2012-01-07  5:48 ` Shawn Guo
  0 siblings, 2 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-01-06  1:03 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-imx/mm-imx5.c between commit 9bdd46257ab3 ("ARM: plat-mxc:
hook special idle handlers to arm_pm_idle") from the arm tree and commit
010dc8af8f28 ("ARM: mx5: use generic irq chip pm interface for pm
functions on") from the arm-soc tree.

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

diff --cc arch/arm/mach-imx/mm-imx5.c
index 65139a6,bc17dfe..0000000
--- a/arch/arm/mach-imx/mm-imx5.c
+++ b/arch/arm/mach-imx/mm-imx5.c
@@@ -21,9 -22,27 +22,24 @@@
  #include <mach/devices-common.h>
  #include <mach/iomux-v3.h>
  
+ static struct clk *gpc_dvfs_clk;
+ 
  static void imx5_idle(void)
  {
 -	if (!need_resched()) {
 -		/* gpc clock is needed for SRPG */
 -		if (gpc_dvfs_clk == NULL) {
 -			gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs");
 -			if (IS_ERR(gpc_dvfs_clk))
 -				goto err0;
 -		}
 -		clk_enable(gpc_dvfs_clk);
 -		mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
 -		if (tzic_enable_wake())
 -			goto err1;
 -		cpu_do_idle();
 -err1:
 -		clk_disable(gpc_dvfs_clk);
++	/* gpc clock is needed for SRPG */
++	if (gpc_dvfs_clk == NULL) {
++		gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs");
++		if (IS_ERR(gpc_dvfs_clk))
++			goto err0;
+ 	}
++	clk_enable(gpc_dvfs_clk);
 +	mx5_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
++	if (tzic_enable_wake())
++		goto err1;
++	cpu_do_idle();
++err1:
++	clk_disable(gpc_dvfs_clk);
+ err0:
 -	local_irq_enable();
  }
  
  /*
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120106/5097ddd7/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-01-06  1:03 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-01-06  1:03 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/mach-at91/at91cap9.c, arch/arm/mach-at91/at91sam9260.c,
arch/arm/mach-at91/at91sam9261.c, arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c and arch/arm/mach-at91/at91sam9rl.c
between commits 1b2073e77894 ("ARM: restart: at91: use new restart hook")
and 8994cb50fee0 ("ARM: mach-at91: move special idle code out of line")
from the arm tree and commit f22deee523e0 ("ARM: at91: make shutdown
controler soc independent") from the arm-soc tree.

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

diff --cc arch/arm/mach-at91/at91cap9.c
index f1c829f,506a26c..0000000
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@@ -13,9 -13,7 +13,8 @@@
   */
  
  #include <linux/module.h>
- #include <linux/pm.h>
  
 +#include <asm/proc-fns.h>
  #include <asm/irq.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
@@@ -340,11 -328,16 +335,17 @@@ static void __init at91cap9_map_io(void
  	at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE);
  }
  
+ static void __init at91cap9_ioremap_registers(void)
+ {
+ 	at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);
+ 	at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);
+ 	at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);
+ }
+ 
  static void __init at91cap9_initialize(void)
  {
 -	at91_arch_reset = at91cap9_reset;
 +	arm_pm_idle = at91cap9_idle;
 +	arm_pm_restart = at91cap9_restart;
- 	pm_power_off = at91cap9_poweroff;
  	at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
  
  	/* Register GPIO subsystem */

diff --cc arch/arm/mach-at91/at91sam9260.c
index f2237ac,3a960d2..0000000
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@@ -11,9 -11,7 +11,8 @@@
   */
  
  #include <linux/module.h>
- #include <linux/pm.h>
  
 +#include <asm/proc-fns.h>
  #include <asm/irq.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
@@@ -326,17 -320,16 +321,23 @@@ static void __init at91sam9260_map_io(v
  	}
  }
  
 +static void at91sam9260_idle(void)
 +{
 +	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
 +	cpu_do_idle();
 +}
 +
+ static void __init at91sam9260_ioremap_registers(void)
+ {
+ 	at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);
+ 	at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
+ 	at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
+ }
+ 
  static void __init at91sam9260_initialize(void)
  {
 -	at91_arch_reset = at91sam9_alt_reset;
 +	arm_pm_idle = at91sam9260_idle;
 +	arm_pm_restart = at91sam9_alt_restart;
- 	pm_power_off = at91sam9260_poweroff;
  	at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
  			| (1 << AT91SAM9260_ID_IRQ2);
  
diff --cc arch/arm/mach-at91/at91sam9261.c
index 40ac620,a0538c5..0000000
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@@ -11,9 -11,7 +11,8 @@@
   */
  
  #include <linux/module.h>
- #include <linux/pm.h>
  
 +#include <asm/proc-fns.h>
  #include <asm/irq.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
@@@ -286,17 -278,16 +279,23 @@@ static void __init at91sam9261_map_io(v
  		at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);
  }
  
 +static void at91sam9261_idle(void)
 +{
 +	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
 +	cpu_do_idle();
 +}
 +
+ static void __init at91sam9261_ioremap_registers(void)
+ {
+ 	at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);
+ 	at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);
+ 	at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);
+ }
+ 
  static void __init at91sam9261_initialize(void)
  {
 -	at91_arch_reset = at91sam9_alt_reset;
 +	arm_pm_idle = at91sam9261_idle;
 +	arm_pm_restart = at91sam9_alt_restart;
- 	pm_power_off = at91sam9261_poweroff;
  	at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
  			| (1 << AT91SAM9261_ID_IRQ2);
  
diff --cc arch/arm/mach-at91/at91sam9263.c
index 5e2485b,5ffbbb0..0000000
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@@ -11,9 -11,7 +11,8 @@@
   */
  
  #include <linux/module.h>
- #include <linux/pm.h>
  
 +#include <asm/proc-fns.h>
  #include <asm/irq.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
@@@ -304,17 -298,17 +299,24 @@@ static void __init at91sam9263_map_io(v
  	at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);
  }
  
 +static void at91sam9263_idle(void)
 +{
 +	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
 +	cpu_do_idle();
 +}
 +
+ static void __init at91sam9263_ioremap_registers(void)
+ {
+ 	at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);
+ 	at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);
+ 	at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);
+ 	at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);
+ }
+ 
  static void __init at91sam9263_initialize(void)
  {
 -	at91_arch_reset = at91sam9_alt_reset;
 +	arm_pm_idle = at91sam9263_idle;
 +	arm_pm_restart = at91sam9_alt_restart;
- 	pm_power_off = at91sam9263_poweroff;
  	at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
  
  	/* Register GPIO subsystem */
diff --cc arch/arm/mach-at91/at91sam9g45.c
index e3a0f0c,f61eb64..0000000
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@@ -344,11 -333,16 +339,17 @@@ static void __init at91sam9g45_map_io(v
  	init_consistent_dma_size(SZ_4M);
  }
  
+ static void __init at91sam9g45_ioremap_registers(void)
+ {
+ 	at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);
+ 	at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);
+ 	at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);
+ }
+ 
  static void __init at91sam9g45_initialize(void)
  {
 -	at91_arch_reset = at91sam9g45_reset;
 +	arm_pm_idle = at91sam9g45_idle;
 +	arm_pm_restart = at91sam9g45_restart;
- 	pm_power_off = at91sam9g45_poweroff;
  	at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);
  
  	/* Register GPIO subsystem */
diff --cc arch/arm/mach-at91/at91sam9rl.c
index 5309b44,96247f6..0000000
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@@ -10,9 -10,7 +10,8 @@@
   */
  
  #include <linux/module.h>
- #include <linux/pm.h>
  
 +#include <asm/proc-fns.h>
  #include <asm/irq.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
@@@ -291,17 -283,16 +284,23 @@@ static void __init at91sam9rl_map_io(vo
  	at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);
  }
  
 +static void at91sam9rl_idle(void)
 +{
 +	at91_sys_write(AT91_PMC_SCDR, AT91_PMC_PCK);
 +	cpu_do_idle();
 +}
 +
+ static void __init at91sam9rl_ioremap_registers(void)
+ {
+ 	at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC);
+ 	at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);
+ 	at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);
+ }
+ 
  static void __init at91sam9rl_initialize(void)
  {
 -	at91_arch_reset = at91sam9_alt_reset;
 +	arm_pm_idle = at91sam9rl_idle;
 +	arm_pm_restart = at91sam9_alt_restart;
- 	pm_power_off = at91sam9rl_poweroff;
  	at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
  
  	/* Register GPIO subsystem */
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120106/f9f64d86/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-01-06  1:03 Stephen Rothwell
  2012-01-06  8:48 ` Russell King - ARM Linux
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2012-01-06  1:03 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/pm34xx.c between commit e6ab10af962d ("ARM: OMAP:
convert idle handlers from pm_idle to arm_pm_idle") from the arm tree and
commit 2fd149645eb4 ("") from the arm-soc tree.

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

diff --cc arch/arm/mach-omap2/pm34xx.c
index df5c6bf,fc69875..0000000
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@@ -485,21 -416,12 +416,11 @@@ void omap_sram_idle(void
  	clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]);
  }
  
- int omap3_can_sleep(void)
- {
- 	if (!omap_uart_can_sleep())
- 		return 0;
- 	return 1;
- }
- 
  static void omap3_pm_idle(void)
  {
 -	local_irq_disable();
  	local_fiq_disable();
  
- 	if (!omap3_can_sleep())
- 		goto out;
- 
 -	if (omap_irq_pending() || need_resched())
 +	if (omap_irq_pending())
  		goto out;
  
  	trace_power_start(POWER_CSTATE, 1, smp_processor_id());
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120106/94399eca/attachment-0001.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-01-05  0:27 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-01-05  0:27 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-exynos/Makefile between commit cc511b8d84d8 ("ARM: 7257/1:
EXYNOS: introduce arch/arm/mach-exynos/common.[ch]") from the arm tree
and commit fca3de6ab9bf ("ARM: EXYNOS: Limit usage of pl330 device
instance to non-dt build") from the arm-soc tree.

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

diff --cc arch/arm/mach-exynos/Makefile
index bcb9efc,db527ab..0000000
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -19,8 -19,6 +19,8 @@@ obj-$(CONFIG_SOC_EXYNOS4212)	+= clock-e
  obj-$(CONFIG_PM)		+= pm.o
  obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o
  
- obj-$(CONFIG_ARCH_EXYNOS4)	+= dma.o pmu.o
++obj-$(CONFIG_ARCH_EXYNOS4)	+= pmu.o
 +
  obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
  
  obj-$(CONFIG_EXYNOS4_MCT)	+= mct.o
@@@ -46,8 -46,9 +48,10 @@@ obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-
  obj-$(CONFIG_EXYNOS4_DEV_PD)		+= dev-pd.o
  obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)	+= dev-sysmmu.o
  obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o
+ obj-$(CONFIG_EXYNOS4_DEV_DMA)		+= dma.o
+ obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
  
 +obj-$(CONFIG_ARCH_EXYNOS4)		+= setup-i2c0.o
  obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o
  obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)	+= setup-fimd0.o
  obj-$(CONFIG_EXYNOS4_SETUP_I2C1)	+= setup-i2c1.o
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120105/daab7956/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2012-01-02 23:34 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2012-01-02 23:34 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-s3c64xx/Makefile between commit b024043b6d0d ("ARM: 7245/1:
S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]") from the arm tree
and commits a60879e7ca17 ("ARM: SAMSUNG: Remove SDHCI bus clocks from
platform data"), 875a59374cd1 ("ARM: SAMSUNG: Consolidation of SPI
platform devices to plat-samsung") and 4566c7f7612f ("ARM: S3C64XX:
Modified files for SPI consolidation work") from the arm-soc tree.

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

diff --cc arch/arm/mach-s3c64xx/Makefile
index f37016c,d7d9bb5..0000000
--- a/arch/arm/mach-s3c64xx/Makefile
+++ b/arch/arm/mach-s3c64xx/Makefile
@@@ -27,21 -26,21 +27,20 @@@ obj-$(CONFIG_PM)		+= pm.o irq-pm.o slee
  
  obj-$(CONFIG_S3C64XX_DMA)	+= dma.o
  
 -# Device setup
 +# Device support
  
 -obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o
 -obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o
 -obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
 -obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
 -obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
 -obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
 -obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
 +obj-y				+= dev-uart.o
 +obj-y				+= dev-audio.o
- obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
  
 -# PM
 +# Device setup
  
 -obj-$(CONFIG_PM)		+= pm.o
 -obj-$(CONFIG_PM)		+= sleep.o
 -obj-$(CONFIG_PM)		+= irq-pm.o
 +obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
 +obj-$(CONFIG_S3C64XX_SETUP_I2C0)	+= setup-i2c0.o
 +obj-$(CONFIG_S3C64XX_SETUP_I2C1)	+= setup-i2c1.o
 +obj-$(CONFIG_S3C64XX_SETUP_IDE)		+= setup-ide.o
 +obj-$(CONFIG_S3C64XX_SETUP_KEYPAD)	+= setup-keypad.o
- obj-$(CONFIG_S3C64XX_SETUP_SDHCI)	+= setup-sdhci.o
 +obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
++obj-$(CONFIG_S3C64XX_SETUP_SPI)		+= setup-spi.o
  
  # Machine support
  
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120103/ad73c70e/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2011-12-18 23:55 Stephen Rothwell
  2011-12-19  1:32 ` Shawn Guo
  0 siblings, 1 reply; 70+ messages in thread
From: Stephen Rothwell @ 2011-12-18 23:55 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-imx/mach-imx6q.c between commit 1237f0f6ecf6 ("ARM: 7198/1:
arm/imx6: add restart support for imx6q") from the arm tree and commit
477fce49aef4 ("arm/imx6q-sabrelite: add enet phy ksz9021rn fixup") from
the arm-soc tree.

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

diff --cc arch/arm/mach-imx/mach-imx6q.c
index 05b49bb,bee6334..0000000
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -16,9 -14,10 +16,11 @@@
  #include <linux/irq.h>
  #include <linux/irqdomain.h>
  #include <linux/of.h>
 +#include <linux/of_address.h>
  #include <linux/of_irq.h>
  #include <linux/of_platform.h>
+ #include <linux/phy.h>
+ #include <linux/micrel_phy.h>
  #include <asm/hardware/cache-l2x0.h>
  #include <asm/hardware/gic.h>
  #include <asm/mach/arch.h>
@@@ -26,38 -25,27 +28,57 @@@
  #include <mach/common.h>
  #include <mach/hardware.h>
  
 +void imx6q_restart(char mode, const char *cmd)
 +{
 +	struct device_node *np;
 +	void __iomem *wdog_base;
 +
 +	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-wdt");
 +	wdog_base = of_iomap(np, 0);
 +	if (!wdog_base)
 +		goto soft;
 +
 +	imx_src_prepare_restart();
 +
 +	/* enable wdog */
 +	writew_relaxed(1 << 2, wdog_base);
 +	/* write twice to ensure the request will not get ignored */
 +	writew_relaxed(1 << 2, wdog_base);
 +
 +	/* wait for reset to assert ... */
 +	mdelay(500);
 +
 +	pr_err("Watchdog reset failed to assert reset\n");
 +
 +	/* delay to allow the serial port to show the message */
 +	mdelay(50);
 +
 +soft:
 +	/* we'll take a jump through zero as a poor second */
 +	soft_restart(0);
 +}
 +
+ /* For imx6q sabrelite board: set KSZ9021RN RGMII pad skew */
+ static int ksz9021rn_phy_fixup(struct phy_device *phydev)
+ {
+ 	/* min rx data delay */
+ 	phy_write(phydev, 0x0b, 0x8105);
+ 	phy_write(phydev, 0x0c, 0x0000);
+ 
+ 	/* max rx/tx clock delay, min rx/tx control delay */
+ 	phy_write(phydev, 0x0b, 0x8104);
+ 	phy_write(phydev, 0x0c, 0xf0f0);
+ 	phy_write(phydev, 0x0b, 0x104);
+ 
+ 	return 0;
+ }
+ 
  static void __init imx6q_init_machine(void)
  {
+ 	if (of_machine_is_compatible("fsl,imx6q-sabrelite"))
+ 		phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
+ 					   ksz9021rn_phy_fixup);
+ 
  	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
  
  	imx6q_pm_init();
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111219/6871fb42/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
* linux-next: manual merge of the arm-soc tree with the arm tree
@ 2011-12-18 23:55 Stephen Rothwell
  0 siblings, 0 replies; 70+ messages in thread
From: Stephen Rothwell @ 2011-12-18 23:55 UTC (permalink / raw)
  To: linux-arm-kernel

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-omap2/board-ti8168evm.c between commit fae51fbd5b0b ("ARM:
restart: omap: use new restart hook") from the arm tree and commit
a890b6760d97 ("ARM: OMAP: TI814X: Create board support and enable build
for TI8148 EVM") from the arm-soc tree.

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

diff --cc arch/arm/mach-omap2/board-ti8168evm.c
index 74713e3,5b6ad6e..0000000
--- a/arch/arm/mach-omap2/board-ti8168evm.c
+++ b/arch/arm/mach-omap2/board-ti8168evm.c
@@@ -43,10 -47,19 +47,21 @@@ static void __init ti81xx_evm_init(void
  MACHINE_START(TI8168EVM, "ti8168evm")
  	/* Maintainer: Texas Instruments */
  	.atag_offset	= 0x100,
- 	.map_io		= ti8168_evm_map_io,
- 	.init_early	= ti816x_init_early,
- 	.init_irq	= ti816x_init_irq,
+ 	.map_io		= ti81xx_map_io,
+ 	.init_early	= ti81xx_init_early,
+ 	.init_irq	= ti81xx_init_irq,
+ 	.timer		= &omap3_timer,
+ 	.init_machine	= ti81xx_evm_init,
++	.restart	= omap_prcm_restart,
+ MACHINE_END
+ 
+ MACHINE_START(TI8148EVM, "ti8148evm")
+ 	/* Maintainer: Texas Instruments */
+ 	.atag_offset	= 0x100,
+ 	.map_io		= ti81xx_map_io,
+ 	.init_early	= ti81xx_init_early,
+ 	.init_irq	= ti81xx_init_irq,
  	.timer		= &omap3_timer,
- 	.init_machine	= ti8168_evm_init,
+ 	.init_machine	= ti81xx_evm_init,
 +	.restart	= omap_prcm_restart,
  MACHINE_END
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111219/1f57375f/attachment.sig>

^ permalink raw reply	[flat|nested] 70+ messages in thread
end of thread, other threads:[~2022-02-28  0:17 UTC | newest]

Thread overview: 70+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-09 23:50 linux-next: manual merge of the arm-soc tree with the arm tree Stephen Rothwell
2012-02-10  0:25 ` Olof Johansson
  -- strict thread matches above, loose matches on Subject: below --
2022-02-28  0:16 Stephen Rothwell
2021-02-01 22:01 Stephen Rothwell
2021-02-14 22:14 ` Stephen Rothwell
2021-02-20 19:45   ` Alain Volmat
2021-02-21  0:28     ` Stephen Rothwell
2021-02-21 22:03   ` Stephen Rothwell
2019-08-29 23:27 Stephen Rothwell
2019-08-30 12:29 ` Arnd Bergmann
2018-05-29 23:40 Stephen Rothwell
2018-05-23 12:25 Mark Brown
2017-01-17 22:49 Stephen Rothwell
2017-01-17 22:53 ` Florian Fainelli
2015-08-11 23:48 Stephen Rothwell
2015-08-11 23:53 ` Nicolas Pitre
2015-09-02  0:47 ` Stephen Rothwell
2015-06-01 22:47 Stephen Rothwell
2015-01-29 22:55 Stephen Rothwell
2015-01-29 23:05 ` Russell King - ARM Linux
2014-09-26  1:23 Stephen Rothwell
2014-09-26  8:18 ` Russell King - ARM Linux
2014-09-26  9:27   ` Daniel Thompson
2014-09-26 13:52     ` Russell King - ARM Linux
2014-09-26  8:19 ` Carlo Caione
2014-09-26  8:39   ` Stephen Rothwell
2014-07-25  0:13 Stephen Rothwell
2014-06-02  0:49 Stephen Rothwell
2014-06-02  3:28 ` Olof Johansson
2014-05-27  0:52 Stephen Rothwell
2014-05-27  0:48 Stephen Rothwell
2014-05-23  0:53 Stephen Rothwell
2014-05-23  0:45 Stephen Rothwell
2014-05-23 13:08 ` Gregory CLEMENT
2014-01-05 23:20 Stephen Rothwell
2013-08-15  4:36 Stephen Rothwell
2013-05-01  6:44 Stephen Rothwell
2012-11-26 10:31 Stephen Rothwell
2012-11-26 10:39 ` Nicolas Ferre
2012-09-27  5:48 Stephen Rothwell
2012-09-20  6:03 Stephen Rothwell
2012-09-20  7:04 ` Linus Walleij
2012-05-16  8:50 Stephen Rothwell
2012-05-16  9:36 ` Haojian Zhuang
2012-05-14  8:39 Stephen Rothwell
2012-05-03  5:35 Stephen Rothwell
2012-03-16  6:49 Stephen Rothwell
2012-03-16  8:31 ` Arnd Bergmann
2012-03-15  7:06 Stephen Rothwell
2012-03-15  7:06 Stephen Rothwell
2012-03-15  6:56 Stephen Rothwell
2012-03-13  8:47 Stephen Rothwell
2012-03-13  8:42 Stephen Rothwell
2012-03-13  8:36 Stephen Rothwell
2012-02-29  5:16 Stephen Rothwell
2012-01-24  1:20 Stephen Rothwell
2012-01-06  1:03 Stephen Rothwell
2012-01-07  4:44 ` Shawn Guo
2012-01-07  6:53   ` Stephen Rothwell
2012-01-07  5:48 ` Shawn Guo
2012-01-07  6:48   ` Stephen Rothwell
2012-01-06  1:03 Stephen Rothwell
2012-01-06  1:03 Stephen Rothwell
2012-01-06  8:48 ` Russell King - ARM Linux
2012-01-06 10:31   ` Stephen Rothwell
2012-01-05  0:27 Stephen Rothwell
2012-01-02 23:34 Stephen Rothwell
2011-12-18 23:55 Stephen Rothwell
2011-12-19  1:32 ` Shawn Guo
2011-12-18 23:55 Stephen Rothwell

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).