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

Merge tag 'tegra-for-4.17-arm-dt' of... 

Merge tag 'tegra-for-4.17-arm-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt

Pull "ARM: tegra: Device tree changes for v4.17-rc1" from Thierry Reding:

Support for the VDE is added on Tegra30 along with some general cleanup
and some improvements to the various Toradex boards.

* tag 'tegra-for-4.17-arm-dt' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: apalis-tk1: Support v1.2 hardware revision
  ARM: tegra: apalis-tk1: Copyright period, spurious newlines
  ARM: tegra: apalis-tk1: Hog group for ethernet, PCIe, reset GPIOs
  ARM: tegra: apalis-tk1: Add missing as3722 gpio0 configuration
  ARM: tegra: apalis-tk1: Activate PWM pin muxing for pwm3
  ARM: tegra: apalis-tk1: Set critical trips
  ARM: tegra: apalis/colibri: Remove unneeded reg property
  ARM: tegra: apalis/colibri: Use correct compatible for RTC
  ARM: tegra: Fix I2C bus frequencies on Apalis/Colibri
  ARM: tegra: venice2: Remove duplicate pcie-1 node
  ARM: tegra: beaver: Remove invalid uses of rsvd1
  ARM: tegra: Use proper IRQ type definitions
  ARM: tegra: Fix ULPI regression on Tegra20
  ARM: tegra: Add unit address to VDE IRAM area
  ARM: tegra: Add video decoder node on Tegra30
  ARM: tegra: Add IRAM node on Tegra30
parents 2d78b1da 4957a2f1

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,7 @@ dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \ 
	tegra114-tn7.dtb

dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \

	tegra124-apalis-eval.dtb \

	tegra124-apalis-v1.2-eval.dtb \

	tegra124-jetson-tk1.dtb \

	tegra124-nyan-big.dtb \

	tegra124-nyan-blaze.dtb \

arch/arm/boot/dts/tegra114-dalmore.dts

+1 −1
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ 
			compatible = "realtek,rt5640";

			reg = <0x1c>;

			interrupt-parent = <&gpio>;

			interrupts = <TEGRA_GPIO(W, 3) GPIO_ACTIVE_HIGH>;

			interrupts = <TEGRA_GPIO(W, 3) IRQ_TYPE_EDGE_FALLING>;

			realtek,ldo1-en-gpios =

				<&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_HIGH>;

		};

arch/arm/boot/dts/tegra124-apalis-eval.dts

+15 −8
Original line number Diff line number Diff line 
/*

 * Copyright 2016 Toradex AG

 * Copyright 2016-2018 Toradex AG

 *

 * 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
@@ -105,7 +105,7 @@ 
	 */

	i2c@7000c000 {

		status = "okay";

		clock-frequency = <100000>;

		clock-frequency = <400000>;



		pcie-switch@58 {

			compatible = "plx,pex8605";
@@ -114,7 +114,7 @@ 


		/* M41T0M6 real time clock on carrier board */

		rtc@68 {

			compatible = "st,m41t00";

			compatible = "st,m41t0";

			reg = <0x68>;

		};

	};
@@ -124,7 +124,6 @@ 
	 */

	hdmi_ddc: i2c@7000c400 {

		status = "okay";

		clock-frequency = <100000>;

	};



	/*
@@ -133,7 +132,7 @@ 
	 */

	i2c@7000c500 {

		status = "okay";

		clock-frequency = <100000>;

		clock-frequency = <400000>;

	};



	/* I2C4 (DDC): unused */
@@ -226,9 +225,7 @@ 


	backlight: backlight {

		compatible = "pwm-backlight";



		/* BKL1_PWM */

		pwms = <&pwm 3 5000000>;

		pwms = <&pwm 3 5000000>; /* BKL1_PWM */

		brightness-levels = <255 231 223 207 191 159 127 0>;

		default-brightness-level = <6>;

		/* BKL1_ON */
@@ -276,3 +273,13 @@ 
		vin-supply = <&reg_5v0>;

	};

};



&gpio {

	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */

	pex_perst_n {

		gpio-hog;

		gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "PEX_PERST_N";

	};

};

arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts

0 → 100644
+250 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Copyright 2016-2018 Toradex AG

 */



/dts-v1/;



#include <dt-bindings/input/input.h>

#include "tegra124-apalis-v1.2.dtsi"



/ {

	model = "Toradex Apalis TK1 on Apalis Evaluation Board";

	compatible = "toradex,apalis-tk1-v1.2-eval", "toradex,apalis-tk1-eval",

		     "toradex,apalis-tk1", "nvidia,tegra124";



	aliases {

		rtc0 = "/i2c@7000c000/rtc@68";

		rtc1 = "/i2c@7000d000/pmic@40";

		rtc2 = "/rtc@7000e000";

		serial0 = &uarta;

		serial1 = &uartb;

		serial2 = &uartc;

		serial3 = &uartd;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	pcie@1003000 {

		pci@1,0 {

			status = "okay";

		};

	};



	host1x@50000000 {

		hdmi@54280000 {

			status = "okay";

		};

	};



	/* Apalis UART1 */

	serial@70006000 {

		status = "okay";

	};



	/* Apalis UART2 */

	serial@70006040 {

		status = "okay";

	};



	/* Apalis UART3 */

	serial@70006200 {

		status = "okay";

	};



	/* Apalis UART4 */

	serial@70006300 {

		status = "okay";

	};



	pwm@7000a000 {

		status = "okay";

	};



	/*

	 * GEN1_I2C: I2C1_SDA/SCL on MXM3 pin 209/211 (e.g. RTC on carrier

	 * board)

	 */

	i2c@7000c000 {

		status = "okay";

		clock-frequency = <400000>;



		pcie-switch@58 {

			compatible = "plx,pex8605";

			reg = <0x58>;

		};



		/* M41T0M6 real time clock on carrier board */

		rtc@68 {

			compatible = "st,m41t0";

			reg = <0x68>;

		};

	};



	/* GEN2_I2C: unused */



	/*

	 * CAM_I2C: I2C3_SDA/SCL (CAM) on MXM3 pin 201/203 (e.g. camera sensor

	 * on carrier board)

	 */

	i2c@7000c500 {

		status = "okay";

		clock-frequency = <400000>;

	};



	/*

	 * I2C4 (DDC): I2C4_SDA/SCL (DDC) on MXM3 pin 205/207

	 * (e.g. display EDID)

	 */

	hdmi_ddc: i2c@7000c700 {

		status = "okay";

	};



	/* SPI1: Apalis SPI1 */

	spi@7000d400 {

		status = "okay";

		spi-max-frequency = <50000000>;



		spidev0: spidev@0 {

			compatible = "spidev";

			reg = <0>;

			spi-max-frequency = <50000000>;

		};

	};



	/* SPI4: Apalis SPI2 */

	spi@7000da00 {

		status = "okay";

		spi-max-frequency = <50000000>;



		spidev1: spidev@0 {

			compatible = "spidev";

			reg = <0>;

			spi-max-frequency = <50000000>;

		};

	};



	/* Apalis Serial ATA */

	sata@70020000 {

		status = "okay";

	};



	hda@70030000 {

		status = "okay";

	};



	usb@70090000 {

		status = "okay";

	};



	/* Apalis MMC1 */

	sdhci@700b0000 {

		status = "okay";

		/* MMC1_CD# */

		cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;

		bus-width = <4>;

		vqmmc-supply = <&vddio_sdmmc1>;

	};



	/* Apalis SD1 */

	sdhci@700b0400 {

		status = "okay";

		/* SD1_CD# */

		cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;

		bus-width = <4>;

		vqmmc-supply = <&vddio_sdmmc3>;

	};



	/* EHCI instance 0: USB1_DP/N -> USBO1_DP/N */

	usb@7d000000 {

		status = "okay";

		dr_mode = "otg";

	};



	usb-phy@7d000000 {

		status = "okay";

		vbus-supply = <&reg_usbo1_vbus>;

	};



	/* EHCI instance 1: USB2_DP/N -> USBH2_DP/N */

	usb@7d004000 {

		status = "okay";

	};



	usb-phy@7d004000 {

		status = "okay";

		vbus-supply = <&reg_usbh_vbus>;

	};



	/* EHCI instance 2: USB3_DP/N -> USBH4_DP/N */

	usb@7d008000 {

		status = "okay";

	};



	usb-phy@7d008000 {

		status = "okay";

		vbus-supply = <&reg_usbh_vbus>;

	};



	backlight: backlight {

		compatible = "pwm-backlight";

		pwms = <&pwm 3 5000000>; /* BKL1_PWM */

		brightness-levels = <255 231 223 207 191 159 127 0>;

		default-brightness-level = <6>;

		/* BKL1_ON */

		enable-gpios = <&gpio TEGRA_GPIO(BB, 5) GPIO_ACTIVE_HIGH>;

	};



	gpio-keys {

		compatible = "gpio-keys";



		wakeup {

			label = "WAKE1_MICO";

			gpios = <&gpio TEGRA_GPIO(DD, 3) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_WAKEUP>;

			debounce-interval = <10>;

			wakeup-source;

		};

	};



	reg_5v0: regulator-5v0 {

		compatible = "regulator-fixed";

		regulator-name = "5V_SW";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	/* USBO1_EN */

	reg_usbo1_vbus: regulator-usbo1-vbus {

		compatible = "regulator-fixed";

		regulator-name = "VCC_USBO1";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio TEGRA_GPIO(T, 5) GPIO_ACTIVE_HIGH>;

		enable-active-high;

		vin-supply = <&reg_5v0>;

	};



	/* USBH_EN */

	reg_usbh_vbus: regulator-usbh-vbus {

		compatible = "regulator-fixed";

		regulator-name = "VCC_USBH(2A|2C|2D|3|4)";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio TEGRA_GPIO(T, 6) GPIO_ACTIVE_HIGH>;

		enable-active-high;

		vin-supply = <&reg_5v0>;

	};

};



&gpio {

	/* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */

	pex_perst_n {

		gpio-hog;

		gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "PEX_PERST_N";

	};

};

arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi

0 → 100644
+2052 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE