Commit 250481d3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-4.5-dt2' of... 

Merge tag 'at91-4.5-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

Second batch of DT changes for 4.5:
- addition of sound nodes for sama5d2 and the xplained
- addition of a new patform by Landis+Gyr: VInCo

* tag 'at91-4.5-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

:
  ARM: at91/dt: sama5d2 Xplained: add pdmic node
  ARM: at91/dt: sama5d2: add pdmic node
  ARM: at91/dt: Add Support for the L+G VInCo platform

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 84829814 ca6349a8

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ 
	sama5d36ek.dtb \

	at91-sama5d4_ma5d4evk.dtb \

	at91-sama5d4_xplained.dtb \

	at91-sama5d4ek.dtb

	at91-sama5d4ek.dtb \

	at91-vinco.dtb

dtb-$(CONFIG_ARCH_ATLAS6) += \

	atlas6-evb.dtb

dtb-$(CONFIG_ARCH_ATLAS7) += \

arch/arm/boot/dts/at91-sama5d2_xplained.dts

+16 −0
Original line number Diff line number Diff line
@@ -119,6 +119,16 @@ 
				status = "okay";

			};



			pdmic@f8018000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_pdmic_default>;

				atmel,model = "PDMIC @ sama5d2_xplained";

				atmel,mic-min-freq = <1000000>;

				atmel,mic-max-freq = <3246000>;

				atmel,mic-offset = <0x0>;

				status = "okay";

			};



			uart1: serial@f8020000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_uart1_default>;
@@ -289,6 +299,12 @@ 
					bias-disable;

				};



				pinctrl_pdmic_default: pdmic_default {

					pinmux = <PIN_PB26__PDMIC_DAT>,

						<PIN_PB27__PDMIC_CLK>;

					bias-disable;

				};



				pinctrl_sdmmc0_default: sdmmc0_default {

					cmd_data {

						pinmux = <PIN_PA1__SDMMC0_CMD>,

arch/arm/boot/dts/at91-vinco.dts

0 → 100644
+256 −0
Original line number Diff line number Diff line 
/*

 * Device Tree file for VInCo platform

 *

 *  Copyright (C) 2014 Atmel,

 *                2014 Nicolas Ferre <nicolas.ferre@atmel.com>

 *   2015 Gregory CLEMENT <gregory.clement@free-electrons.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 "sama5d4.dtsi"



/ {

	model = "L+G VInCo platform";

	compatible = "l+g,vinco", "atmel,sama5d4", "atmel,sama5";



	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory {

		reg = <0x20000000 0x4000000>;

	};



	clocks {

		slow_xtal {

			clock-frequency = <32768>;

		};



		main_xtal {

			clock-frequency = <12000000>;

		};

	};



	ahb {

		apb {



			adc0: adc@fc034000 {

				status = "okay"; /* Enable ADC IIO support */

			};



			mmc0: mmc@f8000000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0

					     &pinctrl_mmc0_dat1_3

					     &pinctrl_mmc0_dat4_7>;

				vqmmc-supply = <&vcc_3v3_reg>;

				vmmc-supply = <&vcc_3v3_reg>;

				no-1-8-v;

				status = "okay";

				slot@0 {

					reg = <0>;

					bus-width = <8>;

					non-removable;

					broken-cd;

					status = "okay";

				};

			};



			spi0: spi@f8010000 {

				cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;

				status = "okay";

				m25p80@0 {

					compatible = "n25q32b", "jedec,spi-nor";

					spi-max-frequency = <50000000>;

					reg = <0>;

				};

			};



			i2c0: i2c@f8014000 {

				status = "okay";

			};



			i2c1: i2c@f8018000 {

				status = "okay";

				/* kerkey security module */

			};



			macb0: ethernet@f8020000 {

				phy-mode = "rmii";

				status = "okay";



				ethernet-phy@1 {

					reg = <0x1>;

					reset-gpios = <&pioE 8 GPIO_ACTIVE_HIGH>;

					interrupt-parent = <&pioB>;

					interrupts = <15 IRQ_TYPE_EDGE_FALLING>;

				};



			};



			i2c2: i2c@f8024000 {

				status = "okay";



				rtc1: rtc@64 {

					compatible = "epson,rx8900";

					reg = <0x32>;

				};

			};



			usart2: serial@fc008000 {

				/* MBUS */

				status = "okay";

			};



			usart3: serial@fc00c000 {

				/* debug */

				status = "okay";

			};



			usart4: serial@fc010000 {

				/* LMN */

				pinctrl-0 = <&pinctrl_usart4 &pinctrl_usart4_rts>;

				linux,rs485-enabled-at-boot-time;

				status = "okay";

			};



			macb1: ethernet@fc028000 {

				phy-mode = "rmii";

				status = "okay";

				#address-cells = <1>;

				#size-cells = <0>;

				status = "okay";



				ethernet-phy@1 {

					reg = <0x1>;

					interrupt-parent = <&pioB>;

					interrupts = <31 IRQ_TYPE_EDGE_FALLING>;

					reset-gpios = <&pioE 6 GPIO_ACTIVE_HIGH>;

				};

			};



			watchdog@fc068640 {

				status = "okay";

			};



			pinctrl@fc06a000 {

				board {

					pinctrl_usba_vbus: usba_vbus {

						atmel,pins =

						<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;

					};

				};

			};

		};



		usb0: gadget@00400000 {

			atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usba_vbus>;

			status = "disable";

		};



		usb1: ohci@00500000 {

			num-ports = <3>;

			atmel,vbus-gpio = <0

					   &pioE 11 GPIO_ACTIVE_LOW

					   &pioE 12 GPIO_ACTIVE_LOW

					  >;

			status = "disable";

		};



		usb2: ehci@00600000 {

			/* 4G Modem */

			status = "okay";

		};



	};



	leds {

		compatible = "gpio-leds";

		status = "okay";



		led_err {

			label = "err";

			gpios = <&pioA 7 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led_rssi {

			label = "rssi";

			gpios = <&pioA 9 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led_tls {

			label = "tls";

			gpios = <&pioA 24 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led_lmc {

			label = "lmc";

			gpios = <&pioA 25 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led_wmt {

			label = "wmt";

			gpios = <&pioA 29 GPIO_ACTIVE_LOW>;

			default-state = "off";

		};



		led_pwr {

			label = "pwr";

			gpios = <&pioA 26 GPIO_ACTIVE_LOW>;

			default-state = "on";

		};



	};



	vcc_3v3_reg: fixedregulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "VCC 3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		regulator-always-on;

	};

};

arch/arm/boot/dts/sama5d2.dtsi

+24 −0
Original line number Diff line number Diff line
@@ -637,6 +637,12 @@ 
						atmel,clk-output-range = <0 83000000>;

					};



					pdmic_clk: pdmic_clk {

						#clock-cells = <0>;

						reg = <48>;

						atmel,clk-output-range = <0 83000000>;

					};



					i2s0_clk: i2s0_clk {

						#clock-cells = <0>;

						reg = <54>;
@@ -763,6 +769,11 @@ 
						atmel,clk-output-range = <0 83000000>;

					};



					pdmic_gclk: pdmic_gclk {

						#clock-cells = <0>;

						reg = <48>;

					};



					i2s0_gclk: i2s0_gclk {

						#clock-cells = <0>;

						reg = <54>;
@@ -852,6 +863,19 @@ 
				clock-names = "t0_clk", "slow_clk";

			};



			pdmic: pdmic@f8018000 {

				compatible = "atmel,sama5d2-pdmic";

				reg = <0xf8018000 0x124>;

				interrupts = <48 IRQ_TYPE_LEVEL_HIGH 7>;

				dmas = <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(50))>;

				dma-names = "rx";

				clocks = <&pdmic_clk>, <&pdmic_gclk>;

				clock-names = "pclk", "gclk";

				status = "disabled";

			};



			uart0: serial@f801c000 {

				compatible = "atmel,at91sam9260-usart";

				reg = <0xf801c000 0x100>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE