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

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

Merge tag 'tegra-for-4.7-arm' of... 

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

Merge "ARM: tegra: Changes for v4.7-rc1" from Thierry Reding:

A couple of patches that cleanup some Kconfig, enable various features,
use stdout-path to define the debug serial port (so that it doesn't have
to be manually specified on the kernel command-line) and cleanup and fix
some minor device trees bugs.

* tag 'tegra-for-4.7-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Correct interrupt type for ARM TWD
  ARM: tegra: Add stdout-path for various boards
  ARM: tegra: Replace legacy *,wakeup property with wakeup-source
  ARM: tegra: Enable watchdog support for Tegra114 and Tegra124
  ARM: tegra: Add high speed UARTs to Jetson TK1 device tree
  ARM: tegra: Fix copy/paste typo in several DTS includes
  ARM: tegra: Remove redundant ARM_L1_CACHE_SHIFT_6 select
parents cb3ba4f7 e7d9b270

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,10 @@ 
		serial0 = &uartd;

		serial0 = &uartd;

	};

	};





	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory {

	memory {

		reg = <0x80000000 0x40000000>;

		reg = <0x80000000 0x40000000>;

	};

	};
@@ -1164,7 +1168,7 @@ 
			label = "Power";

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			linux,code = <KEY_POWER>;

			gpio-key,wakeup;

			wakeup-source;

		};

		};





		volume_down {

		volume_down {

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1047,7 +1047,7 @@ 
			label = "Power";

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			linux,code = <KEY_POWER>;

			gpio-key,wakeup;

			wakeup-source;

		};

		};

	};

	};

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -292,7 +292,7 @@ 
			label = "Power";

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			linux,code = <KEY_POWER>;

			gpio-key,wakeup;

			wakeup-source;

		};

		};





		volume_down {

		volume_down {

arch/arm/boot/dts/tegra114.dtsi

+2 −2
Original line number Original line Diff line number Diff line
@@ -150,7 +150,7 @@ 
	};

	};





	timer@60005000 {

	timer@60005000 {

		compatible = "nvidia,tegra114-timer", "nvidia,tegra20-timer";

		compatible = "nvidia,tegra114-timer", "nvidia,tegra30-timer", "nvidia,tegra20-timer";

		reg = <0x60005000 0x400>;

		reg = <0x60005000 0x400>;

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
@@ -256,7 +256,7 @@ 
	 * driver and APB DMA based serial driver for higher baudrate

	 * driver and APB DMA based serial driver for higher baudrate

	 * and performace. To enable the 8250 based driver, the compatible

	 * and performace. To enable the 8250 based driver, the compatible

	 * is "nvidia,tegra114-uart", "nvidia,tegra20-uart" and to enable

	 * is "nvidia,tegra114-uart", "nvidia,tegra20-uart" and to enable

	 * the APB DMA based serial driver, the comptible is

	 * the APB DMA based serial driver, the compatible is

	 * "nvidia,tegra114-hsuart", "nvidia,tegra30-hsuart".

	 * "nvidia,tegra114-hsuart", "nvidia,tegra30-hsuart".

	 */

	 */

	uarta: serial@70006000 {

	uarta: serial@70006000 {

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

+31 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,15 @@ 
	aliases {

	aliases {

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

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

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

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



		/* This order keeps the mapping DB9 connector <-> ttyS0 */

		serial0 = &uartd;

		serial0 = &uartd;

		serial1 = &uarta;

		serial2 = &uartb;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

	};





	memory {

	memory {
@@ -1367,6 +1375,28 @@ 
		};

		};

	};

	};





	/*

	 * First high speed UART, exposed on the expansion connector J3A2

	 *   Pin 41: BR_UART1_TXD

	 *   Pin 44: BR_UART1_RXD

	 */

	serial@70006000 {

		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";

		status = "okay";

	};



	/*

	 * Second high speed UART, exposed on the expansion connector J3A2

	 *   Pin 65: UART2_RXD

	 *   Pin 68: UART2_TXD

	 *   Pin 71: UART2_CTS_L

	 *   Pin 74: UART2_RTS_L

	 */

	serial@70006040 {

		compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart";

		status = "okay";

	};



	/* DB9 serial port */

	/* DB9 serial port */

	serial@0,70006300 {

	serial@0,70006300 {

		status = "okay";

		status = "okay";
@@ -1761,7 +1791,7 @@ 
			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			linux,code = <KEY_POWER>;

			debounce-interval = <10>;

			debounce-interval = <10>;

			gpio-key,wakeup;

			wakeup-source;

		};

		};

	};

	};