Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1176d17 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Merge "First batch of DT changes for 4.4:" from Nicolas Ferre:

- some DT fixes: dma declaration, led labels
- disable some nodes: PMIC on sama5d3 Xplained, unused i2c1 on at91sam9n12ek
- add some others that were missing: touchscreen, cryto nodes, LCD panels or
  image capture properties on various boards
- as the new pinmux for sama5d2 was accepted, we can now add the definitions
  and the actual muxing for sama5d2 Xplained board

* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: sama5d2 Xplained: add device pin muxing
  ARM: at91/dt: add sama5d2 pinmux
  ARM: at91/dt: ov2640: add hsync/vsync-active property
  ARM: at91/dt: sama5d4 xplained: enable the led D8
  ARM: at91/dt: sama5d4ek: Add support of QT1070 and Maxtouch
  ARM: at91/dt: sama5d4: enable crypto nodes
  ARM: at91/dt: sama5d4: add pioD pin mux mask and enable pioD
  ARM: at91/dt: sama5d3: update iio config for touchscreen
  ARM: at91/dt: sama5d3 xplained: disable pmic
  ARM: at91/dt: at91sam9x5: enable iio touchscreen for 9x5ek
  ARM: at91/dt: at91sam9n12ek: disable i2c1
  ARM: at91/dt: at91sam9n12ek: fix the led labels name
  ARM: at91/dt: corrections to i2c1 declaration to sama5d4
parents 3cb06b30 a9b672a6

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

+61 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
 */

/dts-v1/;

#include "sama5d2.dtsi"

#include "sama5d2-pinfunc.h"



/ {

	model = "Atmel SAMA5D2 Xplained";
@@ -92,6 +93,8 @@ 


		apb {

			spi0: spi@f8000000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spi0_default>;

				status = "okay";



				m25p80@0 {
@@ -102,25 +105,35 @@ 
			};



			macb0: ethernet@f8008000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_macb0_default>;

				phy-mode = "rmii";

				status = "okay";

			};



			uart1: serial@f8020000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_uart1_default>;

				status = "okay";

			};



			i2c0: i2c@f8028000 {

				dmas = <0>, <0>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_i2c0_default>;

				status = "okay";

			};



			uart3: serial@fc008000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_uart3_default>;

				status = "okay";

			};



			i2c1: i2c@fc028000 {

				dmas = <0>, <0>;

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_i2c1_default>;

				status = "okay";



				at24@54 {
@@ -129,6 +142,54 @@ 
					pagesize = <16>;

				};

			};



			pinctrl@fc038000 {

				pinctrl_i2c0_default: i2c0_default {

					pinmux = <PIN_PD21__TWD0>,

						 <PIN_PD22__TWCK0>;

					bias-disable;

				};



				pinctrl_i2c1_default: i2c1_default {

					pinmux = <PIN_PD4__TWD1>,

						 <PIN_PD5__TWCK1>;

					bias-disable;

				};



				pinctrl_macb0_default: macb0_default {

					pinmux = <PIN_PB14__GTXCK>,

						 <PIN_PB15__GTXEN>,

						 <PIN_PB16__GRXDV>,

						 <PIN_PB17__GRXER>,

						 <PIN_PB18__GRX0>,

						 <PIN_PB19__GRX1>,

						 <PIN_PB20__GTX0>,

						 <PIN_PB21__GTX1>,

						 <PIN_PB22__GMDC>,

						 <PIN_PB23__GMDIO>;

					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_PB11__URXD3>,

						 <PIN_PB12__UTXD3>;

					bias-disable;

				};

			};

		};

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
				pmic: act8865@5b {

					compatible = "active-semi,act8865";

					reg = <0x5b>;

					status = "okay";

					status = "disabled";



					regulators {

						vcc_1v8_reg: DCDC_REG1 {

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

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ 
		d8 {

			label = "d8";

			gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;

			status = "disabled";

			default-state = "on";

		};



		d10 {

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

+27 −0
Original line number Diff line number Diff line
@@ -148,6 +148,25 @@ 
					clocks = <&pck2>;

					clock-names = "mclk";

				};



				qt1070:keyboard@1b {

					compatible = "qt1070";

					reg = <0x1b>;

					interrupt-parent = <&pioE>;

					interrupts = <25 0x0>;

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_qt1070_irq>;

					wakeup-source;

				};



				atmel_mxt_ts@4c {

					compatible = "atmel,atmel_mxt_ts";

					reg = <0x4c>;

					interrupt-parent = <&pioE>;

					interrupts = <24 0x0>;

					pinctrl-names = "default";

					pinctrl-0 = <&pinctrl_mxt_ts>;

				};

			};



			macb0: ethernet@f8020000 {
@@ -204,6 +223,14 @@ 
						atmel,pins =

							<AT91_PIOE 13 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PE13 gpio */

					};

					pinctrl_qt1070_irq: qt1070_irq {

						atmel,pins =

							<AT91_PIOE 25 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;

					};

					pinctrl_mxt_ts: mxt_irq {

						atmel,pins =

							<AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;

					};

				};

			};

		};

arch/arm/boot/dts/at91sam9m10g45ek.dts

+2 −0
Original line number Diff line number Diff line
@@ -198,6 +198,8 @@ 
					isi_0: endpoint {

						remote-endpoint = <&ov2640_0>;

						bus-width = <8>;

						vsync-active = <1>;

						hsync-active = <1>;

					};

				};

			};