diff options
| author | Olof Johansson <olof@lixom.net> | 2017-09-01 16:45:36 -0700 | 
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-09-01 16:45:36 -0700 | 
| commit | e3e36ab37c9eac0f2a821806fea05c64f367304b (patch) | |
| tree | 7b82d1f636743ac17161bdd2224dfc7c6432c146 /arch/arm | |
| parent | ebc12a529bfd6589d271b736bcf32919f9d3328f (diff) | |
| parent | 2b17939d9ec4f5d8c50b6277a8e5c0e5a4a8c96b (diff) | |
| download | linux-e3e36ab37c9eac0f2a821806fea05c64f367304b.tar.bz2 | |
Merge tag 'at91-ab-4.14-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
DT for 4.14
 - sama5d2: add classD, ISC and QSPI
 - New SoM and board: sama5d27 SoM1
 - at91sam9g45: add AC97
* tag 'at91-ab-4.14-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: at91sam9g45: add AC97
  ARM: dts: at91: sama5d2_xplained: add pin muxing and enable classd
  ARM: dts: at91: sama5d2: add classd nodes
  ARM: dts: at91: sama5d2_xplained: use pin macros instead of numbers
  ARM: dts: at91: at91-sama5d27_som1_ek: Add sama5d27 SoM1 EK support
  ARM: dts: at91: at91-sama5d27_som1: add sama5d27 SoM1 support
  ARM: dts: at91: sama5d2: add isc node
  ARM: dts: at91: sama5d2: add QSPI nodes
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 102 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 537 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d2_xplained.dts | 39 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9g45.dtsi | 21 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9m10g45ek.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sama5d2.dtsi | 77 | 
7 files changed, 769 insertions, 12 deletions
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 0ef4e4fc8a04..faf46abaa4a2 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -46,6 +46,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \  	at91sam9x35ek.dtb  dtb-$(CONFIG_SOC_SAM_V7) += \  	at91-kizbox2.dtb \ +	at91-sama5d27_som1_ek.dtb \  	at91-sama5d2_xplained.dtb \  	at91-sama5d3_xplained.dtb \  	at91-tse850-3.dtb \ diff --git a/arch/arm/boot/dts/at91-sama5d27_som1.dtsi b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi new file mode 100644 index 000000000000..63a5af898165 --- /dev/null +++ b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi @@ -0,0 +1,102 @@ +/* + * at91-sama5d27_som1.dtsi - Device Tree file for SAMA5D27 SoM1 board + * + *  Copyright (c) 2017, Microchip Technology Inc. + *                2017 Cristian Birsan <cristian.birsan@microchip.com> + *                2017 Claudiu Beznea <claudiu.beznea@microchip.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + *  a) This file is free software; you can redistribute it and/or + *     modify it under the terms of the GNU General Public License as + *     published by the Free Software Foundation; either version 2 of the + *     License, or (at your option) any later version. + * + *     This file is distributed in the hope that it will be useful, + *     but WITHOUT ANY WARRANTY; without even the implied warranty of + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + *     GNU General Public License for more details. + * + * Or, alternatively, + * + *  b) Permission is hereby granted, free of charge, to any person + *     obtaining a copy of this software and associated documentation + *     files (the "Software"), to deal in the Software without + *     restriction, including without limitation the rights to use, + *     copy, modify, merge, publish, distribute, sublicense, and/or + *     sell copies of the Software, and to permit persons to whom the + *     Software is furnished to do so, subject to the following + *     conditions: + * + *     The above copyright notice and this permission notice shall be + *     included in all copies or substantial portions of the Software. + * + *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + *     OTHER DEALINGS IN THE SOFTWARE. + */ +#include "sama5d2.dtsi" +#include "sama5d2-pinfunc.h" + +/ { +	model = "Atmel SAMA5D27 SoM1"; +	compatible = "atmel,sama5d27-som1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5"; + +	clocks { +		slow_xtal { +			clock-frequency = <32768>; +		}; + +		main_xtal { +			clock-frequency = <24000000>; +		}; +	}; + +	ahb { +		apb { +			macb0: ethernet@f8008000 { +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_macb0_default>; +				phy-mode = "rmii"; + +				ethernet-phy@1 { +					reg = <0x1>; +					interrupt-parent = <&pioA>; +					interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>; +					pinctrl-names = "default"; +					pinctrl-0 = <&pinctrl_macb0_phy_irq>; +				}; +			}; + +			pinctrl@fc038000 { + +				pinctrl_macb0_default: macb0_default { +					pinmux = <PIN_PD9__GTXCK>, +						 <PIN_PD10__GTXEN>, +						 <PIN_PD11__GRXDV>, +						 <PIN_PD12__GRXER>, +						 <PIN_PD13__GRX0>, +						 <PIN_PD14__GRX1>, +						 <PIN_PD15__GTX0>, +						 <PIN_PD16__GTX1>, +						 <PIN_PD17__GMDC>, +						 <PIN_PD18__GMDIO>; +					bias-disable; +				}; + +				pinctrl_macb0_phy_irq: macb0_phy_irq { +					pinmux = <PIN_PD31__GPIO>; +					bias-disable; +				}; +			}; +		}; +	}; +}; diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts new file mode 100644 index 000000000000..9c9088c99cc4 --- /dev/null +++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts @@ -0,0 +1,537 @@ +/* + * at91-sama5d27_som1_ek.dts - Device Tree file for SAMA5D27-SOM1-EK board + * + *  Copyright (c) 2017, Microchip Technology Inc. + *                2016 Nicolas Ferre <nicolas.ferre@atmel.com> + *                2017 Cristian Birsan <cristian.birsan@microchip.com> + *                2017 Claudiu Beznea <claudiu.beznea@microchip.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + *  a) This file is free software; you can redistribute it and/or + *     modify it under the terms of the GNU General Public License as + *     published by the Free Software Foundation; either version 2 of the + *     License, or (at your option) any later version. + * + *     This file is distributed in the hope that it will be useful, + *     but WITHOUT ANY WARRANTY; without even the implied warranty of + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + *     GNU General Public License for more details. + * + * Or, alternatively, + * + *  b) Permission is hereby granted, free of charge, to any person + *     obtaining a copy of this software and associated documentation + *     files (the "Software"), to deal in the Software without + *     restriction, including without limitation the rights to use, + *     copy, modify, merge, publish, distribute, sublicense, and/or + *     sell copies of the Software, and to permit persons to whom the + *     Software is furnished to do so, subject to the following + *     conditions: + * + *     The above copyright notice and this permission notice shall be + *     included in all copies or substantial portions of the Software. + * + *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + *     OTHER DEALINGS IN THE SOFTWARE. + */ +/dts-v1/; +#include "at91-sama5d27_som1.dtsi" +#include <dt-bindings/mfd/atmel-flexcom.h> +#include <dt-bindings/gpio/gpio.h> + +/ { +	model = "Atmel SAMA5D27 SOM1 EK"; +	compatible = "atmel,sama5d27-som1-ek", "atmel,sama5d27-som1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5"; + +	chosen { +		stdout-path = "serial0:115200n8"; +	}; + +	ahb { +		usb0: gadget@00300000 { +			atmel,vbus-gpio = <&pioA PIN_PD20 GPIO_ACTIVE_HIGH>; +			pinctrl-names = "default"; +			pinctrl-0 = <&pinctrl_usba_vbus>; +			status = "okay"; +		}; + +		usb1: ohci@00400000 { +			num-ports = <3>; +			atmel,vbus-gpio = <&pioA PIN_PA10 GPIO_ACTIVE_HIGH>; +			pinctrl-names = "default"; +			pinctrl-0 = <&pinctrl_usb_default>; +			status = "okay"; +		}; + +		usb2: ehci@00500000 { +			status = "okay"; +		}; + +		sdmmc0: sdio-host@a0000000 { +			bus-width = <8>; +			pinctrl-names = "default"; +			pinctrl-0 = <&pinctrl_sdmmc0_default>; +			status = "okay"; +		}; + +		sdmmc1: sdio-host@b0000000 { +			bus-width = <4>; +			pinctrl-names = "default"; +			pinctrl-0 = <&pinctrl_sdmmc1_default>; +			status = "okay"; +		}; + +		apb { +			isc: isc@f0008000 { +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>; +				status = "okay"; +			}; + +			spi0: spi@f8000000 { +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_spi0_default>; +				status = "okay"; +			}; + +			macb0: ethernet@f8008000 { +				status = "okay"; +			}; + +			uart1: serial@f8020000 { +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_uart1_default>; +				atmel,use-dma-rx; +				atmel,use-dma-tx; +				status = "okay"; +			}; + +			uart2: serial@f8024000 { +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_mikrobus2_uart>; +				atmel,use-dma-rx; +				atmel-use-dma-tx; +				status = "okay"; +			}; + +			pwm0: pwm@f802c000 { +				status = "okay"; +			}; + +			flx1: flexcom@f8038000 { +				atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_TWI>; +				status = "disabled"; + +				i2c2: i2c@600 { +					compatible = "atmel,sama5d2-i2c"; +					reg = <0x600 0x200>; +					interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>; +					dmas = <0>, <0>; +					dma-names = "tx", "rx"; +					#address-cells = <1>; +					#size-cells = <0>; +					clocks = <&flx1_clk>; +					pinctrl-names = "default"; +					pinctrl-0 = <&pinctrl_mikrobus_i2c>; +					atmel,fifo-size = <16>; +					status = "disabled"; +				}; +			}; + +			shdwc@f8048010 { +				atmel,shdwc-debouncer = <976>; +				atmel,wakeup-rtc-timer; + +				input@0 { +					reg = <0>; +					atmel,wakeup-type = "low"; +				}; +			}; + +			watchdog@f8048040 { +				status = "okay"; +			}; + +			can0: can@f8054000 { +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_can0_default>; +			}; + +			uart3: serial@fc008000 { +				atmel,use-dma-rx; +				atmel,use-dma-tx; +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_uart3_default>; +				status = "disabled"; +			}; + +			uart4: serial@fc00c000 { +				atmel,use-dma-rx; +				atmel,use-dma-tx; +				pinctrl-name = "default"; +				pinctrl-0 = <&pinctrl_mikrobus1_uart>; +				status = "okay"; +			}; + +			flx3: flexcom@fc014000 { +				atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>; +				status = "disabled"; + +				uart7: serial@200 { +					compatible = "atmel,at91sam9260-usart"; +					reg = <0x200 0x200>; +					interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; +					clocks = <&flx3_clk>; +					clock-names = "usart"; +					pinctrl-names = "default"; +					pinctrl-0 = <&pinctrl_flx3_default>; +					atmel,fifo-size = <32>; +					status = "disabled"; +				}; + +				spi2: spi@400 { +					compatible = "atmel,at91rm9200-spi"; +					reg = <0x400 0x200>; +					interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; +					clocks = <&flx3_clk>; +					clock-names = "spi_clk"; +					pinctrl-names = "default"; +					pinctrl-0 = <&pinctrl_flx3_default>; +					atmel,fifo-size = <16>; +					status = "disabled"; +				}; +			}; + +			flx4: flexcom@fc018000 { +				atmel,flexcom-mode = <ATMEL_FLEXCOM_MODE_SPI>; +				status = "okay"; + +				uart6: serial@200 { +					compatible = "atmel,at91sam9260-usart"; +					reg = <0x200 0x200>; +					interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>; +					clocks = <&flx4_clk>; +					clock-names = "usart"; +					pinctrl-names = "default"; +					pinctrl-0 = <&pinctrl_flx4_default>; +					atmel,fifo-size = <32>; +					status = "disabled"; +				}; + +				spi3: spi@400 { +					compatible = "atmel,at91rm9200-spi"; +					reg = <0x400 0x200>; +					interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>; +					clocks = <&flx4_clk>; +					clock-names = "spi_clk"; +					pinctrl-names = "default"; +					pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>; +					atmel,fifo-size = <16>; +					status = "okay"; +				}; + +				i2c3: i2c@600 { +					compatible = "atmel,sama5d2-i2c"; +					reg = <0x600 0x200>; +					interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>; +					dmas = <0>, <0>; +					dma-names = "tx", "rx"; +					#address-cells = <1>; +					#size-cells = <0>; +					clocks = <&flx4_clk>; +					pinctrl-names = "default"; +					pinctrl-0 = <&pinctrl_flx4_default>; +					atmel,fifo-size = <16>; +					status = "disabled"; +				}; +			}; + +			i2c1: i2c@fc028000 { +				dmas = <0>, <0>; +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_i2c1_default>; +				status = "okay"; +			}; + +			pinctrl@fc038000 { + +				pinctrl_can0_default: can0_default { +					pinmux = <PIN_PC10__CANTX0>, +						 <PIN_PC11__CANRX0>; +					bias-disable; +				}; + +				pinctrl_can1_default: can1_default { +					pinmux = <PIN_PC26__CANTX1>, +						 <PIN_PC27__CANRX1>; +					bias-disable; +				}; + +				pinctrl_flx3_default: flx3_default { +					pinmux = <PIN_PC20__FLEXCOM3_IO0>, +						 <PIN_PC19__FLEXCOM3_IO1>, +						 <PIN_PC18__FLEXCOM3_IO2>, +						 <PIN_PC21__FLEXCOM3_IO3>, +						 <PIN_PC22__FLEXCOM3_IO4>; +					bias-disable; +				}; + +				pinctrl_i2c1_default: i2c1_default { +					pinmux = <PIN_PD4__TWD1>, +						 <PIN_PD5__TWCK1>; +					bias-disable; +				}; + +				pinctrl_isc_base: isc_base { +					pinmux = <PIN_PC21__ISC_PCK>, +						 <PIN_PC22__ISC_VSYNC>, +						 <PIN_PC23__ISC_HSYNC>, +						 <PIN_PC24__ISC_MCK>; +					bias-disable; +				}; + +				pinctrl_isc_data_8bit: isc_data_8bit { +					pinmux = <PIN_PC20__ISC_D11>, +						 <PIN_PC19__ISC_D10>, +						 <PIN_PC18__ISC_D9>, +						 <PIN_PC17__ISC_D8>, +						 <PIN_PC16__ISC_D7>, +						 <PIN_PC15__ISC_D6>, +						 <PIN_PC14__ISC_D5>, +						 <PIN_PC13__ISC_D4>; +					bias-disable; +				}; + +				pinctrl_isc_data_9_10: isc_data_9_10 { +					pinmux = <PIN_PC12__ISC_D3>, +						 <PIN_PC11__ISC_D2>; +					bias-disable; +				}; + +				pinctrl_isc_data_11_12: isc_data_11_12 { +					pinmux = <PIN_PC10__ISC_D1>, +						 <PIN_PC9__ISC_D0>; +					bias-disable; +				}; + +				pinctrl_key_gpio_default: key_gpio_default { +					pinmux = <PIN_PA29__GPIO>; +					bias-pull-up; +				}; + +				pinctrl_led_gpio_default: led_gpio_default { +					pinmux = <PIN_PA27__GPIO>, +						 <PIN_PB1__GPIO>, +						 <PIN_PA31__GPIO>; +					bias-pull-up; +				}; + +				pinctrl_sdmmc0_default: sdmmc0_default { +					cmd_data { +						pinmux = <PIN_PA1__SDMMC0_CMD>, +							 <PIN_PA2__SDMMC0_DAT0>, +							 <PIN_PA3__SDMMC0_DAT1>, +							 <PIN_PA4__SDMMC0_DAT2>, +							 <PIN_PA5__SDMMC0_DAT3>, +							 <PIN_PA6__SDMMC0_DAT4>, +							 <PIN_PA7__SDMMC0_DAT5>, +							 <PIN_PA8__SDMMC0_DAT6>, +							 <PIN_PA9__SDMMC0_DAT7>; +						bias-pull-up; +					}; + +					ck_cd_vddsel { +						pinmux = <PIN_PA0__SDMMC0_CK>, +							 <PIN_PA11__SDMMC0_VDDSEL>, +							 <PIN_PA13__SDMMC0_CD>; +						bias-disable; +					}; +				}; + +				pinctrl_sdmmc1_default: sdmmc1_default { +					cmd_data { +						pinmux = <PIN_PA28__SDMMC1_CMD>, +							 <PIN_PA18__SDMMC1_DAT0>, +							 <PIN_PA19__SDMMC1_DAT1>, +							 <PIN_PA20__SDMMC1_DAT2>, +							 <PIN_PA21__SDMMC1_DAT3>; +						bias-pull-up; +					}; + +					conf-ck_cd { +						pinmux = <PIN_PA22__SDMMC1_CK>, +							 <PIN_PA30__SDMMC1_CD>; +						bias-disable; +					}; +				}; + +				pinctrl_spi0_default: spi0_default { +					pinmux = <PIN_PA14__SPI0_SPCK>, +						 <PIN_PA15__SPI0_MOSI>, +						 <PIN_PA16__SPI0_MISO>, +						 <PIN_PA17__SPI0_NPCS0>; +					bias-disable; +				}; + +				pinctrl_uart1_default: uart1_default { +					pinmux = <PIN_PD2__URXD1>, +						 <PIN_PD3__UTXD1>; +					bias-disable; +				}; + +				pinctrl_uart3_default: uart3_default { +					pinmux = <PIN_PC12__URXD3>, +						 <PIN_PC13__UTXD3>; +					bias-disable; +				}; + +				pinctrl_usb_default: usb_default { +					pinmux = <PIN_PA10__GPIO>, +						 <PIN_PD19__GPIO>; +					bias-disable; +				}; + +				pinctrl_usba_vbus: usba_vbus { +					pinmux = <PIN_PD20__GPIO>; +					bias-disable; +				}; + +				pinctrl_mikrobus1_an: mikrobus1_an { +					pinmux = <PIN_PD25__GPIO>; +					bias-disable; +				}; + +				pinctrl_mikrobus2_an: mikrobus2_an { +					pinmux = <PIN_PD26__GPIO>; +					bias-disable; +				}; + +				pinctrl_mikrobus1_rst: mikrobus1_rst { +					pinmux = <PIN_PB2__GPIO>; +					bias-disable; +				}; + +				pinctrl_mikrobus2_rst: mikrobus2_rst { +					pinmux = <PIN_PA26__GPIO>; +					bias-disable; +				}; + +				pinctrl_mikrobus1_spi_cs: mikrobus1_spi_cs { +					pinmux = <PIN_PD0__FLEXCOM4_IO4>; +					bias-disable; +				}; + +				pinctrl_mikrobus2_spi_cs: mikrobus2_spi_cs { +					pinmux = <PIN_PC31__FLEXCOM4_IO3>; +					bias-disable; +				}; + +				pinctrl_mikrobus_spi: mikrobus_spi { +					pinmux = <PIN_PC28__FLEXCOM4_IO0>, +						 <PIN_PC29__FLEXCOM4_IO1>, +						 <PIN_PC30__FLEXCOM4_IO2>; +					bias-disable; +				}; + +				pinctrl_mikrobus1_pwm: mikrobus1_pwm { +					pinmux = <PIN_PB1__PWML1>; +					bias-disable; +				}; + +				pinctrl_mikrobus2_pwm: mikrobus2_pwm { +					pinmux = <PIN_PA31__PWML0>; +					bias-disable; +				}; + +				pinctrl_mikrobus1_int: mikrobus1_int { +					pinmux = <PIN_PB0__GPIO>; +					bias-disable; +				}; + +				pinctrl_mikrobus2_int: mikrobus2_int { +					pinmux = <PIN_PA25__GPIO>; +					bias-disable; +				}; + +				pinctrl_mikrobus1_uart: mikrobus1_uart { +					pinmux = <PIN_PB3__URXD4>, +						 <PIN_PB4__UTXD4>; +					bias-disable; +				}; + +				pinctrl_mikrobus2_uart: mikrobus2_uart { +					pinmux = <PIN_PD23__URXD2>, +						 <PIN_PD24__UTXD2>; +					bias-disable; +				}; + +				pinctrl_mikrobus_i2c: mikrobus1_i2c { +					pinmux = <PIN_PA24__FLEXCOM1_IO0>, +						 <PIN_PA23__FLEXCOM1_IO1>; +					bias-disable; +				}; + +				pinctrl_flx4_default: flx4_uart_default { +					pinmux = <PIN_PC28__FLEXCOM4_IO0>, +						 <PIN_PC29__FLEXCOM4_IO1>, +						 <PIN_PC30__FLEXCOM4_IO2>, +						 <PIN_PC31__FLEXCOM4_IO3>, +						 <PIN_PD0__FLEXCOM4_IO4>; +					bias-disable; +				}; +			}; + +			can1: can@fc050000 { +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_can1_default>; +				status = "okay"; +			}; +		}; +	}; + +	gpio_keys { +		compatible = "gpio-keys"; + +		pinctrl-names = "default"; +		pinctrl-0 = <&pinctrl_key_gpio_default>; + +		pb4 { +			label = "USER"; +			gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>; +			linux,code = <0x104>; +		}; +	}; + +	leds { +		compatible = "gpio-leds"; +		pinctrl-names = "default"; +		pinctrl-0 = <&pinctrl_led_gpio_default>; +		status = "okay"; + +		red { +			label = "red"; +			gpios = <&pioA PIN_PA27 GPIO_ACTIVE_LOW>; +		}; + +		green { +			label = "green"; +			gpios = <&pioA PIN_PB1 GPIO_ACTIVE_LOW>; +		}; + +		blue { +			label = "blue"; +			gpios = <&pioA PIN_PA31 GPIO_ACTIVE_LOW>; +			linux,default-trigger = "heartbeat"; +		}; +	}; +}; diff --git a/arch/arm/boot/dts/at91-sama5d2_xplained.dts b/arch/arm/boot/dts/at91-sama5d2_xplained.dts index 2e2c3d1a1fa2..c7e9ccf2bc87 100644 --- a/arch/arm/boot/dts/at91-sama5d2_xplained.dts +++ b/arch/arm/boot/dts/at91-sama5d2_xplained.dts @@ -68,7 +68,7 @@  	ahb {  		usb0: gadget@00300000 { -			atmel,vbus-gpio = <&pioA 31 GPIO_ACTIVE_HIGH>; +			atmel,vbus-gpio = <&pioA PIN_PA31 GPIO_ACTIVE_HIGH>;  			pinctrl-names = "default";  			pinctrl-0 = <&pinctrl_usba_vbus>;  			status = "okay"; @@ -76,8 +76,8 @@  		usb1: ohci@00400000 {  			num-ports = <3>; -			atmel,vbus-gpio = <0 /* &pioA 41 GPIO_ACTIVE_HIGH */ -					   &pioA 42 GPIO_ACTIVE_HIGH +			atmel,vbus-gpio = <0 /* &pioA PIN_PB9 GPIO_ACTIVE_HIGH */ +					   &pioA PIN_PB10 GPIO_ACTIVE_HIGH  					   0  					  >;  			pinctrl-names = "default"; @@ -127,7 +127,7 @@  				ethernet-phy@1 {  					reg = <0x1>;  					interrupt-parent = <&pioA>; -					interrupts = <73 IRQ_TYPE_LEVEL_LOW>; +					interrupts = <PIN_PC9 IRQ_TYPE_LEVEL_LOW>;  				};  			}; @@ -160,9 +160,9 @@  					compatible = "active-semi,act8945a";  					reg = <0x5b>;  					active-semi,vsel-high; -					active-semi,chglev-gpios = <&pioA 12 GPIO_ACTIVE_HIGH>; -					active-semi,lbo-gpios = <&pioA 72 GPIO_ACTIVE_LOW>; -					active-semi,irq_gpios = <&pioA 45 GPIO_ACTIVE_LOW>; +					active-semi,chglev-gpios = <&pioA PIN_PA12 GPIO_ACTIVE_HIGH>; +					active-semi,lbo-gpios = <&pioA PIN_PC8 GPIO_ACTIVE_LOW>; +					active-semi,irq_gpios = <&pioA PIN_PB13 GPIO_ACTIVE_LOW>;  					active-semi,input-voltage-threshold-microvolt = <6600>;  					active-semi,precondition-timeout = <40>;  					active-semi,total-timeout = <3>; @@ -355,6 +355,14 @@  					bias-pull-up;  				}; +				pinctrl_classd_default: classd_default { +					pinmux = <PIN_PB1__CLASSD_R0>, +						 <PIN_PB2__CLASSD_R1>, +						 <PIN_PB3__CLASSD_R2>, +						 <PIN_PB4__CLASSD_R3>; +					bias-pull-up; +				}; +  				pinctrl_flx0_default: flx0_default {  					pinmux = <PIN_PB28__FLEXCOM0_IO0>,  						 <PIN_PB29__FLEXCOM0_IO1>; @@ -488,6 +496,14 @@  			}; +			classd: classd@fc048000 { +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_classd_default>; +				atmel,pwm-type = "diff"; +				atmel,non-overlap-time = <10>; +				status = "okay"; +			}; +  			can1: can@fc050000 {  				pinctrl-names = "default";  				pinctrl-0 = <&pinctrl_can1_default>; @@ -504,7 +520,7 @@  		bp1 {  			label = "PB_USER"; -			gpios = <&pioA 41 GPIO_ACTIVE_LOW>; +			gpios = <&pioA PIN_PB9 GPIO_ACTIVE_LOW>;  			linux,code = <0x104>;  		};  	}; @@ -517,17 +533,18 @@  		red {  			label = "red"; -			gpios = <&pioA 38 GPIO_ACTIVE_LOW>; +			gpios = <&pioA PIN_PB6 GPIO_ACTIVE_LOW>;  		}; +  		green {  			label = "green"; -			gpios = <&pioA 37 GPIO_ACTIVE_LOW>; +			gpios = <&pioA PIN_PB5 GPIO_ACTIVE_LOW>;  		};  		blue {  			label = "blue"; -			gpios = <&pioA 32 GPIO_ACTIVE_LOW>; +			gpios = <&pioA PIN_PB0 GPIO_ACTIVE_LOW>;  			linux,default-trigger = "heartbeat";  		};  	}; diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index a4808c4fbc05..64fa3f9a39d3 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi @@ -455,6 +455,16 @@  				      >;  				/* shared pinctrl settings */ +				ac97 { +					pinctrl_ac97: ac97-0 { +						atmel,pins = +							<AT91_PIOD 6 AT91_PERIPH_A AT91_PINCTRL_NONE	/* AC97RX */ +							 AT91_PIOD 7 AT91_PERIPH_A AT91_PINCTRL_NONE	/* AC97TX */ +							 AT91_PIOD 8 AT91_PERIPH_A AT91_PINCTRL_NONE	/* AC97FS */ +							 AT91_PIOD 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;	/* AC97CK */ +					}; +				}; +  				adc0 {  					pinctrl_adc0_adtrg: adc0_adtrg {  						atmel,pins = <AT91_PIOD 28 AT91_PERIPH_A AT91_PINCTRL_NONE>; @@ -1043,6 +1053,17 @@  				status = "disabled";  			}; +			ac97: sound@fffac000 { +				compatible = "atmel,at91sam9263-ac97c"; +				reg = <0xfffac000 0x4000>; +				interrupts = <24 IRQ_TYPE_LEVEL_HIGH 4>; +				pinctrl-names = "default"; +				pinctrl-0 = <&pinctrl_ac97>; +				clocks = <&ac97_clk>; +				clock-names = "ac97_clk"; +				status = "disabled"; +			}; +  			adc0: adc@fffb0000 {  				#address-cells = <1>;  				#size-cells = <0>; diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts index 2522c3308305..94c52c555f83 100644 --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -166,6 +166,10 @@  				status = "okay";  			}; +			ac97: sound@fffac000 { +				status = "okay"; +			}; +  			adc0: adc@fffb0000 {  				pinctrl-names = "default";  				pinctrl-0 = < diff --git a/arch/arm/boot/dts/sama5d2.dtsi b/arch/arm/boot/dts/sama5d2.dtsi index cc06da394366..406334edfeb6 100644 --- a/arch/arm/boot/dts/sama5d2.dtsi +++ b/arch/arm/boot/dts/sama5d2.dtsi @@ -416,6 +416,17 @@  				};  			}; +			isc: isc@f0008000 { +				compatible = "atmel,sama5d2-isc"; +				reg = <0xf0008000 0x4000>; +				interrupts = <46 IRQ_TYPE_LEVEL_HIGH 5>; +				clocks = <&isc_clk>, <&iscck>, <&isc_gclk>; +				clock-names = "hclock", "iscck", "gck"; +				#clock-cells = <0>; +				clock-output-names = "isc-mck"; +				status = "disabled"; +			}; +  			ramc0: ramc@f000c000 {  				compatible = "atmel,sama5d3-ddramc";  				reg = <0xf000c000 0x200>; @@ -494,6 +505,24 @@  					clocks = <&plla>;  				}; +				audio_pll_frac: audiopll_fracck { +					compatible = "atmel,sama5d2-clk-audio-pll-frac"; +					#clock-cells = <0>; +					clocks = <&main>; +				}; + +				audio_pll_pad: audiopll_padck { +					compatible = "atmel,sama5d2-clk-audio-pll-pad"; +					#clock-cells = <0>; +					clocks = <&audio_pll_frac>; +				}; + +				audio_pll_pmc: audiopll_pmcck { +					compatible = "atmel,sama5d2-clk-audio-pll-pmc"; +					#clock-cells = <0>; +					clocks = <&audio_pll_frac>; +				}; +  				utmi: utmick {  					compatible = "atmel,at91sam9x5-clk-utmi";  					#clock-cells = <0>; @@ -895,7 +924,7 @@  					#address-cells = <1>;  					#size-cells = <0>;  					interrupt-parent = <&pmc>; -					clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>, <&mck>; +					clocks = <&clk32k>, <&main>, <&plladiv>, <&utmi>, <&mck>, <&audio_pll_pmc>;  					sdmmc0_gclk: sdmmc0_gclk {  						#clock-cells = <0>; @@ -925,6 +954,11 @@  						atmel,clk-output-range = <0 83000000>;  					}; +					isc_gclk: isc_gclk { +						#clock-cells = <0>; +						reg = <46>; +					}; +  					pdmic_gclk: pdmic_gclk {  						#clock-cells = <0>;  						reg = <48>; @@ -951,9 +985,37 @@  						reg = <57>;  						atmel,clk-output-range = <0 80000000>;  					}; + +					classd_gclk: classd_gclk { +						#clock-cells = <0>; +						reg = <59>; +						atmel,clk-output-range = <0 100000000>; +					};  				};  			}; +			qspi0: spi@f0020000 { +				compatible = "atmel,sama5d2-qspi"; +				reg = <0xf0020000 0x100>, <0xd0000000 0x08000000>; +				reg-names = "qspi_base", "qspi_mmap"; +				interrupts = <52 IRQ_TYPE_LEVEL_HIGH 7>; +				clocks = <&qspi0_clk>; +				#address-cells = <1>; +				#size-cells = <0>; +				status = "disabled"; +			}; + +			qspi1: spi@f0024000 { +				compatible = "atmel,sama5d2-qspi"; +				reg = <0xf0024000 0x100>, <0xd8000000 0x08000000>; +				reg-names = "qspi_base", "qspi_mmap"; +				interrupts = <53 IRQ_TYPE_LEVEL_HIGH 7>; +				clocks = <&qspi1_clk>; +				#address-cells = <1>; +				#size-cells = <0>; +				status = "disabled"; +			}; +  			sha@f0028000 {  				compatible = "atmel,at91sam9g46-sha";  				reg = <0xf0028000 0x100>; @@ -1406,6 +1468,19 @@  				status = "okay";  			}; +			classd: classd@fc048000 { +				compatible = "atmel,sama5d2-classd"; +				reg = <0xfc048000 0x100>; +				interrupts = <59 IRQ_TYPE_LEVEL_HIGH 7>; +				dmas = <&dma0 +					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | +					 AT91_XDMAC_DT_PERID(47))>; +				dma-names = "tx"; +				clocks = <&classd_clk>, <&classd_gclk>; +				clock-names = "pclk", "gclk"; +				status = "disabled"; +			}; +  			can1: can@fc050000 {  				compatible = "bosch,m_can";  				reg = <0xfc050000 0x4000>, <0x210000 0x4000>; |