diff options
| author | Olof Johansson <[email protected]> | 2018-07-14 14:24:28 -0700 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2018-07-14 14:24:28 -0700 |
| commit | 1b6d73283560ea82da30da87d699a9ccb8b504ff (patch) | |
| tree | 5971e9fd54f03ea9a37c878b6990b49cfbfa9331 | |
| parent | eb3203ab92147937f36fd43efcd744f44ff0d137 (diff) | |
| parent | 49e414c32053554736c421b1ac5b645f5c73e879 (diff) | |
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: Olof Johansson <[email protected]>
| -rw-r--r-- | Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/pxa2xx.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/pxa3xx.dtsi | 33 |
3 files changed, 37 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt b/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt index 74c9ba6c2823..efd3fb1f68d2 100644 --- a/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt +++ b/Documentation/devicetree/bindings/sound/mrvl,pxa-ssp.txt @@ -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>; }; diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index e4ebcde17837..a520b4c14ea9 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -141,7 +141,7 @@ interrupts = <30 31>; }; - lcd-controller@40500000 { + lcdc: lcd-controller@40500000 { compatible = "marvell,pxa2xx-lcdc"; reg = <0x44000000 0x10000>; interrupts = <17>; diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index 132a3b8ab148..3a8f0edc3af9 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -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 { |