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

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

2021-02-21 Thread Stephen Rothwell

Hi all,

On Mon, 15 Feb 2021 09:14:44 +1100 Stephen Rothwell  
wrote:
>
> On Tue, 2 Feb 2021 09:01:35 +1100 Stephen Rothwell  
> wrote:
> >
> > 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.
> > 
> > diff --cc arch/arm/Kconfig.debug
> > index 7a8697a97c98,c36c5d4c6e9c..
> > --- 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 0x0700 if DEBUG_SUN9I_UART0
> > -   default 0x09405000 if DEBUG_ZTE_ZX
> >  +  default 0x0953 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 0xfb02 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 0xfd00 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 0xfe01 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"  
> 
> With the merge window about to open, this is a reminder that this
> conflict still exists.

This is now a conflict between the arm tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell


pgpSaGbMImC3K.pgp
Description: OpenPGP digital signature

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

2021-02-20 Thread Stephen Rothwell

Hi Alain,

On Sat, 20 Feb 2021 20:45:25 +0100 Alain Volmat  wrote:
>
> sorry for the delay, is there anything I should do concerning this issue
> ?

No, it should be taken care of my the maintainers when they get Linus
to merge their trees.

-- 
Cheers,
Stephen Rothwell

pgp6n6zDuD5bG.pgp
Description: OpenPGP digital signature

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

2021-02-20 Thread Alain Volmat

Hi Stephen,

sorry for the delay, is there anything I should do concerning this issue
?

Cheers,
Alain

On Mon, Feb 15, 2021 at 09:14:44AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 2 Feb 2021 09:01:35 +1100 Stephen Rothwell  
> wrote:
> >
> > 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.
> > 
> > diff --cc arch/arm/Kconfig.debug
> > index 7a8697a97c98,c36c5d4c6e9c..
> > --- 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 0x0700 if DEBUG_SUN9I_UART0
> > -   default 0x09405000 if DEBUG_ZTE_ZX
> >  +  default 0x0953 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 0xfb02 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 0xfd00 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 0xfe01 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"
> 
> With the merge window about to open, this is a reminder that this
> conflict still exists.
> 
> -- 
> Cheers,
> Stephen Rothwell

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

2021-02-14 Thread Stephen Rothwell

Hi all,

On Tue, 2 Feb 2021 09:01:35 +1100 Stephen Rothwell  
wrote:
>
> 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.
> 
> diff --cc arch/arm/Kconfig.debug
> index 7a8697a97c98,c36c5d4c6e9c..
> --- 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 0x0700 if DEBUG_SUN9I_UART0
> - default 0x09405000 if DEBUG_ZTE_ZX
>  +default 0x0953 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 0xfb02 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 0xfd00 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 0xfe01 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"

With the merge window about to open, this is a reminder that this
conflict still exists.

-- 
Cheers,
Stephen Rothwell


pgpv8WzgVY9M7.pgp
Description: OpenPGP digital signature

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

2021-02-01 Thread Stephen Rothwell

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..
--- 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 0x0700 if DEBUG_SUN9I_UART0
-   default 0x09405000 if DEBUG_ZTE_ZX
 +  default 0x0953 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 0xfb02 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 0xfd00 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 0xfe01 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"


pgp3uFJ1RCuNV.pgp
Description: OpenPGP digital signature

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

2019-08-30 Thread Arnd Bergmann

On Fri, Aug 30, 2019 at 1:27 AM Stephen Rothwell  wrote:
>
> 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.

Yes, that's good. Russell, you could drop the patch from your tree if
you like, or let Linus handle the trivial conflict.

   Arnd

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

2019-08-29 Thread Stephen Rothwell

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


pgpqu0lhLE16e.pgp
Description: OpenPGP digital signature

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

2018-05-29 Thread Stephen Rothwell

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..
--- 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   0x42f0
+ #define ARM_CPU_PART_BRAHMA_B53   0x42001000
  
  /* DEC implemented cores */
  #define ARM_CPU_PART_SA1100   0x4400a110


pgpPSK7o_weL8.pgp
Description: OpenPGP digital signature

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

2018-05-29 Thread Stephen Rothwell

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..
--- 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   0x42f0
+ #define ARM_CPU_PART_BRAHMA_B53   0x42001000
  
  /* DEC implemented cores */
  #define ARM_CPU_PART_SA1100   0x4400a110


pgpPSK7o_weL8.pgp
Description: OpenPGP digital signature

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

2018-05-23 Thread Mark Brown

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..
--- 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   0x42f0
+ #define ARM_CPU_PART_BRAHMA_B53   0x42001000
  
  /* DEC implemented cores */
  #define ARM_CPU_PART_SA1100   0x4400a110


signature.asc
Description: PGP signature

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

2018-05-23 Thread Mark Brown

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..
--- 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   0x42f0
+ #define ARM_CPU_PART_BRAHMA_B53   0x42001000
  
  /* DEC implemented cores */
  #define ARM_CPU_PART_SA1100   0x4400a110


signature.asc
Description: PGP signature

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

2017-01-17 Thread Florian Fainelli

On 01/17/2017 02:49 PM, Stephen Rothwell wrote:
> 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.

Your resolution looks correct, thanks Stephen!
-- 
Florian

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

2017-01-17 Thread Florian Fainelli

On 01/17/2017 02:49 PM, Stephen Rothwell wrote:
> 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.

Your resolution looks correct, thanks Stephen!
-- 
Florian

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

2017-01-17 Thread Stephen Rothwell

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..
--- 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;
  }

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

2017-01-17 Thread Stephen Rothwell

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..
--- 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;
  }

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

2015-09-01 Thread Stephen Rothwell

Hi Russell,

On Wed, 12 Aug 2015 09:48:34 +1000 Stephen Rothwell  
wrote:
>
> 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).

These fixups are now being applied to the merge of the arm tree as the
arm-soc commit above has been merged into Linus' tree.

> From: Stephen Rothwell 
> Date: Wed, 12 Aug 2015 09:39:15 +1000
> Subject: [PATCH] ARM: fix for PSCI code movement
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  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 Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2015-09-01 Thread Stephen Rothwell

Hi Russell,

On Wed, 12 Aug 2015 09:48:34 +1000 Stephen Rothwell  
wrote:
>
> 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).

These fixups are now being applied to the merge of the arm tree as the
arm-soc commit above has been merged into Linus' tree.

> From: Stephen Rothwell 
> Date: Wed, 12 Aug 2015 09:39:15 +1000
> Subject: [PATCH] ARM: fix for PSCI code movement
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  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 Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2015-08-11 Thread Nicolas Pitre

On Wed, 12 Aug 2015, Stephen Rothwell wrote:

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

The fix is correct, thanks.


> 
> From: Stephen Rothwell 
> Date: Wed, 12 Aug 2015 09:39:15 +1000
> Subject: [PATCH] ARM: fix for PSCI code movement
> 
> Signed-off-by: Stephen Rothwell 
> ---
>  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 Rothwells...@canb.auug.org.au
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2015-08-11 Thread Stephen Rothwell

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 
Date: Wed, 12 Aug 2015 09:39:15 +1000
Subject: [PATCH] ARM: fix for PSCI code movement

Signed-off-by: Stephen Rothwell 
---
 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 Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2015-08-11 Thread Nicolas Pitre

On Wed, 12 Aug 2015, Stephen Rothwell wrote:

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

The fix is correct, thanks.


 
 From: Stephen Rothwell s...@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 s...@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 Rothwells...@canb.auug.org.au
 
 
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2015-08-11 Thread Stephen Rothwell

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 s...@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 s...@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 Rothwells...@canb.auug.org.au
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2015-06-01 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-socfpga/core.h
index 767c09e954a0,5913bbb50036..
--- 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);
  


pgpyDvaX8z5UT.pgp
Description: OpenPGP digital signature

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

2015-06-01 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-socfpga/core.h
index 767c09e954a0,5913bbb50036..
--- 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);
  


pgpyDvaX8z5UT.pgp
Description: OpenPGP digital signature

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

2015-01-29 Thread Russell King - ARM Linux

On Fri, Jan 30, 2015 at 09:55:33AM +1100, Stephen Rothwell wrote:
> 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).

Both of these conflict resolutions (the other one you sent after this)
look reasonable, thanks Stephen.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2015-01-29 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index a324ecdfeb21,b6a073de1559..
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1448,17 -1461,15 +1517,19 @@@ config DEBUG_UART_VIR
default 0xfef0 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
default 0xfef3 if ARCH_IXP4XX && CPU_BIG_ENDIAN
default 0xfef36000 if DEBUG_HIGHBANK_UART
 +  default 0xfefb 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"


pgpWJTAE5XARp.pgp
Description: OpenPGP digital signature

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

2015-01-29 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index a324ecdfeb21,b6a073de1559..
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1448,17 -1461,15 +1517,19 @@@ config DEBUG_UART_VIR
default 0xfef0 if ARCH_IXP4XX  !CPU_BIG_ENDIAN
default 0xfef3 if ARCH_IXP4XX  CPU_BIG_ENDIAN
default 0xfef36000 if DEBUG_HIGHBANK_UART
 +  default 0xfefb 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


pgpWJTAE5XARp.pgp
Description: OpenPGP digital signature

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

2015-01-29 Thread Russell King - ARM Linux

On Fri, Jan 30, 2015 at 09:55:33AM +1100, Stephen Rothwell wrote:
 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).

Both of these conflict resolutions (the other one you sent after this)
look reasonable, thanks Stephen.

-- 
FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-09-26 Thread Russell King - ARM Linux

On Fri, Sep 26, 2014 at 10:27:49AM +0100, Daniel Thompson wrote:
> On 26/09/14 09:18, Russell King - ARM Linux wrote:
> > On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote:
> >> 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.
> > 
> > Actually, I'll drop the patch set I have.  I didn't spot this earlier,
> > but people seem to have a hard time sorting stuff numerically:
> > 
> > default 0xffd82340 if ARCH_IOP13XX
> > +   default 0xfffb 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
> 
> Oops. This is disappointing from my point-of-view but there's no one to
> blame but me.
> 
> I have fixed this in my tree and will requeue for 3.19.

Okay, I've dropped 8141/1 onwards, so the only patches I have from your
series are:

ep93xx: Enable DEBUG_LL_UART_PL01X
versatile: Enable DEBUG_LL_UART_PL01X

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-09-26 Thread Daniel Thompson

On 26/09/14 09:18, Russell King - ARM Linux wrote:
> On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote:
>> 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.
> 
> Actually, I'll drop the patch set I have.  I didn't spot this earlier,
> but people seem to have a hard time sorting stuff numerically:
> 
> default 0xffd82340 if ARCH_IOP13XX
> +   default 0xfffb 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

Oops. This is disappointing from my point-of-view but there's no one to
blame but me.

I have fixed this in my tree and will requeue for 3.19.


> It also looks like the same is true for arm-soc:
> 
>> @@@ -1174,9 -1133,7 +1213,10 @@@
>>  default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
>>  DEBUG_S3C2410_UART2)
>>  default 0x7c0003f8 if FOOTBRIDGE
>>  +   default 0x8001 if DEBUG_SA1100_UART1
>>  +   default 0x8003 if DEBUG_SA1100_UART2
>>  +   default 0x8005 if DEBUG_SA1100_UART3
>> +default 0x7800 if DEBUG_CNS3XXX
> 
> Last time I checked, 0x7800 comes before 0x7c0003f8.
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-09-26 Thread Stephen Rothwell

Hi Carlo,

On Fri, 26 Sep 2014 10:19:43 +0200 Carlo Caione  wrote:
>
> Am I going blind or these two lines are missing from d8a00916b303
> 
> +   default 0xc81004c0 if DEBUG_MESON_UARTAO
> ...
> +   default 0xf31004c0 if DEBUG_MESON_UARTAO

They are in the final version of arch/arm/Kconfig.debug, just not shown
in the conflict resolution above.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-09-26 Thread Carlo Caione

On Fri, Sep 26, 2014 at 3:23 AM, Stephen Rothwell  wrote:
> 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 Rothwells...@canb.auug.org.au
>
> diff --cc arch/arm/Kconfig.debug
> index 4fcff7737dd1,0d714e10f0a2..
> --- 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 0x01c2 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 0x8001 if DEBUG_SA1100_UART1
>  +  default 0x8003 if DEBUG_SA1100_UART2
>  +  default 0x8005 if DEBUG_SA1100_UART3
> +   default 0x7800 if DEBUG_CNS3XXX
> default 0x8007 if DEBUG_IMX23_UART
> default 0x80074000 if DEBUG_IMX28_UART
> default 0x8023 if DEBUG_PICOXCELL_UART
> @@@ -1204,17 -1163,14 +1246,18 @@@
> default 0xff69 if DEBUG_RK32_UART2
> default 0xffc02000 if DEBUG_SOCFPGA_UART
> default 0xffd82340 if ARCH_IOP13XX
>  +  default 0xfffb 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 0xf700 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 0xf801 if DEBUG_SA1100_UART1
>  +  default 0xf803 if DEBUG_SA1100_UART2
>  +  default 0xf805 if

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

2014-09-26 Thread Russell King - ARM Linux

On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote:
> 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.

Actually, I'll drop the patch set I have.  I didn't spot this earlier,
but people seem to have a hard time sorting stuff numerically:

default 0xffd82340 if ARCH_IOP13XX
+   default 0xfffb 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

It also looks like the same is true for arm-soc:

> @@@ -1174,9 -1133,7 +1213,10 @@@
>   default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
>   DEBUG_S3C2410_UART2)
>   default 0x7c0003f8 if FOOTBRIDGE
>  +default 0x8001 if DEBUG_SA1100_UART1
>  +default 0x8003 if DEBUG_SA1100_UART2
>  +default 0x8005 if DEBUG_SA1100_UART3
> + default 0x7800 if DEBUG_CNS3XXX

Last time I checked, 0x7800 comes before 0x7c0003f8.

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-09-26 Thread Russell King - ARM Linux

On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote:
 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.

Actually, I'll drop the patch set I have.  I didn't spot this earlier,
but people seem to have a hard time sorting stuff numerically:

default 0xffd82340 if ARCH_IOP13XX
+   default 0xfffb 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

It also looks like the same is true for arm-soc:

 @@@ -1174,9 -1133,7 +1213,10 @@@
   default 0x50008000 if DEBUG_S3C24XX_UART  (DEBUG_S3C_UART2 || \
   DEBUG_S3C2410_UART2)
   default 0x7c0003f8 if FOOTBRIDGE
  +default 0x8001 if DEBUG_SA1100_UART1
  +default 0x8003 if DEBUG_SA1100_UART2
  +default 0x8005 if DEBUG_SA1100_UART3
 + default 0x7800 if DEBUG_CNS3XXX

Last time I checked, 0x7800 comes before 0x7c0003f8.

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-09-26 Thread Carlo Caione

On Fri, Sep 26, 2014 at 3:23 AM, Stephen Rothwell s...@canb.auug.org.au wrote:
 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 Rothwells...@canb.auug.org.au

 diff --cc arch/arm/Kconfig.debug
 index 4fcff7737dd1,0d714e10f0a2..
 --- 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 0x01c2 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 0x8001 if DEBUG_SA1100_UART1
  +  default 0x8003 if DEBUG_SA1100_UART2
  +  default 0x8005 if DEBUG_SA1100_UART3
 +   default 0x7800 if DEBUG_CNS3XXX
 default 0x8007 if DEBUG_IMX23_UART
 default 0x80074000 if DEBUG_IMX28_UART
 default 0x8023 if DEBUG_PICOXCELL_UART
 @@@ -1204,17 -1163,14 +1246,18 @@@
 default 0xff69 if DEBUG_RK32_UART2
 default 0xffc02000 if DEBUG_SOCFPGA_UART
 default 0xffd82340 if ARCH_IOP13XX
  +  default 0xfffb 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 0xf700 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 0xf801 if DEBUG_SA1100_UART1
  +  default 0xf803 if DEBUG_SA1100_UART2
  +  default 0xf805 if DEBUG_SA1100_UART3
 default 0xf809 if DEBUG_VEXPRESS_UART0_RS1
 default 0xfa71e000 if

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

2014-09-26 Thread Stephen Rothwell

Hi Carlo,

On Fri, 26 Sep 2014 10:19:43 +0200 Carlo Caione ca...@caione.org wrote:

 Am I going blind or these two lines are missing from d8a00916b303
 
 +   default 0xc81004c0 if DEBUG_MESON_UARTAO
 ...
 +   default 0xf31004c0 if DEBUG_MESON_UARTAO

They are in the final version of arch/arm/Kconfig.debug, just not shown
in the conflict resolution above.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-09-26 Thread Daniel Thompson

On 26/09/14 09:18, Russell King - ARM Linux wrote:
 On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote:
 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.
 
 Actually, I'll drop the patch set I have.  I didn't spot this earlier,
 but people seem to have a hard time sorting stuff numerically:
 
 default 0xffd82340 if ARCH_IOP13XX
 +   default 0xfffb 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

Oops. This is disappointing from my point-of-view but there's no one to
blame but me.

I have fixed this in my tree and will requeue for 3.19.


 It also looks like the same is true for arm-soc:
 
 @@@ -1174,9 -1133,7 +1213,10 @@@
  default 0x50008000 if DEBUG_S3C24XX_UART  (DEBUG_S3C_UART2 || \
  DEBUG_S3C2410_UART2)
  default 0x7c0003f8 if FOOTBRIDGE
  +   default 0x8001 if DEBUG_SA1100_UART1
  +   default 0x8003 if DEBUG_SA1100_UART2
  +   default 0x8005 if DEBUG_SA1100_UART3
 +default 0x7800 if DEBUG_CNS3XXX
 
 Last time I checked, 0x7800 comes before 0x7c0003f8.
 

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-09-26 Thread Russell King - ARM Linux

On Fri, Sep 26, 2014 at 10:27:49AM +0100, Daniel Thompson wrote:
 On 26/09/14 09:18, Russell King - ARM Linux wrote:
  On Fri, Sep 26, 2014 at 11:23:44AM +1000, Stephen Rothwell wrote:
  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.
  
  Actually, I'll drop the patch set I have.  I didn't spot this earlier,
  but people seem to have a hard time sorting stuff numerically:
  
  default 0xffd82340 if ARCH_IOP13XX
  +   default 0xfffb 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
 
 Oops. This is disappointing from my point-of-view but there's no one to
 blame but me.
 
 I have fixed this in my tree and will requeue for 3.19.

Okay, I've dropped 8141/1 onwards, so the only patches I have from your
series are:

ep93xx: Enable DEBUG_LL_UART_PL01X
versatile: Enable DEBUG_LL_UART_PL01X

-- 
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up
according to speedtest.net.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-09-25 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index 4fcff7737dd1,0d714e10f0a2..
--- 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 0x01c2 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 0x8001 if DEBUG_SA1100_UART1
 +  default 0x8003 if DEBUG_SA1100_UART2
 +  default 0x8005 if DEBUG_SA1100_UART3
+   default 0x7800 if DEBUG_CNS3XXX
default 0x8007 if DEBUG_IMX23_UART
default 0x80074000 if DEBUG_IMX28_UART
default 0x8023 if DEBUG_PICOXCELL_UART
@@@ -1204,17 -1163,14 +1246,18 @@@
default 0xff69 if DEBUG_RK32_UART2
default 0xffc02000 if DEBUG_SOCFPGA_UART
default 0xffd82340 if ARCH_IOP13XX
 +  default 0xfffb 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 0xf700 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 0xf801 if DEBUG_SA1100_UART1
 +  default 0xf803 if DEBUG_SA1100_UART2
 +  default 0xf805 if DEBUG_SA1100_UART3
default 0xf809 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

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

2014-09-25 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index 4fcff7737dd1,0d714e10f0a2..
--- 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 0x01c2 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 0x8001 if DEBUG_SA1100_UART1
 +  default 0x8003 if DEBUG_SA1100_UART2
 +  default 0x8005 if DEBUG_SA1100_UART3
+   default 0x7800 if DEBUG_CNS3XXX
default 0x8007 if DEBUG_IMX23_UART
default 0x80074000 if DEBUG_IMX28_UART
default 0x8023 if DEBUG_PICOXCELL_UART
@@@ -1204,17 -1163,14 +1246,18 @@@
default 0xff69 if DEBUG_RK32_UART2
default 0xffc02000 if DEBUG_SOCFPGA_UART
default 0xffd82340 if ARCH_IOP13XX
 +  default 0xfffb 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 0xf700 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 0xf801 if DEBUG_SA1100_UART1
 +  default 0xf803 if DEBUG_SA1100_UART2
 +  default 0xf805 if DEBUG_SA1100_UART3
default 0xf809 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
+

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

2014-07-24 Thread Stephen Rothwell

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 ") from the arm tree and commit
e6dc195c1c69 ("ARM: integrator: get rid of ") 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 Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-07-24 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-06-01 Thread Olof Johansson

On Sun, Jun 1, 2014 at 5:49 PM, Stephen Rothwell  wrote:
> 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).

Looks good. Thanks.


-Olof
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-06-01 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-exynos/exynos.c
index a763c0862da9,bc43e22693b7..
--- 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(_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(_saved_regs);
 -  clean_dcache_area(_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;


signature.asc
Description: PGP signature

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

2014-06-01 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-exynos/exynos.c
index a763c0862da9,bc43e22693b7..
--- 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;


signature.asc
Description: PGP signature

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

2014-06-01 Thread Olof Johansson

On Sun, Jun 1, 2014 at 5:49 PM, Stephen Rothwell s...@canb.auug.org.au wrote:
 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).

Looks good. Thanks.


-Olof
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-05-26 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-zynq/common.c
index d1e992e6403e,edbd9d83f407..
--- 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(0x0206, 0xF0F0);
 -
+   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(_cpuidle_device);
platform_device_register_full();


signature.asc
Description: PGP signature

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

2014-05-26 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-rockchip/rockchip.c
index 138b9975313a,4499b0a31a27..
--- 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


signature.asc
Description: PGP signature

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

2014-05-26 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-rockchip/rockchip.c
index 138b9975313a,4499b0a31a27..
--- 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


signature.asc
Description: PGP signature

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

2014-05-26 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-zynq/common.c
index d1e992e6403e,edbd9d83f407..
--- 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(0x0206, 0xF0F0);
 -
+   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);


signature.asc
Description: PGP signature

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

2014-05-23 Thread Gregory CLEMENT

Hi Stephen,

On 23/05/2014 02:45, Stephen Rothwell wrote:
> 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).
> 

This fix seems to be the good thing to do.

Thanks,

Gregory


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


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-05-23 Thread Gregory CLEMENT

Hi Stephen,

On 23/05/2014 02:45, Stephen Rothwell wrote:
 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).
 

This fix seems to be the good thing to do.

Thanks,

Gregory


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


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2014-05-22 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-vexpress/v2m.c
index b2fea70d412d,38f4f6f37770..
--- 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(0x1c00),
-   .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, );
- 
-   if (map && strcmp(map, "rs1") == 0)
-   iotable_init(_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", _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(), 2400);
- }
- 
- 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(0x0040, 0xfe0f);
+   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= 0x0040,
 +  .l2c_aux_mask   = 0xfe0f,
-   .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


signature.asc
Description: PGP signature

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

2014-05-22 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-mvebu/board-v7.c
index 48169caa56ea,01cfce6ac20b..
--- 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


signature.asc
Description: PGP signature

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

2014-05-22 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-mvebu/board-v7.c
index 48169caa56ea,01cfce6ac20b..
--- 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


signature.asc
Description: PGP signature

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

2014-05-22 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-vexpress/v2m.c
index b2fea70d412d,38f4f6f37770..
--- 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(0x1c00),
-   .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(), 2400);
- }
- 
- 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(0x0040, 0xfe0f);
+   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= 0x0040,
 +  .l2c_aux_mask   = 0xfe0f,
-   .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


signature.asc
Description: PGP signature

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

2014-01-05 Thread Stephen Rothwell

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 

diff --cc arch/arm/Kconfig.debug
index 9afabbb5e798,bda94e46e8d6..
--- 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


pgpa_OXp2R7Cw.pgp
Description: PGP signature

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

2014-01-05 Thread Stephen Rothwell

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 s...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index 9afabbb5e798,bda94e46e8d6..
--- 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


pgpa_OXp2R7Cw.pgp
Description: PGP signature

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

2013-08-14 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index 2d57da3,1533783..000
--- 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 0x01c2 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 0x1600 if ARCH_INTEGRATOR
 +  default 0x1c09 if DEBUG_VEXPRESS_UART0_RS1
 +  default 0x2006 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 0x4009 if ARCH_LPC32XX
 +  default 0x4010 if DEBUG_PXA_UART1
 +  default 0x4200 if ARCH_GEMINI
 +  default 0x7c0003f8 if FOOTBRIDGE
 +  default 0x8023 if DEBUG_PICOXCELL_UART
 +  default

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

2013-08-14 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index 2d57da3,1533783..000
--- 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 0x01c2 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 0x1600 if ARCH_INTEGRATOR
 +  default 0x1c09 if DEBUG_VEXPRESS_UART0_RS1
 +  default 0x2006 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 0x4009 if ARCH_LPC32XX
 +  default 0x4010 if DEBUG_PXA_UART1
 +  default 0x4200 if ARCH_GEMINI
 +  default 0x7c0003f8 if FOOTBRIDGE
 +  default 0x8023 if DEBUG_PICOXCELL_UART
 +  default 0x8007 if DEBUG_IMX23_UART
 +  default 0x80074000

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

2013-05-01 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-tegra/hotplug.c
index e8323bc,8da9f78..000
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@@ -12,8 -11,10 +11,9 @@@
  #include 
  #include 
  
 -#include 
  #include 
  
+ #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


pgp1c_5scfgy5.pgp
Description: PGP signature

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

2013-05-01 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-tegra/hotplug.c
index e8323bc,8da9f78..000
--- 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


pgp1c_5scfgy5.pgp
Description: PGP signature

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

2012-11-26 Thread Nicolas Ferre

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 11/26/2012 11:31 AM, Stephen Rothwell :
> 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).

Yes, good fix that has to be carried...

Thanks, bye,
- -- 
Nicolas Ferre
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJQs0buAAoJEAf03oE53VmQMPgH/0Gynlb5BBImnjSU75mh/dPC
ob/lTJv3w/2gUKPqbOgyxTSmMc9ckFcDELAhFYt+df9hKfOMBzZAUPHLEclZolZ+
AqpnIjGq88TYWMgaREUZ2bigTrzuWKqHiIWV/AoNcz2slhWC//CHK6z9SHE7hZOI
zZFwf326v0dRkm4g785cqalg7pNxQDpE6iMZXuifb8zPWePgKBxqHyPRCbhP1dwu
T4XQ3IgnrvzWcqz/V4mr8kppJXzHNfDEsVZ2XfndhUKVFY4qMGZhFBoTlI6LhNWO
Nu2mD7TaENoKRijLYrdMfidJ65uwAGtEWA6UxEfV1VWVddSsi/D8OuniBta+Ewg=
=zF93
-END PGP SIGNATURE-
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2012-11-26 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc drivers/tty/serial/atmel_serial.c
index 1a8a271,5660ec2..000
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@@ -39,13 -39,13 +39,12 @@@
  #include 
  #include 
  #include 
 +#include 
+ #include 
  
  #include 
  #include 
  
- #include 
- 
 -#include 
 -
  #ifdef CONFIG_ARM
  #include 
  #include 


pgpH4qHty62MI.pgp
Description: PGP signature

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

2012-11-26 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc drivers/tty/serial/atmel_serial.c
index 1a8a271,5660ec2..000
--- 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


pgpH4qHty62MI.pgp
Description: PGP signature

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

2012-11-26 Thread Nicolas Ferre

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 11/26/2012 11:31 AM, Stephen Rothwell :
 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).

Yes, good fix that has to be carried...

Thanks, bye,
- -- 
Nicolas Ferre
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJQs0buAAoJEAf03oE53VmQMPgH/0Gynlb5BBImnjSU75mh/dPC
ob/lTJv3w/2gUKPqbOgyxTSmMc9ckFcDELAhFYt+df9hKfOMBzZAUPHLEclZolZ+
AqpnIjGq88TYWMgaREUZ2bigTrzuWKqHiIWV/AoNcz2slhWC//CHK6z9SHE7hZOI
zZFwf326v0dRkm4g785cqalg7pNxQDpE6iMZXuifb8zPWePgKBxqHyPRCbhP1dwu
T4XQ3IgnrvzWcqz/V4mr8kppJXzHNfDEsVZ2XfndhUKVFY4qMGZhFBoTlI6LhNWO
Nu2mD7TaENoKRijLYrdMfidJ65uwAGtEWA6UxEfV1VWVddSsi/D8OuniBta+Ewg=
=zF93
-END PGP SIGNATURE-
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2012-09-26 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/include/asm/timex.h
index 9acc135,963342a..000
--- 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 
+ #ifdef CONFIG_ARCH_MULTIPLATFORM
+ #define CLOCK_TICK_RATE 100
+ #else
  #include 
+ #endif
  
  typedef unsigned long cycles_t;
 -
 -#ifdef ARCH_HAS_READ_CURRENT_TIMER
  #define get_cycles()  ({ cycles_t c; read_current_timer() ? 0 : c; })
 -#else
 -#define get_cycles()  (0)
 -#endif
  
  #endif


pgp2CLGgrr1Xv.pgp
Description: PGP signature

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

2012-09-26 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/include/asm/timex.h
index 9acc135,963342a..000
--- 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 100
+ #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


pgp2CLGgrr1Xv.pgp
Description: PGP signature

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

2012-09-20 Thread Linus Walleij

On Thu, Sep 20, 2012 at 8:03 AM, Stephen Rothwell  wrote:

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

Looks correct!
Thanks.
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2012-09-20 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-integrator/integrator_cp.c
index f51363e,3df5fc3..000
--- 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_BASE0xc000
  
- #define INTCP_VA_CTRL_BASEIO_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_SIZE0x10
 -
+ #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)


pgpSB6l4WrknP.pgp
Description: PGP signature

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

2012-09-20 Thread Stephen Rothwell

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 Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-integrator/integrator_cp.c
index f51363e,3df5fc3..000
--- 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_BASE0xc000
  
- #define INTCP_VA_CTRL_BASEIO_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_SIZE0x10
 -
+ #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)


pgpSB6l4WrknP.pgp
Description: PGP signature

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

2012-09-20 Thread Linus Walleij

On Thu, Sep 20, 2012 at 8:03 AM, Stephen Rothwell s...@canb.auug.org.au wrote:

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

Looks correct!
Thanks.
Linus Walleij
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

71 matches

Mail list logo