diff options
| author | Jakub Kicinski <[email protected]> | 2023-02-28 14:13:33 -0800 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2023-02-28 14:13:34 -0800 |
| commit | ca643ccf933a10732d29f77089736334179577a5 (patch) | |
| tree | 793eab80aabd1f3dd41ce89244903a3c4c6614ee | |
| parent | 8f9850dd8d23c1290cb642ce9548a440da5771ec (diff) | |
| parent | 8b322f9fdb35ecee0d4a40de8af923444bd624ea (diff) | |
Merge branch 'freescale-t1040rdb-dts-updates'
Vladimir Oltean says:
====================
Freescale T1040RDB DTS updates
This contains a fix for the new device tree for the T1040RDB rev A
board, which never worked, and an update to enable multiple CPU port
support for all revisions of the T1040RDB.
====================
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts | 1 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/t1040rdb.dts | 5 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts b/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts index 73f8c998c64d..d4f5f159d6f2 100644 --- a/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts +++ b/arch/powerpc/boot/dts/fsl/t1040rdb-rev-a.dts @@ -10,7 +10,6 @@ / { model = "fsl,T1040RDB-REV-A"; - compatible = "fsl,T1040RDB-REV-A"; }; &seville_port0 { diff --git a/arch/powerpc/boot/dts/fsl/t1040rdb.dts b/arch/powerpc/boot/dts/fsl/t1040rdb.dts index b6733e7e6580..dd3aab81e9de 100644 --- a/arch/powerpc/boot/dts/fsl/t1040rdb.dts +++ b/arch/powerpc/boot/dts/fsl/t1040rdb.dts @@ -180,6 +180,9 @@ }; &seville_port8 { - ethernet = <&enet0>; + status = "okay"; +}; + +&seville_port9 { status = "okay"; }; diff --git a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi index f58eb820eb5e..ad0ab33336b8 100644 --- a/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t1040si-post.dtsi @@ -686,6 +686,7 @@ seville_port8: port@8 { reg = <8>; phy-mode = "internal"; + ethernet = <&enet0>; status = "disabled"; fixed-link { @@ -697,6 +698,7 @@ seville_port9: port@9 { reg = <9>; phy-mode = "internal"; + ethernet = <&enet1>; status = "disabled"; fixed-link { |