diff options
| author | Tom Rini <trini@konsulko.com> | 2019-04-17 09:19:45 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-04-17 09:19:45 -0400 |
| commit | 4b37f36d68ebb79cdc7d68a539de71e28e954d11 (patch) | |
| tree | c982cc1d42e8eeb28dc1dc31d027e1fe145f113d /include | |
| parent | 14b8c420b88a90e7ca0c979a2ee413bf459941e8 (diff) | |
| parent | f8c8669760610b2949d8d9ccaeef8231a44d4205 (diff) | |
| download | u-boot-4b37f36d68ebb79cdc7d68a539de71e28e954d11.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
- Convert DM_MMC and DM_SCSI
- A20, R40, H6 Linux dts(i) sync
- CLK, RESET support for sunxi, sun8_emac net drivers
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sunxi-common.h | 6 | ||||
| -rw-r--r-- | include/dt-bindings/clock/sun8i-tcon-top.h | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index ee18260be69..a498393472b 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -104,13 +104,7 @@ #define PHYS_SDRAM_0_SIZE 0x80000000 /* 2 GiB */ #ifdef CONFIG_AHCI -#define CONFIG_SCSI_AHCI_PLAT -#define CONFIG_SUNXI_AHCI #define CONFIG_SYS_64BIT_LBA -#define CONFIG_SYS_SCSI_MAX_SCSI_ID 1 -#define CONFIG_SYS_SCSI_MAX_LUN 1 -#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ - CONFIG_SYS_SCSI_MAX_LUN) #endif #define CONFIG_SETUP_MEMORY_TAGS diff --git a/include/dt-bindings/clock/sun8i-tcon-top.h b/include/dt-bindings/clock/sun8i-tcon-top.h new file mode 100644 index 00000000000..25164d76783 --- /dev/null +++ b/include/dt-bindings/clock/sun8i-tcon-top.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ +/* Copyright (C) 2018 Jernej Skrabec <jernej.skrabec@siol.net> */ + +#ifndef _DT_BINDINGS_CLOCK_SUN8I_TCON_TOP_H_ +#define _DT_BINDINGS_CLOCK_SUN8I_TCON_TOP_H_ + +#define CLK_TCON_TOP_TV0 0 +#define CLK_TCON_TOP_TV1 1 +#define CLK_TCON_TOP_DSI 2 + +#endif /* _DT_BINDINGS_CLOCK_SUN8I_TCON_TOP_H_ */ |