arm64, thunder: Enable Cavium Thunder SoC Family

PATCH In review Robert Richter 5 participants 13 messages Sep 12, 2014 – Oct 6, 2014

Subsystems (3)

Device tree bindings arm64 Arm and arm64 SoC sub-architectures (common parts)

lore

Share & tools

lore

Robert Richter

author

2014-09-12 17:49 UTC #0 lore raw

v3 cover arm64, thunder: Enable Cavium Thunder SoC Family

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

v3 changes:
* removed setting NR_CPUS for Thunder, I sent a separate patch that increases this to 64 cpus per default
* reordered patches, dts files changes are know first using dtb-y instead of ARCH_THUNDER option
* moved soc nodes to thunder-88xx.dtsi

v2 changes:
* rebased to 3.17
* placed commas between 32-bit portions of 64 bit addresses
* removed #address-cells and size-cells in gic node
* get rid of the clocks node
* changed to gpl/x11 dual license
* removed memreserve
* moved gic to bus node

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

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

Signature · 1 line

2.1.0

Robert Richter

author

2014-09-12 17:49 UTC #1 lore raw

PATCH v3 1/4 arm64, thunder: Add initial dts for Cavium Thunder SoC

From: Radha Mohan Chintakuntla <[email protected]>

Add initial device tree nodes for Cavium Thunder SoCs with support of 48 cores and gicv3. The dtsi file requires further changes, esp. for pci, gicv3-its and smmu. This changes will be added later together with the device drivers.

Signed-off-by Radha Mohan Chintakuntla <[email protected]>

Signed-off-by Robert Richter <[email protected]>

---
 arch/arm64/boot/dts/Makefile          |   2 +
 arch/arm64/boot/dts/thunder-88xx.dts  |  67 ++++++
 arch/arm64/boot/dts/thunder-88xx.dtsi | 401 ++++++++++++++++++++++++++++++++++
 3 files changed, 470 insertions(+)
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dts
 create mode 100644 arch/arm64/boot/dts/thunder-88xx.dtsi

arch/arm64/boot/dts/Makefile +2 -0

index c52bdb051f66..c2e8e4661a90 100644
@@ -1,6 +1,8 @@
 dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
 dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
 
+dtb-y += thunder-88xx.dtb
+
 targets += dtbs
 targets += $(dtb-y)

arch/arm64/boot/dts/thunder-88xx.dts new file +67 -0

67 lines not on this page · raw message

arch/arm64/boot/dts/thunder-88xx.dtsi new file +401 -0

401 lines not on this page · raw message

Signature · 1 line

2.1.0

Robert Richter

author

2014-09-12 17:49 UTC #2 lore raw

PATCH v3 2/4 arm64, thunder: Document devicetree bindings for Cavium Thunder SoC

In reply to Robert Richter

From: Radha Mohan Chintakuntla <[email protected]>

This patch adds documentation for the devicetree bindings used by the DT files of Cavium Thunder SoC platforms.

Signed-off-by Radha Mohan Chintakuntla <[email protected]>

Signed-off-by Robert Richter <[email protected]>

---
 Documentation/devicetree/bindings/arm/cavium-thunder.txt | 10 ++++++++++
 Documentation/devicetree/bindings/arm/cpus.txt           |  1 +
 2 files changed, 11 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder.txt

Documentation/devicetree/bindings/arm/cavium-thunder.txt new file +10 -0

new file mode 100644
index 000000000000..6f63a5866902
@@ -0,0 +1,10 @@
+Cavium Thunder platform device tree bindings
+--------------------------------------------
+
+Boards with Cavium's Thunder SoC shall have following properties.
+
+Root Node
+---------
+Required root node properties:
+
+  - compatible = "cavium,thunder-88xx";

Documentation/devicetree/bindings/arm/cpus.txt +1 -0

index 298e2f6b33c6..578796a2cfa9 100644
@@ -166,6 +166,7 @@ nodes to be present and contain the properties described below.
 			    "arm,cortex-r5"
 			    "arm,cortex-r7"
 			    "brcm,brahma-b15"
+			    "cavium,thunder"
 			    "faraday,fa526"
 			    "intel,sa110"
 			    "intel,sa1100"

Signature · 1 line

2.1.0

Robert Richter

author

2014-09-12 17:49 UTC #3 lore raw

PATCH v3 3/4 arm64, thunder: Add Kconfig option for Cavium Thunder SoC Family

In reply to Robert Richter

From: Radha Mohan Chintakuntla <[email protected]>

This introduces ARCH_THUNDER to enable soc specific drivers and dtb files.

Signed-off-by Radha Mohan Chintakuntla <[email protected]>

Signed-off-by Robert Richter <[email protected]>

---
 arch/arm64/Kconfig           | 5 +++++
 arch/arm64/boot/dts/Makefile | 3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)

arch/arm64/Kconfig +5 -0

index 67fca2ea81a7..ff9179ba63fb 100644
@@ -134,6 +134,11 @@ source "kernel/Kconfig.freezer"
 
 menu "Platform selection"
 
+config ARCH_THUNDER
+	bool "Cavium Inc. Thunder SoC Family"
+	help
+	  This enables support for Cavium's Thunder Family of SoCs.
+
 config ARCH_VEXPRESS
 	bool "ARMv8 software model (Versatile Express)"
 	select ARCH_REQUIRE_GPIOLIB

arch/arm64/boot/dts/Makefile +1 -2

index c2e8e4661a90..f8001a62029c 100644
@@ -1,8 +1,7 @@
+dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
 dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
 
-dtb-y += thunder-88xx.dtb
-
 targets += dtbs
 targets += $(dtb-y)

Signature · 1 line

2.1.0

Robert Richter

author

2014-09-12 17:49 UTC #4 lore raw

PATCH v3 4/4 arm64, defconfig: Enable Cavium Thunder SoC in defconfig

In reply to Robert Richter

From: Robert Richter <[email protected]>

This patch enables Thunder SoCs in the arm64 defconfig. This is esp. useful to add Thunder platforms to automated builds based on arm64 defconfig.

Signed-off-by Robert Richter <[email protected]>

---
 arch/arm64/configs/defconfig | 1 +
 1 file changed, 1 insertion(+)

arch/arm64/configs/defconfig +1 -0

index d92ef3c54161..9cd37de9aa8d 100644
@@ -32,6 +32,7 @@ CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_ARCH_THUNDER=y
 CONFIG_ARCH_VEXPRESS=y
 CONFIG_ARCH_XGENE=y
 CONFIG_SMP=y

Signature · 1 line

2.1.0

Robert Richter

author

2014-09-23 10:41 UTC #5 lore raw

In reply to Robert Richter

Quoted 22 lines · Robert Richter

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.

Quoted 3 lines

Patches are available here:
git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init

Will,

it would be good if these patches could be applied.

Thanks,

-Robert

Quoted 40 lines

v3 changes:
* removed setting NR_CPUS for Thunder, I sent a separate patch that increases this to 64 cpus per default
* reordered patches, dts files changes are know first using dtb-y instead of ARCH_THUNDER option
* moved soc nodes to thunder-88xx.dtsi
v2 changes:
* rebased to 3.17
* placed commas between 32-bit portions of 64 bit addresses
* removed #address-cells and size-cells in gic node
* get rid of the clocks node
* changed to gpl/x11 dual license
* removed memreserve
* moved gic to bus node
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
 .../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
Signature · 1 line
2.1.0

Will Deacon

2014-09-23 10:46 UTC #6 lore raw

Hi Robert,

Quoted 23 lines · Robert Richter

Quoted 22 lines · Robert Richter
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.

Quoted 7 lines

Quoted 3 lines
Patches are available here:
git://git.kernel.org/pub/scm/linux/kernel/git/rric/linux.git thunder/init
Will,
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.

Will

Catalin Marinas

maintainer

2014-09-23 11:21 UTC #7 lore raw

Quoted 24 lines · Will Deacon

Quoted 23 lines · Robert Richter
Quoted 22 lines · Robert Richter
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.

Quoted 8 lines

Quoted 5 lines
Quoted 3 lines
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).

Signature · 1 line

Catalin

Robert Richter

author

2014-09-23 14:14 UTC #8 lore raw

Olof,

Quoted 29 lines · Catalin Marinas

Quoted 28 lines · Will Deacon
Quoted 27 lines · Robert Richter
Quoted 25 lines · Robert Richter
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

Quoted 7 lines

Quoted 4 lines
Quoted 1 line
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

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

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

Robert Richter

author

2014-10-02 07:29 UTC #9 lore raw

Quoted 35 lines · Robert Richter

Quoted 34 lines · Catalin Marinas
Quoted 32 lines · Will Deacon
Quoted 23 lines · Robert Richter
Quoted 22 lines · Robert Richter
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.
Quoted 5 lines
Quoted 3 lines
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.

Quoted 6 lines

Quoted 2 lines
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

Robert Richter

author

2014-10-02 14:44 UTC #10 lore raw

([GIT PULL] in the subject)

Quoted 36 lines · Robert Richter

Quoted 35 lines · Robert Richter
Quoted 34 lines · Catalin Marinas
Quoted 32 lines · Will Deacon
Quoted 23 lines · Robert Richter
Quoted 22 lines · Robert Richter
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.
Quoted 5 lines
Quoted 3 lines
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.

Quoted 6 lines

Quoted 6 lines
Quoted 2 lines
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)

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

Arnd Bergmann

maintainer

2014-10-02 15:44 UTC #11 lore raw

Quoted 8 lines · 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

Quoted 7 lines

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 arm at kernel.org but only to our personal addresses. Please include the arm at kernel.org 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

Robert Richter

2014-10-06 08:32 UTC #12 lore raw

Arnd,

Quoted 17 lines · Arnd Bergmann

Quoted 8 lines · 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
Quoted 7 lines
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.

Quoted 7 lines

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.

Quoted 6 lines

I originally missed the patches because they were not sent to arm at kernel.org but only to our personal addresses. Please include the arm at kernel.org 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 arm at kernel.org in next requests.

Quoted 3 lines

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.

Quoted 3 lines

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