Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-02-15 10:23:48 +0100
committerJiri Slaby <jslaby@suse.cz>2019-02-15 10:24:03 +0100
commit0454872a2c6c822d239e8165b156addfa3268627 (patch)
tree4422957e27b43acb6a44c97cf8d8b6b5996a9f86
parent199280b2dcb2997bba983727addb3e80b0e50cb7 (diff)
MIPS: Use lower case for addresses in nexys4ddr.dts
-rw-r--r--patches.kernel.org/4.20.9-024-MIPS-Use-lower-case-for-addresses-in-nexys4ddr.patch64
-rw-r--r--series.conf1
2 files changed, 65 insertions, 0 deletions
diff --git a/patches.kernel.org/4.20.9-024-MIPS-Use-lower-case-for-addresses-in-nexys4ddr.patch b/patches.kernel.org/4.20.9-024-MIPS-Use-lower-case-for-addresses-in-nexys4ddr.patch
new file mode 100644
index 0000000000..ddf15d86a5
--- /dev/null
+++ b/patches.kernel.org/4.20.9-024-MIPS-Use-lower-case-for-addresses-in-nexys4ddr.patch
@@ -0,0 +1,64 @@
+From: Paul Burton <paul.burton@mips.com>
+Date: Mon, 4 Feb 2019 19:53:53 +0000
+Subject: [PATCH] MIPS: Use lower case for addresses in nexys4ddr.dts
+References: bnc#1012628
+Patch-mainline: 4.20.9
+Git-commit: 047f2d941b8b24cadd6a4a09e606b7f41188ba3e
+
+commit 047f2d941b8b24cadd6a4a09e606b7f41188ba3e upstream.
+
+DTC introduced an i2c_bus_reg check in v1.4.7, used since Linux v4.20,
+which complains about upper case addresses used in the unit name.
+
+nexys4ddr.dts names an I2C device node "ad7420@4B", leading to:
+
+ arch/mips/boot/dts/xilfpga/nexys4ddr.dts:109.16-112.8: Warning
+ (i2c_bus_reg): /i2c@10A00000/ad7420@4B: I2C bus unit address format
+ error, expected "4b"
+
+Fix this by switching to lower case addresses throughout the file, as is
+*mostly* the case in the file already & fairly standard throughout the
+tree.
+
+Signed-off-by: Paul Burton <paul.burton@mips.com>
+Cc: stable@vger.kernel.org # v4.20+
+Cc: linux-mips@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/mips/boot/dts/xilfpga/nexys4ddr.dts | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/arch/mips/boot/dts/xilfpga/nexys4ddr.dts b/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
+index 2152b7ba65fb..cc8dbea0911f 100644
+--- a/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
++++ b/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
+@@ -90,11 +90,11 @@
+ interrupts = <0>;
+ };
+
+- axi_i2c: i2c@10A00000 {
++ axi_i2c: i2c@10a00000 {
+ compatible = "xlnx,xps-iic-2.00.a";
+ interrupt-parent = <&axi_intc>;
+ interrupts = <4>;
+- reg = < 0x10A00000 0x10000 >;
++ reg = < 0x10a00000 0x10000 >;
+ clocks = <&ext>;
+ xlnx,clk-freq = <0x5f5e100>;
+ xlnx,family = "Artix7";
+@@ -106,9 +106,9 @@
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+- ad7420@4B {
++ ad7420@4b {
+ compatible = "adi,adt7420";
+- reg = <0x4B>;
++ reg = <0x4b>;
+ };
+ } ;
+ };
+--
+2.20.1
+
diff --git a/series.conf b/series.conf
index 2a45145798..ad7d526d68 100644
--- a/series.conf
+++ b/series.conf
@@ -1106,6 +1106,7 @@
patches.kernel.org/4.20.9-021-tracing-uprobes-Fix-output-for-multiple-string.patch
patches.kernel.org/4.20.9-022-tracing-uprobes-Fix-typo-in-pr_fmt-string.patch
patches.kernel.org/4.20.9-023-mips-cm-reprime-error-cause.patch
+ patches.kernel.org/4.20.9-024-MIPS-Use-lower-case-for-addresses-in-nexys4ddr.patch
########################################################
# Build fixes that apply to the vanilla kernel too.