| Message ID | 20180730114008.30464-4-codrin.ciubotariu@microchip.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: at91: sama5d2: Add nodes for I2S | expand |
Hi Codrin, On 30.07.2018 14:40, Codrin Ciubotariu wrote: > From: Cyrille Pitchen <cyrille.pitchen@atmel.com> > > This patch sets the pin muxing for the I2S controllers > > Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com> > [codrin.ciubotariu@microchip.com: added pin muxing for the second > controller] > Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> > --- > > Changes in v6: > - none; > > arch/arm/boot/dts/at91-sama5d2_xplained.dts | 28 +++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts > index fcc85d70f36e..95cbec0f8790 100644 > --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts > +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts > @@ -281,6 +281,11 @@ > status = "okay"; > }; > > + i2s0: i2s@f8050000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2s0_default>; The approach with the disabled controllers in board DTS files (for our boards) is to use the: status = "disabled" and if there are pin conflicts with other controllers to put a mark in there, something like: status = "disabled"; /* Conflict with X */ I'm seeing that i2s1 is in conflict with sdmmc1 and spi0. Thank you, Claudiu Beznea > + }; > + > can0: can@f8054000 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_can0_default>; > @@ -424,6 +429,24 @@ > bias-disable; > }; > > + pinctrl_i2s0_default: i2s0_default { > + pinmux = <PIN_PC1__I2SC0_CK>, > + <PIN_PC2__I2SC0_MCK>, > + <PIN_PC3__I2SC0_WS>, > + <PIN_PC4__I2SC0_DI0>, > + <PIN_PC5__I2SC0_DO0>; > + bias-disable; > + }; > + > + pinctrl_i2s1_default: i2s1_default { > + pinmux = <PIN_PA15__I2SC1_CK>, > + <PIN_PA14__I2SC1_MCK>, > + <PIN_PA16__I2SC1_WS>, > + <PIN_PA17__I2SC1_DI0>, > + <PIN_PA18__I2SC1_DO0>; > + bias-disable; > + }; > + > pinctrl_key_gpio_default: key_gpio_default { > pinmux = <PIN_PB9__GPIO>; > bias-pull-up; > @@ -546,6 +569,11 @@ > status = "okay"; > }; > > + i2s1: i2s@fc04c000 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_i2s1_default>; > + }; > + > can1: can@fc050000 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_can1_default>; >
On 30.07.2018 16:49, Claudiu Beznea wrote: > Hi Codrin, > > On 30.07.2018 14:40, Codrin Ciubotariu wrote: >> From: Cyrille Pitchen <cyrille.pitchen@atmel.com> >> >> This patch sets the pin muxing for the I2S controllers >> >> Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com> >> [codrin.ciubotariu@microchip.com: added pin muxing for the second >> controller] >> Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> >> --- >> >> Changes in v6: >> - none; >> >> arch/arm/boot/dts/at91-sama5d2_xplained.dts | 28 +++++++++++++++++++++ >> 1 file changed, 28 insertions(+) >> >> diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts >> index fcc85d70f36e..95cbec0f8790 100644 >> --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts >> +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts >> @@ -281,6 +281,11 @@ >> status = "okay"; >> }; >> >> + i2s0: i2s@f8050000 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2s0_default>; > > The approach with the disabled controllers in board DTS files (for our > boards) is to use the: status = "disabled" and if there are pin conflicts > with other controllers to put a mark in there, something like: > status = "disabled"; /* Conflict with X */ > > I'm seeing that i2s1 is in conflict with sdmmc1 and spi0. Ok, I will disable them and add the pin conflicts in the next version. Thank you for your review. Best regards, Codrin
diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index fcc85d70f36e..95cbec0f8790 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -281,6 +281,11 @@ status = "okay"; }; + i2s0: i2s@f8050000 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2s0_default>; + }; + can0: can@f8054000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_can0_default>; @@ -424,6 +429,24 @@ bias-disable; }; + pinctrl_i2s0_default: i2s0_default { + pinmux = <PIN_PC1__I2SC0_CK>, + <PIN_PC2__I2SC0_MCK>, + <PIN_PC3__I2SC0_WS>, + <PIN_PC4__I2SC0_DI0>, + <PIN_PC5__I2SC0_DO0>; + bias-disable; + }; + + pinctrl_i2s1_default: i2s1_default { + pinmux = <PIN_PA15__I2SC1_CK>, + <PIN_PA14__I2SC1_MCK>, + <PIN_PA16__I2SC1_WS>, + <PIN_PA17__I2SC1_DI0>, + <PIN_PA18__I2SC1_DO0>; + bias-disable; + }; + pinctrl_key_gpio_default: key_gpio_default { pinmux = <PIN_PB9__GPIO>; bias-pull-up; @@ -546,6 +569,11 @@ status = "okay"; }; + i2s1: i2s@fc04c000 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2s1_default>; + }; + can1: can@fc050000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_can1_default>;