diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/dts/imx6q-logicpd-u-boot.dtsi | 18 | ||||
-rw-r--r-- | arch/arm/mach-k3/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-k3/common.c | 20 | ||||
-rw-r--r-- | arch/arm/mach-k3/include/mach/sys_proto.h | 2 |
4 files changed, 41 insertions, 1 deletions
diff --git a/arch/arm/dts/imx6q-logicpd-u-boot.dtsi b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi new file mode 100644 index 0000000000..625bed8f7d --- /dev/null +++ b/arch/arm/dts/imx6q-logicpd-u-boot.dtsi @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Logic PD <aford173@gmail.com> + */ + +#include "imx6qdl-u-boot.dtsi" + +&uart1 { + u-boot,dm-spl; +}; + +&usdhc1 { + u-boot,dm-spl; +}; + +&usdhc2 { + u-boot,dm-spl; +}; diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 9652c96a78..de1c1cc73f 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -98,7 +98,7 @@ config K3_SYSFW_IMAGE_MMCSD_RAW_MODE_PART config K3_SYSFW_IMAGE_SIZE_MAX int "Amount of memory dynamically allocated for loading SYSFW blob" depends on K3_LOAD_SYSFW - default 269000 + default 276000 help Amount of memory (in bytes) reserved through dynamic allocation at runtime for loading the combined System Firmware and configuration image diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 3e36d90ace..c16afc654f 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -137,6 +137,26 @@ int fdt_fixup_msmc_ram(void *blob, char *parent_path, char *node_name) return 0; } + +int fdt_disable_node(void *blob, char *node_path) +{ + int offs; + int ret; + + offs = fdt_path_offset(blob, node_path); + if (offs < 0) { + debug("Node %s not found.\n", node_path); + return 0; + } + ret = fdt_setprop_string(blob, offs, "status", "disabled"); + if (ret < 0) { + printf("Could not add status property to node %s: %s\n", + node_path, fdt_strerror(ret)); + return ret; + } + return 0; +} + #endif #ifndef CONFIG_SYSRESET diff --git a/arch/arm/mach-k3/include/mach/sys_proto.h b/arch/arm/mach-k3/include/mach/sys_proto.h index 45832b45a1..3c825aa3d1 100644 --- a/arch/arm/mach-k3/include/mach/sys_proto.h +++ b/arch/arm/mach-k3/include/mach/sys_proto.h @@ -14,4 +14,6 @@ struct ti_sci_handle *get_ti_sci_handle(void); int fdt_fixup_msmc_ram(void *blob, char *parent_path, char *node_name); int do_board_detect(void); void release_resources_for_core_shutdown(void); +int fdt_disable_node(void *blob, char *node_path); + #endif |