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

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

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

ARM: tegra: Device tree changes for v4.20-rc1

This contains a massive amount of changes from Marcel Ziswiler for
various boards by Toradex.

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

: (129 commits)
  ARM: dts: paz00: fix wakeup gpio keycode
  ARM: tegra: tegra20: Fix mixed tabs-spaces indentation
  ARM: tegra: colibri_t20: add eval board device tree
  ARM: tegra: colibri_t20: rename ac97 label to tegra_ac97
  ARM: tegra: colibri_t20: get rid of fake clocks simple bus
  ARM: tegra: colibri_t20: rename tps6586x@34 and drop unused pmic label
  ARM: tegra: colibri_t20: iris: drop unused i2c_ddc label
  ARM: tegra: colibri_t20: rename i2c_ddc to hdmi_ddc
  ARM: tegra: colibri_t20: drop module level model and compatible
  ARM: tegra: colibri_t20: iris: add colibri ssp support
  ARM: tegra: colibri_t20: iris: simplify model and compatible properties
  ARM: tegra: colibri_t20: simplify model and compatible properties
  ARM: tegra: colibri_t20: add compatibility comment
  ARM: tegra: colibri_t20: annotate/move sd card detect
  ARM: tegra: colibri_t20: add gpio hogs for gmi_wr_n buffers
  ARM: tegra: colibri_t20: add gpio hog to unreset usb ethernet chip
  ARM: tegra: colibri_t20: add i2c-thermtrip
  ARM: tegra: colibri_t20: annotate/rename lm95245 temperature sensor
  ARM: tegra: colibri_t20: iris: add dr_mode property
  ARM: tegra: colibri_t20: iris: add gpio wakeup key
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fb5c84ce ebea2a43

Documentation/devicetree/bindings/arm/tegra.txt

+7 −2
Original line number Diff line number Diff line
@@ -47,12 +47,17 @@ board-specific compatible values: 
  nvidia,ventana

  toradex,apalis_t30

  toradex,apalis_t30-eval

  toradex,apalis_t30-v1.1

  toradex,apalis_t30-v1.1-eval

  toradex,apalis-tk1

  toradex,apalis-tk1-eval

  toradex,colibri_t20-512

  toradex,apalis-tk1-v1.2

  toradex,apalis-tk1-v1.2-eval

  toradex,colibri_t20

  toradex,colibri_t20-eval-v3

  toradex,colibri_t20-iris

  toradex,colibri_t30

  toradex,colibri_t30-eval-v3

  toradex,iris



Trusted Foundations

-------------------------------------------

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ pine64 Pine64 
pixcir  PIXCIR MICROELECTRONICS Co., Ltd

plathome	Plat'Home Co., Ltd.

plda	PLDA

plx	Broadcom Corporation (formerly PLX Technology)

portwell	Portwell Inc.

poslab	Poslab Technology Co., Ltd.

powervr	PowerVR (deprecated, use img)

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,7 @@ dtb-$(CONFIG_ARCH_TANGO) += \ 
	tango4-vantage-1172.dtb

dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \

	tegra20-harmony.dtb \

	tegra20-colibri-eval-v3.dtb \

	tegra20-colibri-iris.dtb \

	tegra20-medcom-wide.dtb \

	tegra20-paz00.dtb \
@@ -1073,6 +1074,7 @@ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ 
	tegra20-ventana.dtb

dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \

	tegra30-apalis-eval.dtb \

	tegra30-apalis-v1.1-eval.dtb \

	tegra30-beaver.dtb \

	tegra30-cardhu-a02.dtb \

	tegra30-cardhu-a04.dtb \

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

+23 −17
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
	host1x@50000000 {

		hdmi@54280000 {

			status = "okay";

			hdmi-supply = <&reg_5v0>;

		};

	};
@@ -122,7 +123,7 @@ 
	/*

	 * GEN2_I2C: I2C2_SDA/SCL (DDC) on MXM3 pin 205/207 (e.g. display EDID)

	 */

	hdmi_ddc: i2c@7000c400 {

	i2c@7000c400 {

		status = "okay";

	};
@@ -141,29 +142,19 @@ 
	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";

		target-5v-supply = <&reg_5v0>;

		target-12v-supply = <&reg_12v0>;

	};



	hda@70030000 {
@@ -177,18 +168,18 @@ 
	/* Apalis MMC1 */

	sdhci@700b0000 {

		status = "okay";

		bus-width = <4>;

		/* 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";

		bus-width = <4>;

		/* SD1_CD# */

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

		bus-width = <4>;

		vqmmc-supply = <&vddio_sdmmc3>;

	};
@@ -225,11 +216,12 @@ 


	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>;

		power-supply = <&reg_3v3>;

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

	};



	gpio-keys {
@@ -244,6 +236,13 @@ 
		};

	};



	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3.3V_SW";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	reg_5v0: regulator-5v0 {

		compatible = "regulator-fixed";

		regulator-name = "5V_SW";
@@ -251,6 +250,13 @@ 
		regulator-max-microvolt = <5000000>;

	};



	reg_12v0: regulator-12v0 {

		compatible = "regulator-fixed";

		regulator-name = "12V_SW";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

	};



	/* USBO1_EN */

	reg_usbo1_vbus: regulator-usbo1-vbus {

		compatible = "regulator-fixed";
@@ -276,7 +282,7 @@ 


&gpio {

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

	pex_perst_n {

	pex-perst-n {

		gpio-hog;

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

		output-high;

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

+25 −18
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ 
/ {

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

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

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

		     "toradex,apalis-tk1-v1.2", "toradex,apalis-tk1",

		     "nvidia,tegra124";



	aliases {

		rtc0 = "/i2c@7000c000/rtc@68";
@@ -36,6 +37,7 @@ 
	host1x@50000000 {

		hdmi@54280000 {

			status = "okay";

			hdmi-supply = <&reg_5v0>;

		};

	};
@@ -98,7 +100,7 @@ 
	 * I2C4 (DDC): I2C4_SDA/SCL (DDC) on MXM3 pin 205/207

	 * (e.g. display EDID)

	 */

	hdmi_ddc: i2c@7000c700 {

	i2c@7000c700 {

		status = "okay";

	};
@@ -106,29 +108,19 @@ 
	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";

		target-5v-supply = <&reg_5v0>;

		target-12v-supply = <&reg_12v0>;

	};



	hda@70030000 {
@@ -142,18 +134,18 @@ 
	/* Apalis MMC1 */

	sdhci@700b0000 {

		status = "okay";

		bus-width = <4>;

		/* 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";

		bus-width = <4>;

		/* SD1_CD# */

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

		bus-width = <4>;

		vqmmc-supply = <&vddio_sdmmc3>;

	};
@@ -190,11 +182,12 @@ 


	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>;

		power-supply = <&reg_3v3>;

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

	};



	gpio-keys {
@@ -209,6 +202,13 @@ 
		};

	};



	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3.3V_SW";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	reg_5v0: regulator-5v0 {

		compatible = "regulator-fixed";

		regulator-name = "5V_SW";
@@ -216,6 +216,13 @@ 
		regulator-max-microvolt = <5000000>;

	};



	reg_12v0: regulator-12v0 {

		compatible = "regulator-fixed";

		regulator-name = "12V_SW";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

	};



	/* USBO1_EN */

	reg_usbo1_vbus: regulator-usbo1-vbus {

		compatible = "regulator-fixed";
@@ -241,7 +248,7 @@ 


&gpio {

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

	pex_perst_n {

	pex-perst-n {

		gpio-hog;

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

		output-high;

CRA Git | Maintained and supported by SUSTech CRA and CCSE