diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi index 8e491f9359..62f9cf2c11 100644 --- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi @@ -50,22 +50,22 @@ u-boot,dm-spl; }; -&vcc_5v0 { - u-boot,dm-spl; -}; +//&vcc_5v0 { +// u-boot,dm-spl; +//}; &vcc_3v3_sys { u-boot,dm-spl; }; -&vdd_mmc1 { - u-boot,dm-spl; -}; +//&vdd_mmc1 { +// u-boot,dm-spl; +//}; -&vdd_sd_dv { - u-boot,dm-spl; -}; +//&vdd_sd_dv { +// u-boot,dm-spl; +//}; -&vdd_sd_dv_pins_default { - u-boot,dm-spl; -}; +//&vdd_sd_dv_pins_default { +// u-boot,dm-spl; +//}; diff --git a/arch/arm/dts/k3-am625-sk.dts b/arch/arm/dts/k3-am625-sk.dts index bfe1e78ed8..4fa4aacbf7 100644 --- a/arch/arm/dts/k3-am625-sk.dts +++ b/arch/arm/dts/k3-am625-sk.dts @@ -11,7 +11,7 @@ / { compatible = "ti,am625-sk", "ti,am625"; - model = "Texas Instruments AM625 SK"; + model = "Coda Octopus Dive - Voice Processor"; }; &cpsw_port2 { @@ -84,3 +84,16 @@ }; }; }; + + +&main_i2c1 { + status = "disabled"; +}; + +&ospi0 { + status = "disabled"; +}; + +&sdhci2 { + status = "disabled"; +}; diff --git a/arch/arm/dts/k3-am62x-sk-common.dtsi b/arch/arm/dts/k3-am62x-sk-common.dtsi index 72ebb1400f..c3b5c9b08d 100644 --- a/arch/arm/dts/k3-am62x-sk-common.dtsi +++ b/arch/arm/dts/k3-am62x-sk-common.dtsi @@ -82,16 +82,16 @@ regulator-boot-on; }; - vcc_5v0: regulator-1 { - /* Output of LM34936 */ - compatible = "regulator-fixed"; - regulator-name = "vcc_5v0"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vmain_pd>; - regulator-always-on; - regulator-boot-on; - }; + //vcc_5v0: regulator-1 { + // /* Output of LM34936 */ + // compatible = "regulator-fixed"; + // regulator-name = "vcc_5v0"; + // regulator-min-microvolt = <5000000>; + // regulator-max-microvolt = <5000000>; + // vin-supply = <&vmain_pd>; + // regulator-always-on; + // regulator-boot-on; + //}; vcc_3v3_sys: regulator-2 { /* output of LM61460-Q1 */ @@ -104,46 +104,46 @@ regulator-boot-on; }; - vdd_mmc1: fixed-regulator-sd { - /* TPS22918DBVR */ - compatible = "regulator-fixed"; - regulator-name = "vdd_mmc1"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - enable-active-high; - vin-supply = <&vcc_3v3_sys>; - gpio = <&exp1 3 GPIO_ACTIVE_HIGH>; - }; - - vdd_sd_dv: gpio-regulator-TLV71033 { - /* Output of TLV71033 */ - compatible = "regulator-gpio"; - regulator-name = "tlv71033"; - pinctrl-names = "default"; - pinctrl-0 = <&vdd_sd_dv_pins_default>; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - vin-supply = <&vcc_5v0>; - gpios = <&main_gpio0 31 GPIO_ACTIVE_HIGH>; - states = <1800000 0x0>, - <3300000 0x1>; - }; - - leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&usr_led_pins_default>; - - led-0 { - label = "am62-sk:green:heartbeat"; - gpios = <&main_gpio1 49 GPIO_ACTIVE_HIGH>; - linux,default-trigger = "heartbeat"; - function = LED_FUNCTION_HEARTBEAT; - default-state = "off"; - }; - }; + //vdd_mmc1: fixed-regulator-sd { + // /* TPS22918DBVR */ + // compatible = "regulator-fixed"; + // regulator-name = "vdd_mmc1"; + // regulator-min-microvolt = <3300000>; + // regulator-max-microvolt = <3300000>; + // regulator-boot-on; + // enable-active-high; + // vin-supply = <&vcc_3v3_sys>; + // gpio = <&exp1 3 GPIO_ACTIVE_HIGH>; + //}; + + //vdd_sd_dv: gpio-regulator-TLV71033 { + // /* Output of TLV71033 */ + // compatible = "regulator-gpio"; + // regulator-name = "tlv71033"; + // pinctrl-names = "default"; + // pinctrl-0 = <&vdd_sd_dv_pins_default>; + // regulator-min-microvolt = <1800000>; + // regulator-max-microvolt = <3300000>; + // regulator-boot-on; + // vin-supply = <&vcc_5v0>; + // gpios = <&main_gpio0 31 GPIO_ACTIVE_HIGH>; + // states = <1800000 0x0>, + // <3300000 0x1>; + //}; + + //leds { + // compatible = "gpio-leds"; + // pinctrl-names = "default"; + // pinctrl-0 = <&usr_led_pins_default>; + + // led-0 { + // label = "am62-sk:green:heartbeat"; + // gpios = <&main_gpio1 49 GPIO_ACTIVE_HIGH>; + // linux,default-trigger = "heartbeat"; + // function = LED_FUNCTION_HEARTBEAT; + // default-state = "off"; + // }; + //}; extcon_usb0: extcon-usb0 { compatible = "linux,extcon-usb-gpio"; @@ -386,12 +386,13 @@ &sdhci1 { /* SD/MMC */ - vmmc-supply = <&vdd_mmc1>; - vqmmc-supply = <&vdd_sd_dv>; + vmmc-supply = <&vcc_3v3_sys>; + //vqmmc-supply = <&vdd_sd_dv>; pinctrl-names = "default"; pinctrl-0 = <&main_mmc1_pins_default>; ti,driver-strength-ohm = <50>; disable-wp; + no-1-8-v; /* disabling all the UHS modes */ }; &usbss0 { diff --git a/arch/arm/mach-k3/am625_init.c b/arch/arm/mach-k3/am625_init.c index d103c73770..504b9a2b35 100644 --- a/arch/arm/mach-k3/am625_init.c +++ b/arch/arm/mach-k3/am625_init.c @@ -25,6 +25,9 @@ #define K3RTC_KICK0_UNLOCK_VALUE 0x83e70b13 #define K3RTC_KICK1_UNLOCK_VALUE 0x95a4f1e0 +/*eMMC boot mode fix */ +#define EMMC_BOOT 9 + #if defined(CONFIG_SPL_BUILD) /* @@ -245,6 +248,10 @@ u32 spl_mmc_boot_mode(const u32 boot_device) switch (boot_device) { case BOOT_DEVICE_MMC1: + if (((devstat & MAIN_DEVSTAT_PRIMARY_BOOTMODE_MASK) >> + MAIN_DEVSTAT_PRIMARY_BOOTMODE_SHIFT) == EMMC_BOOT) + return MMCSD_MODE_EMMCBOOT; + if ((bootmode_cfg & MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_MASK) >> MAIN_DEVSTAT_PRIMARY_MMC_FS_RAW_SHIFT) return MMCSD_MODE_EMMCBOOT; diff --git a/configs/am62x_evm_a53_defconfig b/configs/am62x_evm_a53_defconfig index d9bf9a5b7d..509500dc2b 100644 --- a/configs/am62x_evm_a53_defconfig +++ b/configs/am62x_evm_a53_defconfig @@ -82,7 +82,7 @@ CONFIG_MULTI_DTB_FIT=y CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_SYS_MMC_ENV_PART=1 +CONFIG_SYS_MMC_ENV_PART=2 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SPL_DM=y @@ -124,8 +124,8 @@ CONFIG_MMC_IO_VOLTAGE=y CONFIG_SPL_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y CONFIG_SPL_MMC_UHS_SUPPORT=y -CONFIG_MMC_HS200_SUPPORT=y -CONFIG_SPL_MMC_HS200_SUPPORT=y +CONFIG_MMC_HS200_SUPPORT=n +CONFIG_SPL_MMC_HS200_SUPPORT=n CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_ADMA=y CONFIG_SPL_MMC_SDHCI_ADMA=y diff --git a/configs/am62x_evm_r5_defconfig b/configs/am62x_evm_r5_defconfig index 18a619cdc1..7bb26b040f 100644 --- a/configs/am62x_evm_r5_defconfig +++ b/configs/am62x_evm_r5_defconfig @@ -10,9 +10,9 @@ CONFIG_SOC_K3_AM625=y CONFIG_TARGET_AM625_R5_EVM=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0x680000 -CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 +# CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000 CONFIG_DM_GPIO=y -CONFIG_SPL_DM_SPI=y +CONFIG_SPL_DM_SPI=n CONFIG_SPL_TEXT_BASE=0x43c00000 CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y @@ -24,8 +24,8 @@ CONFIG_SPL_SIZE_LIMIT_SUBTRACT_GD=y CONFIG_SPL_SIZE_LIMIT_PROVIDE_STACK=0x3500 CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y -CONFIG_SPL_SPI_FLASH_SUPPORT=y -CONFIG_SPL_SPI_SUPPORT=y +CONFIG_SPL_SPI_FLASH_SUPPORT=n +CONFIG_SPL_SPI_SUPPORT=n CONFIG_DEFAULT_DEVICE_TREE="k3-am625-r5-sk" CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x80080000 @@ -42,15 +42,15 @@ CONFIG_SPL_DMA=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_I2C_SUPPORT=y CONFIG_SPL_DM_MAILBOX=y -CONFIG_SPL_DM_SPI_FLASH=y +CONFIG_SPL_DM_SPI_FLASH=n CONFIG_SPL_DM_RESET=y CONFIG_SPL_POWER_DOMAIN=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_REMOTEPROC=y # CONFIG_SPL_SPI_FLASH_TINY is not set -CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y -CONFIG_SPL_SPI_LOAD=y +CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=n +CONFIG_SPL_SPI_LOAD=n CONFIG_SPL_THERMAL=y CONFIG_SPL_YMODEM_SUPPORT=y CONFIG_HUSH_PARSER=y