Skip to content

Revert "ipq806x: swap lan leds for Meraki MR52" #16775

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

Closed
wants to merge 1 commit into from

Conversation

rkboni
Copy link
Contributor

@rkboni rkboni commented Oct 24, 2024

This reverts commit ec8f647, as with the current kernel version, the change actually causes the same bug it once may have fixed -- that is, the leds are now again reversed.

I suspect this was due to a switch to a newer kernel version between when the patch was submitted and now reversing the order of the interfaces, so that eth0 / the LAN interface is also the interface used for PoE, and eth1 / the WAN interface is the non-PoE interface.

@github-actions github-actions bot added target/ipq806x pull request/issue for ipq806x target release/23.05 pull request/issue targeted (also) for OpenWrt 23.05 release labels Oct 24, 2024
@rkboni
Copy link
Contributor Author

rkboni commented Oct 24, 2024

CC @namiltd @Ansuel

@namiltd
Copy link
Contributor

namiltd commented Oct 24, 2024

To preserve the order of interfaces in the dts file, replace the gpios number instead of changing the names.

This reverts commit ec8f647, as with the
current kernel version, the change actually causes the same bug it once
may have fixed -- that is, the leds are now again reversed.

I suspect this was due to a switch to a newer kernel version between when
the patch was submitted and now reversing the order of the interfaces, so
that eth0 / the LAN interface is also the interface used for PoE, and eth1
/ the WAN interface is the non-PoE interface.

Signed-off-by: Rafal Boni <rafal.boni@gmail.com>

Re-order the interfaces so they're in numberic order again.
@rkboni rkboni force-pushed the revert-lan-led-reversal branch from 02bdbf9 to 4776f52 Compare October 24, 2024 08:23
@namiltd
Copy link
Contributor

namiltd commented Oct 24, 2024

Does the problem also occur in snapshot (kernel 6.6)?

@rkboni
Copy link
Contributor Author

rkboni commented Oct 24, 2024

Does the problem also occur in snapshot (kernel 6.6)?

I don't have a spare system to test SNAPSHOT / 6.6 builds on, sadly :/, so not sure if that's affected or not.

@rkboni
Copy link
Contributor Author

rkboni commented Oct 24, 2024

Does the problem also occur in snapshot (kernel 6.6)?

I don't have a spare system to test SNAPSHOT / 6.6 builds on, sadly :/, so not sure if that's affected or not.

Per https://forum.openwrt.org/t/cisco-meraki-mr52-no-dns-after-upgrade-to-23-05-3/194709/97, the LEDs are still backwards in SNAPSHOT (kernel 6.6) builds.

@rkboni
Copy link
Contributor Author

rkboni commented Oct 24, 2024

Not sure if it needs to be more complicated than 2 PRs one here and one for main -- if not, then here's the one for main: #16779. Otherwise, please advise how best to accomplish this... push the main one first and then backport that to openwrt-23.05?

@KanjiMonster
Copy link
Member

All changes/fixes need to go to main first, and can then be backported to branches as appropriate, unless the fix is for something only in that branch, e.g. updated kernel release for a version not in main anymore.

@rkboni
Copy link
Contributor Author

rkboni commented Oct 25, 2024

Closing and will back-port once #16775 is merged.

@rkboni rkboni closed this Oct 25, 2024
@rkboni rkboni deleted the revert-lan-led-reversal branch October 25, 2024 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release/23.05 pull request/issue targeted (also) for OpenWrt 23.05 release target/ipq806x pull request/issue for ipq806x target
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants