diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
| commit | 4b6e1fda107e5244e80ebc41865650ac2873dc88 (patch) | |
| tree | f448089740af77c2987d12e2dd5b753b7659586f /arch/arm | |
| parent | 27bec5c12757c80f598b704477c1bc6c250bcb4c (diff) | |
| parent | 341392dd115f1385c31bb0b034ec15f542730e30 (diff) | |
| download | talos-obmc-uboot-4b6e1fda107e5244e80ebc41865650ac2873dc88.tar.gz talos-obmc-uboot-4b6e1fda107e5244e80ebc41865650ac2873dc88.zip | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/exynos4210-universal_c210.dts | 10 | ||||
| -rw-r--r-- | arch/arm/dts/tegra20-seaboard.dts | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-ls102xa/config.h | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/dts/exynos4210-universal_c210.dts b/arch/arm/dts/exynos4210-universal_c210.dts index 16948c9342..ad3527ec6f 100644 --- a/arch/arm/dts/exynos4210-universal_c210.dts +++ b/arch/arm/dts/exynos4210-universal_c210.dts @@ -42,11 +42,11 @@ }; soft-spi { - compatible = "u-boot,soft-spi"; - cs-gpio = <&gpy4 3 0>; - sclk-gpio = <&gpy3 1 0>; - mosi-gpio = <&gpy3 3 0>; - miso-gpio = <&gpy3 0 0>; + compatible = "spi-gpio"; + cs-gpios = <&gpy4 3 0>; + gpio-sck = <&gpy3 1 0>; + gpio-mosi = <&gpy3 3 0>; + gpio-miso = <&gpy3 0 0>; spi-delay-us = <1>; #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts index eada59073e..5893d2a3f8 100644 --- a/arch/arm/dts/tegra20-seaboard.dts +++ b/arch/arm/dts/tegra20-seaboard.dts @@ -40,10 +40,6 @@ nvidia,panel = <&lcd_panel>; }; }; - - dc@54240000 { - status = "disabled"; - }; }; /* This is not used in U-Boot, but is expected to be in kernel .dts */ diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index 267bd17727..d77c04a86a 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -82,7 +82,7 @@ /* SATA */ #define AHCI_BASE_ADDR (CONFIG_SYS_IMMR + 0x02200000) #define CONFIG_BOARD_LATE_INIT -#define CONFIG_CMD_SCSI +#define CONFIG_SCSI #define CONFIG_LIBATA #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT |
