fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/arm-dts-add-pinmuxing-for-i2c2-and-i2c3-for-logicpd-.patch b/queue-4.14/arm-dts-add-pinmuxing-for-i2c2-and-i2c3-for-logicpd-.patch
new file mode 100644 (file)
index 0000000..96ad436
--- /dev/null
+++ b/queue-4.14/arm-dts-add-pinmuxing-for-i2c2-and-i2c3-for-logicpd-.patch
@@ -0,0 +1,58 @@
+From da7ac83e0430c48a667fcfcd9bc1329803c73ea1 Mon Sep 17 00:00:00 2001
+From: Adam Ford <aford173@gmail.com>
+Date: Thu, 15 Feb 2018 08:25:56 -0600
+Subject: ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD SOM-LV
+
+[ Upstream commit 5fe3c0fa0d54877c65e7c9b4442aeeb25cdf469a ]
+
+Since I2C1 and I2C4 have explicit pinmuxing set, let's be on the
+safe side and set the pin muxing for I2C2 and I2C3.
+
+Signed-off-by: Adam Ford <aford173@gmail.com>
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm/boot/dts/logicpd-som-lv.dtsi | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi
+index a7883676f675c..b144a6a5d3523 100644
+--- a/arch/arm/boot/dts/logicpd-som-lv.dtsi
++++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi
+@@ -115,10 +115,14 @@
+ };
+ 
+ &i2c2 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&i2c2_pins>;
+       clock-frequency = <400000>;
+ };
+ 
+ &i2c3 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&i2c3_pins>;
+       clock-frequency = <400000>;
+ };
+ 
+@@ -241,6 +245,18 @@
+                       OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)        /* sys_boot1.gpio_3 */
+               >;
+       };
++      i2c2_pins: pinmux_i2c2_pins {
++              pinctrl-single,pins = <
++                      OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)        /* i2c2_scl */
++                      OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)        /* i2c2_sda */
++              >;
++      };
++      i2c3_pins: pinmux_i2c3_pins {
++              pinctrl-single,pins = <
++                      OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)        /* i2c3_scl */
++                      OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)        /* i2c3_sda */
++              >;
++      };
+ };
+ 
+ &omap3_pmx_core2 {
+-- 
+2.20.1
+

diff --git a/queue-4.14/arm-dts-add-pinmuxing-for-i2c2-and-i2c3-for-logicpd-.patch-16786 b/queue-4.14/arm-dts-add-pinmuxing-for-i2c2-and-i2c3-for-logicpd-.patch-16786
new file mode 100644 (file)
index 0000000..bb4d1d1
--- /dev/null
+++ b/queue-4.14/arm-dts-add-pinmuxing-for-i2c2-and-i2c3-for-logicpd-.patch-16786
@@ -0,0 +1,58 @@
+From c2c1eb86f40e958014d2f871784d695f0a720d4c Mon Sep 17 00:00:00 2001
+From: Adam Ford <aford173@gmail.com>
+Date: Thu, 15 Feb 2018 08:25:55 -0600
+Subject: ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD torpedo
+
+[ Upstream commit a135a392acbec7ecda782981788e8c03767a1571 ]
+
+Since I2C1 and I2C4 have explicit pinmuxing set, let's be on the
+safe side and set the pin muxing for I2C2 and I2C3.
+
+Signed-off-by: Adam Ford <aford173@gmail.com>
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+index cf22b35f0a289..fe4cbdc72359e 100644
+--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
++++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi
+@@ -121,10 +121,14 @@
+ };
+ 
+ &i2c2 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&i2c2_pins>;
+       clock-frequency = <400000>;
+ };
+ 
+ &i2c3 {
++      pinctrl-names = "default";
++      pinctrl-0 = <&i2c3_pins>;
+       clock-frequency = <400000>;
+       at24@50 {
+               compatible = "atmel,24c64";
+@@ -219,6 +223,18 @@
+                       OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0)        /* i2c1_sda.i2c1_sda */
+               >;
+       };
++      i2c2_pins: pinmux_i2c2_pins {
++              pinctrl-single,pins = <
++                      OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT | MUX_MODE0)        /* i2c2_scl */
++                      OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT | MUX_MODE0)        /* i2c2_sda */
++              >;
++      };
++      i2c3_pins: pinmux_i2c3_pins {
++              pinctrl-single,pins = <
++                      OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT | MUX_MODE0)        /* i2c3_scl */
++                      OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT | MUX_MODE0)        /* i2c3_sda */
++              >;
++      };
+ };
+ 
+ &uart2 {
+-- 
+2.20.1
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 2ed9af49ccd7d63dd7a08c14e4f1fe4fdf7ee0e2..3a9191476964b5cca049d4c7c2823da704520176 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -1 +1,3 @@
 scsi-fcoe-embed-fc_rport_priv-in-fcoe_rport-structure.patch
+arm-dts-add-pinmuxing-for-i2c2-and-i2c3-for-logicpd-.patch
+arm-dts-add-pinmuxing-for-i2c2-and-i2c3-for-logicpd-.patch-16786