Commit cefb8fb6 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'at91-dt-7.1' of... 

Merge tag 'at91-dt-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt

Microchip AT91 device tree updates for v7.1

This update includes:
- enable LVDS, LCD and PMU for SAMA7D64 SoC
- drop unused #address-cells, #size-cells for SAM9X60 UDC node

* tag 'at91-dt-7.1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  ARM: dts: microchip: sama7d65: add Cortex-A7 PMU node
  arm: dts: microchip: remove unused #address-cells/#size-cells from sam9x60 udc node
  ARM: dts: microchip: sama7d65: add LVDS controller
  ARM: dts: microchip: sama7d65: add LCD controller

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents 55fbbbbe 7d7a9fc1

arch/arm/boot/dts/microchip/sam9x60.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ ahb { 
		ranges;



		usb0: gadget@500000 {

			#address-cells = <1>;

			#size-cells = <0>;

			compatible = "microchip,sam9x60-udc";

			reg = <0x00500000 0x100000

				0xf803c000 0x400>;

arch/arm/boot/dts/microchip/sama7d65.dtsi

+40 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ ns_sram: sram@100000 { 
		#size-cells = <1>;

	};



	pmu {

		compatible = "arm,cortex-a7-pmu";

		interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;

	};



	soc {

		compatible = "simple-bus";

		ranges;
@@ -278,6 +283,41 @@ sdmmc1: mmc@e1208000 { 
			status = "disabled";

		};



		xlcdc: lcd-controller@e1400000 {

			compatible = "microchip,sama7d65-xlcdc";

			reg = <0xe1400000 0x2000>;

			interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&pmc PMC_TYPE_PERIPHERAL 56>, <&pmc PMC_TYPE_GCK 56>, <&clk32k 1>;

			clock-names = "periph_clk", "sys_clk", "slow_clk";

			status = "disabled";



			display-controller {

				compatible = "atmel,hlcdc-display-controller";

				#address-cells = <1>;

				#size-cells = <0>;



				port@0 {

					reg = <0>;

					#address-cells = <1>;

					#size-cells = <0>;

				};

			};



			pwm {

				compatible = "atmel,hlcdc-pwm";

				#pwm-cells = <3>;

			};

		};



		lvdsc: lvds-controller@e1408000 {

			compatible = "microchip,sama7d65-lvds", "microchip,sam9x75-lvds";

			reg = <0xe1408000 0x100>;

			interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&pmc PMC_TYPE_PERIPHERAL 104>;

			clock-names = "pclk";

			status = "disabled";

		};



		aes: crypto@e1600000 {

			compatible = "microchip,sama7d65-aes", "atmel,at91sam9g46-aes";

			reg = <0xe1600000 0x100>;