Commit 28544e61 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

AT91 DT for 4.20

 - warning fiwes from Rob
 - many updates for the axentia boards
 - ADC, I2S and touch screen support for sama5d2

* tag 'at91-4.20-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  arm: dts: sama5d2: Update coresight bindings for hardware ports
  ARM: dts: at91: sama5d27_som1_ek: add adc regulators
  ARM: dts: atmel: Fix I2C and SPI bus warnings
  ARM: dts: at91: sama5d4: add labels to soc dtsi for derivative boards
  ARM: dts: at91: tse850: drop three indentation levels
  ARM: dts: at91: nattis: drop three indentation levels
  ARM: dts: at91: nattis: describe the lvds panel
  ARM: dts: at91: nattis: move pinctrls for the lvds chip to the lvds node
  ARM: dts: at91: nattis: state the actual lvds-encoder chip
  ARM: dts: at91: nattis: make the SD-card slot work
  ARM: dts: at91: nattis: set the PRLUD and HIPOW signals low
  ARM: dts: at91/trivial: remove old NAND bindings leftover in sama5d2
  ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45
  ARM: dts: at91: sama5d2 Xplained: add pin muxing for I2S
  ARM: dts: at91: sama5d2: add nodes for I2S controllers
  ARM: dts: at91: sama5d2: add I2S clock muxing nodes
  ARM: dts: at91: sama5d2: Add resistive touch device
  ARM: dts: at91: sama5d2: add channel cells for ADC device

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 74cf77e8 97181516

arch/arm/boot/dts/at91-dvk_su60_somc.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -70,9 +70,9 @@ 
&i2c1 {

	status = "okay";



	eeprom@87 {

	eeprom@57 {

		compatible = "giantec,gt24c32a", "atmel,24c32";

		reg = <87>;

		reg = <0x57>;

		pagesize = <32>;

	};

};

arch/arm/boot/dts/at91-dvk_su60_somc_lcm.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ 
&i2c1 {

	status = "okay";



	ft5426@56 {

	ft5426@38 {

		compatible = "focaltech,ft5426", "edt,edt-ft5406";

		reg = <56>;

		reg = <0x38>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_lcd_ctp_int>;

arch/arm/boot/dts/at91-nattis-2-natte-2.dts

+57 −46
Original line number Diff line number Diff line
@@ -16,46 +16,6 @@ 
	compatible = "axentia,nattis-2", "axentia,natte-2", "axentia,linea",

		     "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";



	ahb {

		apb {

			pinctrl@fffff200 {

				nattis {

					pinctrl_usba_vbus: usba_vbus {

						atmel,pins =

							<AT91_PIOD 28

							 AT91_PERIPH_GPIO

							 AT91_PINCTRL_DEGLITCH>;

					};



					pinctrl_mmc0_cd: mmc0_cd {

						atmel,pins =

							<AT91_PIOD 5

							 AT91_PERIPH_GPIO

							 AT91_PINCTRL_PULL_UP_DEGLITCH>;

					};



					pinctrl_lcd_prlud0: lcd_prlud0 {

						atmel,pins =

							<AT91_PIOA 21

							 AT91_PERIPH_GPIO

							 AT91_PINCTRL_OUTPUT_VAL(0)>;

					};



					pinctrl_lcd_hipow0: lcd_hipow0 {

						atmel,pins =

							<AT91_PIOA 23

							 AT91_PERIPH_GPIO

							 AT91_PINCTRL_OUTPUT_VAL(0)>;

					};

				};

			};



			watchdog@fffffe40 {

				status = "okay";

			};

		};

	};



	gpio-keys {

		compatible = "gpio-keys";
@@ -103,10 +63,29 @@ 
	};



	panel: panel {

		compatible = "sharp,lq150x1lg11";

		compatible = "sharp,lq150x1lg11", "panel-lvds";



		backlight = <&panel_bl>;

		power-supply = <&panel_reg>;



		width-mm = <304>;

		height-mm = <228>;



		data-mapping = "jeida-18";



		panel-timing {

			// 1024x768 @ 60Hz (typical)

			clock-frequency = <50000000 65000000 80000000>;

			hactive = <1024>;

			vactive = <768>;

			hfront-porch = <48 88 88>;

			hback-porch = <96 168 168>;

			hsync-len = <32 64 64>;

			vsync-len = <3 13 74>;

			vfront-porch = <3 13 74>;

			vback-porch = <3 12 74>;

		};



		port {

			panel_input: endpoint {

				remote-endpoint = <&lvds_encoder_output>;
@@ -115,7 +94,10 @@ 
	};



	lvds-encoder {

		compatible = "lvds-encoder";

		compatible = "ti,ds90c185", "lvds-encoder";



		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_lvds_prlud0 &pinctrl_lvds_hipow0>;



		ports {

			#address-cells = <1>;
@@ -159,6 +141,36 @@ 
	};

};



&pinctrl {

	nattis {

		pinctrl_usba_vbus: usba_vbus {

			atmel,pins = <AT91_PIOD 28 AT91_PERIPH_GPIO

				      AT91_PINCTRL_DEGLITCH>;

		};



		pinctrl_mmc0_cd: mmc0_cd {

			atmel,pins = <AT91_PIOD  5 AT91_PERIPH_GPIO

				      AT91_PINCTRL_PULL_UP_DEGLITCH>;

		};



		pinctrl_lvds_prlud0: lvds_prlud0 {

			atmel,pins = <AT91_PIOA 21 AT91_PERIPH_GPIO

				      (AT91_PINCTRL_OUTPUT |

				       AT91_PINCTRL_OUTPUT_VAL(0))>;

		};



		pinctrl_lvds_hipow0: lvds_hipow0 {

			atmel,pins = <AT91_PIOA 23 AT91_PERIPH_GPIO

				      (AT91_PINCTRL_OUTPUT |

				       AT91_PINCTRL_OUTPUT_VAL(0))>;

		};

	};

};



&watchdog {

	status = "okay";

};



&i2c0 {

	status = "okay";
@@ -195,14 +207,12 @@ 


	hlcdc-display-controller {

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_lcd_base

			     &pinctrl_lcd_rgb565

			     &pinctrl_lcd_prlud0

			     &pinctrl_lcd_hipow0>;

		pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb565>;



		port@0 {

			hlcdc_output: endpoint {

				remote-endpoint = <&lvds_encoder_input>;

				bus-width = <16>;

			};

		};

	};
@@ -219,6 +229,7 @@ 
		reg = <0>;

		bus-width = <4>;

		cd-gpios = <&pioD 5 GPIO_ACTIVE_HIGH>;

		cd-inverted;

	};

};

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

+42 −0
Original line number Diff line number Diff line
@@ -283,6 +283,13 @@ 
				status = "okay";

			};



			adc: adc@fc030000 {

				vddana-supply = <&vddana>;

				vref-supply = <&advref>;



				status = "disabled";

			};



			pinctrl@fc038000 {



				pinctrl_can1_default: can1_default {
@@ -549,4 +556,39 @@ 
			linux,default-trigger = "heartbeat";

		};

	};



	vddin_3v3: fixed-regulator-vddin_3v3 {

		compatible = "regulator-fixed";



		regulator-name = "VDDIN_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		status = "okay";

	};



	vddana: fixed-regulator-vddana {

		compatible = "regulator-fixed";



		regulator-name = "VDDANA";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vddin_3v3>;

		status = "okay";

	};



	advref: fixed-regulator-advref {

		compatible = "regulator-fixed";



		regulator-name = "advref";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-boot-on;

		vin-supply = <&vddana>;

		status = "okay";

	};

};

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

+30 −0
Original line number Diff line number Diff line
@@ -281,6 +281,12 @@ 
				status = "okay";

			};



			i2s0: i2s@f8050000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_i2s0_default>;

				status = "disabled"; /* conflict with can0 */

			};



			can0: can@f8054000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_can0_default>;
@@ -424,6 +430,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 +570,12 @@ 
				status = "okay";

			};



			i2s1: i2s@fc04c000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_i2s1_default>;

				status = "disabled"; /* conflict with spi0, sdmmc1 */

			};



			can1: can@fc050000 {

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_can1_default>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE