On 23.09.14 16:14:29, Robert Richter wrote:
> On 23.09.14 12:21:05, Catalin Marinas wrote:
> > On Tue, Sep 23, 2014 at 11:46:41AM +0100, Will Deacon wrote:
> > > On Tue, Sep 23, 2014 at 11:41:22AM +0100, Robert Richter wrote:
> > > > On 12.09.14 19:49:43, Robert Richter wrote:
> > > > > From: Robert Richter <[email protected]>
> > > > >
> > > > > This initial patches enable Cavium Thunder SoC Family. The patches add
> > > > > devicetree and Kconfig support and then add Thunder to the defconfig.
> > > > >
> > > > > The Thunder system needs more enablement patches for subsystems and
> > > > > devices, this includes network, ahci, gicv3/gicv3-its, pci, smmu, kvm.
> > > > > We will send separate patch sets for these. All of them base on this
> > > > > initial patches.
> > > > >
> > > > > I sent a separate patch set independently that introduces support for
> > > > > dts vendor subdirs. After both patch sets have been applied I will
> > > > > send a patch in addition that moves the dts file into a subdirectory.
> > > > >
> > > > > I sent another separate patch that sets NR_CPUS to 64 per default.
> > > > >
> > > > > The first patch introduces dts files without having a Kconfig option
> > > > > for the soc (ARCH_THUNDER). However, this is introduced in patch 3 and
> > > > > added to defconfig in patch 4 as this is my preferred solution. If
> > > > > there is still resistance having an ARCH_THUNDER option, just drop
> > > > > them.
> > > > >
> > > > > Patches are available here:
> > > > >
> > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init
> > > >
> > > > it would be good if these patches could be applied.
> > >
> > > Catalin's handling the 3.18 merge window, but this looks like arm-soc
> > > material anyway and should go via Olof/Arnd.
> >
> > Yes. Olof said he's cherry-picking arm64 SoC patches (or Robert could
> > send him a pull request).
>
> just in case you want to pull, please pull from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18
Olof, Arnd,
please pull or apply.
Thanks,
-Robert
([GIT PULL] in the subject)
On 02.10.14 09:29:38, Robert Richter wrote:
> On 23.09.14 16:14:29, Robert Richter wrote:
> > On 23.09.14 12:21:05, Catalin Marinas wrote:
> > > On Tue, Sep 23, 2014 at 11:46:41AM +0100, Will Deacon wrote:
> > > > On Tue, Sep 23, 2014 at 11:41:22AM +0100, Robert Richter wrote:
> > > > > On 12.09.14 19:49:43, Robert Richter wrote:
> > > > > > From: Robert Richter <[email protected]>
> > > > > >
> > > > > > This initial patches enable Cavium Thunder SoC Family. The patches add
> > > > > > devicetree and Kconfig support and then add Thunder to the defconfig.
> > > > > >
> > > > > > The Thunder system needs more enablement patches for subsystems and
> > > > > > devices, this includes network, ahci, gicv3/gicv3-its, pci, smmu, kvm.
> > > > > > We will send separate patch sets for these. All of them base on this
> > > > > > initial patches.
> > > > > >
> > > > > > I sent a separate patch set independently that introduces support for
> > > > > > dts vendor subdirs. After both patch sets have been applied I will
> > > > > > send a patch in addition that moves the dts file into a subdirectory.
> > > > > >
> > > > > > I sent another separate patch that sets NR_CPUS to 64 per default.
> > > > > >
> > > > > > The first patch introduces dts files without having a Kconfig option
> > > > > > for the soc (ARCH_THUNDER). However, this is introduced in patch 3 and
> > > > > > added to defconfig in patch 4 as this is my preferred solution. If
> > > > > > there is still resistance having an ARCH_THUNDER option, just drop
> > > > > > them.
> > > > > >
> > > > > > Patches are available here:
> > > > > >
> > > > > > git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init
> > > > >
> > > > > it would be good if these patches could be applied.
> > > >
> > > > Catalin's handling the 3.18 merge window, but this looks like arm-soc
> > > > material anyway and should go via Olof/Arnd.
> > >
> > > Yes. Olof said he's cherry-picking arm64 SoC patches (or Robert could
> > > send him a pull request).
> >
> > just in case you want to pull, please pull from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18
Olof, Arnd,
please pull or apply.
Thanks,
-Robert
The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be:
Linux 3.17-rc5 (2014-09-14 17:50:12 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18
for you to fetch changes up to 1200e87a26b6b4fe1f473267c83515117e08ee39:
arm64, defconfig: Enable Cavium Thunder SoC in defconfig (2014-09-23 15:10:55 +0200)
----------------------------------------------------------------
Enablement patches for Cavium Thunder SoC Family. The patches add
devicetree and Kconfig support and then add Thunder to the defconfig.
----------------------------------------------------------------
Radha Mohan Chintakuntla (3):
arm64, thunder: Add initial dts for Cavium Thunder SoC
arm64, thunder: Document devicetree bindings for Cavium Thunder SoC
arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family
Robert Richter (1):
arm64, defconfig: Enable Cavium Thunder SoC in defconfig
Documentation/devicetree/bindings/arm/cavium-thunder.txt | 10 ++++
Documentation/devicetree/bindings/arm/cpus.txt | 1 +
arch/arm64/Kconfig | 5 ++
arch/arm64/boot/dts/Makefile | 1 +
arch/arm64/boot/dts/thunder-88xx.dts | 67 +++++++++++++++++++++
arch/arm64/boot/dts/thunder-88xx.dtsi | 401 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm64/configs/defconfig | 1 +
7 files changed, 486 insertions(+)
create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder.txt
create mode 100644 arch/arm64/boot/dts/thunder-88xx.dts
create mode 100644 arch/arm64/boot/dts/thunder-88xx.dtsi
On Thursday 02 October 2014 16:44:52 Robert Richter wrote:
> The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be:
>
> Linux 3.17-rc5 (2014-09-14 17:50:12 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18
>
> for you to fetch changes up to 1200e87a26b6b4fe1f473267c83515117e08ee39:
>
> arm64, defconfig: Enable Cavium Thunder SoC in defconfig (2014-09-23 15:10:55 +0200)
>
> ----------------------------------------------------------------
> Enablement patches for Cavium Thunder SoC Family. The patches add
> devicetree and Kconfig support and then add Thunder to the defconfig.
I've pulled them into a new next/arm64 branch in the arm-soc tree,
but noticed that you had based them on top of -rc5. If you have no
strong reasons to pick a newer -rc, it's better to base on top of
-rc1, to save us trouble with backmerges.
I ended up rebasing to -rc1, since you gave the option to apply the
patches directly.
I originally missed the patches because they were not sent to
[email protected] but only to our personal addresses. Please include
the [email protected] address whenever you want patches or pull requests
to get applied (as opposed to reviewed). We are not really taking
new code for arm-soc any more, but this one was first submitted
for inclusion a while back, so I'm making an exception.
Finally, I also wanted to pull your "dts, kbuild: Implement support
for dtb vendor subdirs", but that clearly conflicts with this series,
and I decided not to pull that and take this one instead.
I'm guessing we'd see conflicts with other patches in linux-next,
so I'd rather not do the merge any more now, we can take that one
for 3.19.
Arnd
Arnd,
On 02.10.14 17:44:48, Arnd Bergmann wrote:
> On Thursday 02 October 2014 16:44:52 Robert Richter wrote:
> > The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be:
> >
> > Linux 3.17-rc5 (2014-09-14 17:50:12 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git tags/for-arm-soc-v3.18
> >
> > for you to fetch changes up to 1200e87a26b6b4fe1f473267c83515117e08ee39:
> >
> > arm64, defconfig: Enable Cavium Thunder SoC in defconfig (2014-09-23 15:10:55 +0200)
> >
> > ----------------------------------------------------------------
> > Enablement patches for Cavium Thunder SoC Family. The patches add
> > devicetree and Kconfig support and then add Thunder to the defconfig.
>
> I've pulled them into a new next/arm64 branch in the arm-soc tree,
> but noticed that you had based them on top of -rc5. If you have no
> strong reasons to pick a newer -rc, it's better to base on top of
> -rc1, to save us trouble with backmerges.
>
> I ended up rebasing to -rc1, since you gave the option to apply the
> patches directly.
thanks for applying the patches.
Ok, I think a reason to update to -rc5 was a conflict in another patch
of my patch stack unrelated to this series. Wasn't aware of
backmerging conflicts you might get and will avoid unnecessary updates
in the future.
> I originally missed the patches because they were not sent to
> [email protected] but only to our personal addresses. Please include
> the [email protected] address whenever you want patches or pull requests
> to get applied (as opposed to reviewed). We are not really taking
> new code for arm-soc any more, but this one was first submitted
> for inclusion a while back, so I'm making an exception.
Will use [email protected] in next requests.
> Finally, I also wanted to pull your "dts, kbuild: Implement support
> for dtb vendor subdirs", but that clearly conflicts with this series,
> and I decided not to pull that and take this one instead.
I was hoping one or the other patch set would have applied earlier,
then I could have rebased them. Anyway, will do this now and let you
know after the merge window closed.
> I'm guessing we'd see conflicts with other patches in linux-next,
> so I'd rather not do the merge any more now, we can take that one
> for 3.19.
Fine with me.
-Robert