Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions arch/arm/boot/dts/adi/sc594-som-ezkit.dts
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
compatible = "adi,sc594-som-ezkit", "adi,sc59x";

scb {
sound {
compatible = "adi,sc5xx-asoc-card";
adi,cpu-dai = <&i2s4>;
adi,codec = <&adau1962>, <&adau1979>;
};

Check warning on line 23 in arch/arm/boot/dts/adi/sc594-som-ezkit.dts

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build

(simple_bus_reg): /scb/sound: missing or empty reg/ranges property
};
};

Expand Down Expand Up @@ -117,13 +117,6 @@
line-name = "eth1-reset";
};

gige-reset {
gpio-hog;
gpios = <15 GPIO_ACTIVE_HIGH>;
output-high;
line-name = "gige-reset";
};

};

adau1979: adau1979@11 {
Expand Down Expand Up @@ -160,38 +153,40 @@
&emac0 {
snps,reset-active-low;
snps,reset-delays-us = <0 200 500>;
phy-handle = <&dp83867>;
phy-handle = <&adin1300>;
Comment thread
ozan956 marked this conversation as resolved.
phy-mode = "rgmii-id";
pinctrl-names = "default";
pinctrl-0 = <&eth0_default>;
status = "okay";

mdio0 {
mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
dp83867: ethernet-phy@0 {

adin1300: ethernet-phy@0 {
Comment thread
ozan956 marked this conversation as resolved.
reg = <0>;
ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
ti,dp83867-rxctrl-strap-quirk;
reset-gpios = <&crr_gpio_expander 15 GPIO_ACTIVE_LOW>;
Comment thread
sipraga marked this conversation as resolved.
reset-assert-us = <10>;
reset-deassert-us = <5000>;
};
};
};

&emac1 {
phy-handle = <&dp83848>;
phy-handle = <&adin1200>;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just my 2c here, but the commits are a bit confusingly structured IMO. in one commit you rename the label from dp83848 to adin1200, but you only update this phandle in the following commit. I don't really see the point. I would suggest to just have commits like:

  1. "describe the EMAC1 PHY" (where you're adding new PHY)
  2. "describe the EMAC0 PHY properly" (where you're changing from TI to ADI PHYs)
    (on a per-board basis)

and in both cases, put the phy-handles and reset-gpios/timings in the relevant commit.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, I fixed the commits, I was just doin the fixes and was waiting for approval of functionality to commit-cleanup 👷‍♂️

phy-mode = "rmii";
pinctrl-names = "default";
pinctrl-0 = <&eth1_default>;

status = "disabled";

mdio1 {
mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
dp83848: ethernet-phy@1 {

adin1200: ethernet-phy@1 {
reg = <1>;
};
};
Expand Down
13 changes: 4 additions & 9 deletions arch/arm/boot/dts/adi/sc594-som-ezlite.dts
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@

clocks {
compatible = "simple-bus";
mclk: mclk {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <24576000>;
clock-output-names = "mclk";
};

Check warning on line 25 in arch/arm/boot/dts/adi/sc594-som-ezlite.dts

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build

(simple_bus_reg): /clocks/mclk: missing or empty reg/ranges property
};

scb {
sound {
compatible = "adi,sc5xx-asoc-card";
adi,cpu-dai = <&i2s0>;
adi,codec = <&adau1372>;
};

Check warning on line 33 in arch/arm/boot/dts/adi/sc594-som-ezlite.dts

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build

(simple_bus_reg): /scb/sound: missing or empty reg/ranges property
};
};

Expand Down Expand Up @@ -70,13 +70,6 @@
line-name = "usb_qspi_reset";
};

eth0-reset {
gpio-hog;
gpios = <12 GPIO_ACTIVE_LOW>;
output-low;
line-name = "eth0-reset";
};

adau1372-pwrdwn {
gpio-hog;
gpios = <13 GPIO_ACTIVE_LOW>;
Expand Down Expand Up @@ -124,12 +117,15 @@
pinctrl-0 = <&eth0_default>;
status = "okay";

mdio0 {
mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
adin1300: ethernet-phy@0 {
reg = <0>;
reset-gpios = <&crr_gpio_expander 12 GPIO_ACTIVE_LOW>;
reset-assert-us = <10>;
reset-deassert-us = <5000>;
};
};
};
Expand Down Expand Up @@ -180,4 +176,3 @@
pinctrl-0 = <&sru_dai0>;
status = "okay";
};

1 change: 0 additions & 1 deletion arch/arm/boot/dts/adi/sc594-som.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/adi-adsp.h>
#include <dt-bindings/pinctrl/adi-adsp-sru.h>
#include <dt-bindings/net/ti-dp83867.h>
#include "sc59x.dtsi"

/ {
Expand Down Expand Up @@ -185,48 +184,48 @@

status = "disabled";

flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "issi,is25lx256", "jedec,spi-nor";
reg = <0>;

spi-tx-bus-width = <8>;
spi-rx-bus-width = <8>;
spi-max-frequency = <125000000>;

cdns,read-delay = <4>;
cdns,tshsl-ns = <50>;
cdns,tsd2d-ns = <255>;
cdns,tchsh-ns = <8>;
cdns,tslch-ns = <8>;

partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

ospi_0: partition@0 {
label = "u-boot-spl";
reg = <0x0 0x40000>;
};

ospi_1: partition@1 {
label = "u-boot";
reg = <0x40000 0xc0000>;
};

ospi_2: partition@3 {
label = "kernel";
reg = <0x100000 0xf00000>;
};

ospi_3: partition@4 {
label = "rootfs";
reg = <0x01000000 0x1000000>;
};
};
};

Check warning on line 228 in arch/arm/boot/dts/adi/sc594-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build

(avoid_unnecessary_addr_size): /scb/spi@31027000/flash@0: unnecessary #address-cells/#size-cells without "ranges", "dma-ranges" or child "reg" or "ranges" property
};

&i2c2 {
Expand Down Expand Up @@ -446,16 +445,16 @@
};

&tru {
rpmsg_to_a55: channel@0 {
adi,tru-master-id = <139>; /* trigger master SOFT3 */
adi,tru-slave-id = <160>; /* TRU0_IRQ3 */
};

Check warning on line 451 in arch/arm/boot/dts/adi/sc594-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build

(unit_address_vs_reg): /scb/tru@3108A000/channel@0: node has a unit name, but no reg or ranges property
rpmsg_to_sharc0: channel@1 {
adi,tru-master-id = <140>; /* trigger master SOFT4 */
adi,tru-slave-id = <164>; /* TRU0_IRQ7 */
};

Check warning on line 455 in arch/arm/boot/dts/adi/sc594-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build

(unit_address_vs_reg): /scb/tru@3108A000/channel@1: node has a unit name, but no reg or ranges property
rpmsg_to_sharc1: channel@2 {
adi,tru-master-id = <141>; /* trigger master SOFT5 */
adi,tru-slave-id = <168>; /* TRU0_IRQ11 */
};

Check warning on line 459 in arch/arm/boot/dts/adi/sc594-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_arm / build

(unit_address_vs_reg): /scb/tru@3108A000/channel@2: node has a unit name, but no reg or ranges property
};
3 changes: 1 addition & 2 deletions arch/arm/configs/sc594-som-ezkit_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_NETDEVICES=y
CONFIG_NETCONSOLE=y
CONFIG_STMMAC_ETH=y
CONFIG_DP83848_PHY=y
CONFIG_DP83867_PHY=y
CONFIG_ADIN_PHY=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_MISC=y
CONFIG_VT_HW_CONSOLE_BINDING=y
Expand Down
3 changes: 1 addition & 2 deletions arch/arm/configs/sc594-som-ezlite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ CONFIG_BLK_DEV_SD=y
CONFIG_NETDEVICES=y
CONFIG_NETCONSOLE=y
CONFIG_STMMAC_ETH=y
CONFIG_DP83848_PHY=y
CONFIG_DP83867_PHY=y
CONFIG_ADIN_PHY=y
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_MISC=y
CONFIG_VT_HW_CONSOLE_BINDING=y
Expand Down
56 changes: 26 additions & 30 deletions arch/arm64/boot/dts/adi/sc598-som-ezkit.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,6 @@
line-name = "eth1-reset";
};

gige-reset {
gpio-hog;
gpios = <15 GPIO_ACTIVE_LOW>;
output-low;
line-name = "gige-reset";
};
};

adau1979: adau1979@11 {
Expand All @@ -195,7 +189,7 @@
&emac0 {
snps,reset-active-low;
snps,reset-delays-us = <0 200 500>;
phy-handle = <&dp83867>;
phy-handle = <&adin1300>;
phy-mode = "rgmii-id";
pinctrl-names = "default";
pinctrl-0 = <&eth0_default>;
Expand Down Expand Up @@ -235,37 +229,39 @@
};
};

mdio0 {
mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
dp83867: ethernet-phy@0 {

adin1300: ethernet-phy@0 {
Comment thread
ozan956 marked this conversation as resolved.
reg = <0>;
ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;
ti,dp83867-rxctrl-strap-quirk;
reset-gpios = <&crr_gpio_expander 15 GPIO_ACTIVE_LOW>;
reset-assert-us = <10>;
reset-deassert-us = <5000>;
};
};
};

//&emac1 {
// phy-handle = <&dp83848>;
// phy-mode = "rmii";
// pinctrl-names = "default";
// pinctrl-0 = <&eth1_default>;
// status = "disabled";//

// mdio1 {
// compatible = "snps,dwmac-mdio";
// #address-cells = <1>;
// #size-cells = <0>;
// dp83848: ethernet-phy@1 {
// reg = <1>;
// };
// };//

//};
&emac1 {
phy-handle = <&adin1200>;
phy-mode = "rmii";
pinctrl-names = "default";
pinctrl-0 = <&eth1_default>;

/* USB0 and ETH1 share board wiring; keep ETH1 disabled by default. */
status = "disabled";
Comment thread
ozan956 marked this conversation as resolved.

mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;

adin1200: ethernet-phy@1 {
Comment thread
ozan956 marked this conversation as resolved.
reg = <1>;
};
};
};

&i2s4 {
pinctrl-names = "default";
Expand Down
12 changes: 4 additions & 8 deletions arch/arm64/boot/dts/adi/sc598-som-ezlite.dts
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,6 @@
line-name = "usb_qspi_reset";
};

eth0-reset {
gpio-hog;
gpios = <12 GPIO_ACTIVE_LOW>;
output-low;
line-name = "eth0-reset";
};

adau1372-pwrdwn {
gpio-hog;
gpios = <13 GPIO_ACTIVE_LOW>;
Expand Down Expand Up @@ -169,12 +162,15 @@
};
};

mdio0 {
mdio {
compatible = "snps,dwmac-mdio";
#address-cells = <1>;
#size-cells = <0>;
adin1300: ethernet-phy@0 {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since it's not part of your PR diff, no need to fix the missing newline here IMO

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since I change mdio namings, maybe I can also do that?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

go ahead if you're up for it, I just didn't want to ask you to fix yet more things ;D

reg = <0>;
reset-gpios = <&crr_gpio_expander 12 GPIO_ACTIVE_LOW>;
reset-assert-us = <10>;
reset-deassert-us = <5000>;
};
};

Expand Down
1 change: 0 additions & 1 deletion arch/arm64/boot/dts/adi/sc598-som.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/dts-v1/;

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/net/ti-dp83867.h>
#include <dt-bindings/pinctrl/adi-adsp.h>
#include <dt-bindings/pinctrl/adi-adsp-sru.h>
#include "sc59x-64.dtsi"
Expand Down Expand Up @@ -55,31 +54,31 @@
};
};

sram1_mmap: sram-mmap@0 {
compatible = "adi,sram-mmap";
memory-region = <&sram1_res>;
status = "okay";
};

Check warning on line 61 in arch/arm64/boot/dts/adi/sc598-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build

(unit_address_vs_reg): /sram-mmap@0: node has a unit name, but no reg or ranges property

scb {
sharc0: core1-rproc@28240000 {
compatible = "adi,remoteproc";
reg = <0x28240000 0x160000>,
<0x20000000 0x200000>;
core-id = <1>;
firmware-name = "adi_adsp_core1_fw.ldr";
interrupts = <GIC_SPI 337 IRQ_TYPE_EDGE_RISING>; /* TRU0_SLV3 */
adi,svect = <&rcu 0x30>;
resets = <&rcu 1 0>, <&rcu 1 1>;
reset-names = "crst", "start";
mboxes = <&tru 135>; /* trigger master SOFT4 */
mbox-names = "kick";
adi,l1-da = <0x240000 0x3a0000>;
adi,l2-da = <0x20000000 0x20200000>;
adi,rsc-table = <&rsc_tbl0>;
adi,verify = <1>;
status = "okay";
};

Check warning on line 81 in arch/arm64/boot/dts/adi/sc598-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build

(unique_unit_address): /scb/core1-rproc@28240000: duplicate unit-address (also used in node /scb/core0-rpmsg@28240000)

sharc1: core2-rproc@28a40000 {
compatible = "adi,remoteproc";
Expand All @@ -100,50 +99,50 @@
status = "okay";
};

sharc0_rpmsg: core0-rpmsg@28240000 {
status = "disabled";
compatible = "adi,rpmsg-sc598";
core-id = <1>;
adi,rcu = <&rcu>;
adi,check-idle;
adi,rsc-table = <&rsc_tbl0>;
interrupts = <GIC_SPI 337 IRQ_TYPE_EDGE_RISING>; /* TRU0_SLV3 */
adi,tru = <&tru>;
adi,tru-master-id = <135>; /* trigger master SOFT4 */
vdev-vring = <&vdev0vrings>;
memory-region = <&vdev0buffer>;
};

Check warning on line 114 in arch/arm64/boot/dts/adi/sc598-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build

(unit_address_vs_reg): /scb/core0-rpmsg@28240000: node has a unit name, but no reg or ranges property

Check warning on line 114 in arch/arm64/boot/dts/adi/sc598-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build

(simple_bus_reg): /scb/core0-rpmsg@28240000: missing or empty reg/ranges property

sharc1_rpmsg: core1-rpmsg@28a40000 {
status = "disabled";
compatible = "adi,rpmsg-sc598";
core-id = <2>;
adi,rcu = <&rcu>;
adi,check-idle;
adi,rsc-table = <&rsc_tbl1>;
interrupts = <GIC_SPI 337 IRQ_TYPE_EDGE_RISING>; /* TRU0_SLV3 */
adi,tru = <&tru>;
adi,tru-master-id = <136>; /* trigger master SOFT5 */
vdev-vring = <&vdev1vrings>;
memory-region = <&vdev1buffer>;
};

Check warning on line 128 in arch/arm64/boot/dts/adi/sc598-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build

(unit_address_vs_reg): /scb/core1-rpmsg@28a40000: node has a unit name, but no reg or ranges property

Check warning on line 128 in arch/arm64/boot/dts/adi/sc598-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build

(simple_bus_reg): /scb/core1-rpmsg@28a40000: missing or empty reg/ranges property
};

};

&tru {
rpmsg_to_a55: channel@0 {
adi,tru-master-id = <134>; /* trigger master SOFT3 */
adi,tru-slave-id = <160>; /* TRU0_IRQ3 */
};

Check warning on line 137 in arch/arm64/boot/dts/adi/sc598-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build

(unit_address_vs_reg): /scb/tru@3108a000/channel@0: node has a unit name, but no reg or ranges property
rpmsg_to_sharc0: channel@1 {
adi,tru-master-id = <135>; /* trigger master SOFT4 */
adi,tru-slave-id = <164>; /* TRU0_IRQ7 */
};

Check warning on line 141 in arch/arm64/boot/dts/adi/sc598-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build

(unit_address_vs_reg): /scb/tru@3108a000/channel@1: node has a unit name, but no reg or ranges property
rpmsg_to_sharc1: channel@2 {
adi,tru-master-id = <136>; /* trigger master SOFT5 */
adi,tru-slave-id = <168>; /* TRU0_IRQ11 */
};

Check warning on line 145 in arch/arm64/boot/dts/adi/sc598-som.dtsi

View workflow job for this annotation

GitHub Actions / build_gcc_aarch64 / build

(unit_address_vs_reg): /scb/tru@3108a000/channel@2: node has a unit name, but no reg or ranges property
};

&thermal {
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/sc598-som-ezkit_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ CONFIG_VIRTIO_NET=y
# CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set
CONFIG_STMMAC_ETH=y
CONFIG_ADIN_PHY=y
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_XILINX is not set
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/sc598-som-ezlite_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ CONFIG_VIRTIO_NET=y
# CONFIG_NET_VENDOR_SMSC is not set
# CONFIG_NET_VENDOR_SOCIONEXT is not set
CONFIG_STMMAC_ETH=y
CONFIG_ADIN_PHY=y
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_XILINX is not set
Expand Down
Loading