Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1692035 > unrolled thread

[PATCH 0/2] arm64: dts: cleanup Broadcom boards per SoC

Started byScott Branden <scott.branden@broadcom.com>
First post2017-07-19 19:10 +0200
Last post2017-07-28 16:50 +0200
Articles 5 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/2] arm64: dts: cleanup Broadcom boards per SoC Scott Branden <scott.branden@broadcom.com> - 2017-07-19 19:10 +0200
    [PATCH 2/2] arm64: dts: move rpi into rpi directory Scott Branden <scott.branden@broadcom.com> - 2017-07-19 19:10 +0200
      Re: [PATCH 2/2] arm64: dts: move rpi into rpi directory Scott Branden <scott.branden@broadcom.com> - 2017-07-19 22:30 +0200
      Re: [PATCH 2/2] arm64: dts: move rpi into rpi directory Eric Anholt <eric@anholt.net> - 2017-07-19 22:30 +0200
    Re: [PATCH 0/2] arm64: dts: cleanup Broadcom boards per SoC Scott Branden <scott.branden@broadcom.com> - 2017-07-28 16:50 +0200

#1692035 — [PATCH 0/2] arm64: dts: cleanup Broadcom boards per SoC

FromScott Branden <scott.branden@broadcom.com>
Date2017-07-19 19:10 +0200
Subject[PATCH 0/2] arm64: dts: cleanup Broadcom boards per SoC
Message-ID<u50E1-3cT-3@gated-at.bofh.it>
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

[toc] | [next] | [standalone]

#1692036 — [PATCH 2/2] arm64: dts: move rpi into rpi directory

FromScott Branden <scott.branden@broadcom.com>
Date2017-07-19 19:10 +0200
Subject[PATCH 2/2] arm64: dts: move rpi into rpi directory
Message-ID<u50E1-3cT-11@gated-at.bofh.it>
In reply to#1692035
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 <scott.branden@broadcom.com>
---
 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

[toc] | [prev] | [next] | [standalone]

#1692178 — Re: [PATCH 2/2] arm64: dts: move rpi into rpi directory

FromScott Branden <scott.branden@broadcom.com>
Date2017-07-19 22:30 +0200
SubjectRe: [PATCH 2/2] arm64: dts: move rpi into rpi directory
Message-ID<u53Lz-5fP-11@gated-at.bofh.it>
In reply to#1692036
Hi Eric,


On 17-07-19 01:21 PM, Eric Anholt wrote:
> Scott Branden <scott.branden@broadcom.com> 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

[toc] | [prev] | [next] | [standalone]

#1692180 — Re: [PATCH 2/2] arm64: dts: move rpi into rpi directory

FromEric Anholt <eric@anholt.net>
Date2017-07-19 22:30 +0200
SubjectRe: [PATCH 2/2] arm64: dts: move rpi into rpi directory
Message-ID<u53Lz-5fP-13@gated-at.bofh.it>
In reply to#1692036

[Multipart message — attachments visible in raw view] — view raw

Scott Branden <scott.branden@broadcom.com> 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.

[toc] | [prev] | [next] | [standalone]

#1698860

FromScott Branden <scott.branden@broadcom.com>
Date2017-07-28 16:50 +0200
Message-ID<u8eKv-4ZB-33@gated-at.bofh.it>
In reply to#1692035
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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web