forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
arm64: dts: ti: iot2050: Prepare for adding 2nd-generation boards
The current IOT2050 devices are Product Generation 1 (PG1), using SR1.0 AM65x silicon. Upcoming PG2 devices will use SR2.x SoCs and will therefore need separate device trees. Prepare for that by factoring out common bits that will be shared across both generations. At this chance, drop a link to the product homepage to in the top-level dts files. Also fix a typo in my email address in some headers. Signed-off-by: Jan Kiszka <[email protected]> Signed-off-by: Nishanth Menon <[email protected]> Link: https://lore.kernel.org/r/31fece05f9728a852c0632985c4fa537cced4ece.1632657917.git.jan.kiszka@web.de
- Loading branch information
1 parent
4f535a0
commit a9dbf04
Showing
6 changed files
with
178 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
| /* | ||
| * Copyright (c) Siemens AG, 2021 | ||
| * | ||
| * Authors: | ||
| * Jan Kiszka <[email protected]> | ||
| * | ||
| * Common bits of the IOT2050 Basic and Advanced variants, PG1 | ||
| */ | ||
|
|
||
| &dss { | ||
| assigned-clocks = <&k3_clks 67 2>; | ||
| assigned-clock-parents = <&k3_clks 67 5>; | ||
| }; | ||
|
|
||
| &serdes0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &sdhci1 { | ||
| no-1-8-v; | ||
| }; | ||
|
|
||
| &tx_pru0_0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru0_1 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru1_0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru1_1 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru2_0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru2_1 { | ||
| status = "disabled"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,13 +4,11 @@ | |
| * | ||
| * Authors: | ||
| * Le Jin <[email protected]> | ||
| * Jan Kiszka <jan.kiszk@siemens.com> | ||
| * Jan Kiszka <jan.kiszka@siemens.com> | ||
| * | ||
| * Common bits of the IOT2050 Basic and Advanced variants | ||
| * Common bits of the IOT2050 Basic and Advanced variants, PG1 and PG2 | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
|
|
||
| #include "k3-am654.dtsi" | ||
| #include <dt-bindings/phy/phy.h> | ||
|
|
||
|
|
@@ -557,7 +555,6 @@ | |
| pinctrl-0 = <&main_mmc1_pins_default>; | ||
| ti,driver-strength-ohm = <50>; | ||
| disable-wp; | ||
| no-1-8-v; | ||
| }; | ||
|
|
||
| &usb0 { | ||
|
|
@@ -631,10 +628,6 @@ | |
| }; | ||
| }; | ||
|
|
||
| &serdes0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &pcie0_rc { | ||
| status = "disabled"; | ||
| }; | ||
|
|
@@ -738,27 +731,3 @@ | |
| &icssg2_mdio { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru0_0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru0_1 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru1_0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru1_1 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru2_0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &tx_pru2_1 { | ||
| status = "disabled"; | ||
| }; | ||
60 changes: 60 additions & 0 deletions
60
arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
| /* | ||
| * Copyright (c) Siemens AG, 2018-2021 | ||
| * | ||
| * Authors: | ||
| * Le Jin <[email protected]> | ||
| * Jan Kiszka <[email protected]> | ||
| * | ||
| * Common bits of the IOT2050 Basic variant, PG1 and PG2 | ||
| */ | ||
|
|
||
| #include "k3-am65-iot2050-common.dtsi" | ||
|
|
||
| / { | ||
| memory@80000000 { | ||
| device_type = "memory"; | ||
| /* 1G RAM */ | ||
| reg = <0x00000000 0x80000000 0x00000000 0x40000000>; | ||
| }; | ||
|
|
||
| cpus { | ||
| cpu-map { | ||
| /delete-node/ cluster1; | ||
| }; | ||
| /delete-node/ cpu@100; | ||
| /delete-node/ cpu@101; | ||
| }; | ||
|
|
||
| /delete-node/ l2-cache1; | ||
| }; | ||
|
|
||
| /* eMMC */ | ||
| &sdhci0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &main_pmx0 { | ||
| main_uart0_pins_default: main-uart0-pins-default { | ||
| pinctrl-single,pins = < | ||
| AM65X_IOPAD(0x01e4, PIN_INPUT, 0) /* (AF11) UART0_RXD */ | ||
| AM65X_IOPAD(0x01e8, PIN_OUTPUT, 0) /* (AE11) UART0_TXD */ | ||
| AM65X_IOPAD(0x01ec, PIN_INPUT, 0) /* (AG11) UART0_CTSn */ | ||
| AM65X_IOPAD(0x01f0, PIN_OUTPUT, 0) /* (AD11) UART0_RTSn */ | ||
| AM65X_IOPAD(0x0188, PIN_INPUT, 1) /* (D25) UART0_DCDn */ | ||
| AM65X_IOPAD(0x018c, PIN_INPUT, 1) /* (B26) UART0_DSRn */ | ||
| AM65X_IOPAD(0x0190, PIN_OUTPUT, 1) /* (A24) UART0_DTRn */ | ||
| AM65X_IOPAD(0x0194, PIN_INPUT, 1) /* (E24) UART0_RIN */ | ||
| >; | ||
| }; | ||
| }; | ||
|
|
||
| &main_uart0 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&main_uart0_pins_default>; | ||
| }; | ||
|
|
||
| &mcu_r5fss0 { | ||
| /* lock-step mode not supported on Basic boards */ | ||
| ti,cluster-mode = <0>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,63 +4,21 @@ | |
| * | ||
| * Authors: | ||
| * Le Jin <[email protected]> | ||
| * Jan Kiszka <jan.kiszk@siemens.com> | ||
| * Jan Kiszka <jan.kiszka@siemens.com> | ||
| * | ||
| * AM6528-based (dual-core) IOT2050 Basic variant | ||
| * AM6528-based (dual-core) IOT2050 Basic variant, Product Generation 1 | ||
| * 1 GB RAM, no eMMC, main_uart0 on connector X30 | ||
| * | ||
| * Product homepage: | ||
| * https://new.siemens.com/global/en/products/automation/pc-based/iot-gateways/simatic-iot2050.html | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
|
|
||
| #include "k3-am65-iot2050-common.dtsi" | ||
| #include "k3-am6528-iot2050-basic-common.dtsi" | ||
| #include "k3-am65-iot2050-common-pg1.dtsi" | ||
|
|
||
| / { | ||
| compatible = "siemens,iot2050-basic", "ti,am654"; | ||
| model = "SIMATIC IOT2050 Basic"; | ||
|
|
||
| memory@80000000 { | ||
| device_type = "memory"; | ||
| /* 1G RAM */ | ||
| reg = <0x00000000 0x80000000 0x00000000 0x40000000>; | ||
| }; | ||
|
|
||
| cpus { | ||
| cpu-map { | ||
| /delete-node/ cluster1; | ||
| }; | ||
| /delete-node/ cpu@100; | ||
| /delete-node/ cpu@101; | ||
| }; | ||
|
|
||
| /delete-node/ l2-cache1; | ||
| }; | ||
|
|
||
| /* eMMC */ | ||
| &sdhci0 { | ||
| status = "disabled"; | ||
| }; | ||
|
|
||
| &main_pmx0 { | ||
| main_uart0_pins_default: main-uart0-pins-default { | ||
| pinctrl-single,pins = < | ||
| AM65X_IOPAD(0x01e4, PIN_INPUT, 0) /* (AF11) UART0_RXD */ | ||
| AM65X_IOPAD(0x01e8, PIN_OUTPUT, 0) /* (AE11) UART0_TXD */ | ||
| AM65X_IOPAD(0x01ec, PIN_INPUT, 0) /* (AG11) UART0_CTSn */ | ||
| AM65X_IOPAD(0x01f0, PIN_OUTPUT, 0) /* (AD11) UART0_RTSn */ | ||
| AM65X_IOPAD(0x0188, PIN_INPUT, 1) /* (D25) UART0_DCDn */ | ||
| AM65X_IOPAD(0x018c, PIN_INPUT, 1) /* (B26) UART0_DSRn */ | ||
| AM65X_IOPAD(0x0190, PIN_OUTPUT, 1) /* (A24) UART0_DTRn */ | ||
| AM65X_IOPAD(0x0194, PIN_INPUT, 1) /* (E24) UART0_RIN */ | ||
| >; | ||
| }; | ||
| }; | ||
|
|
||
| &main_uart0 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&main_uart0_pins_default>; | ||
| }; | ||
|
|
||
| &mcu_r5fss0 { | ||
| /* lock-step mode not supported on this board */ | ||
| ti,cluster-mode = <0>; | ||
| }; | ||
56 changes: 56 additions & 0 deletions
56
arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // SPDX-License-Identifier: GPL-2.0 | ||
| /* | ||
| * Copyright (c) Siemens AG, 2018-2021 | ||
| * | ||
| * Authors: | ||
| * Le Jin <[email protected]> | ||
| * Jan Kiszka <[email protected]> | ||
| * | ||
| * Common bits of the IOT2050 Advanced variant, PG1 and PG2 | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
|
|
||
| #include "k3-am65-iot2050-common.dtsi" | ||
|
|
||
| / { | ||
| memory@80000000 { | ||
| device_type = "memory"; | ||
| /* 2G RAM */ | ||
| reg = <0x00000000 0x80000000 0x00000000 0x80000000>; | ||
| }; | ||
| }; | ||
|
|
||
| &main_pmx0 { | ||
| main_mmc0_pins_default: main-mmc0-pins-default { | ||
| pinctrl-single,pins = < | ||
| AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN, 0) /* (B25) MMC0_CLK */ | ||
| AM65X_IOPAD(0x01ac, PIN_INPUT_PULLUP, 0) /* (B27) MMC0_CMD */ | ||
| AM65X_IOPAD(0x01a4, PIN_INPUT_PULLUP, 0) /* (A26) MMC0_DAT0 */ | ||
| AM65X_IOPAD(0x01a0, PIN_INPUT_PULLUP, 0) /* (E25) MMC0_DAT1 */ | ||
| AM65X_IOPAD(0x019c, PIN_INPUT_PULLUP, 0) /* (C26) MMC0_DAT2 */ | ||
| AM65X_IOPAD(0x0198, PIN_INPUT_PULLUP, 0) /* (A25) MMC0_DAT3 */ | ||
| AM65X_IOPAD(0x0194, PIN_INPUT_PULLUP, 0) /* (E24) MMC0_DAT4 */ | ||
| AM65X_IOPAD(0x0190, PIN_INPUT_PULLUP, 0) /* (A24) MMC0_DAT5 */ | ||
| AM65X_IOPAD(0x018c, PIN_INPUT_PULLUP, 0) /* (B26) MMC0_DAT6 */ | ||
| AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP, 0) /* (D25) MMC0_DAT7 */ | ||
| AM65X_IOPAD(0x01b8, PIN_OUTPUT_PULLUP, 7) /* (B23) MMC0_SDWP */ | ||
| AM65X_IOPAD(0x01b4, PIN_INPUT_PULLUP, 0) /* (A23) MMC0_SDCD */ | ||
| AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* (C25) MMC0_DS */ | ||
| >; | ||
| }; | ||
| }; | ||
|
|
||
| /* eMMC */ | ||
| &sdhci0 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&main_mmc0_pins_default>; | ||
| bus-width = <8>; | ||
| non-removable; | ||
| ti,driver-strength-ohm = <50>; | ||
| disable-wp; | ||
| }; | ||
|
|
||
| &main_uart0 { | ||
| status = "disabled"; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,57 +4,21 @@ | |
| * | ||
| * Authors: | ||
| * Le Jin <[email protected]> | ||
| * Jan Kiszka <jan.kiszk@siemens.com> | ||
| * Jan Kiszka <jan.kiszka@siemens.com> | ||
| * | ||
| * AM6548-based (quad-core) IOT2050 Advanced variant | ||
| * AM6548-based (quad-core) IOT2050 Advanced variant, Product Generation 1 | ||
| * 2 GB RAM, 16 GB eMMC, USB-serial converter on connector X30 | ||
| * | ||
| * Product homepage: | ||
| * https://new.siemens.com/global/en/products/automation/pc-based/iot-gateways/simatic-iot2050.html | ||
| */ | ||
|
|
||
| /dts-v1/; | ||
|
|
||
| #include "k3-am65-iot2050-common.dtsi" | ||
| #include "k3-am6548-iot2050-advanced-common.dtsi" | ||
| #include "k3-am65-iot2050-common-pg1.dtsi" | ||
|
|
||
| / { | ||
| compatible = "siemens,iot2050-advanced", "ti,am654"; | ||
| model = "SIMATIC IOT2050 Advanced"; | ||
|
|
||
| memory@80000000 { | ||
| device_type = "memory"; | ||
| /* 2G RAM */ | ||
| reg = <0x00000000 0x80000000 0x00000000 0x80000000>; | ||
| }; | ||
| }; | ||
|
|
||
| &main_pmx0 { | ||
| main_mmc0_pins_default: main-mmc0-pins-default { | ||
| pinctrl-single,pins = < | ||
| AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN, 0) /* (B25) MMC0_CLK */ | ||
| AM65X_IOPAD(0x01ac, PIN_INPUT_PULLUP, 0) /* (B27) MMC0_CMD */ | ||
| AM65X_IOPAD(0x01a4, PIN_INPUT_PULLUP, 0) /* (A26) MMC0_DAT0 */ | ||
| AM65X_IOPAD(0x01a0, PIN_INPUT_PULLUP, 0) /* (E25) MMC0_DAT1 */ | ||
| AM65X_IOPAD(0x019c, PIN_INPUT_PULLUP, 0) /* (C26) MMC0_DAT2 */ | ||
| AM65X_IOPAD(0x0198, PIN_INPUT_PULLUP, 0) /* (A25) MMC0_DAT3 */ | ||
| AM65X_IOPAD(0x0194, PIN_INPUT_PULLUP, 0) /* (E24) MMC0_DAT4 */ | ||
| AM65X_IOPAD(0x0190, PIN_INPUT_PULLUP, 0) /* (A24) MMC0_DAT5 */ | ||
| AM65X_IOPAD(0x018c, PIN_INPUT_PULLUP, 0) /* (B26) MMC0_DAT6 */ | ||
| AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP, 0) /* (D25) MMC0_DAT7 */ | ||
| AM65X_IOPAD(0x01b8, PIN_OUTPUT_PULLUP, 7) /* (B23) MMC0_SDWP */ | ||
| AM65X_IOPAD(0x01b4, PIN_INPUT_PULLUP, 0) /* (A23) MMC0_SDCD */ | ||
| AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* (C25) MMC0_DS */ | ||
| >; | ||
| }; | ||
| }; | ||
|
|
||
| /* eMMC */ | ||
| &sdhci0 { | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&main_mmc0_pins_default>; | ||
| bus-width = <8>; | ||
| non-removable; | ||
| ti,driver-strength-ohm = <50>; | ||
| disable-wp; | ||
| }; | ||
|
|
||
| &main_uart0 { | ||
| status = "disabled"; | ||
| }; | ||