On 3/18/21 2:52 AM, Bhaskar Chowdhury wrote:
> 
> s/conlicts/conflicts/
> 
> Signed-off-by: Bhaskar Chowdhury <unixbhas...@gmail.com>

Acked-by: Randy Dunlap <rdun...@infradead.org>

> ---
>  arch/arm/boot/dts/sama5d3.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
> index 7c979652f330..d1841bffe3c5 100644
> --- a/arch/arm/boot/dts/sama5d3.dtsi
> +++ b/arch/arm/boot/dts/sama5d3.dtsi
> @@ -709,7 +709,7 @@ pinctrl_mmc0_dat4_7: mmc0_dat4_7 {
>                                               atmel,pins =
>                                                       <AT91_PIOD 5 
> AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD5 periph A MCI0_DA4 with pullup, 
> conflicts with TIOA0, PWMH2 */
>                                                        AT91_PIOD 6 
> AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD6 periph A MCI0_DA5 with pullup, 
> conflicts with TIOB0, PWML2 */
> -                                                      AT91_PIOD 7 
> AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD7 periph A MCI0_DA6 with pullup, 
> conlicts with TCLK0, PWMH3 */
> +                                                      AT91_PIOD 7 
> AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD7 periph A MCI0_DA6 with pullup, 
> conflicts with TCLK0, PWMH3 */
>                                                        AT91_PIOD 8 
> AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;       /* PD8 periph A MCI0_DA7 with 
> pullup, conflicts with PWML3 */
>                                       };
>                               };
> --
> 2.26.2
> 


-- 
~Randy

Reply via email to