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

Commit 205dc205 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dt2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC DT updates part 2 from Arnd Bergmann:
 "This is a follow-up to the early ARM SoC DT changes, with additional
  content that has external dependencies:

   - The Tegra IOMMU DT support depends on changes from the iommu tree,
     plus the contents of the arm-soc drivers branch
   - The MVEBU PHY support depends on changes from the phy tree
   - The AT91 DT support depends on changes from the RTC and DMA-slave
     trees

  All of these changes just enable additional devices for existing
  platforms"

* tag 'dt2-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: tegra: Enable IOMMU for display controllers on Tegra124
  ARM: tegra: Enable IOMMU for display controllers on Tegra114
  ARM: tegra: Enable IOMMU for display controllers on Tegra30
  ARM: tegra: Add memory controller support for Tegra124
  ARM: tegra: Add memory controller support for Tegra114
  ARM: tegra: Add memory controller support for Tegra30
  ARM: tegra: Add APB_MISC_GP as a MIPI pad control bank
  ARM: mvebu: add PHY support to the dts for the USB controllers on Armada 375
  ARM: mvebu: add Device Tree description of USB cluster controller on Armada 375
  ARM: at91/dt: at91sam9g45: add ISI node
  ARM: at91/dt: enable the RTT block on the at91sam9m10g45ek board
  ARM: at91/dt: enable the RTT block on the sam9g20ek board
  ARM: at91/dt: add GPBR nodes
  ARM: at91/dt: add RTT nodes to at91 dtsis
  ARM: at91/dt: at91sam9rl: add rtc
  ARM: at91: fix GPLv2 wording
  ARM: at91/dt: sama5d4: add DMA support
  ARM: at91/dt: sama5d4: use macro instead of numeric value
parents 94bbdb63 1d5f497d

arch/arm/boot/dts/armada-375.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include "skeleton.dtsi"

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/interrupt-controller/irq.h>

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



#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
@@ -348,6 +349,12 @@ 
				#clock-cells = <1>;

			};



			usbcluster: usb-cluster@18400 {

				compatible = "marvell,armada-375-usb-cluster";

				reg = <0x18400 0x4>;

				#phy-cells = <1>;

			};



			mbusc: mbus-controller@20000 {

				compatible = "marvell,mbus-controller";

				reg = <0x20000 0x100>, <0x20180 0x20>;
@@ -398,6 +405,8 @@ 
				reg = <0x50000 0x500>;

				interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 18>;

				phys = <&usbcluster PHY_TYPE_USB2>;

				phy-names = "usb";

				status = "disabled";

			};
@@ -414,6 +423,8 @@ 
				reg = <0x58000 0x20000>,<0x5b880 0x80>;

				interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&gateclk 16>;

				phys = <&usbcluster PHY_TYPE_USB3>;

				phy-names = "usb";

				status = "disabled";

			};

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

+2 −2
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ 
 * licensing only applies to this file, and not this project as a

 * whole.

 *

 *  a) This library is free software; you can redistribute it and/or

 *  a) This file is free software; you can redistribute it and/or

 *     modify it under the terms of the GNU General Public License as

 *     published by the Free Software Foundation; either version 2 of the

 *     License, or (at your option) any later version.

 *

 *     This library is distributed in the hope that it will be useful,

 *     This file is distributed in the hope that it will be useful,

 *     but WITHOUT ANY WARRANTY; without even the implied warranty of

 *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *     GNU General Public License for more details.

arch/arm/boot/dts/at91sam9260.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -956,6 +956,14 @@ 
				};

			};



			rtc@fffffd20 {

				compatible = "atmel,at91sam9260-rtt";

				reg = <0xfffffd20 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&clk32k>;

				status = "disabled";

			};



			watchdog@fffffd40 {

				compatible = "atmel,at91sam9260-wdt";

				reg = <0xfffffd40 0x10>;
@@ -966,6 +974,12 @@ 
				atmel,idle-halt;

				status = "disabled";

			};



			gpbr: syscon@fffffd50 {

				compatible = "atmel,at91sam9260-gpbr", "syscon";

				reg = <0xfffffd50 0x10>;

				status = "disabled";

			};

		};



		nand0: nand@40000000 {

arch/arm/boot/dts/at91sam9261.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -828,12 +828,26 @@ 
				clocks = <&mck>;

			};



			rtc@fffffd20 {

				compatible = "atmel,at91sam9260-rtt";

				reg = <0xfffffd20 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&slow_xtal>;

				status = "disabled";

			};



			watchdog@fffffd40 {

				compatible = "atmel,at91sam9260-wdt";

				reg = <0xfffffd40 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				status = "disabled";

			};



			gpbr: syscon@fffffd50 {

				compatible = "atmel,at91sam9260-gpbr", "syscon";

				reg = <0xfffffd50 0x10>;

				status = "disabled";

			};

		};

	};

arch/arm/boot/dts/at91sam9263.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -922,6 +922,27 @@ 
				pinctrl-0 = <&pinctrl_can_rx_tx>;

				clocks = <&can_clk>;

				clock-names = "can_clk";

			};



			rtc@fffffd20 {

				compatible = "atmel,at91sam9260-rtt";

				reg = <0xfffffd20 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&slow_xtal>;

				status = "disabled";

			};



			rtc@fffffd50 {

				compatible = "atmel,at91sam9260-rtt";

				reg = <0xfffffd50 0x10>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

				clocks = <&slow_xtal>;

				status = "disabled";

			};



			gpbr: syscon@fffffd60 {

				compatible = "atmel,at91sam9260-gpbr", "syscon";

				reg = <0xfffffd60 0x50>;

				status = "disabled";

			};

		};