On 12/05/2014 at 11:44:14 +0200, Nicolas Ferre wrote :
> Signed-off-by: Nicolas Ferre <nicolas.fe...@atmel.com>
Acked-by: Alexandre Belloni <alexandre.bell...@free-electrons.com>
> ---
> v1 -> v2: - removed useless comment part, kept the "conflicts with..." part
> - grouped "high" and "low" signal definitions together for each
> channel
>
> arch/arm/boot/dts/sama5d3.dtsi | 78
> ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 78 insertions(+)
>
> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
> index 9caa06b3641e..e08da17e1890 100644
> --- a/arch/arm/boot/dts/sama5d3.dtsi
> +++ b/arch/arm/boot/dts/sama5d3.dtsi
> @@ -583,6 +583,84 @@
> };
> };
>
> + pwm0 {
> + pinctrl_pwm0_pwmh0_0: pwm0_pwmh0-0 {
> + atmel,pins =
> + <AT91_PIOA 20
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with ISI_D4 and LCDDAT20 */
> + };
> + pinctrl_pwm0_pwmh0_1: pwm0_pwmh0-1 {
> + atmel,pins =
> + <AT91_PIOB 0
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GTX0 */
> + };
> + pinctrl_pwm0_pwml0_0: pwm0_pwml0-0 {
> + atmel,pins =
> + <AT91_PIOA 21
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with ISI_D5 and LCDDAT21 */
> + };
> + pinctrl_pwm0_pwml0_1: pwm0_pwml0-1 {
> + atmel,pins =
> + <AT91_PIOB 1
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GTX1 */
> + };
> +
> + pinctrl_pwm0_pwmh1_0: pwm0_pwmh1-0 {
> + atmel,pins =
> + <AT91_PIOA 22
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with ISI_D6 and LCDDAT22 */
> + };
> + pinctrl_pwm0_pwmh1_1: pwm0_pwmh1-1 {
> + atmel,pins =
> + <AT91_PIOB 4
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GRX0 */
> + };
> + pinctrl_pwm0_pwmh1_2: pwm0_pwmh1-2 {
> + atmel,pins =
> + <AT91_PIOB 27
> AT91_PERIPH_C AT91_PINCTRL_NONE>; /* conflicts with G125CKO and RTS1 */
> + };
> + pinctrl_pwm0_pwml1_0: pwm0_pwml1-0 {
> + atmel,pins =
> + <AT91_PIOA 23
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with ISI_D7 and LCDDAT23 */
> + };
> + pinctrl_pwm0_pwml1_1: pwm0_pwml1-1 {
> + atmel,pins =
> + <AT91_PIOB 5
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GRX1 */
> + };
> + pinctrl_pwm0_pwml1_2: pwm0_pwml1-2 {
> + atmel,pins =
> + <AT91_PIOE 31
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with IRQ */
> + };
> +
> + pinctrl_pwm0_pwmh2_0: pwm0_pwmh2-0 {
> + atmel,pins =
> + <AT91_PIOB 8
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GTXCK */
> + };
> + pinctrl_pwm0_pwmh2_1: pwm0_pwmh2-1 {
> + atmel,pins =
> + <AT91_PIOD 5
> AT91_PERIPH_C AT91_PINCTRL_NONE>; /* conflicts with MCI0_DA4 and TIOA0 */
> + };
> + pinctrl_pwm0_pwml2_0: pwm0_pwml2-0 {
> + atmel,pins =
> + <AT91_PIOB 9
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GTXEN */
> + };
> + pinctrl_pwm0_pwml2_1: pwm0_pwml2-1 {
> + atmel,pins =
> + <AT91_PIOD 6
> AT91_PERIPH_C AT91_PINCTRL_NONE>; /* conflicts with MCI0_DA5 and TIOB0 */
> + };
> +
> + pinctrl_pwm0_pwmh3_0: pwm0_pwmh3-0 {
> + atmel,pins =
> + <AT91_PIOB 12
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GRXDV */
> + };
> + pinctrl_pwm0_pwmh3_1: pwm0_pwmh3-1 {
> + atmel,pins =
> + <AT91_PIOD 7
> AT91_PERIPH_C AT91_PINCTRL_NONE>; /* conflicts with MCI0_DA6 and TCLK0 */
> + };
> + pinctrl_pwm0_pwml3_0: pwm0_pwml3-0 {
> + atmel,pins =
> + <AT91_PIOB 13
> AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with GRXER */
> + };
> + pinctrl_pwm0_pwml3_1: pwm0_pwml3-1 {
> + atmel,pins =
> + <AT91_PIOD 8
> AT91_PERIPH_C AT91_PINCTRL_NONE>; /* conflicts with MCI0_DA7 */
> + };
> + };
> +
> spi0 {
> pinctrl_spi0: spi0-0 {
> atmel,pins =
> --
> 1.8.2.2
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
