* [PATCH 1/2] ARM: dts: am33xx: Make am33xx-strip.dtsi independent
@ 2016-10-21 9:45 Teresa Remmet
2016-10-21 9:45 ` [PATCH 2/2] ARM: dts: am33xx.dtsi: Add spi aliases Teresa Remmet
2016-10-24 6:07 ` [PATCH 1/2] ARM: dts: am33xx: Make am33xx-strip.dtsi independent Teresa Remmet
0 siblings, 2 replies; 3+ messages in thread
From: Teresa Remmet @ 2016-10-21 9:45 UTC (permalink / raw)
To: barebox
am33xx-strip.dtsi was used to remove unused nodes in the MLO device tree.
It always required the am33xx.dtsi include. But if we add aliases to the
am33xx.dtsi, where the nodes are beeing deleted in the am33xx-strip.dtsi
we get compile errors. So made am33xx-strip.dtsi independent from am33xx.dtsi
and renamed it to am33xx-mlo.dtsi.
Also added spi0 alias to am33xx-mlo.dtsi.
Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
arch/arm/dts/am335x-bone-common.dts | 3 +--
arch/arm/dts/am335x-phytec-phycard-som-mlo.dts | 3 +--
arch/arm/dts/am335x-phytec-phycore-som-mlo.dts | 3 +--
arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts | 3 +--
arch/arm/dts/{am33xx-strip.dtsi => am33xx-mlo.dtsi} | 9 ++++++++-
5 files changed, 12 insertions(+), 9 deletions(-)
rename arch/arm/dts/{am33xx-strip.dtsi => am33xx-mlo.dtsi} (87%)
diff --git a/arch/arm/dts/am335x-bone-common.dts b/arch/arm/dts/am335x-bone-common.dts
index 0488cbe..63962df 100644
--- a/arch/arm/dts/am335x-bone-common.dts
+++ b/arch/arm/dts/am335x-bone-common.dts
@@ -7,8 +7,7 @@
* all we need for the MLO
*/
-#include "am33xx.dtsi"
-#include "am33xx-strip.dtsi"
+#include "am33xx-mlo.dtsi"
#include "am33xx-clocks-strip.dtsi"
#include "am335x-bone-common.dtsi"
diff --git a/arch/arm/dts/am335x-phytec-phycard-som-mlo.dts b/arch/arm/dts/am335x-phytec-phycard-som-mlo.dts
index a1755fd..817093b 100644
--- a/arch/arm/dts/am335x-phytec-phycard-som-mlo.dts
+++ b/arch/arm/dts/am335x-phytec-phycard-som-mlo.dts
@@ -7,9 +7,8 @@
*/
/dts-v1/;
-#include "am33xx.dtsi"
+#include "am33xx-mlo.dtsi"
#include "am335x-phytec-phycard-som.dtsi"
-#include "am33xx-strip.dtsi"
#include "am33xx-clocks-strip.dtsi"
/ {
diff --git a/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts b/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts
index f7bc462..817b672 100644
--- a/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts
+++ b/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts
@@ -7,9 +7,8 @@
*/
/dts-v1/;
-#include "am33xx.dtsi"
+#include "am33xx-mlo.dtsi"
#include "am335x-phytec-phycore-som.dtsi"
-#include "am33xx-strip.dtsi"
#include "am33xx-clocks-strip.dtsi"
/ {
diff --git a/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts b/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts
index e848a29..cf36c4c 100644
--- a/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts
+++ b/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts
@@ -7,9 +7,8 @@
*/
/dts-v1/;
-#include "am33xx.dtsi"
+#include "am33xx-mlo.dtsi"
#include "am335x-phytec-phyflex-som.dtsi"
-#include "am33xx-strip.dtsi"
#include "am33xx-clocks-strip.dtsi"
/ {
diff --git a/arch/arm/dts/am33xx-strip.dtsi b/arch/arm/dts/am33xx-mlo.dtsi
similarity index 87%
rename from arch/arm/dts/am33xx-strip.dtsi
rename to arch/arm/dts/am33xx-mlo.dtsi
index 2943fd1..36f137b 100644
--- a/arch/arm/dts/am33xx-strip.dtsi
+++ b/arch/arm/dts/am33xx-mlo.dtsi
@@ -6,12 +6,19 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#include <arm/am33xx.dtsi>
/ {
aliases {
+ gpio0 = &gpio0;
+ gpio1 = &gpio1;
+ gpio2 = &gpio2;
+ gpio3 = &gpio3;
+ mmc0 = &mmc1;
+ mmc1 = &mmc2;
+ spi0 = &spi0;
/delete-property/ i2c1;
/delete-property/ i2c2;
- /delete-property/ mmc2;
/delete-property/ d_can0;
/delete-property/ d_can1;
};
--
1.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] ARM: dts: am33xx.dtsi: Add spi aliases
2016-10-21 9:45 [PATCH 1/2] ARM: dts: am33xx: Make am33xx-strip.dtsi independent Teresa Remmet
@ 2016-10-21 9:45 ` Teresa Remmet
2016-10-24 6:07 ` [PATCH 1/2] ARM: dts: am33xx: Make am33xx-strip.dtsi independent Teresa Remmet
1 sibling, 0 replies; 3+ messages in thread
From: Teresa Remmet @ 2016-10-21 9:45 UTC (permalink / raw)
To: barebox
We need to add the spi aliases to set the bus number correct in
the driver.
Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
arch/arm/dts/am33xx.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi
index 7ba0a0b..f1ee7b3 100644
--- a/arch/arm/dts/am33xx.dtsi
+++ b/arch/arm/dts/am33xx.dtsi
@@ -18,5 +18,7 @@
mmc0 = &mmc1;
mmc1 = &mmc2;
mmc2 = &mmc3;
+ spi0 = &spi0;
+ spi1 = &spi1;
};
};
--
1.9.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] ARM: dts: am33xx: Make am33xx-strip.dtsi independent
2016-10-21 9:45 [PATCH 1/2] ARM: dts: am33xx: Make am33xx-strip.dtsi independent Teresa Remmet
2016-10-21 9:45 ` [PATCH 2/2] ARM: dts: am33xx.dtsi: Add spi aliases Teresa Remmet
@ 2016-10-24 6:07 ` Teresa Remmet
1 sibling, 0 replies; 3+ messages in thread
From: Teresa Remmet @ 2016-10-24 6:07 UTC (permalink / raw)
To: barebox
Please forget about this one. There is a far more easier way to go.
I will send a new patch.
Teresa
Am Freitag, den 21.10.2016, 11:45 +0200 schrieb Teresa Remmet:
> am33xx-strip.dtsi was used to remove unused nodes in the MLO device tree.
> It always required the am33xx.dtsi include. But if we add aliases to the
> am33xx.dtsi, where the nodes are beeing deleted in the am33xx-strip.dtsi
> we get compile errors. So made am33xx-strip.dtsi independent from am33xx.dtsi
> and renamed it to am33xx-mlo.dtsi.
>
> Also added spi0 alias to am33xx-mlo.dtsi.
>
> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> ---
> arch/arm/dts/am335x-bone-common.dts | 3 +--
> arch/arm/dts/am335x-phytec-phycard-som-mlo.dts | 3 +--
> arch/arm/dts/am335x-phytec-phycore-som-mlo.dts | 3 +--
> arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts | 3 +--
> arch/arm/dts/{am33xx-strip.dtsi => am33xx-mlo.dtsi} | 9 ++++++++-
> 5 files changed, 12 insertions(+), 9 deletions(-)
> rename arch/arm/dts/{am33xx-strip.dtsi => am33xx-mlo.dtsi} (87%)
>
> diff --git a/arch/arm/dts/am335x-bone-common.dts b/arch/arm/dts/am335x-bone-common.dts
> index 0488cbe..63962df 100644
> --- a/arch/arm/dts/am335x-bone-common.dts
> +++ b/arch/arm/dts/am335x-bone-common.dts
> @@ -7,8 +7,7 @@
> * all we need for the MLO
> */
>
> -#include "am33xx.dtsi"
> -#include "am33xx-strip.dtsi"
> +#include "am33xx-mlo.dtsi"
> #include "am33xx-clocks-strip.dtsi"
> #include "am335x-bone-common.dtsi"
>
> diff --git a/arch/arm/dts/am335x-phytec-phycard-som-mlo.dts b/arch/arm/dts/am335x-phytec-phycard-som-mlo.dts
> index a1755fd..817093b 100644
> --- a/arch/arm/dts/am335x-phytec-phycard-som-mlo.dts
> +++ b/arch/arm/dts/am335x-phytec-phycard-som-mlo.dts
> @@ -7,9 +7,8 @@
> */
> /dts-v1/;
>
> -#include "am33xx.dtsi"
> +#include "am33xx-mlo.dtsi"
> #include "am335x-phytec-phycard-som.dtsi"
> -#include "am33xx-strip.dtsi"
> #include "am33xx-clocks-strip.dtsi"
>
> / {
> diff --git a/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts b/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts
> index f7bc462..817b672 100644
> --- a/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts
> +++ b/arch/arm/dts/am335x-phytec-phycore-som-mlo.dts
> @@ -7,9 +7,8 @@
> */
> /dts-v1/;
>
> -#include "am33xx.dtsi"
> +#include "am33xx-mlo.dtsi"
> #include "am335x-phytec-phycore-som.dtsi"
> -#include "am33xx-strip.dtsi"
> #include "am33xx-clocks-strip.dtsi"
>
> / {
> diff --git a/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts b/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts
> index e848a29..cf36c4c 100644
> --- a/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts
> +++ b/arch/arm/dts/am335x-phytec-phyflex-som-mlo.dts
> @@ -7,9 +7,8 @@
> */
> /dts-v1/;
>
> -#include "am33xx.dtsi"
> +#include "am33xx-mlo.dtsi"
> #include "am335x-phytec-phyflex-som.dtsi"
> -#include "am33xx-strip.dtsi"
> #include "am33xx-clocks-strip.dtsi"
>
> / {
> diff --git a/arch/arm/dts/am33xx-strip.dtsi b/arch/arm/dts/am33xx-mlo.dtsi
> similarity index 87%
> rename from arch/arm/dts/am33xx-strip.dtsi
> rename to arch/arm/dts/am33xx-mlo.dtsi
> index 2943fd1..36f137b 100644
> --- a/arch/arm/dts/am33xx-strip.dtsi
> +++ b/arch/arm/dts/am33xx-mlo.dtsi
> @@ -6,12 +6,19 @@
> * it under the terms of the GNU General Public License version 2 as
> * published by the Free Software Foundation.
> */
> +#include <arm/am33xx.dtsi>
>
> / {
> aliases {
> + gpio0 = &gpio0;
> + gpio1 = &gpio1;
> + gpio2 = &gpio2;
> + gpio3 = &gpio3;
> + mmc0 = &mmc1;
> + mmc1 = &mmc2;
> + spi0 = &spi0;
> /delete-property/ i2c1;
> /delete-property/ i2c2;
> - /delete-property/ mmc2;
> /delete-property/ d_can0;
> /delete-property/ d_can1;
> };
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-10-24 6:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-21 9:45 [PATCH 1/2] ARM: dts: am33xx: Make am33xx-strip.dtsi independent Teresa Remmet
2016-10-21 9:45 ` [PATCH 2/2] ARM: dts: am33xx.dtsi: Add spi aliases Teresa Remmet
2016-10-24 6:07 ` [PATCH 1/2] ARM: dts: am33xx: Make am33xx-strip.dtsi independent Teresa Remmet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox