pinctrl: sh-pfc: r8a7795: Rename SEL_SCIF to SEL_SATA
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 9 Nov 2015 08:56:21 +0000 (09:56 +0100)
committerGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 30 Nov 2015 12:41:34 +0000 (13:41 +0100)
Cfr. Manual Errata for Rev 0.50 of the R-Car Gen3 datasheet.

This has no user-visible impact.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/sh-pfc/pfc-r8a7795.c

index 29d001b8a727e154a053fced803f8c3da699f0c0..bb5f37cbb9502d5f2a6343aa9809bc0bd18ef652 100644 (file)
@@ -495,7 +495,7 @@ FM(IP16_31_28)      IP16_31_28
 #define MOD_SEL1_13            FM(SEL_SCIF3_0)         FM(SEL_SCIF3_1)
 #define MOD_SEL1_12            FM(SEL_SCIF2_0)         FM(SEL_SCIF2_1)
 #define MOD_SEL1_11            FM(SEL_SCIF1_0)         FM(SEL_SCIF1_1)
-#define MOD_SEL1_10            FM(SEL_SCIF_0)          FM(SEL_SCIF_1)
+#define MOD_SEL1_10            FM(SEL_SATA_0)          FM(SEL_SATA_1)
 #define MOD_SEL1_9             FM(SEL_REMOCON_0)       FM(SEL_REMOCON_1)
 #define MOD_SEL1_6             FM(SEL_RCAN0_0)         FM(SEL_RCAN0_1)
 #define MOD_SEL1_5             FM(SEL_PWM6_0)          FM(SEL_PWM6_1)
@@ -1033,7 +1033,7 @@ static const u16 pinmux_data[] = {
        PINMUX_IPSR_DATA(IP9_19_16,     SD2_DAT3),
 
        PINMUX_IPSR_DATA(IP9_23_20,     SD2_DS),
-       PINMUX_IPSR_MSEL(IP9_23_20,     SATA_DEVSLP_B,          SEL_SCIF_1),
+       PINMUX_IPSR_MSEL(IP9_23_20,     SATA_DEVSLP_B,          SEL_SATA_1),
 
        PINMUX_IPSR_DATA(IP9_27_24,     SD3_DAT4),
        PINMUX_IPSR_MSEL(IP9_27_24,     SD2_CD_A,               SEL_SDHI2_0),
@@ -1293,7 +1293,7 @@ static const u16 pinmux_data[] = {
 
        PINMUX_IPSR_DATA(IP15_11_8,     SSI_SDATA6),
        PINMUX_IPSR_MSEL(IP15_11_8,     SIM0_CLK_D,             SEL_SIMCARD_3),
-       PINMUX_IPSR_MSEL(IP15_11_8,     SATA_DEVSLP_A,          SEL_SCIF_0),
+       PINMUX_IPSR_MSEL(IP15_11_8,     SATA_DEVSLP_A,          SEL_SATA_0),
 
        PINMUX_IPSR_DATA(IP15_15_12,    SSI_SCK78),
        PINMUX_IPSR_MSEL(IP15_15_12,    HRX2_B,                 SEL_HSCIF2_1),