Commit 1b6d7328 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'pxa-dt-4.19' of https://github.com/rjarzmik/linux into next/dt 

This device-tree pxa update brings :
 - pxa3xx fixes and updates

* tag 'pxa-dt-4.19' of https://github.com/rjarzmik/linux

:
  arm: dts: pxa3xx: Add ssp ports to pxa3xx device tree
  arm: dts: pxa3xx: provide correct clk-names property for nand controller node
  ARM: dts: pxa: add label to lcd controller node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents eb3203ab 49e414c3

Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt

+3 −5
Original line number Diff line number Diff line
@@ -9,20 +9,18 @@ Example: 


	/* upstream device */



	ssp0: ssp@41000000 {

	ssp1: ssp@41000000 {

		compatible = "mrvl,pxa3xx-ssp";

		reg = <0x41000000 0x40>;

		interrupts = <24>;

		clock-names = "pxa27x-ssp.0";

		dmas = <&dma 13

			&dma 14>;

		dma-names = "rx", "tx";

	};



	/* DAI as user */



	ssp_dai0: ssp_dai@0 {

		compatible = "mrvl,pxa-ssp-dai";

		port = <&ssp0>;

		port = <&ssp1>;

		#sound-dai-cells = <0>;

	};

arch/arm/boot/dts/pxa2xx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 
			interrupts = <30 31>;

		};



		lcd-controller@40500000 {

		lcdc: lcd-controller@40500000 {

			compatible = "marvell,pxa2xx-lcdc";

			reg = <0x44000000 0x10000>;

			interrupts = <17>;

arch/arm/boot/dts/pxa3xx.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
			reg = <0x43100000 90>;

			interrupts = <45>;

			clocks = <&clks CLK_NAND>;

			clock-names = "core";

			dmas = <&pdma 97 3>;

			dma-names = "data";

			#address-cells = <1>;
@@ -242,6 +243,38 @@ 
			clocks = <&clks CLK_PWM1>;

			status = "disabled";

		};



		ssp1: ssp@41000000 {

			compatible = "mrvl,pxa3xx-ssp";

			reg = <0x41000000 0x40>;

			interrupts = <24>;

			clocks = <&clks CLK_SSP1>;

			status = "disabled";

		};



		ssp2: ssp@41700000 {

			compatible = "mrvl,pxa3xx-ssp";

			reg = <0x41700000 0x40>;

			interrupts = <16>;

			clocks = <&clks CLK_SSP2>;

			status = "disabled";

		};



		ssp3: ssp@41900000 {

			compatible = "mrvl,pxa3xx-ssp";

			reg = <0x41900000 0x40>;

			interrupts = <0>;

			clocks = <&clks CLK_SSP3>;

			status = "disabled";

		};



		ssp4: ssp@41a00000 {

			compatible = "mrvl,pxa3xx-ssp";

			reg = <0x41a00000 0x40>;

			interrupts = <13>;

			clocks = <&clks CLK_SSP4>;

			status = "disabled";

		};

	};



	clocks {

CRA Git | Maintained and supported by SUSTech CRA and CCSE