[GIT PULL 3.19] Broadcom Cygnus SoC defconfig

[GIT PULL 3.19] Broadcom Cygnus SoC defconfig

[Florian Fainelli]

The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:

  Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)

are available in the git repository at:

  http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-defconfig-v2

for you to fetch changes up to b316a9f98a2e328d10f5ed3c341fa28880152af3:

  ARM: bcm_defconfig: remove one level of menu from Kconfig (2014-11-11 22:42:05 -0800)

----------------------------------------------------------------
This pull requests removes one level in menuconfig for the BCM SoCs for the
bcm_defconfig file.

----------------------------------------------------------------
Scott Branden (1):
      ARM: bcm_defconfig: remove one level of menu from Kconfig

 arch/arm/configs/bcm_defconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes

[Florian Fainelli]

The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:

  Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)

are available in the git repository at:

  http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-dts-v2

for you to fetch changes up to c9ad7bc5fe3c57c8c817fcb1bd264a02176a40c4:

  ARM: dts: Enable Broadcom Cygnus SoC (2014-11-11 22:30:42 -0800)

----------------------------------------------------------------
This pull request contains the Broadcom Cygnus Device Tree changes:

- binding documentation for the SoC and clock
- cygnus SoC and clock dtsi files
- DTS for Cygnus Entreprise phone, BCM911360K and BCM958300K

----------------------------------------------------------------
Jonathan Richardson (1):
      dt-bindings: Document Broadcom Cygnus SoC and clocks

Scott Branden (1):
      ARM: dts: Enable Broadcom Cygnus SoC

 .../devicetree/bindings/arm/bcm/cygnus.txt         |  31 +++++
 .../devicetree/bindings/clock/bcm-cygnus-clock.txt |  34 +++++
 arch/arm/boot/dts/Makefile                         |   3 +
 arch/arm/boot/dts/bcm-cygnus-clock.dtsi            |  91 ++++++++++++++
 arch/arm/boot/dts/bcm-cygnus.dtsi                  | 140 +++++++++++++++++++++
 arch/arm/boot/dts/bcm911360_entphn.dts             |  53 ++++++++
 arch/arm/boot/dts/bcm911360k.dts                   |  53 ++++++++
 arch/arm/boot/dts/bcm958300k.dts                   |  53 ++++++++
 8 files changed, 458 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/bcm/cygnus.txt
 create mode 100644 Documentation/devicetree/bindings/clock/bcm-cygnus-clock.txt
 create mode 100644 arch/arm/boot/dts/bcm-cygnus-clock.dtsi
 create mode 100644 arch/arm/boot/dts/bcm-cygnus.dtsi
 create mode 100644 arch/arm/boot/dts/bcm911360_entphn.dts
 create mode 100644 arch/arm/boot/dts/bcm911360k.dts
 create mode 100644 arch/arm/boot/dts/bcm958300k.dts

[GIT PULL 3.19] Broadcom Cygnus SoC MAINTAINERS updates

[Florian Fainelli]

The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:

  Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)

are available in the git repository at:

  http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-maintainers-v2

for you to fetch changes up to 36c0237f1ae08f9ba538ade0ab6375bd58bb996c:

  MAINTAINERS: Entry for Cygnus/iproc arm architecture (2014-11-11 23:04:25 -0800)

----------------------------------------------------------------
This pull request contains the MAINTAINERS update to add the Broadcom Cygnus
SoC platform files, Device Tree sources and clock drivers.

----------------------------------------------------------------
Scott Branden (1):
      MAINTAINERS: Entry for Cygnus/iproc arm architecture

 MAINTAINERS | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

[GIT PULL 3.19] Broadcom Cygnus SoC platform support

[Florian Fainelli]

The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:

  Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)

are available in the git repository at:

  http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-platform-v2

for you to fetch changes up to 64e74aa788f996cd0e328a1c4223e9d438b78e9c:

  ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig (2014-11-11 22:35:45 -0800)

----------------------------------------------------------------
This pull request contains the platform code to support the Broadcom Cygnus SoC
using the iProc architecture:

- add support for the Broadcom Cygnus SoC
- consolidate the BCM5301X Kconfig options under the iProc menuconfig entry
- remove one level of menu in menuconfig

----------------------------------------------------------------
Jonathan Richardson (1):
      ARM: cygnus: Initial support for Broadcom Cygnus SoC

Scott Branden (2):
      ARM: mach-bcm: Consolidate currently supported IPROC SoCs
      ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig

 arch/arm/mach-bcm/Kconfig      | 93 ++++++++++++++++++++++++++----------------
 arch/arm/mach-bcm/Makefile     |  3 ++
 arch/arm/mach-bcm/bcm_cygnus.c | 25 ++++++++++++
 3 files changed, 85 insertions(+), 36 deletions(-)
 create mode 100644 arch/arm/mach-bcm/bcm_cygnus.c

[GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes

[Arnd Bergmann]

On Wednesday 12 November 2014, Florian Fainelli wrote:
> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
> 
>   Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
> 
> are available in the git repository at:
> 
>   http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-dts-v2
> 
> for you to fetch changes up to c9ad7bc5fe3c57c8c817fcb1bd264a02176a40c4:
> 
>   ARM: dts: Enable Broadcom Cygnus SoC (2014-11-11 22:30:42 -0800)
> 
> ----------------------------------------------------------------
> This pull request contains the Broadcom Cygnus Device Tree changes:
> 
> - binding documentation for the SoC and clock
> - cygnus SoC and clock dtsi files
> - DTS for Cygnus Entreprise phone, BCM911360K and BCM958300K

Something went wrong here: This branch contains the updated license
statements, but Olof had already merged the branch with the original
license statements that we didn't like, so all three patches conflict
with the ones we already have.

I've done an merge of the new branch over the old one, which was
literally the first thing in the next/dt branch. This isn't ideal,
but I think it's the best way out of the mess.

I hope we can avoid this in the future.

	Arnd

[GIT PULL 3.19] Broadcom Cygnus SoC MAINTAINERS updates

[Arnd Bergmann]

On Wednesday 12 November 2014, Florian Fainelli wrote:
> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
> 
>   Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
> 
> are available in the git repository at:
> 
>   http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-maintainers-v2
> 
> for you to fetch changes up to 36c0237f1ae08f9ba538ade0ab6375bd58bb996c:
> 
>   MAINTAINERS: Entry for Cygnus/iproc arm architecture (2014-11-11 23:04:25 -0800)
> 
> ----------------------------------------------------------------
> This pull request contains the MAINTAINERS update to add the Broadcom Cygnus
> SoC platform files, Device Tree sources and clock drivers.
> 
> ----------------------------------------------------------------
> Scott Branden (1):
>       MAINTAINERS: Entry for Cygnus/iproc arm architecture
> 
>  MAINTAINERS | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 

Pulled into next/fixes-non-critical, thanks!

	Arnd

[GIT PULL 3.19] Broadcom Cygnus SoC platform support

[Arnd Bergmann]

On Wednesday 12 November 2014, Florian Fainelli wrote:
> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
> 
>   Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
> 
> are available in the git repository at:
> 
>   http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-platform-v2
> 
> for you to fetch changes up to 64e74aa788f996cd0e328a1c4223e9d438b78e9c:
> 
>   ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig (2014-11-11 22:35:45 -0800)
> 
> ----------------------------------------------------------------
> This pull request contains the platform code to support the Broadcom Cygnus SoC
> using the iProc architecture:
> 
> - add support for the Broadcom Cygnus SoC
> - consolidate the BCM5301X Kconfig options under the iProc menuconfig entry
> - remove one level of menu in menuconfig
> 
> ----------------------------------------------------------------
> Jonathan Richardson (1):
>       ARM: cygnus: Initial support for Broadcom Cygnus SoC
> 
> Scott Branden (2):
>       ARM: mach-bcm: Consolidate currently supported IPROC SoCs
>       ARM: mach-bcm: ARCH_BCM_MOBILE: remove one level of menu from Kconfig
> 
>  arch/arm/mach-bcm/Kconfig      | 93 ++++++++++++++++++++++++++----------------
>  arch/arm/mach-bcm/Makefile     |  3 ++
>  arch/arm/mach-bcm/bcm_cygnus.c | 25 ++++++++++++
>  3 files changed, 85 insertions(+), 36 deletions(-)
>  create mode 100644 arch/arm/mach-bcm/bcm_cygnus.c
> 

Pulled into next/soc, thanks!

	Arnd

[GIT PULL 3.19] Broadcom Cygnus SoC defconfig

[Arnd Bergmann]

On Wednesday 12 November 2014, Florian Fainelli wrote:
> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
> 
>   Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
> 
> are available in the git repository at:
> 
>   http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-defconfig-v2
> 
> for you to fetch changes up to b316a9f98a2e328d10f5ed3c341fa28880152af3:
> 
>   ARM: bcm_defconfig: remove one level of menu from Kconfig (2014-11-11 22:42:05 -0800)
> 
> ----------------------------------------------------------------
> This pull requests removes one level in menuconfig for the BCM SoCs for the
> bcm_defconfig file.
> 
> ----------------------------------------------------------------
> Scott Branden (1):
>       ARM: bcm_defconfig: remove one level of menu from Kconfig
> 
>  arch/arm/configs/bcm_defconfig | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 

After taking a closer look, I ended up putting this into next/soc as well,
not next/defconfig, since the change has a mutual dependency on the Kconfig
change in that branch.

	Arnd

[GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes

[Scott Branden]

On 14-11-20 03:54 AM, Arnd Bergmann wrote:
> On Wednesday 12 November 2014, Florian Fainelli wrote:
>> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
>>
>>    Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
>>
>> are available in the git repository at:
>>
>>    http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-dts-v2
>>
>> for you to fetch changes up to c9ad7bc5fe3c57c8c817fcb1bd264a02176a40c4:
>>
>>    ARM: dts: Enable Broadcom Cygnus SoC (2014-11-11 22:30:42 -0800)
>>
>> ----------------------------------------------------------------
>> This pull request contains the Broadcom Cygnus Device Tree changes:
>>
>> - binding documentation for the SoC and clock
>> - cygnus SoC and clock dtsi files
>> - DTS for Cygnus Entreprise phone, BCM911360K and BCM958300K
>
> Something went wrong here: This branch contains the updated license
> statements, but Olof had already merged the branch with the original
> license statements that we didn't like, so all three patches conflict
> with the ones we already have.
Hi Arnd,

It seems like the devicetree/bindings patch from this tag was not merged 
in to next/dt ?

>
> I've done an merge of the new branch over the old one, which was
> literally the first thing in the next/dt branch. This isn't ideal,
> but I think it's the best way out of the mess.
>
> I hope we can avoid this in the future.
>
> 	Arnd
>

[GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes

[Arnd Bergmann]

On Thursday 20 November 2014 12:55:35 Scott Branden wrote:
> On 14-11-20 03:54 AM, Arnd Bergmann wrote:
> > On Wednesday 12 November 2014, Florian Fainelli wrote:
> >> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
> >>
> >>    Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
> >>
> >> are available in the git repository at:
> >>
> >>    http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-dts-v2
> >>
> >> for you to fetch changes up to c9ad7bc5fe3c57c8c817fcb1bd264a02176a40c4:
> >>
> >>    ARM: dts: Enable Broadcom Cygnus SoC (2014-11-11 22:30:42 -0800)
> >>
> >> ----------------------------------------------------------------
> >> This pull request contains the Broadcom Cygnus Device Tree changes:
> >>
> >> - binding documentation for the SoC and clock
> >> - cygnus SoC and clock dtsi files
> >> - DTS for Cygnus Entreprise phone, BCM911360K and BCM958300K
> >
> > Something went wrong here: This branch contains the updated license
> > statements, but Olof had already merged the branch with the original
> > license statements that we didn't like, so all three patches conflict
> > with the ones we already have.
> Hi Arnd,
> 
> It seems like the devicetree/bindings patch from this tag was not merged 
> in to next/dt ?

I definitely see them here, can you pull our tree again and have a second
look? Do you see them in linux-next?

	Arnd

[GIT PULL 3.19] Broadcom Cygnus SoC Device Tree changes

[Scott Branden]

On 14-11-21 03:55 AM, Arnd Bergmann wrote:
> On Thursday 20 November 2014 12:55:35 Scott Branden wrote:
>> On 14-11-20 03:54 AM, Arnd Bergmann wrote:
>>> On Wednesday 12 November 2014, Florian Fainelli wrote:
>>>> The following changes since commit f114040e3ea6e07372334ade75d1ee0775c355e1:
>>>>
>>>>     Linux 3.18-rc1 (2014-10-19 18:08:38 -0700)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>     http://github.com/brcm/linux.git tags/arm-soc/for-3.19/cygnus-dts-v2
>>>>
>>>> for you to fetch changes up to c9ad7bc5fe3c57c8c817fcb1bd264a02176a40c4:
>>>>
>>>>     ARM: dts: Enable Broadcom Cygnus SoC (2014-11-11 22:30:42 -0800)
>>>>
>>>> ----------------------------------------------------------------
>>>> This pull request contains the Broadcom Cygnus Device Tree changes:
>>>>
>>>> - binding documentation for the SoC and clock
>>>> - cygnus SoC and clock dtsi files
>>>> - DTS for Cygnus Entreprise phone, BCM911360K and BCM958300K
>>>
>>> Something went wrong here: This branch contains the updated license
>>> statements, but Olof had already merged the branch with the original
>>> license statements that we didn't like, so all three patches conflict
>>> with the ones we already have.
>> Hi Arnd,
>>
>> It seems like the devicetree/bindings patch from this tag was not merged
>> in to next/dt ?
>
> I definitely see them here, can you pull our tree again and have a second
> look? Do you see them in linux-next?
I see them now.  Sorry, must have been doing something wrong yesterday.

>
> 	Arnd
>