summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-03 16:07:01 +0300
committerTom Rini <trini@konsulko.com>2021-08-03 16:07:01 +0300
commitb91c70433386d133c842729c5d9b109cdcc79399 (patch)
tree26ec8aeb2cf89311f4894a8dafc79ce242ac4674 /arch
parent3b64774323298362f9833aac75bb4639b4f98999 (diff)
parent18f3afa4be879a9f591518a8f623b30f8b39917d (diff)
downloadu-boot-b91c70433386d133c842729c5d9b109cdcc79399.tar.xz
Merge https://source.denx.de/u-boot/custodians/u-boot-samsung
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/dts/exynos5250-smdk5250.dts1
-rw-r--r--arch/arm/mach-exynos/include/mach/sromc.h18
3 files changed, 2 insertions, 18 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2b7b625705..3a745ce126 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -661,6 +661,7 @@ config ARCH_EXYNOS
select DM
select DM_GPIO
select DM_I2C
+ select DM_ETH
select DM_KEYBOARD
select DM_SERIAL
select DM_SPI
diff --git a/arch/arm/dts/exynos5250-smdk5250.dts b/arch/arm/dts/exynos5250-smdk5250.dts
index e542a79076..afe0cca48a 100644
--- a/arch/arm/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/dts/exynos5250-smdk5250.dts
@@ -41,6 +41,7 @@
};
sromc@12250000 {
+ compatible = "samsung,exynos5-sromc";
bank = <1>;
srom-timing = <1 9 12 1 6 1 1>;
width = <2>;
diff --git a/arch/arm/mach-exynos/include/mach/sromc.h b/arch/arm/mach-exynos/include/mach/sromc.h
index 15c9ccc723..ac229e0d16 100644
--- a/arch/arm/mach-exynos/include/mach/sromc.h
+++ b/arch/arm/mach-exynos/include/mach/sromc.h
@@ -33,22 +33,4 @@ struct s5p_sromc {
/* Configure the Band Width and Bank Control Regs for required SROMC Bank */
void s5p_config_sromc(u32 srom_bank, u32 srom_bw_conf, u32 srom_bc_conf);
-enum {
- FDT_SROM_PMC,
- FDT_SROM_TACP,
- FDT_SROM_TAH,
- FDT_SROM_TCOH,
- FDT_SROM_TACC,
- FDT_SROM_TCOS,
- FDT_SROM_TACS,
-
- FDT_SROM_TIMING_COUNT,
-};
-
-struct fdt_sromc {
- u8 bank; /* srom bank number */
- u8 width; /* bus width in bytes */
- unsigned int timing[FDT_SROM_TIMING_COUNT]; /* timing parameters */
-};
-
#endif /* __ASM_ARCH_SROMC_H_ */