Re: [PATCH v2 1/9] ARM: meson: Sync Amlogic DT from Linux 5.14
08.09.2021 17:17, Neil Armstrong via groups.io wrote:
diff --git a/arch/arm/dts/meson-axg.dtsi b/arch/arm/dts/meson-axg.dtsi
index b9efc84692..3f5254eeb4 100644
--- a/arch/arm/dts/meson-axg.dtsi
+++ b/arch/arm/dts/meson-axg.dtsi
...
+
+ usb: usb@ffe09080 {
+ compatible = "amlogic,meson-axg-usb-ctrl";
+ reg = <0x0 0xffe09080 0x0 0x20>;
+ interrupts = ;
+ #address-cells = <2>;
Hi.
I have looked through the dts for axg and found that a usb node use
"amlogic,meson-axg-usb-ctrl" that is not supported in uboot. In
linux-kernel it exists in drivers/usb/dwc3/dwc3-meson-g12a.c
In previous dts usb node used amlogic,meson-gxl-usb-ctrl and it worked good.
Re: [PATCH v2 1/9] ARM: meson: Sync Amlogic DT from Linux 5.14
Hi,
On 15/09/2021 09:49, Vyacheslav wrote:
> 08.09.2021 17:17, Neil Armstrong via groups.io wrote:
>> diff --git a/arch/arm/dts/meson-axg.dtsi b/arch/arm/dts/meson-axg.dtsi
>> index b9efc84692..3f5254eeb4 100644
>> --- a/arch/arm/dts/meson-axg.dtsi
>> +++ b/arch/arm/dts/meson-axg.dtsi
> ...
>> +
>> + usb: usb@ffe09080 {
>> + compatible = "amlogic,meson-axg-usb-ctrl";
>> + reg = <0x0 0xffe09080 0x0 0x20>;
>> + interrupts = ;
>> + #address-cells = <2>;
>
> Hi.
> I have looked through the dts for axg and found that a usb node use
> "amlogic,meson-axg-usb-ctrl" that is not supported in uboot. In linux-kernel
> it exists in drivers/usb/dwc3/dwc3-meson-g12a.c
> In previous dts usb node used amlogic,meson-gxl-usb-ctrl and it worked good.
>
You're right, "amlogic,meson-axg-usb-ctrl" is missing in the
drivers/usb/dwc3/dwc3-meson-gxl.c driver
I'll add and resend the serie.
Neil
Re: [PATCH v2 1/9] ARM: meson: Sync Amlogic DT from Linux 5.14
On Thu, Sep 09, 2021 at 11:42:34AM +0200, Neil Armstrong wrote:
> Hi Tom,
>
> On 08/09/2021 17:46, Tom Rini wrote:
> > On Wed, Sep 08, 2021 at 04:17:20PM +0200, Neil Armstrong wrote:
> >
> >> Import Amlogic DT changes from Linux commit 7d2a07b76933 ("Linux 5.14"),
> >> dt-bindings clock changes and new meson-g12b-gsking-x.dts,
> >> meson-sm1-bananapi-m5 & odroid-hc4 boards.
> >>
> >> Signed-off-by: Neil Armstrong
> >
> > Given some other related email threads, I'm curious. Does this mean
> > that everything U-Boot specific is currently in -u-boot.dtsi files? Or
> > is there some manual syncing within the main dts files (aside from
> > perhaps needing to #include a -u-boot.dtsi) ? Thanks!
>
> The dts, dtsi and bindings files are copied verbatim from Linux and all
> the U-Boot specific changes are in the -u-boot.dtsi files indeed.
>
> Is this an issue somehow ?
Great, that's exactly what I was hoping to hear.
--
Tom
signature.asc
Description: PGP signature
Re: [PATCH v2 1/9] ARM: meson: Sync Amlogic DT from Linux 5.14
Hi Tom,
On 08/09/2021 17:46, Tom Rini wrote:
> On Wed, Sep 08, 2021 at 04:17:20PM +0200, Neil Armstrong wrote:
>
>> Import Amlogic DT changes from Linux commit 7d2a07b76933 ("Linux 5.14"),
>> dt-bindings clock changes and new meson-g12b-gsking-x.dts,
>> meson-sm1-bananapi-m5 & odroid-hc4 boards.
>>
>> Signed-off-by: Neil Armstrong
>
> Given some other related email threads, I'm curious. Does this mean
> that everything U-Boot specific is currently in -u-boot.dtsi files? Or
> is there some manual syncing within the main dts files (aside from
> perhaps needing to #include a -u-boot.dtsi) ? Thanks!
The dts, dtsi and bindings files are copied verbatim from Linux and all
the U-Boot specific changes are in the -u-boot.dtsi files indeed.
Is this an issue somehow ?
Neil
Re: [PATCH v2 1/9] ARM: meson: Sync Amlogic DT from Linux 5.14
On Wed, Sep 08, 2021 at 04:17:20PM +0200, Neil Armstrong wrote:
> Import Amlogic DT changes from Linux commit 7d2a07b76933 ("Linux 5.14"),
> dt-bindings clock changes and new meson-g12b-gsking-x.dts,
> meson-sm1-bananapi-m5 & odroid-hc4 boards.
>
> Signed-off-by: Neil Armstrong
Given some other related email threads, I'm curious. Does this mean
that everything U-Boot specific is currently in -u-boot.dtsi files? Or
is there some manual syncing within the main dts files (aside from
perhaps needing to #include a -u-boot.dtsi) ? Thanks!
> ---
> arch/arm/dts/Makefile | 3 +
> arch/arm/dts/meson-axg-s400.dts | 16 +
> arch/arm/dts/meson-axg.dtsi | 181 +
> arch/arm/dts/meson-g12-common.dtsi| 31 +-
> arch/arm/dts/meson-g12a-sei510.dts| 2 +-
> arch/arm/dts/meson-g12b-gsking-x.dts | 133
> arch/arm/dts/meson-g12b-gtking-pro.dts| 23 +-
> arch/arm/dts/meson-g12b-gtking.dts| 22 +-
> arch/arm/dts/meson-g12b-odroid-n2-plus.dts| 2 +-
> arch/arm/dts/meson-g12b-odroid-n2.dtsi| 74 +-
> arch/arm/dts/meson-g12b-w400.dtsi | 2 +-
> arch/arm/dts/meson-g12b.dtsi | 4 +
> arch/arm/dts/meson-gx-libretech-pc.dtsi | 2 +-
> arch/arm/dts/meson-gx-p23x-q20x.dtsi | 2 +-
> arch/arm/dts/meson-gx.dtsi| 7 +
> arch/arm/dts/meson-gxbb-nanopi-k2.dts | 42 +-
> arch/arm/dts/meson-gxbb-odroidc2.dts | 44 +-
> arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 2 +-
> arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 50 +-
> .../dts/meson-gxl-s905x-libretech-cc-v2.dts | 6 +-
> arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 2 +-
> arch/arm/dts/meson-gxm-khadas-vim2.dts| 55 +-
> arch/arm/dts/meson-gxm-wetek-core2.dts| 2 +-
> arch/arm/dts/meson-gxm.dtsi | 20 +
> arch/arm/dts/meson-khadas-vim3.dtsi | 73 +-
> arch/arm/dts/meson-sm1-bananapi-m5.dts| 646 ++
> arch/arm/dts/meson-sm1-khadas-vim3l.dts | 20 +-
> arch/arm/dts/meson-sm1-odroid-c4.dts | 448 +---
> arch/arm/dts/meson-sm1-odroid-hc4.dts | 140
> arch/arm/dts/meson-sm1-odroid.dtsi| 449
> arch/arm/dts/meson-sm1-sei610.dts | 10 +-
> arch/arm/dts/meson-sm1.dtsi | 12 +-
> include/dt-bindings/clock/axg-clkc.h | 26 +-
> include/dt-bindings/clock/g12a-clkc.h | 2 +
> 34 files changed, 2030 insertions(+), 523 deletions(-)
> create mode 100644 arch/arm/dts/meson-g12b-gsking-x.dts
> create mode 100644 arch/arm/dts/meson-sm1-bananapi-m5.dts
> create mode 100644 arch/arm/dts/meson-sm1-odroid-hc4.dts
> create mode 100644 arch/arm/dts/meson-sm1-odroid.dtsi
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index fc16a57e60..f0160d2dc0 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -177,11 +177,14 @@ dtb-$(CONFIG_ARCH_MESON) += \
> meson-g12a-sei510.dtb \
> meson-g12b-gtking.dtb \
> meson-g12b-gtking-pro.dtb \
> + meson-g12b-gsking-x.dtb \
> meson-g12b-odroid-n2.dtb \
> meson-g12b-odroid-n2-plus.dtb \
> meson-g12b-a311d-khadas-vim3.dtb \
> + meson-sm1-bananapi-m5.dtb \
> meson-sm1-khadas-vim3l.dtb \
> meson-sm1-odroid-c4.dtb \
> + meson-sm1-odroid-hc4.dtb \
> meson-sm1-sei610.dtb
> dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
> tegra20-medcom-wide.dtb \
> diff --git a/arch/arm/dts/meson-axg-s400.dts b/arch/arm/dts/meson-axg-s400.dts
> index cb1360ae12..359589d1df 100644
> --- a/arch/arm/dts/meson-axg-s400.dts
> +++ b/arch/arm/dts/meson-axg-s400.dts
> @@ -441,6 +441,16 @@
> status = "okay";
> };
>
> + {
> + reset-gpios = < GPIOX_19 GPIO_ACTIVE_LOW>;
> + status = "okay";
> +};
> +
> + {
> + reset-gpios = < GPIOZ_10 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
> + status = "okay";
> +};
> +
> _ab {
> status = "okay";
> pinctrl-0 = <_a_x20_pins>;
> @@ -584,3 +594,9 @@
> pinctrl-0 = <_ao_a_pins>;
> pinctrl-names = "default";
> };
> +
> + {
> + status = "okay";
> + dr_mode = "otg";
> + vbus-supply = <_pwr>;
> +};
> diff --git a/arch/arm/dts/meson-axg.dtsi b/arch/arm/dts/meson-axg.dtsi
> index b9efc84692..3f5254eeb4 100644
> --- a/arch/arm/dts/meson-axg.dtsi
> +++ b/arch/arm/dts/meson-axg.dtsi
> @@ -12,6 +12,7 @@
> #include
> #include
> #include
> +#include
>
> / {
> compatible = "amlogic,meson-axg";
> @@ -171,6 +172,98 @@
> #size-cells = <2>;
> ranges;
>
> + pcieA: pcie@f980 {
> + compatible = "amlogic,axg-pcie", "snps,dw-pcie";
> + reg = <0x0 0xf980 0x0 0x40>,
> + <0x0 0xff646000 0x0 0x2000>,
> + <0x0 0xf9f0 0x0 0x10>;
> +
[PATCH v2 1/9] ARM: meson: Sync Amlogic DT from Linux 5.14
Import Amlogic DT changes from Linux commit 7d2a07b76933 ("Linux 5.14"),
dt-bindings clock changes and new meson-g12b-gsking-x.dts,
meson-sm1-bananapi-m5 & odroid-hc4 boards.
Signed-off-by: Neil Armstrong
---
arch/arm/dts/Makefile | 3 +
arch/arm/dts/meson-axg-s400.dts | 16 +
arch/arm/dts/meson-axg.dtsi | 181 +
arch/arm/dts/meson-g12-common.dtsi| 31 +-
arch/arm/dts/meson-g12a-sei510.dts| 2 +-
arch/arm/dts/meson-g12b-gsking-x.dts | 133
arch/arm/dts/meson-g12b-gtking-pro.dts| 23 +-
arch/arm/dts/meson-g12b-gtking.dts| 22 +-
arch/arm/dts/meson-g12b-odroid-n2-plus.dts| 2 +-
arch/arm/dts/meson-g12b-odroid-n2.dtsi| 74 +-
arch/arm/dts/meson-g12b-w400.dtsi | 2 +-
arch/arm/dts/meson-g12b.dtsi | 4 +
arch/arm/dts/meson-gx-libretech-pc.dtsi | 2 +-
arch/arm/dts/meson-gx-p23x-q20x.dtsi | 2 +-
arch/arm/dts/meson-gx.dtsi| 7 +
arch/arm/dts/meson-gxbb-nanopi-k2.dts | 42 +-
arch/arm/dts/meson-gxbb-odroidc2.dts | 44 +-
arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 2 +-
arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 50 +-
.../dts/meson-gxl-s905x-libretech-cc-v2.dts | 6 +-
arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 2 +-
arch/arm/dts/meson-gxm-khadas-vim2.dts| 55 +-
arch/arm/dts/meson-gxm-wetek-core2.dts| 2 +-
arch/arm/dts/meson-gxm.dtsi | 20 +
arch/arm/dts/meson-khadas-vim3.dtsi | 73 +-
arch/arm/dts/meson-sm1-bananapi-m5.dts| 646 ++
arch/arm/dts/meson-sm1-khadas-vim3l.dts | 20 +-
arch/arm/dts/meson-sm1-odroid-c4.dts | 448 +---
arch/arm/dts/meson-sm1-odroid-hc4.dts | 140
arch/arm/dts/meson-sm1-odroid.dtsi| 449
arch/arm/dts/meson-sm1-sei610.dts | 10 +-
arch/arm/dts/meson-sm1.dtsi | 12 +-
include/dt-bindings/clock/axg-clkc.h | 26 +-
include/dt-bindings/clock/g12a-clkc.h | 2 +
34 files changed, 2030 insertions(+), 523 deletions(-)
create mode 100644 arch/arm/dts/meson-g12b-gsking-x.dts
create mode 100644 arch/arm/dts/meson-sm1-bananapi-m5.dts
create mode 100644 arch/arm/dts/meson-sm1-odroid-hc4.dts
create mode 100644 arch/arm/dts/meson-sm1-odroid.dtsi
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index fc16a57e60..f0160d2dc0 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -177,11 +177,14 @@ dtb-$(CONFIG_ARCH_MESON) += \
meson-g12a-sei510.dtb \
meson-g12b-gtking.dtb \
meson-g12b-gtking-pro.dtb \
+ meson-g12b-gsking-x.dtb \
meson-g12b-odroid-n2.dtb \
meson-g12b-odroid-n2-plus.dtb \
meson-g12b-a311d-khadas-vim3.dtb \
+ meson-sm1-bananapi-m5.dtb \
meson-sm1-khadas-vim3l.dtb \
meson-sm1-odroid-c4.dtb \
+ meson-sm1-odroid-hc4.dtb \
meson-sm1-sei610.dtb
dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
tegra20-medcom-wide.dtb \
diff --git a/arch/arm/dts/meson-axg-s400.dts b/arch/arm/dts/meson-axg-s400.dts
index cb1360ae12..359589d1df 100644
--- a/arch/arm/dts/meson-axg-s400.dts
+++ b/arch/arm/dts/meson-axg-s400.dts
@@ -441,6 +441,16 @@
status = "okay";
};
+ {
+ reset-gpios = < GPIOX_19 GPIO_ACTIVE_LOW>;
+ status = "okay";
+};
+
+ {
+ reset-gpios = < GPIOZ_10 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;
+ status = "okay";
+};
+
_ab {
status = "okay";
pinctrl-0 = <_a_x20_pins>;
@@ -584,3 +594,9 @@
pinctrl-0 = <_ao_a_pins>;
pinctrl-names = "default";
};
+
+ {
+ status = "okay";
+ dr_mode = "otg";
+ vbus-supply = <_pwr>;
+};
diff --git a/arch/arm/dts/meson-axg.dtsi b/arch/arm/dts/meson-axg.dtsi
index b9efc84692..3f5254eeb4 100644
--- a/arch/arm/dts/meson-axg.dtsi
+++ b/arch/arm/dts/meson-axg.dtsi
@@ -12,6 +12,7 @@
#include
#include
#include
+#include
/ {
compatible = "amlogic,meson-axg";
@@ -171,6 +172,98 @@
#size-cells = <2>;
ranges;
+ pcieA: pcie@f980 {
+ compatible = "amlogic,axg-pcie", "snps,dw-pcie";
+ reg = <0x0 0xf980 0x0 0x40>,
+ <0x0 0xff646000 0x0 0x2000>,
+ <0x0 0xf9f0 0x0 0x10>;
+ reg-names = "elbi", "cfg", "config";
+ interrupts = ;
+ #interrupt-cells = <1>;
+ interrupt-map-mask = <0 0 0 0>;
+ interrupt-map = <0 0 0 0 GIC_SPI 179
IRQ_TYPE_EDGE_RISING>;
+ bus-range = <0x0 0xff>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ device_type = "pci";
+ ranges
