Separate Broadcom boards per SoC to assist in cleaner management of boards.
This has already been done for Stingray and is done here for RPI and NS2.
If this is problematic for RPI please let me know and RPI patch can be
dropped from patch series.
Scott Branden (2):
arm64: dts: move ns2 into northstar2 directory
arm64: dts: move rpi into rpi directory
arch/arm64/boot/dts/broadcom/Makefile | 7 +++----
arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi | 1 -
arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi | 1 -
arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 -
arch/arm64/boot/dts/broadcom/bcm283x.dtsi | 1 -
arch/arm64/boot/dts/broadcom/northstar2/Makefile | 6 ++++++
arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-clock.dtsi | 0
arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-svk.dts | 0
arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts | 0
arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2.dtsi | 0
arch/arm64/boot/dts/broadcom/rpi/Makefile | 5 +++++
arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi | 1 +
arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837-rpi-3-b.dts | 0
arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837.dtsi | 0
arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi | 1 +
arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi | 1 +
arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi | 1 +
17 files changed, 18 insertions(+), 8 deletions(-)
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x.dtsi
create mode 100644 arch/arm64/boot/dts/broadcom/northstar2/Makefile
rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-clock.dtsi (100%)
rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-svk.dts (100%)
rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts (100%)
rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2.dtsi (100%)
create mode 100644 arch/arm64/boot/dts/broadcom/rpi/Makefile
create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi
rename arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837-rpi-3-b.dts (100%)
rename arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837.dtsi (100%)
create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi
create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi
create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi
--
2.5.0
Place northstar2 into its own subdirectory. This helps as the number
of Broadcom boards grow and we can separate them per SoC.
Signed-off-by: Scott Branden <[email protected]>
---
arch/arm64/boot/dts/broadcom/Makefile | 4 ++--
arch/arm64/boot/dts/broadcom/northstar2/Makefile | 6 ++++++
arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-clock.dtsi | 0
arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-svk.dts | 0
arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts | 0
arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2.dtsi | 0
6 files changed, 8 insertions(+), 2 deletions(-)
create mode 100644 arch/arm64/boot/dts/broadcom/northstar2/Makefile
rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-clock.dtsi (100%)
rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-svk.dts (100%)
rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts (100%)
rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2.dtsi (100%)
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
index f11bdd6..3eaef38 100644
--- a/arch/arm64/boot/dts/broadcom/Makefile
+++ b/arch/arm64/boot/dts/broadcom/Makefile
@@ -1,7 +1,7 @@
dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
-dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb ns2-xmc.dtb
-dts-dirs := stingray
+dts-dirs += northstar2
+dts-dirs += stingray
always := $(dtb-y)
subdir-y := $(dts-dirs)
clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/broadcom/northstar2/Makefile b/arch/arm64/boot/dts/broadcom/northstar2/Makefile
new file mode 100644
index 0000000..e01a148
--- /dev/null
+++ b/arch/arm64/boot/dts/broadcom/northstar2/Makefile
@@ -0,0 +1,6 @@
+dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-svk.dtb
+dtb-$(CONFIG_ARCH_BCM_IPROC) += ns2-xmc.dtb
+
+always := $(dtb-y)
+subdir-y := $(dts-dirs)
+clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/broadcom/ns2-clock.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/ns2-clock.dtsi
rename to arch/arm64/boot/dts/broadcom/northstar2/ns2-clock.dtsi
diff --git a/arch/arm64/boot/dts/broadcom/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/ns2-svk.dts
rename to arch/arm64/boot/dts/broadcom/northstar2/ns2-svk.dts
diff --git a/arch/arm64/boot/dts/broadcom/ns2-xmc.dts b/arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/ns2-xmc.dts
rename to arch/arm64/boot/dts/broadcom/northstar2/ns2-xmc.dts
diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/ns2.dtsi
rename to arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi
--
2.5.0
Place rpi into its own subdirectory. This helps as the number
of Broadcom boards grow and we can separate them per SoC.
Signed-off-by: Scott Branden <[email protected]>
---
arch/arm64/boot/dts/broadcom/Makefile | 3 +--
arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi | 1 -
arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi | 1 -
arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 -
arch/arm64/boot/dts/broadcom/bcm283x.dtsi | 1 -
arch/arm64/boot/dts/broadcom/rpi/Makefile | 5 +++++
arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi | 1 +
arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837-rpi-3-b.dts | 0
arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837.dtsi | 0
arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi | 1 +
arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi | 1 +
arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi | 1 +
12 files changed, 10 insertions(+), 6 deletions(-)
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x.dtsi
create mode 100644 arch/arm64/boot/dts/broadcom/rpi/Makefile
create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi
rename arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837-rpi-3-b.dts (100%)
rename arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837.dtsi (100%)
create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi
create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi
create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi
diff --git a/arch/arm64/boot/dts/broadcom/Makefile b/arch/arm64/boot/dts/broadcom/Makefile
index 3eaef38..1708ff5 100644
--- a/arch/arm64/boot/dts/broadcom/Makefile
+++ b/arch/arm64/boot/dts/broadcom/Makefile
@@ -1,6 +1,5 @@
-dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
-
dts-dirs += northstar2
+dts-dirs += rpi
dts-dirs += stingray
always := $(dtb-y)
subdir-y := $(dts-dirs)
diff --git a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi b/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
deleted file mode 120000
index 3937b77..0000000
--- a/arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../arm/boot/dts/bcm2835-rpi.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
deleted file mode 120000
index dca7c05..0000000
--- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
deleted file mode 120000
index cbeebe3..0000000
--- a/arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../arm/boot/dts/bcm283x-rpi-usb-host.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi b/arch/arm64/boot/dts/broadcom/bcm283x.dtsi
deleted file mode 120000
index 5f54e4c..0000000
--- a/arch/arm64/boot/dts/broadcom/bcm283x.dtsi
+++ /dev/null
@@ -1 +0,0 @@
-../../../../arm/boot/dts/bcm283x.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/broadcom/rpi/Makefile b/arch/arm64/boot/dts/broadcom/rpi/Makefile
new file mode 100644
index 0000000..d1a5606
--- /dev/null
+++ b/arch/arm64/boot/dts/broadcom/rpi/Makefile
@@ -0,0 +1,5 @@
+dtb-$(CONFIG_ARCH_BCM2835) += bcm2837-rpi-3-b.dtb
+
+always := $(dtb-y)
+subdir-y := $(dts-dirs)
+clean-files := *.dtb
diff --git a/arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi
new file mode 120000
index 0000000..06e5aa0
--- /dev/null
+++ b/arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi
@@ -0,0 +1 @@
+../../../../../arm/boot/dts/bcm2835-rpi.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/rpi/bcm2837-rpi-3-b.dts
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
rename to arch/arm64/boot/dts/broadcom/rpi/bcm2837-rpi-3-b.dts
diff --git a/arch/arm64/boot/dts/broadcom/bcm2837.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm2837.dtsi
similarity index 100%
rename from arch/arm64/boot/dts/broadcom/bcm2837.dtsi
rename to arch/arm64/boot/dts/broadcom/rpi/bcm2837.dtsi
diff --git a/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi
new file mode 120000
index 0000000..3eff817
--- /dev/null
+++ b/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi
@@ -0,0 +1 @@
+../../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi
new file mode 120000
index 0000000..2102a8c
--- /dev/null
+++ b/arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi
@@ -0,0 +1 @@
+../../../../../arm/boot/dts/bcm283x-rpi-usb-host.dtsi
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi b/arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi
new file mode 120000
index 0000000..db7e86c
--- /dev/null
+++ b/arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi
@@ -0,0 +1 @@
+../../../../../arm/boot/dts/bcm283x.dtsi
\ No newline at end of file
--
2.5.0
Scott Branden <[email protected]> writes:
> Place rpi into its own subdirectory. This helps as the number
> of Broadcom boards grow and we can separate them per SoC.
It seems like pretty unnecessary churn to me, though I wouldn't
necessarily block it. However, it conflicts with the patch I was
preparing yesterday to try to resolve our DT merging troubles
(https://lkml.org/lkml/2017/5/16/707), so I'd like to hold off on it for
now.
Hi Eric,
On 17-07-19 01:21 PM, Eric Anholt wrote:
> Scott Branden <[email protected]> writes:
>
>> Place rpi into its own subdirectory. This helps as the number
>> of Broadcom boards grow and we can separate them per SoC.
> It seems like pretty unnecessary churn to me, though I wouldn't
> necessarily block it. However, it conflicts with the patch I was
> preparing yesterday to try to resolve our DT merging troubles
> (https://lkml.org/lkml/2017/5/16/707), so I'd like to hold off on it for
> now.
I'm quite fine with dropping the rpi dts patch. I'm going to proceed
with the northstar2 patch
before more SoC and boards are introduced.
Thanks,
Scott
Hi Florian,
Could you please pick up PATCH 1/2 of this series below and drop PATCH 2/2 ?
On 17-07-19 10:05 AM, Scott Branden wrote:
> Separate Broadcom boards per SoC to assist in cleaner management of boards.
> This has already been done for Stingray and is done here for RPI and NS2.
>
> If this is problematic for RPI please let me know and RPI patch can be
> dropped from patch series.
>
> Scott Branden (2):
> arm64: dts: move ns2 into northstar2 directory
> arm64: dts: move rpi into rpi directory
>
> arch/arm64/boot/dts/broadcom/Makefile | 7 +++----
> arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi | 1 -
> arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi | 1 -
> arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 -
> arch/arm64/boot/dts/broadcom/bcm283x.dtsi | 1 -
> arch/arm64/boot/dts/broadcom/northstar2/Makefile | 6 ++++++
> arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-clock.dtsi | 0
> arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-svk.dts | 0
> arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts | 0
> arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2.dtsi | 0
> arch/arm64/boot/dts/broadcom/rpi/Makefile | 5 +++++
> arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi | 1 +
> arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837-rpi-3-b.dts | 0
> arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837.dtsi | 0
> arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi | 1 +
> arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi | 1 +
> arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi | 1 +
> 17 files changed, 18 insertions(+), 8 deletions(-)
> delete mode 120000 arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi
> delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi
> delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi
> delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x.dtsi
> create mode 100644 arch/arm64/boot/dts/broadcom/northstar2/Makefile
> rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-clock.dtsi (100%)
> rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-svk.dts (100%)
> rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts (100%)
> rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2.dtsi (100%)
> create mode 100644 arch/arm64/boot/dts/broadcom/rpi/Makefile
> create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm2835-rpi.dtsi
> rename arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837-rpi-3-b.dts (100%)
> rename arch/arm64/boot/dts/broadcom/{ => rpi}/bcm2837.dtsi (100%)
> create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-smsc9514.dtsi
> create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x-rpi-usb-host.dtsi
> create mode 120000 arch/arm64/boot/dts/broadcom/rpi/bcm283x.dtsi
>
Thanks,
Scott
On 07/19/2017 10:05 AM, Scott Branden wrote:
> Place northstar2 into its own subdirectory. This helps as the number
> of Broadcom boards grow and we can separate them per SoC.
>
> Signed-off-by: Scott Branden <[email protected]>
Applied, thanks Scott.
--
Florian
Hi Scott,
[auto build test ERROR on v4.13-rc1]
[cannot apply to robh/for-next arm64/for-next/core next-20170808]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Scott-Branden/arm64-dts-move-ns2-into-northstar2-directory/20170721-023618
config: arm-at91_dt_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
wget https://raw.githubusercontent.com/01org/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm
All errors (new ones prefixed by >>):
>> arch/arm/boot/dts/bcm2837-rpi-3-b.dts:1:46: fatal error: arm64/broadcom/bcm2837-rpi-3-b.dts: No such file or directory
#include "arm64/broadcom/bcm2837-rpi-3-b.dts"
^
compilation terminated.
vim +1 arch/arm/boot/dts/bcm2837-rpi-3-b.dts
072f58af Eric Anholt 2017-04-25 @1 #include "arm64/broadcom/bcm2837-rpi-3-b.dts"
:::::: The code at line 1 was first introduced by commit
:::::: 072f58af1dfbc39f8daf6be170d90c2465df4771 ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6)
:::::: TO: Eric Anholt <[email protected]>
:::::: CC: Eric Anholt <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation