<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Oct 13, 2016 at 5:07 PM, Joel Stanley <span dir="ltr"><<a href="mailto:joel@jms.id.au" target="_blank">joel@jms.id.au</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Fri, Sep 30, 2016 at 7:27 AM, <<a href="mailto:maxims@google.com">maxims@google.com</a>> wrote:<br>
> From: Maxim Sloyko <<a href="mailto:maxims@google.com">maxims@google.com</a>><br>
><br>
> Fixed FUC -> FUN typo in SCU.<br>
<br>
</span>This lacks a signed off by as previously discussed.<br>
<br>
You have not made a convincing argument for this change. I suggest you<br>
drop the patch from your series.<br></blockquote><div><br></div><div>Are you against this change per se or just against it being in this patch series?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Cheers,<br>
<br>
Joel<br>
<div><div class="h5"><br>
> ---<br>
> arch/arm/include/asm/arch-<wbr>aspeed/regs-scu.h | 65 +++++++++++++++--------------<br>
> arch/arm/mach-aspeed/ast-scu.c | 2 +-<br>
> 2 files changed, 34 insertions(+), 33 deletions(-)<br>
><br>
> diff --git a/arch/arm/include/asm/arch-<wbr>aspeed/regs-scu.h b/arch/arm/include/asm/arch-<wbr>aspeed/regs-scu.h<br>
> index b714fa9..aab032a 100644<br>
> --- a/arch/arm/include/asm/arch-<wbr>aspeed/regs-scu.h<br>
> +++ b/arch/arm/include/asm/arch-<wbr>aspeed/regs-scu.h<br>
> @@ -830,49 +830,50 @@<br>
> /* AST_SCU_FUN_PIN_CTRL5 0x90 - Multi-function Pin Control#5 */<br>
> #define SCU_FUN_PIN_SPICS1 (0x1 << 31)<br>
> #define SCU_FUN_PIN_LPC_PLUS (0x1 << 30)<br>
> -#define SCU_FUC_PIN_USB20_HOST (0x1 << 29)<br>
> -#define SCU_FUC_PIN_USB11_PORT4 (0x1 << 28)<br>
> -#define SCU_FUC_PIN_I2C14 (0x1 << 27)<br>
> -#define SCU_FUC_PIN_I2C13 (0x1 << 26)<br>
> -#define SCU_FUC_PIN_I2C12 (0x1 << 25)<br>
> -#define SCU_FUC_PIN_I2C11 (0x1 << 24)<br>
> -#define SCU_FUC_PIN_I2C10 (0x1 << 23)<br>
> -#define SCU_FUC_PIN_I2C9 (0x1 << 22)<br>
> -#define SCU_FUC_PIN_I2C8 (0x1 << 21)<br>
> -#define SCU_FUC_PIN_I2C7 (0x1 << 20)<br>
> -#define SCU_FUC_PIN_I2C6 (0x1 << 19)<br>
> -#define SCU_FUC_PIN_I2C5 (0x1 << 18)<br>
> -#define SCU_FUC_PIN_I2C4 (0x1 << 17)<br>
> -#define SCU_FUC_PIN_I2C3 (0x1 << 16)<br>
> -#define SCU_FUC_PIN_MII2_RX_DWN_DIS (0x1 << 15)<br>
> -#define SCU_FUC_PIN_MII2_TX_DWN_DIS (0x1 << 14)<br>
> -#define SCU_FUC_PIN_MII1_RX_DWN_DIS (0x1 << 13)<br>
> -#define SCU_FUC_PIN_MII1_TX_DWN_DIS (0x1 << 12)<br>
> -<br>
> -#define SCU_FUC_PIN_MII2_TX_DRIV(x) (x << 10)<br>
> -#define SCU_FUC_PIN_MII2_TX_DRIV_MASK (0x3 << 10)<br>
> -#define SCU_FUC_PIN_MII1_TX_DRIV(x) (x << 8)<br>
> -#define SCU_FUC_PIN_MII1_TX_DRIV_MASK (0x3 << 8)<br>
> +#define SCU_FUN_PIN_USB20_HOST (0x1 << 29)<br>
> +#define SCU_FUN_PIN_USB11_PORT4 (0x1 << 28)<br>
> +#define SCU_FUN_PIN_I2C14 (0x1 << 27)<br>
> +#define SCU_FUN_PIN_I2C13 (0x1 << 26)<br>
> +#define SCU_FUN_PIN_I2C12 (0x1 << 25)<br>
> +#define SCU_FUN_PIN_I2C11 (0x1 << 24)<br>
> +#define SCU_FUN_PIN_I2C10 (0x1 << 23)<br>
> +#define SCU_FUN_PIN_I2C9 (0x1 << 22)<br>
> +#define SCU_FUN_PIN_I2C8 (0x1 << 21)<br>
> +#define SCU_FUN_PIN_I2C7 (0x1 << 20)<br>
> +#define SCU_FUN_PIN_I2C6 (0x1 << 19)<br>
> +#define SCU_FUN_PIN_I2C5 (0x1 << 18)<br>
> +#define SCU_FUN_PIN_I2C4 (0x1 << 17)<br>
> +#define SCU_FUN_PIN_I2C3 (0x1 << 16)<br>
> +#define SCU_FUN_PIN_I2C(n) (0x1 << (16 + (n) - 3))<br>
> +#define SCU_FUN_PIN_MII2_RX_DWN_DIS (0x1 << 15)<br>
> +#define SCU_FUN_PIN_MII2_TX_DWN_DIS (0x1 << 14)<br>
> +#define SCU_FUN_PIN_MII1_RX_DWN_DIS (0x1 << 13)<br>
> +#define SCU_FUN_PIN_MII1_TX_DWN_DIS (0x1 << 12)<br>
> +<br>
> +#define SCU_FUN_PIN_MII2_TX_DRIV(x) (x << 10)<br>
> +#define SCU_FUN_PIN_MII2_TX_DRIV_MASK (0x3 << 10)<br>
> +#define SCU_FUN_PIN_MII1_TX_DRIV(x) (x << 8)<br>
> +#define SCU_FUN_PIN_MII1_TX_DRIV_MASK (0x3 << 8)<br>
><br>
> #define MII_NORMAL_DRIV 0x0<br>
> #define MII_HIGH_DRIV 0x2<br>
><br>
> -#define SCU_FUC_PIN_UART6 (0x1 << 7)<br>
> -#define SCU_FUC_PIN_ROM_16BIT (0x1 << 6)<br>
> -#define SCU_FUC_PIN_DIGI_V_OUT(x) (x)<br>
> -#define SCU_FUC_PIN_DIGI_V_OUT_MASK (0x3)<br>
> +#define SCU_FUN_PIN_UART6 (0x1 << 7)<br>
> +#define SCU_FUN_PIN_ROM_16BIT (0x1 << 6)<br>
> +#define SCU_FUN_PIN_DIGI_V_OUT(x) (x)<br>
> +#define SCU_FUN_PIN_DIGI_V_OUT_MASK (0x3)<br>
><br>
> #define VIDEO_DISABLE 0x0<br>
> #define VIDEO_12BITS 0x1<br>
> #define VIDEO_24BITS 0x2<br>
> //#define VIDEO_DISABLE 0x3<br>
><br>
> -#define SCU_FUC_PIN_USB11_PORT2 (0x1 << 3)<br>
> -#define SCU_FUC_PIN_SD1_8BIT (0x1 << 3)<br>
> +#define SCU_FUN_PIN_USB11_PORT2 (0x1 << 3)<br>
> +#define SCU_FUN_PIN_SD1_8BIT (0x1 << 3)<br>
><br>
> -#define SCU_FUC_PIN_MAC1_MDIO (0x1 << 2)<br>
> -#define SCU_FUC_PIN_SD2 (0x1 << 1)<br>
> -#define SCU_FUC_PIN_SD1 (0x1 << 0)<br>
> +#define SCU_FUN_PIN_MAC1_MDIO (0x1 << 2)<br>
> +#define SCU_FUN_PIN_SD2 (0x1 << 1)<br>
> +#define SCU_FUN_PIN_SD1 (0x1 << 0)<br>
><br>
><br>
> /* AST_SCU_FUN_PIN_CTRL6 0x94 - Multi-function Pin Control#6*/<br>
> diff --git a/arch/arm/mach-aspeed/ast-<wbr>scu.c b/arch/arm/mach-aspeed/ast-<wbr>scu.c<br>
> index 0cc0d67..280c421 100644<br>
> --- a/arch/arm/mach-aspeed/ast-<wbr>scu.c<br>
> +++ b/arch/arm/mach-aspeed/ast-<wbr>scu.c<br>
> @@ -394,7 +394,7 @@ void ast_scu_multi_func_eth(u8 num)<br>
> AST_SCU_FUN_PIN_CTRL1);<br>
><br>
> ast_scu_write(ast_scu_read(<wbr>AST_SCU_FUN_PIN_CTRL5) |<br>
> - SCU_FUC_PIN_MAC1_MDIO,<br>
> + SCU_FUN_PIN_MAC1_MDIO,<br>
> AST_SCU_FUN_PIN_CTRL5);<br>
><br>
> break;<br>
> --<br>
> 2.8.0.rc3.226.g39d4020<br>
><br>
</div></div>> ______________________________<wbr>_________________<br>
> openbmc mailing list<br>
> <a href="mailto:openbmc@lists.ozlabs.org">openbmc@lists.ozlabs.org</a><br>
> <a href="https://lists.ozlabs.org/listinfo/openbmc" rel="noreferrer" target="_blank">https://lists.ozlabs.org/<wbr>listinfo/openbmc</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div><b>M</b>axim <b>S</b>loyko</div></div>
</div></div>