Skip to content

Commit

Permalink
realtek: move RTL8231 definitions to board files
Browse files Browse the repository at this point in the history
The RTL8231 is an external chip, and not part of the SoC. That means
it is more appropriate to define it in the board specific (base) files,
instead of the DT include for the SoC itself.

Moving the RTL8231 definition also ensures that boards with no GPIO
expander, or an alternative one, don't have a useless gpio1 node label
defined.

Tested on a Netgear GS110TPPv1.

Signed-off-by: Sander Vanheule <sander@svanheule.net>
  • Loading branch information
svanheule authored and dangowrt committed Feb 20, 2022
1 parent 004d4d6 commit 4b31717
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 21 deletions.
11 changes: 6 additions & 5 deletions target/linux/realtek/dts-5.10/rtl8380_netgear_gigabit.dtsi
Expand Up @@ -28,12 +28,13 @@
gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
open-source;
};
};

&gpio1 {
status = "okay";

indirect-access-bus-id = <31>;
gpio1: rtl8231-gpio {
compatible = "realtek,rtl8231-gpio";
#gpio-cells = <2>;
gpio-controller;
indirect-access-bus-id = <31>;
};
};

&ethernet0 {
Expand Down
17 changes: 10 additions & 7 deletions target/linux/realtek/dts-5.10/rtl8380_zyxel_gs1900.dtsi
Expand Up @@ -39,15 +39,18 @@
gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
};
};
};

&gpio1 {
status = "okay";
gpio1: rtl8231-gpio {
compatible = "realtek,rtl8231-gpio";
#gpio-cells = <2>;
gpio-controller;
indirect-access-bus-id = <0>;

poe_enable {
gpio-hog;
gpios = <13 0>;
output-high;
poe_enable {
gpio-hog;
gpios = <13 GPIO_ACTIVE_HIGH>;
output-high;
};
};
};

Expand Down
7 changes: 7 additions & 0 deletions target/linux/realtek/dts-5.10/rtl8382_d-link_dgs-1210-10p.dts
Expand Up @@ -44,6 +44,13 @@
linux,code = <KEY_RESTART>;
};*/
};

gpio1: rtl8231-gpio {
compatible = "realtek,rtl8231-gpio";
#gpio-cells = <2>;
gpio-controller;
indirect-access-bus-id = <0>;
};
};


Expand Down
9 changes: 0 additions & 9 deletions target/linux/realtek/dts-5.10/rtl838x.dtsi
Expand Up @@ -169,15 +169,6 @@
};
};

gpio1: rtl8231-gpio {
compatible = "realtek,rtl8231-gpio";
#gpio-cells = <2>;
indirect-access-bus-id = <0>;
gpio-controller;

status = "disabled";
};

pinmux: pinmux@1b001000 {
compatible = "pinctrl-single";
reg = <0x1b001000 0x4>;
Expand Down

0 comments on commit 4b31717

Please sign in to comment.