cddd459140
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
248 lines
5.6 KiB
Diff
248 lines
5.6 KiB
Diff
From c9be87f17c64d08c06e4858589a0014f73868867 Mon Sep 17 00:00:00 2001
|
|
From: Pankaj Bansal <pankaj.bansal@nxp.com>
|
|
Date: Thu, 28 Feb 2019 17:28:36 +0530
|
|
Subject: [PATCH] arm64: dts: lx2160aqds: Add mdio mux nodes
|
|
|
|
The two external MDIO buses used to communicate with phy devices that are
|
|
external to SOC are muxed in LX2160AQDS board.
|
|
These buses can be routed to any one of the eight IO slots on LX2160AQDS
|
|
board depending on value in fpga register 0x54.
|
|
Additionally the external MDIO1 is used to communicate to the onboard
|
|
RGMII phy devices.
|
|
The mdio1 is controlled by bits 4-7 of fpga register and mdio2 is
|
|
controlled by bits 4-7 of fpga register.
|
|
|
|
Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com>
|
|
---
|
|
arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 145 ++++++++++++++++++++++
|
|
arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 8 ++
|
|
arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 24 ++--
|
|
3 files changed, 165 insertions(+), 12 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts
|
|
@@ -29,6 +29,130 @@
|
|
regulator-boot-on;
|
|
regulator-always-on;
|
|
};
|
|
+
|
|
+ mdio-mux-1 {
|
|
+ compatible = "mdio-mux-multiplexer";
|
|
+ mux-controls = <&mux 0>;
|
|
+ mdio-parent-bus = <&emdio1>;
|
|
+ #address-cells=<1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
+ mdio@0 { /* On-board PHY #1 RGMI1*/
|
|
+ reg = <0x00>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@8 { /* On-board PHY #2 RGMI2*/
|
|
+ reg = <0x8>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@18 { /* Slot #1 */
|
|
+ reg = <0x18>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@19 { /* Slot #2 */
|
|
+ reg = <0x19>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@1a { /* Slot #3 */
|
|
+ reg = <0x1a>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@1b { /* Slot #4 */
|
|
+ reg = <0x1b>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@1c { /* Slot #5 */
|
|
+ reg = <0x1c>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@1d { /* Slot #6 */
|
|
+ reg = <0x1d>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@1e { /* Slot #7 */
|
|
+ reg = <0x1e>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@1f { /* Slot #8 */
|
|
+ reg = <0x1f>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ mdio-mux-2 {
|
|
+ compatible = "mdio-mux-multiplexer";
|
|
+ mux-controls = <&mux 1>;
|
|
+ mdio-parent-bus = <&emdio2>;
|
|
+ #address-cells=<1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
+ mdio@0 { /* Slot #1 (secondary EMI) */
|
|
+ reg = <0x00>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@1 { /* Slot #2 (secondary EMI) */
|
|
+ reg = <0x01>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@2 { /* Slot #3 (secondary EMI) */
|
|
+ reg = <0x02>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@3 { /* Slot #4 (secondary EMI) */
|
|
+ reg = <0x03>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@4 { /* Slot #5 (secondary EMI) */
|
|
+ reg = <0x04>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@5 { /* Slot #6 (secondary EMI) */
|
|
+ reg = <0x05>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@6 { /* Slot #7 (secondary EMI) */
|
|
+ reg = <0x06>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+
|
|
+ mdio@7 { /* Slot #8 (secondary EMI) */
|
|
+ reg = <0x07>;
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
&crypto {
|
|
@@ -71,6 +195,14 @@
|
|
};
|
|
};
|
|
|
|
+&emdio1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&emdio2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&esdhc0 {
|
|
status = "okay";
|
|
};
|
|
@@ -82,6 +214,19 @@
|
|
&i2c0 {
|
|
status = "okay";
|
|
|
|
+ fpga@66 {
|
|
+ compatible = "fsl,lx2160aqds-fpga", "fsl,fpga-qixis-i2c",
|
|
+ "simple-mfd";
|
|
+ reg = <0x66>;
|
|
+
|
|
+ mux: mux-controller {
|
|
+ compatible = "reg-mux";
|
|
+ #mux-control-cells = <1>;
|
|
+ mux-reg-masks = <0x54 0xf8>, /* 0: reg 0x54, bits 7:3 */
|
|
+ <0x54 0x07>; /* 1: reg 0x54, bit 2:0 */
|
|
+ };
|
|
+ };
|
|
+
|
|
i2c-mux@77 {
|
|
compatible = "nxp,pca9547";
|
|
reg = <0x77>;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts
|
|
@@ -35,6 +35,14 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&emdio1 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
+&emdio2 {
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&esdhc0 {
|
|
sd-uhs-sdr104;
|
|
sd-uhs-sdr50;
|
|
--- a/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
|
|
+++ b/arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi
|
|
@@ -478,26 +478,26 @@
|
|
little-endian;
|
|
};
|
|
|
|
- /* TODO: WRIOP (CCSR?) */
|
|
- emdio1: mdio@0x8B96000 { /* WRIOP0: 0x8B8_0000, E-MDIO1: 0x1_6000 */
|
|
+ /* WRIOP0: 0x8b8_0000, E-MDIO1: 0x1_6000 */
|
|
+ emdio1: mdio@8b96000 {
|
|
compatible = "fsl,fman-memac-mdio";
|
|
- reg = <0x0 0x8B96000 0x0 0x1000>;
|
|
- device_type = "mdio"; /* TODO: is this necessary? */
|
|
- little-endian; /* force the driver in LE mode */
|
|
-
|
|
- /* Not necessary on the QDS, but needed on the RDB */
|
|
+ reg = <0x0 0x8b96000 0x0 0x1000>;
|
|
+ interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
+ little-endian; /* force the driver in LE mode */
|
|
+ status = "disabled";
|
|
};
|
|
|
|
- emdio2: mdio@0x8B97000 { /* WRIOP0: 0x8B8_0000, E-MDIO2: 0x1_7000 */
|
|
+ /* WRIOP0: 0x8b8_0000, E-MDIO2: 0x1_7000 */
|
|
+ emdio2: mdio@8b97000 {
|
|
compatible = "fsl,fman-memac-mdio";
|
|
- reg = <0x0 0x8B97000 0x0 0x1000>;
|
|
- device_type = "mdio"; /* TODO: is this necessary? */
|
|
- little-endian; /* force the driver in LE mode */
|
|
-
|
|
+ reg = <0x0 0x8b97000 0x0 0x1000>;
|
|
+ interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
+ little-endian; /* force the driver in LE mode */
|
|
+ status = "disabled";
|
|
};
|
|
|
|
pcs_mdio1: mdio@0x8c07000 {
|