summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2023-02-23 11:23:15 +0100
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2023-02-23 11:23:15 +0100
commit01c6b5880dda2d2875995e129d57fa849174b5ed (patch)
tree63e3bb62b515cebdde6a0668da3b942054e47cce
parent6d147efd19e42b03b812392c4bf8eee4e96b2d2d (diff)
arm: dts: k3-am625-verdin: drop skevm specific stuff
Drop SKEVM specific stuff. Upstream-Status: Pending Initial U-Boot to be used for bring-up and validation of the V1.0 design, we'll decide on the step forward to mainline this once the bring-up and validation will be done. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--arch/arm/dts/k3-am625-verdin-u-boot.dtsi6
-rw-r--r--arch/arm/dts/k3-am625-verdin.dts40
2 files changed, 0 insertions, 46 deletions
diff --git a/arch/arm/dts/k3-am625-verdin-u-boot.dtsi b/arch/arm/dts/k3-am625-verdin-u-boot.dtsi
index d4b23a2506..13f108a311 100644
--- a/arch/arm/dts/k3-am625-verdin-u-boot.dtsi
+++ b/arch/arm/dts/k3-am625-verdin-u-boot.dtsi
@@ -83,12 +83,6 @@
u-boot,dm-spl;
};
-#ifdef SKEVM
-&exp1 {
- u-boot,dm-spl;
-};
-#endif
-
&k3_clks {
u-boot,dm-spl;
};
diff --git a/arch/arm/dts/k3-am625-verdin.dts b/arch/arm/dts/k3-am625-verdin.dts
index 0c07cad51c..736c513f5f 100644
--- a/arch/arm/dts/k3-am625-verdin.dts
+++ b/arch/arm/dts/k3-am625-verdin.dts
@@ -5,9 +5,6 @@
/dts-v1/;
-/* remove once our HW arrives */
-#define SKEVM
-
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/net/ti-dp83867.h>
@@ -39,16 +36,11 @@
/* Verdin SD_1 Power Supply */
reg_sdhc1_vmmc: regulator-sdhci1 {
compatible = "regulator-fixed";
-#ifdef SKEVM
- enable-active-high;
- gpio = <&exp1 3 GPIO_ACTIVE_HIGH>;
-#else
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sd1_pwr_en>;
enable-active-high;
/* Verdin SD_1_PWR_EN (SODIMM 76) */
gpio = <&main_gpio0 29 GPIO_ACTIVE_HIGH>;
-#endif
off-on-delay-us = <100000>;
regulator-max-microvolt = <3300000>;
regulator-min-microvolt = <3300000>;
@@ -61,11 +53,7 @@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_vsel_sd>;
/* PMIC_VSEL_SD */
-#ifdef SKEVM
- gpios = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
-#else
gpios = <&main_gpio0 21 GPIO_ACTIVE_HIGH>;
-#endif
regulator-name = "LDO1-VSEL-SD (PMIC)";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
@@ -139,7 +127,6 @@
&cpsw3g_mdio {
cpsw3g_phy0: ethernet-phy@0 {
reg = <0>;
-#ifndef SKEVM
assigned-clocks = <&k3_clks 157 20>;
assigned-clock-parents = <&k3_clks 157 22>;
assigned-clock-rates = <25000000>;
@@ -150,7 +137,6 @@
reset-gpios = <&main_gpio0 17 GPIO_ACTIVE_LOW>;
reset-assert-us = <10>;
reset-deassert-us = <1000>;
-#endif
ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
ti,min-output-impedance;
ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
@@ -181,28 +167,6 @@
&main_i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_i2c1>;
-#ifdef SKEVM
- clock-frequency = <400000>;
-
- exp1: gpio@22 {
- compatible = "ti,tca6424";
- reg = <0x22>;
- gpio-controller;
- #gpio-cells = <2>;
- gpio-line-names = "GPIO_CPSW2_RST", "GPIO_CPSW1_RST",
- "PRU_DETECT", "MMC1_SD_EN",
- "VPP_LDO_EN", "EXP_PS_3V3_En",
- "EXP_PS_5V0_En", "EXP_HAT_DETECT",
- "GPIO_AUD_RSTn", "GPIO_eMMC_RSTn",
- "UART1_FET_BUF_EN", "WL_LT_EN",
- "GPIO_HDMI_RSTn", "CSI_GPIO1",
- "CSI_GPIO2", "PRU_3V3_EN",
- "HDMI_INTn", "TEST_GPIO2",
- "MCASP1_FET_EN", "MCASP1_BUF_BT_EN",
- "MCASP1_FET_SEL", "UART1_FET_SEL",
- "TSINT#", "IO_EXP_TEST_LED";
- };
-#endif
/* EEPROM on display adapter (MIPI DSI Display Adapter) */
eeprom_display_adapter: eeprom@50 {
@@ -230,11 +194,7 @@
/* PMIC_VSEL_SD */
pinctrl_vsel_sd: main-gpio0-21-pins-default {
pinctrl-single,pins = <
-#ifndef SKEVM
AM62X_IOPAD(0x0054, PIN_INPUT, 7) /* (P21) GPMC0_AD6.GPIO0_21 */
-#else
- AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (P25) GPMC0_CLK.GPIO0_31 */
-#endif
>;
};