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

Commit 4a8ab771 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-3.18-fixes-for-rc5' of... 

Merge tag 'tegra-for-3.18-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into fixes

Pull "ARM: tegra: Device tree fixes for v3.18-rc5" from Thierry Reding:

This contains the serial port numbering fixes that are required for the
serial port numbering to stay the same with or without the serial core
making use of the aliases defined in DT.

eMMC is also fixed for TN7 and Roth boards which were using the wrong
regulators.

* tag 'tegra-for-3.18-fixes-for-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: tegra: roth: Fix SD card VDD_IO regulator
  ARM: tegra: Remove eMMC vmmc property for roth/tn7
  ARM: dts: tegra: move serial aliases to per-board
  ARM: tegra: Add serial port labels to Tegra124 DT

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 5210436b 221b9bf4

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
	aliases {

		rtc0 = "/i2c@7000d000/tps65913@58";

		rtc1 = "/rtc@7000e000";

		serial0 = &uartd;

	};



	memory {

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

+5 −4
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
		linux,initrd-end = <0x82800000>;

	};



	aliases {

		serial0 = &uartd;

	};



	firmware {

		trusted-foundations {

			compatible = "tlm,trusted-foundations";
@@ -916,8 +920,6 @@ 
						regulator-name = "vddio-sdmmc3";

						regulator-min-microvolt = <1800000>;

						regulator-max-microvolt = <3300000>;

						regulator-always-on;

						regulator-boot-on;

					};



					ldousb {
@@ -962,7 +964,7 @@ 
	sdhci@78000400 {

		status = "okay";

		bus-width = <4>;

		vmmc-supply = <&vddio_sdmmc3>;

		vqmmc-supply = <&vddio_sdmmc3>;

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

		power-gpios = <&gpio TEGRA_GPIO(H, 0) GPIO_ACTIVE_HIGH>;

	};
@@ -971,7 +973,6 @@ 
	sdhci@78000600 {

		status = "okay";

		bus-width = <8>;

		vmmc-supply = <&vdd_1v8>;

		non-removable;

	};

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

+4 −1
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
		linux,initrd-end = <0x82800000>;

	};



	aliases {

		serial0 = &uartd;

	};



	firmware {

		trusted-foundations {

			compatible = "tlm,trusted-foundations";
@@ -240,7 +244,6 @@ 
	sdhci@78000600 {

		status = "okay";

		bus-width = <8>;

		vmmc-supply = <&vdd_1v8>;

		non-removable;

	};

arch/arm/boot/dts/tegra114.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -9,13 +9,6 @@ 
	compatible = "nvidia,tegra114";

	interrupt-parent = <&gic>;



	aliases {

		serial0 = &uarta;

		serial1 = &uartb;

		serial2 = &uartc;

		serial3 = &uartd;

	};



	host1x@50000000 {

		compatible = "nvidia,tegra114-host1x", "simple-bus";

		reg = <0x50000000 0x00028000>;

arch/arm/boot/dts/tegra124-jetson-tk1.dts

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
	aliases {

		rtc0 = "/i2c@0,7000d000/pmic@40";

		rtc1 = "/rtc@0,7000e000";

		serial0 = &uartd;

	};



	memory {