ARM: dts: DT data for OMAP platforms for v3.13
Subsystems (3)
v2 cover ARM: dts: DT data for OMAP platforms for v3.13
Following series is a collection of dts patches for the below features:
crypto:
aes, sha on am335x
aes, des on am437x
aes, des on omap4
display:
beaglebone black HDMI
am335x-evm panel
Series is based on Benoit Cousson's for_3.13/dts branch (commit sha 45646cd) Available at: git at github.com:joelagnel/linux-kernel.git (branch for-benoit)
v2 changes:
- Fixed hex capitalization
- Dropped interrupt-parent property and use macros
Benoit Parrot (1):
ARM: dts: AM33XX: Add LCDC info into am335x-evm
Darren Etheridge (1):
dts: boneblack: add pinmux and hdmi node to enable display
Joel Fernandes (5):
omap4: dts: Add node for AES
omap4: dts: Add node for DES3DES module
am33xx: dts: Fix AES interrupt number
ARM: am437x: dts: Add AES node for am437x
ARM: am437x: dts: Add DES node for am437x
Mark A. Greer (2):
ARM: dts: Add SHAM data and documentation for AM33XX
ARM: dts: Add AES data and documentation for AM33XX
.../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++ .../devicetree/bindings/crypto/omap-sham.txt | 31 +++++++++ arch/arm/boot/dts/am335x-bone.dts | 8 +++ arch/arm/boot/dts/am335x-boneblack.dts | 48 +++++++++++++ arch/arm/boot/dts/am335x-evm.dts | 79 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-evmsk.dts | 8 +++ arch/arm/boot/dts/am33xx.dtsi | 28 ++++++++ arch/arm/boot/dts/am4372.dtsi | 14 ++++ arch/arm/boot/dts/omap4.dtsi | 18 +++++ 9 files changed, 268 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txt create mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txt
Signature · 1 line
1.8.1.2
PATCH v2 1/9 omap4: dts: Add node for AES
OMAP4 has an AES module that uses the omap-aes crypto driver. Add DT entries for the same.
--- arch/arm/boot/dts/omap4.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/boot/dts/omap4.dtsi +9 -0
@@ -663,5 +663,14 @@ ram-bits = <12>; ti,has-mailbox; }; + + aes: aes at 4b501000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x4b501000 0xa0>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&sdma 111>, <&sdma 110>; + dma-names = "tx", "rx"; + }; }; };
Signature · 1 line
1.8.1.2
PATCH v2 2/9 omap4: dts: Add node for DES3DES module
In reply to Joel FernandesOMAP4 has an DES3DES module that uses the omap-des crypto driver. Add DT entries for the same.
--- arch/arm/boot/dts/omap4.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+)
arch/arm/boot/dts/omap4.dtsi +9 -0
@@ -672,5 +672,14 @@ dmas = <&sdma 111>, <&sdma 110>; dma-names = "tx", "rx"; }; + + des: des at 480a5000 { + compatible = "ti,omap4-des"; + ti,hwmods = "des"; + reg = <0x480a5000 0xa0>; + interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>; + dmas = <&sdma 117>, <&sdma 116>; + dma-names = "tx", "rx"; + }; }; };
Signature · 1 line
1.8.1.2
PATCH v2 3/9 ARM: dts: Add SHAM data and documentation for AM33XX
In reply to Joel FernandesFrom: "Mark A. Greer" <[email protected]>
Add the generic AM33XX SHAM module's device tree data and enable it for the am335x-evm, am335x-evmsk, and am335x-bone platforms. Also add Documentation file describing the data for the SHAM module.
--- .../devicetree/bindings/crypto/omap-sham.txt | 31 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 4 +++ arch/arm/boot/dts/am335x-evm.dts | 4 +++ arch/arm/boot/dts/am335x-evmsk.dts | 4 +++ arch/arm/boot/dts/am33xx.dtsi | 9 +++++++ 5 files changed, 52 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txt
Documentation/devicetree/bindings/crypto/omap-sham.txt new file +31 -0
@@ -0,0 +1,31 @@ +OMAP SoC SHA crypto Module + +Required properties: + +- compatible : Should contain entries for this and backward compatible + SHAM versions: + - "ti,omap2-sham" for OMAP2 & OMAP3. + - "ti,omap4-sham" for OMAP4 and AM33XX. + Note that these two versions are incompatible. +- ti,hwmods: Name of the hwmod associated with the SHAM module +- reg : Offset and length of the register set for the module +- interrupt-parent : the phandle for the interrupt controller that + services interrupts for this module. +- interrupts : the interrupt number for the SHAM module. + +Optional properties: +- dmas: DMA specifier for the rx dma. See the DMA client binding, + Documentation/devicetree/bindings/dma/dma.txt +- dma-names: DMA request name. Should be "rx" if a dma is present. + +Example: + /* AM335x */ + sham: sham at 53100000 { + compatible = "ti,omap4-sham"; + ti,hwmods = "sham"; + reg = <0x53100000 0x200>; + interrupt-parent = <&intc>; + interrupts = <109>; + dmas = <&edma 36>; + dma-names = "rx"; + };
arch/arm/boot/dts/am335x-bone.dts +4 -0
@@ -19,3 +19,7 @@ &mmc1 { vmmc-supply = <&ldo3_reg>; }; + +&sham { + status = "okay"; +};
arch/arm/boot/dts/am335x-evm.dts +4 -0
@@ -522,3 +522,7 @@ status = "okay"; vmmc-supply = <&vmmc_reg>; }; + +&sham { + status = "okay"; +};
arch/arm/boot/dts/am335x-evmsk.dts +4 -0
@@ -424,3 +424,7 @@ status = "okay"; vmmc-supply = <&vmmc_reg>; }; + +&sham { + status = "okay"; +};
arch/arm/boot/dts/am33xx.dtsi +9 -0
@@ -710,5 +710,14 @@ #size-cells = <1>; status = "disabled"; }; + + sham: sham at 53100000 { + compatible = "ti,omap4-sham"; + ti,hwmods = "sham"; + reg = <0x53100000 0x200>; + interrupts = <109>; + dmas = <&edma 36>; + dma-names = "rx"; + }; }; };
Signature · 1 line
1.8.1.2
Re: [PATCH v2 3/9] ARM: dts: Add SHAM data and documentation for AM33XX
Quoted 28 lines · Joel Fernandes
From: "Mark A. Greer" <[email protected]>
Add the generic AM33XX SHAM module's device tree data and enable it for the am335x-evm, am335x-evmsk, and am335x-bone platforms. Also add Documentation file describing the data for the SHAM module.
[joelf at ti.com: Dropped interrupt-parrent property]CC Paul Walmsley <[email protected]>Signed-off-by Mark A. Greer <[email protected]>--- .../devicetree/bindings/crypto/omap-sham.txt | 31 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 4 +++ arch/arm/boot/dts/am335x-evm.dts | 4 +++ arch/arm/boot/dts/am335x-evmsk.dts | 4 +++ arch/arm/boot/dts/am33xx.dtsi | 9 +++++++ 5 files changed, 52 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txtDocumentation/devicetree/bindings/crypto/omap-sham.txt new file +3
-0@@ -0,0 +1,31 @@ +OMAP SoC SHA crypto Module + +Required properties:
Documentation/devicetree/bindings/crypto/omap-sham.txt line 13
Quoted 10 lines
Documentation/devicetree/bindings/crypto/omap-sham.txt new file +10
-0+ +- compatible : Should contain entries for this and backward compatible + SHAM versions: + - "ti,omap2-sham" for OMAP2 & OMAP3. + - "ti,omap4-sham" for OMAP4 and AM33XX. + Note that these two versions are incompatible. +- ti,hwmods: Name of the hwmod associated with the SHAM module +- reg : Offset and length of the register set for the module +- interrupt-parent : the phandle for the interrupt controller that + services interrupts for this module.
I don't think this is strictly speaking necessary -- it's mostly going to be implicit (it is in the dtsi below). As this is a standard property, you don't need to document it here.
Documentation/devicetree/bindings/crypto/omap-sham.txt line 14
Quoted 1 line
Documentation/devicetree/bindings/crypto/omap-sham.txt new file +1
-0+- interrupts : the interrupt number for the SHAM module.
Sorry, I missed this last time, but this should be interrupt-specifier rather than interrupt number.
Otherwise, this looks good to me. With the fixups above:
Quoted 76 lines
Documentation/devicetree/bindings/crypto/omap-sham.txt new file +17
-0+ +Optional properties: +- dmas: DMA specifier for the rx dma. See the DMA client binding, + Documentation/devicetree/bindings/dma/dma.txt +- dma-names: DMA request name. Should be "rx" if a dma is present. + +Example: + /* AM335x */ + sham: sham at 53100000 { + compatible = "ti,omap4-sham"; + ti,hwmods = "sham"; + reg = <0x53100000 0x200>; + interrupt-parent = <&intc>; + interrupts = <109>; + dmas = <&edma 36>; + dma-names = "rx"; + };arch/arm/boot/dts/am335x-bone.dts +4
-0@@ -19,3 +19,7 @@ &mmc1 { vmmc-supply = <&ldo3_reg>; }; + +&sham { + status = "okay"; +};arch/arm/boot/dts/am335x-evm.dts +4
-0@@ -522,3 +522,7 @@ status = "okay"; vmmc-supply = <&vmmc_reg>; }; + +&sham { + status = "okay"; +};arch/arm/boot/dts/am335x-evmsk.dts +4
-0@@ -424,3 +424,7 @@ status = "okay"; vmmc-supply = <&vmmc_reg>; }; + +&sham { + status = "okay"; +};arch/arm/boot/dts/am33xx.dtsi +9
-0@@ -710,5 +710,14 @@ #size-cells = <1>; status = "disabled"; }; + + sham: sham at 53100000 { + compatible = "ti,omap4-sham"; + ti,hwmods = "sham"; + reg = <0x53100000 0x200>; + interrupts = <109>; + dmas = <&edma 36>; + dma-names = "rx"; + }; }; };Signature · 1 line
1.8.1.2
Re: [PATCH v2 3/9] ARM: dts: Add SHAM data and documentation for AM33XX
Quoted 35 lines · Mark Rutland
Quoted 34 lines · Joel Fernandes
From: "Mark A. Greer" <[email protected]>
Add the generic AM33XX SHAM module's device tree data and enable it for the am335x-evm, am335x-evmsk, and am335x-bone platforms. Also add Documentation file describing the data for the SHAM module.
[joelf at ti.com: Dropped interrupt-parrent property]CC Paul Walmsley <[email protected]>Signed-off-by Mark A. Greer <[email protected]>--- .../devicetree/bindings/crypto/omap-sham.txt | 31 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 4 +++ arch/arm/boot/dts/am335x-evm.dts | 4 +++ arch/arm/boot/dts/am335x-evmsk.dts | 4 +++ arch/arm/boot/dts/am33xx.dtsi | 9 +++++++ 5 files changed, 52 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txtDocumentation/devicetree/bindings/crypto/omap-sham.txt new file +9
-0@@ -0,0 +1,31 @@ +OMAP SoC SHA crypto Module + +Required properties: + +- compatible : Should contain entries for this and backward compatible + SHAM versions: + - "ti,omap2-sham" for OMAP2 & OMAP3. + - "ti,omap4-sham" for OMAP4 and AM33XX. + Note that these two versions are incompatible.
Quoted 8 lines
Documentation/devicetree/bindings/crypto/omap-sham.txt line 13
Quoted 4 lines
Documentation/devicetree/bindings/crypto/omap-sham.txt new file +4
-0+- ti,hwmods: Name of the hwmod associated with the SHAM module +- reg : Offset and length of the register set for the module +- interrupt-parent : the phandle for the interrupt controller that + services interrupts for this module.I don't think this is strictly speaking necessary -- it's mostly going to be implicit (it is in the dtsi below). As this is a standard property, you don't need to document it here.
Ok, dropping from documentation.
Quoted 4 lines
Documentation/devicetree/bindings/crypto/omap-sham.txt line 14
Quoted 1 line
Documentation/devicetree/bindings/crypto/omap-sham.txt new file +1
-0+- interrupts : the interrupt number for the SHAM module.Sorry, I missed this last time, but this should be interrupt-specifier rather than interrupt number.
Ok, done.
Quoted 4 lines
Otherwise, this looks good to me. With the fixups above:
Acked-by Mark Rutland <[email protected]>
Thanks!
-Joel
Quoted 77 lines
Quoted 77 lines
Documentation/devicetree/bindings/crypto/omap-sham.txt new file +17
-0+ +Optional properties: +- dmas: DMA specifier for the rx dma. See the DMA client binding, + Documentation/devicetree/bindings/dma/dma.txt +- dma-names: DMA request name. Should be "rx" if a dma is present. + +Example: + /* AM335x */ + sham: sham at 53100000 { + compatible = "ti,omap4-sham"; + ti,hwmods = "sham"; + reg = <0x53100000 0x200>; + interrupt-parent = <&intc>; + interrupts = <109>; + dmas = <&edma 36>; + dma-names = "rx"; + };arch/arm/boot/dts/am335x-bone.dts +4
-0@@ -19,3 +19,7 @@ &mmc1 { vmmc-supply = <&ldo3_reg>; }; + +&sham { + status = "okay"; +};arch/arm/boot/dts/am335x-evm.dts +4
-0@@ -522,3 +522,7 @@ status = "okay"; vmmc-supply = <&vmmc_reg>; }; + +&sham { + status = "okay"; +};arch/arm/boot/dts/am335x-evmsk.dts +4
-0@@ -424,3 +424,7 @@ status = "okay"; vmmc-supply = <&vmmc_reg>; }; + +&sham { + status = "okay"; +};arch/arm/boot/dts/am33xx.dtsi +9
-0@@ -710,5 +710,14 @@ #size-cells = <1>; status = "disabled"; }; + + sham: sham at 53100000 { + compatible = "ti,omap4-sham"; + ti,hwmods = "sham"; + reg = <0x53100000 0x200>; + interrupts = <109>; + dmas = <&edma 36>; + dma-names = "rx"; + }; }; };Signature · 1 line
1.8.1.2
PATCH v2 4/9 ARM: dts: Add AES data and documentation for AM33XX
In reply to Joel FernandesFrom: "Mark A. Greer" <[email protected]>
Add the generic AM33XX AES module's device tree data and enable it for the am335x-evm, am335x-evmsk, and am335x-bone platforms. Also add Documentation file describing the data for the AES module.
[joelf at ti.com: Dropped interrupt-parent propert]
--- .../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 4 +++ arch/arm/boot/dts/am335x-evm.dts | 4 +++ arch/arm/boot/dts/am335x-evmsk.dts | 4 +++ arch/arm/boot/dts/am33xx.dtsi | 10 +++++++ 5 files changed, 56 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txt
Documentation/devicetree/bindings/crypto/omap-aes.txt new file +34 -0
@@ -0,0 +1,34 @@ +OMAP SoC AES crypto Module + +Required properties: + +- compatible : Should contain entries for this and backward compatible + AES versions: + - "ti,omap2-aes" for OMAP2. + - "ti,omap3-aes" for OMAP3. + - "ti,omap4-aes" for OMAP4 and AM33XX. + Note that the OMAP2 and 3 versions are compatible (OMAP3 supports + more algorithms) but they are incompatible with OMAP4. +- ti,hwmods: Name of the hwmod associated with the AES odule +- reg : Offset and length of the register set for the module +- interrupt-parent : the phandle for the interrupt controller that + services interrupts for this module. +- interrupts : the interrupt number for the AES odule. + +Optional properties: +- dmas: DMA specifier for tx and rx dma. See the DMA client binding, + Documentation/devicetree/bindings/dma/dma.txt +- dma-names: DMA request names. Should be '"tx", "rx"' if dma is present. + +Example: + /* AM335x */ + aes: aes at 53500000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x53500000 0xa0>; + interrupt-parent = <&intc>; + interrupts = <102>; + dmas = <&edma 6 + &edma 5>; + dma-names = "tx", "rx"; + };
arch/arm/boot/dts/am335x-bone.dts +4 -0
@@ -23,3 +23,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +};
arch/arm/boot/dts/am335x-evm.dts +4 -0
@@ -526,3 +526,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +};
arch/arm/boot/dts/am335x-evmsk.dts +4 -0
@@ -428,3 +428,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +};
arch/arm/boot/dts/am33xx.dtsi +10 -0
@@ -719,5 +719,15 @@ dmas = <&edma 36>; dma-names = "rx"; }; + + aes: aes at 53500000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x53500000 0xa0>; + interrupts = <102>; + dmas = <&edma 6 + &edma 5>; + dma-names = "tx", "rx"; + }; }; };
Signature · 1 line
1.8.1.2
Re: [PATCH v2 4/9] ARM: dts: Add AES data and documentation for AM33XX
Quoted 32 lines · Joel Fernandes
From: "Mark A. Greer" <[email protected]>
Add the generic AM33XX AES module's device tree data and enable it for the am335x-evm, am335x-evmsk, and am335x-bone platforms. Also add Documentation file describing the data for the AES module.
[joelf at ti.com: Dropped interrupt-parent propert]
CC Paul Walmsley <[email protected]>Signed-off-by Mark A. Greer <[email protected]>--- .../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 4 +++ arch/arm/boot/dts/am335x-evm.dts | 4 +++ arch/arm/boot/dts/am335x-evmsk.dts | 4 +++ arch/arm/boot/dts/am33xx.dtsi | 10 +++++++ 5 files changed, 56 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txtDocumentation/devicetree/bindings/crypto/omap-aes.txt new file +6
-0@@ -0,0 +1,34 @@ +OMAP SoC AES crypto Module + +Required properties: + +- compatible : Should contain entries for this and backward compatible + AES versions:
Documentation/devicetree/bindings/crypto/omap-aes.txt line 16
Quoted 10 lines
Documentation/devicetree/bindings/crypto/omap-aes.txt new file +10
-0+ - "ti,omap2-aes" for OMAP2. + - "ti,omap3-aes" for OMAP3. + - "ti,omap4-aes" for OMAP4 and AM33XX. + Note that the OMAP2 and 3 versions are compatible (OMAP3 supports + more algorithms) but they are incompatible with OMAP4. +- ti,hwmods: Name of the hwmod associated with the AES odule +- reg : Offset and length of the register set for the module +- interrupt-parent : the phandle for the interrupt controller that + services interrupts for this module. +- interrupts : the interrupt number for the AES odule.
Similar comments to the SHAM module here:
* s/interrupt number/interrupt-specifier/
* Drop interrupt-parent.
* s/AES odule/AES module/
Documentation/devicetree/bindings/crypto/omap-aes.txt line 20
Quoted 4 lines
Documentation/devicetree/bindings/crypto/omap-aes.txt new file +4
-0+ +Optional properties: +- dmas: DMA specifier for tx and rx dma. See the DMA client binding, + Documentation/devicetree/bindings/dma/dma.txt
s/DMA specifier/DMA specifiers/
Documentation/devicetree/bindings/crypto/omap-aes.txt line 21
Quoted 1 line
Documentation/devicetree/bindings/crypto/omap-aes.txt new file +1
-0+- dma-names: DMA request names. Should be '"tx", "rx"' if dma is present.
Nit: I'd prefer 'Should include "tx" and "rx" if present' -- I hope the driver's requesting these by name rather than relying on a specific ordering (it makes future expansion and optional components far easier to handle sanely).
Documentation/devicetree/bindings/crypto/omap-aes.txt line 34
Quoted 13 lines
Documentation/devicetree/bindings/crypto/omap-aes.txt new file +13
-0+ +Example: + /* AM335x */ + aes: aes at 53500000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x53500000 0xa0>; + interrupt-parent = <&intc>; + interrupts = <102>; + dmas = <&edma 6 + &edma 5>; + dma-names = "tx", "rx"; + };
Minor nit, but for consistency could you bracket the DMAs individually:
dmas = <&edma 6>, <&edma 5>;
Quoted 42 lines
arch/arm/boot/dts/am335x-bone.dts +4
-0@@ -23,3 +23,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +};arch/arm/boot/dts/am335x-evm.dts +4
-0@@ -526,3 +526,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +};arch/arm/boot/dts/am335x-evmsk.dts +4
-0@@ -428,3 +428,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +};arch/arm/boot/dts/am33xx.dtsi +0
-0@@ -719,5 +719,15 @@ dmas = <&edma 36>;
arch/arm/boot/dts/am33xx.dtsi line 729
Quoted 10 lines
arch/arm/boot/dts/am33xx.dtsi +8
-0dma-names = "rx"; }; + + aes: aes at 53500000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x53500000 0xa0>; + interrupts = <102>; + dmas = <&edma 6 + &edma 5>;
Bracketing here too, please.
Cheers,
Mark.
Quoted 8 lines
arch/arm/boot/dts/am33xx.dtsi +2
-0+ dma-names = "tx", "rx"; + }; }; };Signature · 1 line
1.8.1.2
Re: [PATCH v2 4/9] ARM: dts: Add AES data and documentation for AM33XX
These patches were not authored by me but I'll go ahead and fix them up anyway.
Quoted 46 lines · Mark Rutland
Quoted 32 lines · Joel Fernandes
From: "Mark A. Greer" <[email protected]>
Add the generic AM33XX AES module's device tree data and enable it for the am335x-evm, am335x-evmsk, and am335x-bone platforms. Also add Documentation file describing the data for the AES module.
[joelf at ti.com: Dropped interrupt-parent propert]
CC Paul Walmsley <[email protected]>Signed-off-by Mark A. Greer <[email protected]>--- .../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-bone.dts | 4 +++ arch/arm/boot/dts/am335x-evm.dts | 4 +++ arch/arm/boot/dts/am335x-evmsk.dts | 4 +++ arch/arm/boot/dts/am33xx.dtsi | 10 +++++++ 5 files changed, 56 insertions(+) create mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txtDocumentation/devicetree/bindings/crypto/omap-aes.txt new file +6
-0@@ -0,0 +1,34 @@ +OMAP SoC AES crypto Module + +Required properties: + +- compatible : Should contain entries for this and backward compatible + AES versions:Documentation/devicetree/bindings/crypto/omap-aes.txt line 16
Quoted 10 lines
Documentation/devicetree/bindings/crypto/omap-aes.txt new file +10
-0+ - "ti,omap2-aes" for OMAP2. + - "ti,omap3-aes" for OMAP3. + - "ti,omap4-aes" for OMAP4 and AM33XX. + Note that the OMAP2 and 3 versions are compatible (OMAP3 supports + more algorithms) but they are incompatible with OMAP4. +- ti,hwmods: Name of the hwmod associated with the AES odule +- reg : Offset and length of the register set for the module +- interrupt-parent : the phandle for the interrupt controller that + services interrupts for this module. +- interrupts : the interrupt number for the AES odule.Similar comments to the SHAM module here:
Quoted 3 lines
* s/interrupt number/interrupt-specifier/
* Drop interrupt-parent.
* s/AES odule/AES module/
Ok, done.
Quoted 10 lines
Documentation/devicetree/bindings/crypto/omap-aes.txt line 20
Quoted 4 lines
Documentation/devicetree/bindings/crypto/omap-aes.txt new file +4
-0+ +Optional properties: +- dmas: DMA specifier for tx and rx dma. See the DMA client binding, + Documentation/devicetree/bindings/dma/dma.txts/DMA specifier/DMA specifiers/
Documentation/devicetree/bindings/crypto/omap-aes.txt line 21
Quoted 1 line
Documentation/devicetree/bindings/crypto/omap-aes.txt new file +1
-0+- dma-names: DMA request names. Should be '"tx", "rx"' if dma is present.Nit: I'd prefer 'Should include "tx" and "rx" if present' -- I hope the
Ok, changed to the same.
Quoted 3 lines
driver's requesting these by name rather than relying on a specific ordering (it makes future expansion and optional components far easier to handle sanely).
Yes, that's the case. Its handled by name using the dma_request_slave_channel_compat API.
Quoted 16 lines
Documentation/devicetree/bindings/crypto/omap-aes.txt line 34
Quoted 13 lines
Documentation/devicetree/bindings/crypto/omap-aes.txt new file +13
-0+ +Example: + /* AM335x */ + aes: aes at 53500000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x53500000 0xa0>; + interrupt-parent = <&intc>; + interrupts = <102>; + dmas = <&edma 6 + &edma 5>; + dma-names = "tx", "rx"; + };Minor nit, but for consistency could you bracket the DMAs individually:
Quoted 2 lines
dmas = <&edma 6>, <&edma 5>;
Ok changed as above.
Quoted 47 lines
Quoted 47 lines
arch/arm/boot/dts/am335x-bone.dts +4
-0@@ -23,3 +23,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +};arch/arm/boot/dts/am335x-evm.dts +4
-0@@ -526,3 +526,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +};arch/arm/boot/dts/am335x-evmsk.dts +4
-0@@ -428,3 +428,7 @@ &sham { status = "okay"; }; + +&aes { + status = "okay"; +};arch/arm/boot/dts/am33xx.dtsi +2
-0@@ -719,5 +719,15 @@ dmas = <&edma 36>; dma-names = "rx"; }; + + aes: aes at 53500000 {
Quoted 8 lines
arch/arm/boot/dts/am33xx.dtsi line 729
Quoted 6 lines
arch/arm/boot/dts/am33xx.dtsi +6
-0+ compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x53500000 0xa0>; + interrupts = <102>; + dmas = <&edma 6 + &edma 5>;Bracketing here too, please.
Done.
Thanks,
-Joel
PATCH v2 5/9 am33xx: dts: Fix AES interrupt number
In reply to Joel Fernandes--- arch/arm/boot/dts/am33xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/am33xx.dtsi +1 -1
@@ -724,7 +724,7 @@ compatible = "ti,omap4-aes"; ti,hwmods = "aes"; reg = <0x53500000 0xa0>; - interrupts = <102>; + interrupts = <103>; dmas = <&edma 6 &edma 5>; dma-names = "tx", "rx";
Signature · 1 line
1.8.1.2
Re: [PATCH v2 5/9] am33xx: dts: Fix AES interrupt number
Quoted 1 line · Joel Fernandes
Signed-off-by Joel Fernandes <[email protected]>
Even if this is obvious, a small changelog is always recommended.
Thanks,
Benoit
Quoted 18 lines
--- arch/arm/boot/dts/am33xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/boot/dts/am33xx.dtsi +1
-1@@ -724,7 +724,7 @@ compatible = "ti,omap4-aes"; ti,hwmods = "aes"; reg = <0x53500000 0xa0>; - interrupts = <102>; + interrupts = <103>; dmas = <&edma 6 &edma 5>; dma-names = "tx", "rx";
PATCH v2 6/9 ARM: am437x: dts: Add AES node for am437x
In reply to Joel FernandesAM437x SoC has AES module similar to the one on OMAP4. Add DT node for the same.
--- arch/arm/boot/dts/am4372.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/am4372.dtsi +7 -0
@@ -411,5 +411,12 @@ ti,hwmods = "epwmss5"; status = "disabled"; }; + + aes: aes at 53501000 { + compatible = "ti,omap4-aes"; + ti,hwmods = "aes"; + reg = <0x53501000 0xa0>; + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; + }; }; };
Signature · 1 line
1.8.1.2
PATCH v2 7/9 ARM: am437x: dts: Add DES node for am437x
In reply to Joel FernandesAM437x SoC has a DES3DES module similar to the one on OMAP4. Add DT node for the same.
--- arch/arm/boot/dts/am4372.dtsi | 7 +++++++ 1 file changed, 7 insertions(+)
arch/arm/boot/dts/am4372.dtsi +7 -0
@@ -418,5 +418,12 @@ reg = <0x53501000 0xa0>; interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; }; + + des: des at 53701000 { + compatible = "ti,omap4-des"; + ti,hwmods = "des"; + reg = <0x53701000 0xa0>; + interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>; + }; }; };
Signature · 1 line
1.8.1.2
PATCH v2 8/9 ARM: dts: AM33XX: Add LCDC info into am335x-evm
In reply to Joel FernandesFrom: Benoit Parrot <[email protected]>
Add LCDC device node in DT for am33xx
Add LCDC and Panel info in DT for am335x-evm
Changes:
- remove redundant/unnecessary SoC specific setting in the board dts
- resolved conflicts on for_3.13/dts
--- arch/arm/boot/dts/am335x-evm.dts | 71 ++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/am33xx.dtsi | 9 +++++ 2 files changed, 80 insertions(+)
arch/arm/boot/dts/am335x-evm.dts +71 -0
@@ -85,6 +85,40 @@ brightness-levels = <0 51 53 56 62 75 101 152 255>; default-brightness-level = <8>; }; + + panel { + compatible = "ti,tilcdc,panel"; + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&lcd_pins_s0>; + panel-info { + ac-bias = <255>; + ac-bias-intrpt = <0>; + dma-burst-sz = <16>; + bpp = <32>; + fdd = <0x80>; + sync-edge = <0>; + sync-ctrl = <1>; + raster-order = <0>; + fifo-th = <0>; + }; + + display-timings { + 800x480p62 { + clock-frequency = <30000000>; + hactive = <800>; + vactive = <480>; + hfront-porch = <39>; + hback-porch = <39>; + hsync-len = <47>; + vback-porch = <29>; + vfront-porch = <13>; + vsync-len = <2>; + hsync-active = <1>; + vsync-active = <1>; + }; + }; + }; }; &am33xx_pinmux {
@@ -212,6 +246,39 @@ 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) >; }; + + lcd_pins_s0: lcd_pins_s0 { + pinctrl-single,pins = < + 0x20 0x01 /* gpmc_ad8.lcd_data16, OUTPUT | MODE1 */ + 0x24 0x01 /* gpmc_ad9.lcd_data17, OUTPUT | MODE1 */ + 0x28 0x01 /* gpmc_ad10.lcd_data18, OUTPUT | MODE1 */ + 0x2c 0x01 /* gpmc_ad11.lcd_data19, OUTPUT | MODE1 */ + 0x30 0x01 /* gpmc_ad12.lcd_data20, OUTPUT | MODE1 */ + 0x34 0x01 /* gpmc_ad13.lcd_data21, OUTPUT | MODE1 */ + 0x38 0x01 /* gpmc_ad14.lcd_data22, OUTPUT | MODE1 */ + 0x3c 0x01 /* gpmc_ad15.lcd_data23, OUTPUT | MODE1 */ + 0xa0 0x00 /* lcd_data0.lcd_data0, OUTPUT | MODE0 */ + 0xa4 0x00 /* lcd_data1.lcd_data1, OUTPUT | MODE0 */ + 0xa8 0x00 /* lcd_data2.lcd_data2, OUTPUT | MODE0 */ + 0xac 0x00 /* lcd_data3.lcd_data3, OUTPUT | MODE0 */ + 0xb0 0x00 /* lcd_data4.lcd_data4, OUTPUT | MODE0 */ + 0xb4 0x00 /* lcd_data5.lcd_data5, OUTPUT | MODE0 */ + 0xb8 0x00 /* lcd_data6.lcd_data6, OUTPUT | MODE0 */ + 0xbc 0x00 /* lcd_data7.lcd_data7, OUTPUT | MODE0 */ + 0xc0 0x00 /* lcd_data8.lcd_data8, OUTPUT | MODE0 */ + 0xc4 0x00 /* lcd_data9.lcd_data9, OUTPUT | MODE0 */ + 0xc8 0x00 /* lcd_data10.lcd_data10, OUTPUT | MODE0 */ + 0xcc 0x00 /* lcd_data11.lcd_data11, OUTPUT | MODE0 */ + 0xd0 0x00 /* lcd_data12.lcd_data12, OUTPUT | MODE0 */ + 0xd4 0x00 /* lcd_data13.lcd_data13, OUTPUT | MODE0 */ + 0xd8 0x00 /* lcd_data14.lcd_data14, OUTPUT | MODE0 */ + 0xdc 0x00 /* lcd_data15.lcd_data15, OUTPUT | MODE0 */ + 0xe0 0x00 /* lcd_vsync.lcd_vsync, OUTPUT | MODE0 */ + 0xe4 0x00 /* lcd_hsync.lcd_hsync, OUTPUT | MODE0 */ + 0xe8 0x00 /* lcd_pclk.lcd_pclk, OUTPUT | MODE0 */ + 0xec 0x00 /* lcd_ac_bias_en.lcd_ac_bias_en, OUTPUT | MODE0 */ + >; + }; }; &uart0 {
@@ -308,6 +375,10 @@ }; }; +&lcdc { + status = "okay"; +}; + &elm { status = "okay"; };
arch/arm/boot/dts/am33xx.dtsi +9 -0
@@ -682,6 +682,15 @@ status = "disabled"; }; + lcdc: lcdc at 4830e000 { + compatible = "ti,am33xx-tilcdc"; + reg = <0x4830e000 0x1000>; + interrupt-parent = <&intc>; + interrupts = <36>; + ti,hwmods = "lcdc"; + status = "disabled"; + }; + tscadc: tscadc at 44e0d000 { compatible = "ti,am3359-tscadc"; reg = <0x44e0d000 0x1000>;
Signature · 1 line
1.8.1.2
PATCH v2 9/9 dts: boneblack: add pinmux and hdmi node to enable display
In reply to Joel FernandesFrom: Darren Etheridge <[email protected]>
Enable the hdmi output and the LCD Controller on BeagleBone Black. Also configure the correct pinmux for output of video data from the SoC to the HDMI encoder.
--- arch/arm/boot/dts/am335x-boneblack.dts | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
arch/arm/boot/dts/am335x-boneblack.dts +48 -0
@@ -28,3 +28,51 @@ status = "okay"; ti,vcc-aux-disable-is-sleep; }; + +&am33xx_pinmux { + nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins { + pinctrl-single,pins = < + 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ + 0xa0 0x08 /* lcd_data0.lcd_data0, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xa4 0x08 /* lcd_data1.lcd_data1, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xa8 0x08 /* lcd_data2.lcd_data2, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xac 0x08 /* lcd_data3.lcd_data3, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xb0 0x08 /* lcd_data4.lcd_data4, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xb4 0x08 /* lcd_data5.lcd_data5, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xb8 0x08 /* lcd_data6.lcd_data6, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xbc 0x08 /* lcd_data7.lcd_data7, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xc0 0x08 /* lcd_data8.lcd_data8, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xc4 0x08 /* lcd_data9.lcd_data9, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xc8 0x08 /* lcd_data10.lcd_data10, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xcc 0x08 /* lcd_data11.lcd_data11, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xd0 0x08 /* lcd_data12.lcd_data12, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xd4 0x08 /* lcd_data13.lcd_data13, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xd8 0x08 /* lcd_data14.lcd_data14, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xdc 0x08 /* lcd_data15.lcd_data15, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT | AM33XX_PULL_DISA */ + 0xe0 0x00 /* lcd_vsync.lcd_vsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ + 0xe4 0x00 /* lcd_hsync.lcd_hsync, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ + 0xe8 0x00 /* lcd_pclk.lcd_pclk, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ + 0xec 0x00 /* lcd_ac_bias_en.lcd_ac_bias_en, OMAP_MUX_MODE0 | AM33XX_PIN_OUTPUT */ + >; + }; + nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins { + pinctrl-single,pins = < + 0x1b0 0x03 /* xdma_event_intr0, OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */ + >; + }; +}; + +&lcdc { + status = "okay"; +}; + +/ { + hdmi { + compatible = "ti,tilcdc,slave"; + i2c = <&i2c0>; + pinctrl-names = "default", "off"; + pinctrl-0 = <&nxp_hdmi_bonelt_pins>; + pinctrl-1 = <&nxp_hdmi_bonelt_off_pins>; + status = "okay"; + }; +};
Signature · 1 line
1.8.1.2
v2 cover ARM: dts: DT data for OMAP platforms for v3.13
In reply to Joel Fernandes+ DT list and DT maintainers.
Hi Joel,
Thanks for the update. It looks good to me.
For the new bindings added below;
Quoted 2 lines
.../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++ .../devicetree/bindings/crypto/omap-sham.txt | 31 +++++++++
I will need the acked-by from one of the DT maintainers.
Regards,
Benoit
Quoted 46 lines · Joel Fernandes
Following series is a collection of dts patches for the below features:
crypto:
aes, sha on am335x
aes, des on am437x
aes, des on omap4
display:
beaglebone black HDMI
am335x-evm panelSeries is based on Benoit Cousson's for_3.13/dts branch (commit sha 45646cd) Available at: git at github.com:joelagnel/linux-kernel.git (branch for-benoit)
v2 changes:
- Fixed hex capitalization
- Dropped interrupt-parent property and use macrosBenoit Parrot (1):
ARM: dts: AM33XX: Add LCDC info into am335x-evmDarren Etheridge (1):
dts: boneblack: add pinmux and hdmi node to enable displayJoel Fernandes (5):
omap4: dts: Add node for AES
omap4: dts: Add node for DES3DES module
am33xx: dts: Fix AES interrupt number
ARM: am437x: dts: Add AES node for am437x
ARM: am437x: dts: Add DES node for am437xMark A. Greer (2):
ARM: dts: Add SHAM data and documentation for AM33XX
ARM: dts: Add AES data and documentation for AM33XX.../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++ .../devicetree/bindings/crypto/omap-sham.txt | 31 +++++++++ arch/arm/boot/dts/am335x-bone.dts | 8 +++ arch/arm/boot/dts/am335x-boneblack.dts | 48 +++++++++++++ arch/arm/boot/dts/am335x-evm.dts | 79 ++++++++++++++++++++++ arch/arm/boot/dts/am335x-evmsk.dts | 8 +++ arch/arm/boot/dts/am33xx.dtsi | 28 ++++++++ arch/arm/boot/dts/am4372.dtsi | 14 ++++ arch/arm/boot/dts/omap4.dtsi | 18 +++++ 9 files changed, 268 insertions(+)create mode 100644
Documentation/devicetree/bindings/crypto/omap-aes.txtcreate mode 100644Documentation/devicetree/bindings/crypto/omap-sham.txt
v2 cover ARM: dts: DT data for OMAP platforms for v3.13
Quoted 4 lines · Benoit Cousson
+ DT list and DT maintainers.
Hi Joel,
Quoted 8 lines
Thanks for the update. It looks good to me.
For the new bindings added below;
Quoted 2 lines
.../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++ .../devicetree/bindings/crypto/omap-sham.txt | 31 +++++++++I will need the acked-by from one of the DT maintainers.
Sure. To help with giving Ack for this, I'd like to also mention these patches were due for long time and reposted. The supporting code is already in the kernel.
Also bindings were reviewed by Mark Rutland comments in the following thread were addressed:
http://www.spinics.net/lists/arm-kernel/msg269006.html
Mark, could you give Ack for these patches if they look OK?
thanks,
-Joel
v2 cover ARM: dts: DT data for OMAP platforms for v3.13
Quoted 12 lines · Joel Fernandes
Quoted 11 lines · Benoit Cousson
+ DT list and DT maintainers.
Hi Joel,
Thanks for the update. It looks good to me.
For the new bindings added below;
Quoted 2 lines
.../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++ .../devicetree/bindings/crypto/omap-sham.txt | 31 +++++++++
Quoted 8 lines
Quoted 1 line
I will need the acked-by from one of the DT maintainers.
Sure. To help with giving Ack for this, I'd like to also mention these patches were due for long time and reposted. The supporting code is already in the kernel.
Also bindings were reviewed by Mark Rutland comments in the following thread were addressed:
http://www.spinics.net/lists/arm-kernel/msg269006.html
OK, that's good news, at least it was already reviewed by Mark.
I'm fixing and pulling the series, and will add Mark's Acked-by as soon as he will send it.
Meanwhile some nits, I'm fixing myself this time :-)
None of your subjects is following the same guideline and the repertory guideline...
omap4: dts: Add node for AES
omap4: dts: Add node for DES3DES module
am33xx: dts: Fix AES interrupt number
ARM: am437x: dts: Add AES node for am437x
ARM: am437x: dts: Add DES node for am437x
It should be ARM: dts: OMAPXXX or AMXXX...
Regards,
Benoit
v2 cover ARM: dts: DT data for OMAP platforms for v3.13
Quoted 44 lines · Benoit Cousson
Quoted 14 lines · Joel Fernandes
Quoted 4 lines · Benoit Cousson
+ DT list and DT maintainers.
Hi Joel,
Quoted 8 lines
Thanks for the update. It looks good to me.
For the new bindings added below;
Quoted 2 lines
.../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++ .../devicetree/bindings/crypto/omap-sham.txt | 31 +++++++++I will need the acked-by from one of the DT maintainers.
Quoted 7 lines
Sure. To help with giving Ack for this, I'd like to also mention these patches were due for long time and reposted. The supporting code is already in the kernel.
Also bindings were reviewed by Mark Rutland comments in the following thread were addressed:
http://www.spinics.net/lists/arm-kernel/msg269006.htmlOK, that's good news, at least it was already reviewed by Mark.
I'm fixing and pulling the series, and will add Mark's Acked-by as soon as he will send it.
Meanwhile some nits, I'm fixing myself this time :-)
None of your subjects is following the same guideline and the repertory guideline...
omap4: dts: Add node for AES
omap4: dts: Add node for DES3DES module
am33xx: dts: Fix AES interrupt number
ARM: am437x: dts: Add AES node for am437x
ARM: am437x: dts: Add DES node for am437xIt should be ARM: dts: OMAPXXX or AMXXX...
Regards,
Benoit
Quoted 32 lines · Joel Fernandes
Quoted 14 lines · Benoit Cousson
Quoted 4 lines
+ DT list and DT maintainers.
Hi Joel,
Quoted 8 lines
Thanks for the update. It looks good to me.
For the new bindings added below;
Quoted 2 lines
.../devicetree/bindings/crypto/omap-aes.txt | 34 ++++++++++ .../devicetree/bindings/crypto/omap-sham.txt | 31 +++++++++I will need the acked-by from one of the DT maintainers.
Quoted 7 lines
Sure. To help with giving Ack for this, I'd like to also mention these patches were due for long time and reposted. The supporting code is already in the kernel.
Also bindings were reviewed by Mark Rutland comments in the following thread were addressed:
http://www.spinics.net/lists/arm-kernel/msg269006.htmlOK, that's good news, at least it was already reviewed by Mark.
I'm fixing and pulling the series, and will add Mark's Acked-by as soon as he will send it.
Meanwhile some nits, I'm fixing myself this time :-)
None of your subjects is following the same guideline and the repertory guideline...
Quoted 7 lines
omap4: dts: Add node for AES
omap4: dts: Add node for DES3DES module
am33xx: dts: Fix AES interrupt number
ARM: am437x: dts: Add AES node for am437x
ARM: am437x: dts: Add DES node for am437xIt should be ARM: dts: OMAPXXX or AMXXX...
Thanks & sorry about that.
I think Mark came back with some more comments on 2 of those patches. I will work on those and repost.
-Joel