Commit 44506752 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'at91-ab-4.13-dt-fixes' of...

Merge tag 'at91-ab-4.13-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes

Pull "DT fixes for 4.13" from Alexandre Belloni:

 - Fix NAND flash support for sama5d2

* tag 'at91-ab-4.13-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: sama5d2: fix EBI/NAND controllers declaration
  ARM: dts: at91: sama5d2: use sama5d2 compatible string for SMC
parents 64c2c372 8ff235fe
...@@ -303,7 +303,7 @@ ebi: ebi@10000000 { ...@@ -303,7 +303,7 @@ ebi: ebi@10000000 {
#size-cells = <1>; #size-cells = <1>;
atmel,smc = <&hsmc>; atmel,smc = <&hsmc>;
reg = <0x10000000 0x10000000 reg = <0x10000000 0x10000000
0x40000000 0x30000000>; 0x60000000 0x30000000>;
ranges = <0x0 0x0 0x10000000 0x10000000 ranges = <0x0 0x0 0x10000000 0x10000000
0x1 0x0 0x60000000 0x10000000 0x1 0x0 0x60000000 0x10000000
0x2 0x0 0x70000000 0x10000000 0x2 0x0 0x70000000 0x10000000
...@@ -1048,18 +1048,18 @@ tcb1: timer@f8010000 { ...@@ -1048,18 +1048,18 @@ tcb1: timer@f8010000 {
}; };
hsmc: hsmc@f8014000 { hsmc: hsmc@f8014000 {
compatible = "atmel,sama5d3-smc", "syscon", "simple-mfd"; compatible = "atmel,sama5d2-smc", "syscon", "simple-mfd";
reg = <0xf8014000 0x1000>; reg = <0xf8014000 0x1000>;
interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>; interrupts = <17 IRQ_TYPE_LEVEL_HIGH 6>;
clocks = <&hsmc_clk>; clocks = <&hsmc_clk>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
pmecc: ecc-engine@ffffc070 { pmecc: ecc-engine@f8014070 {
compatible = "atmel,sama5d2-pmecc"; compatible = "atmel,sama5d2-pmecc";
reg = <0xffffc070 0x490>, reg = <0xf8014070 0x490>,
<0xffffc500 0x100>; <0xf8014500 0x100>;
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment