Now that we have an updated NAND driver in place that (exclusively) supports the new binding, drop our override, so the new driver is used instead. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- arch/arm/dts/at91-sama5d3_xplained.dts | 26 -------------------------- arch/arm/dts/sama5d3.dtsi | 16 ---------------- 2 files changed, 42 deletions(-) diff --git a/arch/arm/dts/at91-sama5d3_xplained.dts b/arch/arm/dts/at91-sama5d3_xplained.dts index cdb29ca6669e..b734457214eb 100644 --- a/arch/arm/dts/at91-sama5d3_xplained.dts +++ b/arch/arm/dts/at91-sama5d3_xplained.dts @@ -22,29 +22,3 @@ /* Will be automatically read back from HW */ /delete-node/ &{/memory@20000000}; - -&nand_controller { - nand@3 { - compatible = "atmel,at91rm9200-nand"; - #address-cells = <1>; - #size-cells = <1>; - reg = < 0x60000000 0x01000000 /* EBI CS3 */ - 0xffffc070 0x00000490 /* SMC PMECC regs */ - 0xffffc500 0x00000100 /* SMC PMECC Error Location regs */ - 0x00110000 0x00018000 /* ROM code */ - >; - interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>; - atmel,nand-addr-offset = <21>; - atmel,nand-cmd-offset = <22>; - atmel,nand-has-dma; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_nand0_ale_cle>; - atmel,pmecc-lookup-table-offset = <0x10000 0x8000>; - - atmel,has-pmecc; - atmel,pmecc-cap = <4>; - atmel,pmecc-sector-size = <512>; - status = "okay"; - }; -}; - diff --git a/arch/arm/dts/sama5d3.dtsi b/arch/arm/dts/sama5d3.dtsi index 2301ad135b3b..84fc1d0ed431 100644 --- a/arch/arm/dts/sama5d3.dtsi +++ b/arch/arm/dts/sama5d3.dtsi @@ -5,19 +5,3 @@ mmc1 = &mmc1; }; }; - -&ebi { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - -}; - -&nand_controller { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <1>; - ranges; - -}; -- 2.30.2