mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-18 12:51:40 +00:00
Helios4 - kernel patch clean-up / consolidation
This commit is contained in:
parent
75a40bcfdb
commit
494d6b0376
5 changed files with 2 additions and 73 deletions
|
@ -1,21 +0,0 @@
|
|||
diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
index 1075535..2045dc0 100644
|
||||
--- a/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
+++ b/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
@@ -244,16 +244,6 @@
|
||||
µsom_spi1_cs_pins>;
|
||||
pinctrl-names = "default";
|
||||
status = "okay";
|
||||
-
|
||||
- spi-flash@0 {
|
||||
- #address-cells = <1>;
|
||||
- #size-cells = <1>;
|
||||
- compatible = "w25q32", "jedec,spi-nor";
|
||||
- reg = <0>; /* Chip select 0 */
|
||||
- spi-max-frequency = <104000000>;
|
||||
- spi-cpha;
|
||||
- status = "okay";
|
||||
- };
|
||||
};
|
||||
|
||||
sdhci@d8000 {
|
|
@ -1,7 +1,3 @@
|
|||
arch/arm/boot/dts/Makefile | 1 +
|
||||
arch/arm/boot/dts/armada-388-helios4.dts | 309 +++++++++++++++++++++
|
||||
2 files changed, 310 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
|
||||
index 4b17f35..c6b6038 100644
|
||||
--- a/arch/arm/boot/dts/Makefile
|
||||
|
@ -14,12 +10,13 @@ index 4b17f35..c6b6038 100644
|
|||
armada-388-db.dtb \
|
||||
armada-388-gp.dtb \
|
||||
armada-388-rd.dtb
|
||||
|
||||
diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
new file mode 100644
|
||||
index 0000000..93d0132
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
@@ -0,0 +1,309 @@
|
||||
@@ -0,0 +1,295 @@
|
||||
+/*
|
||||
+ * Device Tree file for Helios4
|
||||
+ * based on SolidRun Clearfog revision A1 rev 2.0 (88F6828)
|
||||
|
@ -199,11 +196,6 @@ index 0000000..93d0132
|
|||
+ status = "okay";
|
||||
+ vmmc = <®_3p3v>;
|
||||
+ wp-inverted;
|
||||
+ max-frequency = <50000000>;
|
||||
+ cap-sd-highspeed;
|
||||
+ sd-uhs-sdr12;
|
||||
+ sd-uhs-sdr25;
|
||||
+ sd-uhs-sdr50;
|
||||
+ };
|
||||
+
|
||||
+ usb@58000 {
|
||||
|
@ -320,12 +312,3 @@ index 0000000..93d0132
|
|||
+ marvell,function = "gpio";
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&spi1 {
|
||||
+ status = "okay";
|
||||
+
|
||||
+ spi-flash@0 {
|
||||
+ spi-max-frequency = <104000000>;
|
||||
+ status = "okay";
|
||||
+ };
|
||||
+};
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
index 93d0132..47699bd 100644
|
||||
--- a/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
+++ b/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
@@ -298,12 +298,3 @@
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
};
|
||||
-
|
||||
-&spi1 {
|
||||
- status = "okay";
|
||||
-
|
||||
- spi-flash@0 {
|
||||
- spi-max-frequency = <104000000>;
|
||||
- status = "okay";
|
||||
- };
|
||||
-};
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/arch/arm/boot/dts/armada-388-helios4.dts b/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
index 47699bd..4a5e8fc 100644
|
||||
--- a/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
+++ b/arch/arm/boot/dts/armada-388-helios4.dts
|
||||
@@ -177,11 +177,6 @@
|
||||
status = "okay";
|
||||
vmmc = <®_3p3v>;
|
||||
wp-inverted;
|
||||
- max-frequency = <50000000>;
|
||||
- cap-sd-highspeed;
|
||||
- sd-uhs-sdr12;
|
||||
- sd-uhs-sdr25;
|
||||
- sd-uhs-sdr50;
|
||||
};
|
||||
|
||||
usb@58000 {
|
Loading…
Add table
Reference in a new issue