-
Notifications
You must be signed in to change notification settings - Fork 961
Fix SC59x Ethernet PHY descriptions #3444
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: adsp-6.18.31-y
Are you sure you want to change the base?
Changes from all commits
374ebb6
88f5762
70d4720
597a88a
19b7214
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
|
|
@@ -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 { | ||
|
|
@@ -160,38 +153,40 @@ | |
| &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 = <ð0_default>; | ||
| status = "okay"; | ||
|
|
||
| mdio0 { | ||
| mdio { | ||
| compatible = "snps,dwmac-mdio"; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| dp83867: ethernet-phy@0 { | ||
|
|
||
| adin1300: ethernet-phy@0 { | ||
|
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>; | ||
|
sipraga marked this conversation as resolved.
|
||
| reset-assert-us = <10>; | ||
| reset-deassert-us = <5000>; | ||
| }; | ||
| }; | ||
| }; | ||
|
|
||
| &emac1 { | ||
| phy-handle = <&dp83848>; | ||
| phy-handle = <&adin1200>; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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:
and in both cases, put the phy-handles and reset-gpios/timings in the relevant commit.
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 = <ð1_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>; | ||
| }; | ||
| }; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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>; | ||
|
|
@@ -169,12 +162,15 @@ | |
| }; | ||
| }; | ||
|
|
||
| mdio0 { | ||
| mdio { | ||
| compatible = "snps,dwmac-mdio"; | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
| adin1300: ethernet-phy@0 { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since I change mdio namings, maybe I can also do that?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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>; | ||
| }; | ||
| }; | ||
|
|
||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.