You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
118 lines
2.6 KiB
Diff
118 lines
2.6 KiB
Diff
From 9b95b301b219df19c20f4a563f1da6338b09b0d0 Mon Sep 17 00:00:00 2001
|
|
From: Linus Walleij <linus.walleij@linaro.org>
|
|
Date: Tue, 31 Dec 2019 18:14:28 +0100
|
|
Subject: [PATCH 3/7] ARM: dts: gemini: Rename IDE nodes
|
|
|
|
By renaming the ATA drive nodes to "ide@" we activate the
|
|
semantic checks to the DT schema for the controller and use
|
|
the correct notation for PATA drives.
|
|
|
|
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
arch/arm/boot/dts/gemini-dlink-dir-685.dts | 2 +-
|
|
arch/arm/boot/dts/gemini-dlink-dns-313.dts | 2 +-
|
|
arch/arm/boot/dts/gemini-nas4220b.dts | 4 ++--
|
|
arch/arm/boot/dts/gemini-sl93512r.dts | 4 ++--
|
|
arch/arm/boot/dts/gemini-sq201.dts | 2 +-
|
|
arch/arm/boot/dts/gemini.dtsi | 8 ++++++--
|
|
6 files changed, 13 insertions(+), 9 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/gemini-dlink-dir-685.dts
|
|
+++ b/arch/arm/boot/dts/gemini-dlink-dir-685.dts
|
|
@@ -443,7 +443,7 @@
|
|
};
|
|
};
|
|
|
|
- ata@63000000 {
|
|
+ ide@63000000 {
|
|
status = "okay";
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
|
|
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
|
|
@@ -297,7 +297,7 @@
|
|
};
|
|
};
|
|
|
|
- ata@63000000 {
|
|
+ ide@63000000 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
--- a/arch/arm/boot/dts/gemini-nas4220b.dts
|
|
+++ b/arch/arm/boot/dts/gemini-nas4220b.dts
|
|
@@ -170,11 +170,11 @@
|
|
};
|
|
};
|
|
|
|
- ata@63000000 {
|
|
+ ide@63000000 {
|
|
status = "okay";
|
|
};
|
|
|
|
- ata@63400000 {
|
|
+ ide@63400000 {
|
|
status = "okay";
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/gemini-sl93512r.dts
|
|
+++ b/arch/arm/boot/dts/gemini-sl93512r.dts
|
|
@@ -293,11 +293,11 @@
|
|
};
|
|
};
|
|
|
|
- ata@63000000 {
|
|
+ ide@63000000 {
|
|
status = "okay";
|
|
};
|
|
|
|
- ata@63400000 {
|
|
+ ide@63400000 {
|
|
status = "okay";
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/gemini-sq201.dts
|
|
+++ b/arch/arm/boot/dts/gemini-sq201.dts
|
|
@@ -289,7 +289,7 @@
|
|
};
|
|
};
|
|
|
|
- ata@63000000 {
|
|
+ ide@63000000 {
|
|
status = "okay";
|
|
};
|
|
|
|
--- a/arch/arm/boot/dts/gemini.dtsi
|
|
+++ b/arch/arm/boot/dts/gemini.dtsi
|
|
@@ -356,7 +356,7 @@
|
|
};
|
|
};
|
|
|
|
- ata@63000000 {
|
|
+ ide@63000000 {
|
|
compatible = "cortina,gemini-pata", "faraday,ftide010";
|
|
reg = <0x63000000 0x1000>;
|
|
interrupts = <4 IRQ_TYPE_EDGE_RISING>;
|
|
@@ -365,9 +365,11 @@
|
|
clock-names = "PCLK";
|
|
sata = <&sata>;
|
|
status = "disabled";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
};
|
|
|
|
- ata@63400000 {
|
|
+ ide@63400000 {
|
|
compatible = "cortina,gemini-pata", "faraday,ftide010";
|
|
reg = <0x63400000 0x1000>;
|
|
interrupts = <5 IRQ_TYPE_EDGE_RISING>;
|
|
@@ -376,6 +378,8 @@
|
|
clock-names = "PCLK";
|
|
sata = <&sata>;
|
|
status = "disabled";
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
};
|
|
|
|
dma-controller@67000000 {
|