From 13f7374e21d34cadc90e3a066c4c60ea9d2bb9a5 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 12 Feb 2020 20:31:31 -0800 Subject: [PATCH] 4.9-stable patches added patches: pinctrl-sh-pfc-r8a7778-fix-duplicate-sdself_b-and-sd1_clk_b.patch --- ...fix-duplicate-sdself_b-and-sd1_clk_b.patch | 41 +++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 queue-4.9/pinctrl-sh-pfc-r8a7778-fix-duplicate-sdself_b-and-sd1_clk_b.patch diff --git a/queue-4.9/pinctrl-sh-pfc-r8a7778-fix-duplicate-sdself_b-and-sd1_clk_b.patch b/queue-4.9/pinctrl-sh-pfc-r8a7778-fix-duplicate-sdself_b-and-sd1_clk_b.patch new file mode 100644 index 00000000000..ad65e552a96 --- /dev/null +++ b/queue-4.9/pinctrl-sh-pfc-r8a7778-fix-duplicate-sdself_b-and-sd1_clk_b.patch @@ -0,0 +1,41 @@ +From 805f635703b2562b5ddd822c62fc9124087e5dd5 Mon Sep 17 00:00:00 2001 +From: Geert Uytterhoeven +Date: Wed, 18 Dec 2019 20:48:07 +0100 +Subject: pinctrl: sh-pfc: r8a7778: Fix duplicate SDSELF_B and SD1_CLK_B + +From: Geert Uytterhoeven + +commit 805f635703b2562b5ddd822c62fc9124087e5dd5 upstream. + +The FN_SDSELF_B and FN_SD1_CLK_B enum IDs are used twice, which means +one set of users must be wrong. Replace them by the correct enum IDs. + +Fixes: 87f8c988636db0d4 ("sh-pfc: Add r8a7778 pinmux support") +Signed-off-by: Geert Uytterhoeven +Link: https://lore.kernel.org/r/20191218194812.12741-2-geert+renesas@glider.be +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/pinctrl/sh-pfc/pfc-r8a7778.c ++++ b/drivers/pinctrl/sh-pfc/pfc-r8a7778.c +@@ -2324,7 +2324,7 @@ static const struct pinmux_cfg_reg pinmu + FN_ATAG0_A, 0, FN_REMOCON_B, 0, + /* IP0_11_8 [4] */ + FN_SD1_DAT2_A, FN_MMC_D2, 0, FN_BS, +- FN_ATADIR0_A, 0, FN_SDSELF_B, 0, ++ FN_ATADIR0_A, 0, FN_SDSELF_A, 0, + FN_PWM4_B, 0, 0, 0, + 0, 0, 0, 0, + /* IP0_7_5 [3] */ +@@ -2366,7 +2366,7 @@ static const struct pinmux_cfg_reg pinmu + FN_TS_SDAT0_A, 0, 0, 0, + 0, 0, 0, 0, + /* IP1_10_8 [3] */ +- FN_SD1_CLK_B, FN_MMC_D6, 0, FN_A24, ++ FN_SD1_CD_A, FN_MMC_D6, 0, FN_A24, + FN_DREQ1_A, 0, FN_HRX0_B, FN_TS_SPSYNC0_A, + /* IP1_7_5 [3] */ + FN_A23, FN_HTX0_B, FN_TX2_B, FN_DACK2_A, diff --git a/queue-4.9/series b/queue-4.9/series index 35e7557bf27..191623fb210 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -107,3 +107,4 @@ arm-dts-at91-sama5d3-fix-maximum-peripheral-clock-rates.patch arm-dts-at91-sama5d3-define-clock-rate-range-for-tcb1.patch tools-power-acpi-fix-compilation-error.patch powerpc-pseries-allow-not-having-ibm-hypertas-functions-hcall-multi-tce-for-ddw.patch +pinctrl-sh-pfc-r8a7778-fix-duplicate-sdself_b-and-sd1_clk_b.patch -- 2.47.3