From: Greg Kroah-Hartman Date: Wed, 7 Mar 2018 17:36:42 +0000 (-0800) Subject: 4.4-stable patches X-Git-Tag: v4.14.25~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5f094cb716a72191f34253d7dee750f6137e7a8;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch --- diff --git a/queue-4.4/arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch b/queue-4.4/arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch new file mode 100644 index 00000000000..3fc1b02b8d0 --- /dev/null +++ b/queue-4.4/arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch @@ -0,0 +1,51 @@ +From 74402055a2d3ec998a1ded599e86185a27d9bbf4 Mon Sep 17 00:00:00 2001 +From: Adam Ford +Date: Thu, 25 Jan 2018 14:10:37 -0600 +Subject: ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux + +From: Adam Ford + +commit 74402055a2d3ec998a1ded599e86185a27d9bbf4 upstream. + +The pinmuxing was missing for I2C1 which was causing intermittent issues +with the PMIC which is connected to I2C1. The bootloader did not quite +configure the I2C1 either, so when running at 2.6MHz, it was generating +errors at time. + +This correctly sets the I2C1 pinmuxing so it can operate at 2.6MHz + +Fixes: 687c27676151 ("ARM: dts: Add minimal support for LogicPD Torpedo +DM3730 devkit") + +Signed-off-by: Adam Ford +Signed-off-by: Tony Lindgren +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 8 ++++++++ + 1 file changed, 8 insertions(+) + +--- a/arch/arm/boot/dts/logicpd-torpedo-som.dtsi ++++ b/arch/arm/boot/dts/logicpd-torpedo-som.dtsi +@@ -90,6 +90,8 @@ + }; + + &i2c1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&i2c1_pins>; + clock-frequency = <2600000>; + + twl: twl@48 { +@@ -146,6 +148,12 @@ + OMAP3630_CORE2_IOPAD(0x25da, PIN_INPUT_PULLUP | MUX_MODE2) /* etk_ctl.sdmmc3_cmd */ + >; + }; ++ i2c1_pins: pinmux_i2c1_pins { ++ pinctrl-single,pins = < ++ OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */ ++ OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */ ++ >; ++ }; + }; + + #include "twl4030.dtsi" diff --git a/queue-4.4/series b/queue-4.4/series index beeebc35d1e..e6adac52e23 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -10,3 +10,4 @@ arm-mvebu-fix-broken-pl310_errata_753970-selects.patch kvm-mmu-fix-overlap-between-public-and-private-memslots.patch x86-syscall-sanitize-syscall-table-de-references-under-speculation-fix.patch btrfs-don-t-clear-sgid-when-inheriting-acls.patch +arm-dts-logicpd-torpedo-fix-i2c1-pinmux.patch