diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-25 23:35:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-25 23:35:53 -0500 |
| commit | 1234d178a8ec508fb709cd2f331725b0108bf581 (patch) | |
| tree | 5a3e7b51c0d9d572e5526ac7518e5329f23d4829 /arch | |
| parent | 133276f14acfbad4268acd19a70d3cda0a60b5e3 (diff) | |
| parent | ce92b89c4005d8c712e166fba98ea4207f1391e2 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-mpc85xx
- Update Sata node for T2080QDS and revert SATA related unrequired
patches.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/powerpc/dts/t2080.dtsi | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 8cc82f80b4..6fc6ea8fef 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -352,6 +352,7 @@ config TARGET_T2080QDS select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE select FSL_DDR_INTERACTIVE + imply CMD_SATA config TARGET_T2080RDB bool "Support T2080RDB" @@ -360,7 +361,6 @@ config TARGET_T2080RDB select SUPPORT_SPL select PHYS_64BIT imply CMD_SATA - imply FSL_SATA imply PANIC_HANG config TARGET_T2081QDS @@ -1099,8 +1099,10 @@ config ARCH_T2080 select SYS_FSL_SEC_COMPAT_4 select SYS_PPC64 select FSL_IFC + imply CMD_SATA imply CMD_NAND imply CMD_REGINFO + imply FSL_SATA config ARCH_T2081 bool diff --git a/arch/powerpc/dts/t2080.dtsi b/arch/powerpc/dts/t2080.dtsi index 999fa8cec4..458019ae92 100644 --- a/arch/powerpc/dts/t2080.dtsi +++ b/arch/powerpc/dts/t2080.dtsi @@ -88,20 +88,13 @@ phy_type = "utmi"; }; - sata0: sata@220000 { + sata: sata@220000 { compatible = "fsl,pq-sata-v2"; reg = <0x220000 0x1000>; interrupts = <68 0x2 0 0>; - sata-number = <0x0>; - sata-fpdma = <0x0>; - }; - - sata1: sata@221000 { - compatible = "fsl,pq-sata-v2"; - reg = <0x221000 0x1000>; - interrupts = <69 0x2 0 0>; - sata-number = <0x0>; - sata-fpdma = <0x0>; + sata-offset = <0x1000>; + sata-number = <2>; + sata-fpdma = <0>; }; }; |