Message ID | 1420538486-1420-1-git-send-email-yoshihiro.shimoda.uh@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 6d40530e4789b3e2f14d61ca57ab02bd5395d5c9 |
Headers | show |
Hi Shimoda-san, On Tue, Jan 6, 2015 at 11:01 AM, Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> wrote: > Since the FLD bit field is bit[3:2], the MDR1_FLD_MASK value should > be 0x0000000c. Thanks, my mistake. Fortunately the definition is not used. > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Shimoda-san, On Tue, Jan 6, 2015 at 11:01 AM, Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> wrote: > Since the FLD bit field is bit[3:2], the MDR1_FLD_MASK value should > be 0x0000000c. This patch doesn't apply, since Mark has applied your other patch "spi: sh-msiof: Configure MSIOF sync signal timing in device tree". Please rebase on top of spi/for-next (or renesas-drivers-2015-01-06-v3.19-rc3). Thanks! Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Geert-san, > Hi Shimoda-san, > > On Tue, Jan 6, 2015 at 11:01 AM, Yoshihiro Shimoda > <yoshihiro.shimoda.uh@renesas.com> wrote: > > Since the FLD bit field is bit[3:2], the MDR1_FLD_MASK value should > > be 0x0000000c. > > This patch doesn't apply, since Mark has applied your other patch > "spi: sh-msiof: Configure MSIOF sync signal timing in device tree". > > Please rebase on top of spi/for-next (or renesas-drivers-2015-01-06-v3.19-rc3). Oops. Thank you for the point. I used spi/for-linux branch. So, I will rebase on top of spi/for-next. Best regards, Yoshihiro Shimoda > Thanks! > > Gr{oetje,eeting}s, > > Geert > > -- > Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org > > In personal conversations with technical people, I call myself a hacker. But > when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds > -- > To unsubscribe from this list: send the line "unsubscribe linux-sh" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Jan 06, 2015 at 10:57:32AM +0000, yoshihiro shimoda wrote: > > This patch doesn't apply, since Mark has applied your other patch > > "spi: sh-msiof: Configure MSIOF sync signal timing in device tree". > > > > Please rebase on top of spi/for-next (or renesas-drivers-2015-01-06-v3.19-rc3). > Oops. Thank you for the point. > I used spi/for-linux branch. So, I will rebase on top of spi/for-next. Actually since it's a fix I applied it on a fix branch anyway and merged.
Hi Mark, > > On Tue, Jan 06, 2015 at 10:57:32AM +0000, yoshihiro shimoda wrote: > > > > This patch doesn't apply, since Mark has applied your other patch > > > "spi: sh-msiof: Configure MSIOF sync signal timing in device tree". > > > > > > Please rebase on top of spi/for-next (or renesas-drivers-2015-01-06-v3.19-rc3). > > > Oops. Thank you for the point. > > I used spi/for-linux branch. So, I will rebase on top of spi/for-next. > > Actually since it's a fix I applied it on a fix branch anyway and > merged. Thank you! I already submitted v2 patch, but please ignore it. Best regards, Yoshihiro Shimoda -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 96a5fc0..3ab7a21 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -82,7 +82,7 @@ struct sh_msiof_spi_priv { #define MDR1_SYNCMD_LR 0x30000000 /* L/R mode */ #define MDR1_SYNCAC_SHIFT 25 /* Sync Polarity (1 = Active-low) */ #define MDR1_BITLSB_SHIFT 24 /* MSB/LSB First (1 = LSB first) */ -#define MDR1_FLD_MASK 0x000000c0 /* Frame Sync Signal Interval (0-3) */ +#define MDR1_FLD_MASK 0x0000000c /* Frame Sync Signal Interval (0-3) */ #define MDR1_FLD_SHIFT 2 #define MDR1_XXSTP 0x00000001 /* Transmission/Reception Stop on FIFO */ /* TMDR1 */
Since the FLD bit field is bit[3:2], the MDR1_FLD_MASK value should be 0x0000000c. Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> --- drivers/spi/spi-sh-msiof.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)