diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-01-26 11:09:22 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2016-04-04 10:33:16 +0200 |
| commit | 91011a7605822cd9c16eabcd1cc11ae31d604bfd (patch) | |
| tree | 8f2e757014ada28ce752f32b962109d715b1f501 /arch/arm/boot/dts/integrator.dtsi | |
| parent | ARM: versatile: move flash registration to the device tree (diff) | |
| download | linux-91011a7605822cd9c16eabcd1cc11ae31d604bfd.tar.xz linux-91011a7605822cd9c16eabcd1cc11ae31d604bfd.zip | |
ARM: integrator: move flash registration to device tree
The flash on the Integrator was already defined by the device
tree, but VPP control and flash protection was in the
boardfiles. Simply add the compatible string
"arm,versatile-flash" and the special add-on code for flash
programming voltage and protection kicks in in the MTD
layer.
Remove the board file code and augment the device tree in
one go for seamless transition.
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/integrator.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/integrator.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/integrator.dtsi b/arch/arm/boot/dts/integrator.dtsi index b82f0e6d9a63..6fe0dd1d3541 100644 --- a/arch/arm/boot/dts/integrator.dtsi +++ b/arch/arm/boot/dts/integrator.dtsi @@ -52,8 +52,9 @@ }; flash@24000000 { - compatible = "cfi-flash"; + compatible = "arm,versatile-flash", "cfi-flash"; reg = <0x24000000 0x02000000>; + bank-width = <4>; }; fpga { |