| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220203140240.973690-1-matthias.schiffer@ew.tq-group.com>
Date: Thu, 3 Feb 2022 15:02:39 +0100
From: Matthias Schiffer <matthias.schiffer@...tq-group.com>
To: Nishanth Menon <nm@...com>, Vignesh Raghavendra <vigneshr@...com>,
Tero Kristo <kristo@...nel.org>,
Rob Herring <robh+dt@...nel.org>, jan.kiszka@...mens.com
Cc: linux-arm-kernel@...ts.infradead.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org,
Matthias Schiffer <matthias.schiffer@...tq-group.com>
Subject: [PATCH v2 1/2] arm64: dts: ti: k3-am65: disable optional peripherals by default
All peripherals that require pinmuxing or other configuration to work
should be disabled by default. Dependent DTS are adjusted accordingly.
The following nodes are now "disabled" according to dtx_diff and were not
overridden to "okay", as they define no pinctrl:
k3-am654-base-board:
- mcu_i2c0
- mcu_spi0..2
- mcu_uart0
- cal
- main_i2c3
- ehrpwm0..5
- main_uart1..2
- main_spi1..4
k3-am65-iot2050*:
- mci_spi1..2
- cal
- ehrpwm0..5
- main_spi0..4
Signed-off-by: Matthias Schiffer <matthias.schiffer@...tq-group.com>
---
v2: disable mcu_uart0 by default
.../dts/ti/k3-am65-iot2050-common-pg1.dtsi | 4 -
.../dts/ti/k3-am65-iot2050-common-pg2.dtsi | 7 +
.../boot/dts/ti/k3-am65-iot2050-common.dtsi | 132 +++++-------------
arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 52 +++++++
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 21 ++-
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 2 +
.../ti/k3-am6528-iot2050-basic-common.dtsi | 6 +-
.../arm64/boot/dts/ti/k3-am654-base-board.dts | 129 +++--------------
.../ti/k3-am6548-iot2050-advanced-common.dtsi | 5 +-
9 files changed, 140 insertions(+), 218 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi
index 51f902fa35a73..746f0e89a305c 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi
@@ -13,10 +13,6 @@ &dss {
assigned-clock-parents = <&k3_clks 67 5>;
};
-&serdes0 {
- status = "disabled";
-};
-
&sdhci1 {
no-1-8-v;
};
diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi
index e73458ca69007..b769fe6fc072f 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi
@@ -35,6 +35,7 @@ &dss {
&serdes0 {
assigned-clocks = <&k3_clks 153 4>, <&serdes0 AM654_SERDES_CMU_REFCLK>;
assigned-clock-parents = <&k3_clks 153 7>, <&k3_clks 153 4>;
+ status = "okay";
};
&dwc3_0 {
@@ -42,10 +43,16 @@ &dwc3_0 {
<&k3_clks 151 8>; /* set PIPE3_TXB_CLK to WIZ8B2M4VSB */
phys = <&serdes0 PHY_TYPE_USB3 0>;
phy-names = "usb3-phy";
+ status = "okay";
};
&usb0 {
maximum-speed = "super-speed";
snps,dis-u1-entry-quirk;
snps,dis-u2-entry-quirk;
+ status = "okay";
+};
+
+&usb0_phy {
+ status = "okay";
};
diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
index 3079eaee01c06..873c123c611ed 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi
@@ -362,15 +362,13 @@ &wkup_uart0 {
&main_uart1 {
pinctrl-names = "default";
pinctrl-0 = <&main_uart1_pins_default>;
-};
-
-&main_uart2 {
- status = "disabled";
+ status = "okay";
};
&mcu_uart0 {
pinctrl-names = "default";
pinctrl-0 = <&arduino_uart_pins_default>;
+ status = "okay";
};
&main_gpio0 {
@@ -416,12 +414,14 @@ &wkup_i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&wkup_i2c0_pins_default>;
clock-frequency = <400000>;
+ status = "okay";
};
&mcu_i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&mcu_i2c0_pins_default>;
clock-frequency = <400000>;
+ status = "okay";
psu: regulator@60 {
compatible = "ti,tps62363";
@@ -481,6 +481,7 @@ &main_i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&main_i2c0_pins_default>;
clock-frequency = <400000>;
+ status = "okay";
rtc: rtc8564@51 {
compatible = "nxp,pcf8563";
@@ -498,12 +499,14 @@ &main_i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&main_i2c1_pins_default>;
clock-frequency = <400000>;
+ status = "okay";
};
&main_i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&main_i2c2_pins_default>;
clock-frequency = <400000>;
+ status = "okay";
};
&main_i2c3 {
@@ -514,6 +517,8 @@ &main_i2c3 {
#address-cells = <1>;
#size-cells = <0>;
+ status = "okay";
+
edp-bridge@f {
compatible = "toshiba,tc358767";
reg = <0x0f>;
@@ -541,13 +546,10 @@ bridge_in: endpoint {
};
};
-&mcu_cpsw {
- status = "disabled";
-};
-
&ecap0 {
pinctrl-names = "default";
pinctrl-0 = <&ecap0_pins_default>;
+ status = "okay";
};
&sdhci1 {
@@ -555,20 +557,38 @@ &sdhci1 {
pinctrl-0 = <&main_mmc1_pins_default>;
ti,driver-strength-ohm = <50>;
disable-wp;
+ status = "okay";
+};
+
+&dwc3_0 {
+ status = "okay";
};
+
&usb0 {
pinctrl-names = "default";
pinctrl-0 = <&usb0_pins_default>;
dr_mode = "host";
};
+&usb0_phy {
+ status = "okay";
+};
+
+&dwc3_1 {
+ status = "okay";
+};
+
&usb1 {
pinctrl-names = "default";
pinctrl-0 = <&usb1_pins_default>;
dr_mode = "host";
};
+&usb1_phy {
+ status = "okay";
+};
+
&mcu_spi0 {
pinctrl-names = "default";
pinctrl-0 = <&mcu_spi0_pins_default>;
@@ -576,13 +596,12 @@ &mcu_spi0 {
#address-cells = <1>;
#size-cells= <0>;
ti,pindir-d0-out-d1-in;
-};
-
-&tscadc0 {
- status = "disabled";
+ status = "okay";
};
&tscadc1 {
+ status = "okay";
+
adc {
ti,adc-channels = <0 1 2 3 4 5>;
};
@@ -591,6 +610,7 @@ adc {
&ospi0 {
pinctrl-names = "default";
pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
+ status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
@@ -611,6 +631,7 @@ flash@0 {
&dss {
pinctrl-names = "default";
pinctrl-0 = <&dss_vout1_pins_default>;
+ status = "okay";
assigned-clocks = <&k3_clks 67 2>;
assigned-clock-parents = <&k3_clks 67 5>;
@@ -628,17 +649,14 @@ dpi_out: endpoint {
};
};
-&pcie0_rc {
- status = "disabled";
-};
-
-&pcie0_ep {
- status = "disabled";
+&serdes1 {
+ status = "okay";
};
&pcie1_rc {
pinctrl-names = "default";
pinctrl-0 = <&minipcie_pins_default>;
+ status = "okay";
num-lanes = <1>;
phys = <&serdes1 PHY_TYPE_PCIE 0>;
@@ -646,20 +664,9 @@ &pcie1_rc {
reset-gpios = <&wkup_gpio0 27 GPIO_ACTIVE_HIGH>;
};
-&m_can0 {
- status = "disabled";
-};
-
-&m_can1 {
- status = "disabled";
-};
-
-&pcie1_ep {
- status = "disabled";
-};
-
&mailbox0_cluster0 {
interrupts = <436>;
+ status = "okay";
mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
ti,mbox-tx = <1 0 0>;
@@ -669,6 +676,7 @@ mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
&mailbox0_cluster1 {
interrupts = <432>;
+ status = "okay";
mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
ti,mbox-tx = <1 0 0>;
@@ -676,46 +684,6 @@ mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
};
};
-&mailbox0_cluster2 {
- status = "disabled";
-};
-
-&mailbox0_cluster3 {
- status = "disabled";
-};
-
-&mailbox0_cluster4 {
- status = "disabled";
-};
-
-&mailbox0_cluster5 {
- status = "disabled";
-};
-
-&mailbox0_cluster6 {
- status = "disabled";
-};
-
-&mailbox0_cluster7 {
- status = "disabled";
-};
-
-&mailbox0_cluster8 {
- status = "disabled";
-};
-
-&mailbox0_cluster9 {
- status = "disabled";
-};
-
-&mailbox0_cluster10 {
- status = "disabled";
-};
-
-&mailbox0_cluster11 {
- status = "disabled";
-};
-
&mcu_r5fss0_core0 {
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
<&mcu_r5fss0_core0_memory_region>;
@@ -727,27 +695,3 @@ &mcu_r5fss0_core1 {
<&mcu_r5fss0_core1_memory_region>;
mboxes = <&mailbox0_cluster1 &mbox_mcu_r5fss0_core1>;
};
-
-&icssg0_mdio {
- status = "disabled";
-};
-
-&icssg1_mdio {
- status = "disabled";
-};
-
-&icssg2_mdio {
- status = "disabled";
-};
-
-&mcasp0 {
- status = "disabled";
-};
-
-&mcasp1 {
- status = "disabled";
-};
-
-&mcasp2 {
- status = "disabled";
-};
diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index ce8bb4a61011e..5aa425d1ba802 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -64,6 +64,7 @@ serdes0: serdes@...000 {
ti,serdes-clk = <&serdes0_clk>;
#clock-cells = <1>;
mux-controls = <&serdes_mux 0>;
+ status = "disabled";
};
serdes1: serdes@...000 {
@@ -79,6 +80,7 @@ serdes1: serdes@...000 {
ti,serdes-clk = <&serdes1_clk>;
#clock-cells = <1>;
mux-controls = <&serdes_mux 1>;
+ status = "disabled";
};
main_uart0: serial@...0000 {
@@ -88,6 +90,7 @@ main_uart0: serial@...0000 {
clock-frequency = <48000000>;
current-speed = <115200>;
power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_uart1: serial@...0000 {
@@ -96,6 +99,7 @@ main_uart1: serial@...0000 {
interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <48000000>;
power-domains = <&k3_pds 147 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_uart2: serial@...0000 {
@@ -104,6 +108,7 @@ main_uart2: serial@...0000 {
interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;
clock-frequency = <48000000>;
power-domains = <&k3_pds 148 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
crypto: crypto@...0000 {
@@ -152,6 +157,7 @@ main_i2c0: i2c@...0000 {
clock-names = "fck";
clocks = <&k3_clks 110 1>;
power-domains = <&k3_pds 110 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c1: i2c@...0000 {
@@ -163,6 +169,7 @@ main_i2c1: i2c@...0000 {
clock-names = "fck";
clocks = <&k3_clks 111 1>;
power-domains = <&k3_pds 111 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c2: i2c@...0000 {
@@ -174,6 +181,7 @@ main_i2c2: i2c@...0000 {
clock-names = "fck";
clocks = <&k3_clks 112 1>;
power-domains = <&k3_pds 112 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
main_i2c3: i2c@...0000 {
@@ -185,6 +193,7 @@ main_i2c3: i2c@...0000 {
clock-names = "fck";
clocks = <&k3_clks 113 1>;
power-domains = <&k3_pds 113 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
ecap0: pwm@...0000 {
@@ -194,6 +203,7 @@ ecap0: pwm@...0000 {
power-domains = <&k3_pds 39 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 39 0>;
clock-names = "fck";
+ status = "disabled";
};
main_spi0: spi@...0000 {
@@ -206,6 +216,7 @@ main_spi0: spi@...0000 {
#size-cells = <0>;
dmas = <&main_udmap 0xc500>, <&main_udmap 0x4500>;
dma-names = "tx0", "rx0";
+ status = "disabled";
};
main_spi1: spi@...0000 {
@@ -218,6 +229,7 @@ main_spi1: spi@...0000 {
#size-cells = <0>;
assigned-clocks = <&k3_clks 137 1>;
assigned-clock-rates = <48000000>;
+ status = "disabled";
};
main_spi2: spi@...0000 {
@@ -228,6 +240,7 @@ main_spi2: spi@...0000 {
power-domains = <&k3_pds 139 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
main_spi3: spi@...0000 {
@@ -238,6 +251,7 @@ main_spi3: spi@...0000 {
power-domains = <&k3_pds 140 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
main_spi4: spi@...0000 {
@@ -248,6 +262,7 @@ main_spi4: spi@...0000 {
power-domains = <&k3_pds 141 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
sdhci0: mmc@...0000 {
@@ -272,6 +287,7 @@ sdhci0: mmc@...0000 {
ti,otap-del-sel-hs400 = <0x0>;
ti,trm-icp = <0x8>;
dma-coherent;
+ status = "disabled";
};
sdhci1: mmc@...0000 {
@@ -295,6 +311,7 @@ sdhci1: mmc@...0000 {
ti,otap-del-sel = <0x2>;
ti,trm-icp = <0x8>;
dma-coherent;
+ status = "disabled";
};
scm_conf: scm-conf@...000 {
@@ -361,6 +378,7 @@ dwc3_0: dwc3@...0000 {
assigned-clocks = <&k3_clks 151 2>, <&k3_clks 151 7>;
assigned-clock-parents = <&k3_clks 151 4>, /* set REF_CLK to 20MHz i.e. PER0_PLL/48 */
<&k3_clks 151 9>; /* set PIPE3_TXB_CLK to CLK_12M_RC/256 (for HS only) */
+ status = "disabled";
usb0: usb@...00 {
compatible = "snps,dwc3";
@@ -386,6 +404,7 @@ usb0_phy: phy@...0000 {
clocks = <&k3_clks 151 0>, <&k3_clks 151 1>;
clock-names = "wkupclk", "refclk";
#phy-cells = <0>;
+ status = "disabled";
};
dwc3_1: dwc3@...0000 {
@@ -400,6 +419,7 @@ dwc3_1: dwc3@...0000 {
clocks = <&k3_clks 152 2>;
assigned-clocks = <&k3_clks 152 2>;
assigned-clock-parents = <&k3_clks 152 4>; /* set REF_CLK to 20MHz i.e. PER0_PLL/48 */
+ status = "disabled";
usb1: usb@...00 {
compatible = "snps,dwc3";
@@ -424,6 +444,7 @@ usb1_phy: phy@...0000 {
clocks = <&k3_clks 152 0>, <&k3_clks 152 1>;
clock-names = "wkupclk", "refclk";
#phy-cells = <0>;
+ status = "disabled";
};
intr_main_gpio: interrupt-controller@...000 {
@@ -497,6 +518,7 @@ mailbox0_cluster0: mailbox@...80000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster1: mailbox@...81000 {
@@ -506,6 +528,7 @@ mailbox0_cluster1: mailbox@...81000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster2: mailbox@...82000 {
@@ -515,6 +538,7 @@ mailbox0_cluster2: mailbox@...82000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster3: mailbox@...83000 {
@@ -524,6 +548,7 @@ mailbox0_cluster3: mailbox@...83000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster4: mailbox@...84000 {
@@ -533,6 +558,7 @@ mailbox0_cluster4: mailbox@...84000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster5: mailbox@...85000 {
@@ -542,6 +568,7 @@ mailbox0_cluster5: mailbox@...85000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster6: mailbox@...86000 {
@@ -551,6 +578,7 @@ mailbox0_cluster6: mailbox@...86000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster7: mailbox@...87000 {
@@ -560,6 +588,7 @@ mailbox0_cluster7: mailbox@...87000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster8: mailbox@...88000 {
@@ -569,6 +598,7 @@ mailbox0_cluster8: mailbox@...88000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster9: mailbox@...89000 {
@@ -578,6 +608,7 @@ mailbox0_cluster9: mailbox@...89000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster10: mailbox@...8a000 {
@@ -587,6 +618,7 @@ mailbox0_cluster10: mailbox@...8a000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
mailbox0_cluster11: mailbox@...8b000 {
@@ -596,6 +628,7 @@ mailbox0_cluster11: mailbox@...8b000 {
ti,mbox-num-users = <4>;
ti,mbox-num-fifos = <16>;
interrupt-parent = <&intr_main_navss>;
+ status = "disabled";
};
ringacc: ringacc@...00000 {
@@ -703,6 +736,7 @@ pcie0_rc: pcie@...0000 {
interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>;
msi-map = <0x0 &gic_its 0x0 0x10000>;
device_type = "pci";
+ status = "disabled";
};
pcie0_ep: pcie-ep@...0000 {
@@ -716,6 +750,7 @@ pcie0_ep: pcie-ep@...0000 {
max-link-speed = <2>;
dma-coherent;
interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>;
+ status = "disabled";
};
pcie1_rc: pcie@...0000 {
@@ -736,6 +771,7 @@ pcie1_rc: pcie@...0000 {
interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>;
msi-map = <0x0 &gic_its 0x10000 0x10000>;
device_type = "pci";
+ status = "disabled";
};
pcie1_ep: pcie-ep@...0000 {
@@ -749,6 +785,7 @@ pcie1_ep: pcie-ep@...0000 {
max-link-speed = <2>;
dma-coherent;
interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>;
+ status = "disabled";
};
mcasp0: mcasp@...0000 {
@@ -766,6 +803,7 @@ mcasp0: mcasp@...0000 {
clocks = <&k3_clks 104 0>;
clock-names = "fck";
power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcasp1: mcasp@...0000 {
@@ -783,6 +821,7 @@ mcasp1: mcasp@...0000 {
clocks = <&k3_clks 105 0>;
clock-names = "fck";
power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcasp2: mcasp@...0000 {
@@ -800,6 +839,7 @@ mcasp2: mcasp@...0000 {
clocks = <&k3_clks 106 0>;
clock-names = "fck";
power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
cal: cal@...3000 {
@@ -813,6 +853,7 @@ cal: cal@...3000 {
clock-names = "fck";
clocks = <&k3_clks 2 0>;
power-domains = <&k3_pds 2 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
ports {
#address-cells = <1>;
@@ -857,6 +898,8 @@ dss: dss@...0000 {
dma-coherent;
+ status = "disabled";
+
dss_ports: ports {
#address-cells = <1>;
#size-cells = <0>;
@@ -870,6 +913,7 @@ ehrpwm0: pwm@...0000 {
power-domains = <&k3_pds 40 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 0>, <&k3_clks 40 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm1: pwm@...0000 {
@@ -879,6 +923,7 @@ ehrpwm1: pwm@...0000 {
power-domains = <&k3_pds 41 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 1>, <&k3_clks 41 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm2: pwm@...0000 {
@@ -888,6 +933,7 @@ ehrpwm2: pwm@...0000 {
power-domains = <&k3_pds 42 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 2>, <&k3_clks 42 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm3: pwm@...0000 {
@@ -897,6 +943,7 @@ ehrpwm3: pwm@...0000 {
power-domains = <&k3_pds 43 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 3>, <&k3_clks 43 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm4: pwm@...0000 {
@@ -906,6 +953,7 @@ ehrpwm4: pwm@...0000 {
power-domains = <&k3_pds 44 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 4>, <&k3_clks 44 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
ehrpwm5: pwm@...0000 {
@@ -915,6 +963,7 @@ ehrpwm5: pwm@...0000 {
power-domains = <&k3_pds 45 TI_SCI_PD_EXCLUSIVE>;
clocks = <&ehrpwm_tbclk 5>, <&k3_clks 45 0>;
clock-names = "tbclk", "fck";
+ status = "disabled";
};
icssg0: icssg@...0000 {
@@ -1055,6 +1104,7 @@ icssg0_mdio: mdio@...00 {
#address-cells = <1>;
#size-cells = <0>;
bus_freq = <1000000>;
+ status = "disabled";
};
};
@@ -1196,6 +1246,7 @@ icssg1_mdio: mdio@...00 {
#address-cells = <1>;
#size-cells = <0>;
bus_freq = <1000000>;
+ status = "disabled";
};
};
@@ -1337,6 +1388,7 @@ icssg2_mdio: mdio@...00 {
#address-cells = <1>;
#size-cells = <0>;
bus_freq = <1000000>;
+ status = "disabled";
};
};
};
diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
index 8d592bf41d6f1..57ac3a493adbe 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
@@ -22,11 +22,12 @@ phy_gmii_sel: phy@...0 {
mcu_uart0: serial@...00000 {
compatible = "ti,am654-uart";
- reg = <0x00 0x40a00000 0x00 0x100>;
- interrupts = <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>;
- clock-frequency = <96000000>;
- current-speed = <115200>;
- power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
+ reg = <0x00 0x40a00000 0x00 0x100>;
+ interrupts = <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>;
+ clock-frequency = <96000000>;
+ current-speed = <115200>;
+ power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcu_ram: sram@...00000 {
@@ -46,6 +47,7 @@ mcu_i2c0: i2c@...00000 {
clock-names = "fck";
clocks = <&k3_clks 114 1>;
power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
mcu_spi0: spi@...00000 {
@@ -56,6 +58,7 @@ mcu_spi0: spi@...00000 {
power-domains = <&k3_pds 142 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
mcu_spi1: spi@...10000 {
@@ -66,6 +69,7 @@ mcu_spi1: spi@...10000 {
power-domains = <&k3_pds 143 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
mcu_spi2: spi@...20000 {
@@ -76,6 +80,7 @@ mcu_spi2: spi@...20000 {
power-domains = <&k3_pds 144 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
+ status = "disabled";
};
tscadc0: tscadc@...00000 {
@@ -89,6 +94,7 @@ tscadc0: tscadc@...00000 {
dmas = <&mcu_udmap 0x7100>,
<&mcu_udmap 0x7101 >;
dma-names = "fifo0", "fifo1";
+ status = "disabled";
adc {
#io-channel-cells = <1>;
@@ -107,6 +113,7 @@ tscadc1: tscadc@...10000 {
dmas = <&mcu_udmap 0x7102>,
<&mcu_udmap 0x7103>;
dma-names = "fifo0", "fifo1";
+ status = "disabled";
adc {
#io-channel-cells = <1>;
@@ -172,6 +179,7 @@ m_can0: mcan@...28000 {
<GIC_SPI 545 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "int0", "int1";
bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ status = "disabled";
};
m_can1: mcan@...68000 {
@@ -187,6 +195,7 @@ m_can1: mcan@...68000 {
<GIC_SPI 548 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "int0", "int1";
bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>;
+ status = "disabled";
};
fss: fss@...00000 {
@@ -252,6 +261,8 @@ mcu_cpsw: ethernet@...00000 {
"tx4", "tx5", "tx6", "tx7",
"rx";
+ status = "disabled";
+
ethernet-ports {
#address-cells = <1>;
#size-cells = <0>;
diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index 9c69d0917f69a..8f0c505a16edd 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -54,6 +54,7 @@ wkup_uart0: serial@...00000 {
clock-frequency = <48000000>;
current-speed = <115200>;
power-domains = <&k3_pds 150 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
wkup_i2c0: i2c@...20000 {
@@ -65,6 +66,7 @@ wkup_i2c0: i2c@...20000 {
clock-names = "fck";
clocks = <&k3_clks 115 1>;
power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;
+ status = "disabled";
};
intr_wkup_gpio: interrupt-controller@...00000 {
diff --git a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi
index 4a9bf7d7c07dc..29f539cc23921 100644
--- a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi
@@ -29,11 +29,6 @@ cpu-map {
/delete-node/ l2-cache1;
};
-/* eMMC */
-&sdhci0 {
- status = "disabled";
-};
-
&main_pmx0 {
main_uart0_pins_default: main-uart0-pins-default {
pinctrl-single,pins = <
@@ -52,6 +47,7 @@ AM65X_IOPAD(0x0194, PIN_INPUT, 1) /* (E24) UART0_RIN */
&main_uart0 {
pinctrl-names = "default";
pinctrl-0 = <&main_uart0_pins_default>;
+ status = "okay";
};
&mcu_r5fss0 {
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index 9043f91c9bec7..821ee7f2eff04 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -275,12 +275,14 @@ &main_uart0 {
pinctrl-names = "default";
pinctrl-0 = <&main_uart0_pins_default>;
power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>;
+ status = "okay";
};
&wkup_i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&wkup_i2c0_pins_default>;
clock-frequency = <400000>;
+ status = "okay";
pca9554: gpio@39 {
compatible = "nxp,pca9554";
@@ -300,6 +302,7 @@ &main_i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&main_i2c0_pins_default>;
clock-frequency = <400000>;
+ status = "okay";
pca9555: gpio@21 {
compatible = "nxp,pca9555";
@@ -313,17 +316,20 @@ &main_i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&main_i2c1_pins_default>;
clock-frequency = <400000>;
+ status = "okay";
};
&main_i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&main_i2c2_pins_default>;
clock-frequency = <400000>;
+ status = "okay";
};
&ecap0 {
pinctrl-names = "default";
pinctrl-0 = <&ecap0_pins_default>;
+ status = "okay";
};
&main_spi0 {
@@ -332,6 +338,7 @@ &main_spi0 {
#address-cells = <1>;
#size-cells= <0>;
ti,pindir-d0-out-d1-in;
+ status = "okay";
flash@0{
compatible = "jedec,spi-nor";
@@ -351,6 +358,7 @@ &sdhci0 {
non-removable;
ti,driver-strength-ohm = <50>;
disable-wp;
+ status = "okay";
};
/*
@@ -364,6 +372,11 @@ &sdhci1 {
pinctrl-0 = <&main_mmc1_pins_default>;
ti,driver-strength-ohm = <50>;
disable-wp;
+ status = "okay";
+};
+
+&dwc3_1 {
+ status = "okay";
};
&usb1 {
@@ -372,60 +385,29 @@ &usb1 {
dr_mode = "otg";
};
-&dwc3_0 {
- status = "disabled";
-};
-
-&usb0_phy {
- status = "disabled";
+&usb1_phy {
+ status = "okay";
};
&tscadc0 {
+ status = "okay";
+
adc {
ti,adc-channels = <0 1 2 3 4 5 6 7>;
};
};
&tscadc1 {
+ status = "okay";
+
adc {
ti,adc-channels = <0 1 2 3 4 5 6 7>;
};
};
-&serdes0 {
- status = "disabled";
-};
-
-&serdes1 {
- status = "disabled";
-};
-
-&pcie0_rc {
- status = "disabled";
-};
-
-&pcie0_ep {
- status = "disabled";
-};
-
-&pcie1_rc {
- status = "disabled";
-};
-
-&pcie1_ep {
- status = "disabled";
-};
-
-&m_can0 {
- status = "disabled";
-};
-
-&m_can1 {
- status = "disabled";
-};
-
&mailbox0_cluster0 {
interrupts = <436>;
+ status = "okay";
mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
ti,mbox-tx = <1 0 0>;
@@ -435,6 +417,7 @@ mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 {
&mailbox0_cluster1 {
interrupts = <432>;
+ status = "okay";
mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
ti,mbox-tx = <1 0 0>;
@@ -442,46 +425,6 @@ mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 {
};
};
-&mailbox0_cluster2 {
- status = "disabled";
-};
-
-&mailbox0_cluster3 {
- status = "disabled";
-};
-
-&mailbox0_cluster4 {
- status = "disabled";
-};
-
-&mailbox0_cluster5 {
- status = "disabled";
-};
-
-&mailbox0_cluster6 {
- status = "disabled";
-};
-
-&mailbox0_cluster7 {
- status = "disabled";
-};
-
-&mailbox0_cluster8 {
- status = "disabled";
-};
-
-&mailbox0_cluster9 {
- status = "disabled";
-};
-
-&mailbox0_cluster10 {
- status = "disabled";
-};
-
-&mailbox0_cluster11 {
- status = "disabled";
-};
-
&mcu_r5fss0_core0 {
memory-region = <&mcu_r5fss0_core0_dma_memory_region>,
<&mcu_r5fss0_core0_memory_region>;
@@ -497,6 +440,7 @@ &mcu_r5fss0_core1 {
&ospi0 {
pinctrl-names = "default";
pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;
+ status = "okay";
flash@0{
compatible = "jedec,spi-nor";
@@ -517,6 +461,7 @@ flash@0{
&mcu_cpsw {
pinctrl-names = "default";
pinctrl-0 = <&mcu_cpsw_pins_default &mcu_mdio_pins_default>;
+ status = "okay";
};
&davinci_mdio {
@@ -531,31 +476,3 @@ &cpsw_port1 {
phy-mode = "rgmii-rxid";
phy-handle = <&phy0>;
};
-
-&mcasp0 {
- status = "disabled";
-};
-
-&mcasp1 {
- status = "disabled";
-};
-
-&mcasp2 {
- status = "disabled";
-};
-
-&dss {
- status = "disabled";
-};
-
-&icssg0_mdio {
- status = "disabled";
-};
-
-&icssg1_mdio {
- status = "disabled";
-};
-
-&icssg2_mdio {
- status = "disabled";
-};
diff --git a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
index d25e8b26187f9..731224ec5c366 100644
--- a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
@@ -49,8 +49,5 @@ &sdhci0 {
non-removable;
ti,driver-strength-ohm = <50>;
disable-wp;
-};
-
-&main_uart0 {
- status = "disabled";
+ status = "okay";
};
--
2.25.1
Powered by blists - more mailing lists