* [PATCH v2 1/9] omap4: dts: Add node for AES
[not found] <1380553986-15910-1-git-send-email-joelf@ti.com>
@ 2013-09-30 15:12 ` Joel Fernandes
2013-09-30 15:12 ` [PATCH v2 2/9] omap4: dts: Add node for DES3DES module Joel Fernandes
` (7 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Joel Fernandes @ 2013-09-30 15:12 UTC (permalink / raw)
To: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson
Cc: Joel Fernandes, Tony Lindgren, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, Russell King,
open list:OMAP DEVICE TREE..., open list
OMAP4 has an AES module that uses the omap-aes crypto driver.
Add DT entries for the same.
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 45708e1..16a44d6 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -663,5 +663,14 @@
ram-bits = <12>;
ti,has-mailbox;
};
+
+ aes: aes@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";
+ };
};
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 2/9] omap4: dts: Add node for DES3DES module
[not found] <1380553986-15910-1-git-send-email-joelf@ti.com>
2013-09-30 15:12 ` [PATCH v2 1/9] omap4: dts: Add node for AES Joel Fernandes
@ 2013-09-30 15:12 ` Joel Fernandes
2013-09-30 15:13 ` [PATCH v2 3/9] ARM: dts: Add SHAM data and documentation for AM33XX Joel Fernandes
` (6 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Joel Fernandes @ 2013-09-30 15:12 UTC (permalink / raw)
To: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson
Cc: Joel Fernandes, Tony Lindgren, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, Russell King,
open list:OMAP DEVICE TREE..., open list
OMAP4 has an DES3DES module that uses the omap-des crypto driver.
Add DT entries for the same.
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 16a44d6..6be1f56 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -672,5 +672,14 @@
dmas = <&sdma 111>, <&sdma 110>;
dma-names = "tx", "rx";
};
+
+ des: des@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";
+ };
};
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 3/9] ARM: dts: Add SHAM data and documentation for AM33XX
[not found] <1380553986-15910-1-git-send-email-joelf@ti.com>
2013-09-30 15:12 ` [PATCH v2 1/9] omap4: dts: Add node for AES Joel Fernandes
2013-09-30 15:12 ` [PATCH v2 2/9] omap4: dts: Add node for DES3DES module Joel Fernandes
@ 2013-09-30 15:13 ` Joel Fernandes
2013-10-04 14:26 ` Mark Rutland
2013-09-30 15:13 ` [PATCH v2 4/9] ARM: dts: Add AES " Joel Fernandes
` (5 subsequent siblings)
8 siblings, 1 reply; 14+ messages in thread
From: Joel Fernandes @ 2013-09-30 15:13 UTC (permalink / raw)
To: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson
Cc: Paul Walmsley, Rob Herring, Pawel Moll, Mark Rutland,
Stephen Warren, Ian Campbell, Rob Landley, Tony Lindgren,
Russell King, Mark A. Greer, open list:OPEN FIRMWARE AND...,
open list:DOCUMENTATION, open list
From: "Mark A. Greer" <mgreer@animalcreek.com>
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@ti.com: Dropped interrupt-parrent property]
CC: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
---
.../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
diff --git a/Documentation/devicetree/bindings/crypto/omap-sham.txt b/Documentation/devicetree/bindings/crypto/omap-sham.txt
new file mode 100644
index 0000000..b97710f
--- /dev/null
+++ b/Documentation/devicetree/bindings/crypto/omap-sham.txt
@@ -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@53100000 {
+ compatible = "ti,omap4-sham";
+ ti,hwmods = "sham";
+ reg = <0x53100000 0x200>;
+ interrupt-parent = <&intc>;
+ interrupts = <109>;
+ dmas = <&edma 36>;
+ dma-names = "rx";
+ };
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 0d63348..8a9802e 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -19,3 +19,7 @@
&mmc1 {
vmmc-supply = <&ldo3_reg>;
};
+
+&sham {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 23b0a3e..d59e51c 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -522,3 +522,7 @@
status = "okay";
vmmc-supply = <&vmmc_reg>;
};
+
+&sham {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index bc93895..d45a330 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -424,3 +424,7 @@
status = "okay";
vmmc-supply = <&vmmc_reg>;
};
+
+&sham {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 553adc6..299710b 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -710,5 +710,14 @@
#size-cells = <1>;
status = "disabled";
};
+
+ sham: sham@53100000 {
+ compatible = "ti,omap4-sham";
+ ti,hwmods = "sham";
+ reg = <0x53100000 0x200>;
+ interrupts = <109>;
+ dmas = <&edma 36>;
+ dma-names = "rx";
+ };
};
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v2 3/9] ARM: dts: Add SHAM data and documentation for AM33XX
2013-09-30 15:13 ` [PATCH v2 3/9] ARM: dts: Add SHAM data and documentation for AM33XX Joel Fernandes
@ 2013-10-04 14:26 ` Mark Rutland
2013-10-05 18:18 ` Joel Fernandes
0 siblings, 1 reply; 14+ messages in thread
From: Mark Rutland @ 2013-10-04 14:26 UTC (permalink / raw)
To: Joel Fernandes
Cc: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson, Paul Walmsley, rob.herring@calxeda.com,
Pawel Moll, Stephen Warren, Ian Campbell, Rob Landley,
Tony Lindgren, Russell King, Mark A. Greer,
open list:OPEN FIRMWARE AND..., open list:DOCUMENTATION,
open list
On Mon, Sep 30, 2013 at 04:13:00PM +0100, Joel Fernandes wrote:
> From: "Mark A. Greer" <mgreer@animalcreek.com>
>
> 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@ti.com: Dropped interrupt-parrent property]
> CC: Paul Walmsley <paul@pwsan.com>
> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
> ---
> .../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
>
> diff --git a/Documentation/devicetree/bindings/crypto/omap-sham.txt b/Documentation/devicetree/bindings/crypto/omap-sham.txt
> new file mode 100644
> index 0000000..b97710f
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/crypto/omap-sham.txt
> @@ -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.
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.
> +- 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:
Acked-by: Mark Rutland <mark.rutland@arm.com>
> +
> +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@53100000 {
> + compatible = "ti,omap4-sham";
> + ti,hwmods = "sham";
> + reg = <0x53100000 0x200>;
> + interrupt-parent = <&intc>;
> + interrupts = <109>;
> + dmas = <&edma 36>;
> + dma-names = "rx";
> + };
> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
> index 0d63348..8a9802e 100644
> --- a/arch/arm/boot/dts/am335x-bone.dts
> +++ b/arch/arm/boot/dts/am335x-bone.dts
> @@ -19,3 +19,7 @@
> &mmc1 {
> vmmc-supply = <&ldo3_reg>;
> };
> +
> +&sham {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> index 23b0a3e..d59e51c 100644
> --- a/arch/arm/boot/dts/am335x-evm.dts
> +++ b/arch/arm/boot/dts/am335x-evm.dts
> @@ -522,3 +522,7 @@
> status = "okay";
> vmmc-supply = <&vmmc_reg>;
> };
> +
> +&sham {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
> index bc93895..d45a330 100644
> --- a/arch/arm/boot/dts/am335x-evmsk.dts
> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
> @@ -424,3 +424,7 @@
> status = "okay";
> vmmc-supply = <&vmmc_reg>;
> };
> +
> +&sham {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index 553adc6..299710b 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -710,5 +710,14 @@
> #size-cells = <1>;
> status = "disabled";
> };
> +
> + sham: sham@53100000 {
> + compatible = "ti,omap4-sham";
> + ti,hwmods = "sham";
> + reg = <0x53100000 0x200>;
> + interrupts = <109>;
> + dmas = <&edma 36>;
> + dma-names = "rx";
> + };
> };
> };
> --
> 1.8.1.2
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v2 3/9] ARM: dts: Add SHAM data and documentation for AM33XX
2013-10-04 14:26 ` Mark Rutland
@ 2013-10-05 18:18 ` Joel Fernandes
0 siblings, 0 replies; 14+ messages in thread
From: Joel Fernandes @ 2013-10-05 18:18 UTC (permalink / raw)
To: Mark Rutland
Cc: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson, Paul Walmsley, rob.herring@calxeda.com,
Pawel Moll, Stephen Warren, Ian Campbell, Rob Landley,
Tony Lindgren, Russell King, Mark A. Greer,
open list:OPEN FIRMWARE AND..., DOCUMENTATION, open list
On 10/04/2013 09:26 AM, Mark Rutland wrote:
> On Mon, Sep 30, 2013 at 04:13:00PM +0100, Joel Fernandes wrote:
>> From: "Mark A. Greer" <mgreer@animalcreek.com>
>>
>> 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@ti.com: Dropped interrupt-parrent property]
>> CC: Paul Walmsley <paul@pwsan.com>
>> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
>> ---
>> .../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
>>
>> diff --git a/Documentation/devicetree/bindings/crypto/omap-sham.txt b/Documentation/devicetree/bindings/crypto/omap-sham.txt
>> new file mode 100644
>> index 0000000..b97710f
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/crypto/omap-sham.txt
>> @@ -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.
>
> 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.
>> +- 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.
>
> Otherwise, this looks good to me. With the fixups above:
>
> Acked-by: Mark Rutland <mark.rutland@arm.com>
Thanks!
-Joel
>
>> +
>> +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@53100000 {
>> + compatible = "ti,omap4-sham";
>> + ti,hwmods = "sham";
>> + reg = <0x53100000 0x200>;
>> + interrupt-parent = <&intc>;
>> + interrupts = <109>;
>> + dmas = <&edma 36>;
>> + dma-names = "rx";
>> + };
>> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
>> index 0d63348..8a9802e 100644
>> --- a/arch/arm/boot/dts/am335x-bone.dts
>> +++ b/arch/arm/boot/dts/am335x-bone.dts
>> @@ -19,3 +19,7 @@
>> &mmc1 {
>> vmmc-supply = <&ldo3_reg>;
>> };
>> +
>> +&sham {
>> + status = "okay";
>> +};
>> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
>> index 23b0a3e..d59e51c 100644
>> --- a/arch/arm/boot/dts/am335x-evm.dts
>> +++ b/arch/arm/boot/dts/am335x-evm.dts
>> @@ -522,3 +522,7 @@
>> status = "okay";
>> vmmc-supply = <&vmmc_reg>;
>> };
>> +
>> +&sham {
>> + status = "okay";
>> +};
>> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
>> index bc93895..d45a330 100644
>> --- a/arch/arm/boot/dts/am335x-evmsk.dts
>> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
>> @@ -424,3 +424,7 @@
>> status = "okay";
>> vmmc-supply = <&vmmc_reg>;
>> };
>> +
>> +&sham {
>> + status = "okay";
>> +};
>> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
>> index 553adc6..299710b 100644
>> --- a/arch/arm/boot/dts/am33xx.dtsi
>> +++ b/arch/arm/boot/dts/am33xx.dtsi
>> @@ -710,5 +710,14 @@
>> #size-cells = <1>;
>> status = "disabled";
>> };
>> +
>> + sham: sham@53100000 {
>> + compatible = "ti,omap4-sham";
>> + ti,hwmods = "sham";
>> + reg = <0x53100000 0x200>;
>> + interrupts = <109>;
>> + dmas = <&edma 36>;
>> + dma-names = "rx";
>> + };
>> };
>> };
>> --
>> 1.8.1.2
>>
>>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 4/9] ARM: dts: Add AES data and documentation for AM33XX
[not found] <1380553986-15910-1-git-send-email-joelf@ti.com>
` (2 preceding siblings ...)
2013-09-30 15:13 ` [PATCH v2 3/9] ARM: dts: Add SHAM data and documentation for AM33XX Joel Fernandes
@ 2013-09-30 15:13 ` Joel Fernandes
2013-10-04 14:33 ` Mark Rutland
2013-09-30 15:13 ` [PATCH v2 5/9] am33xx: dts: Fix AES interrupt number Joel Fernandes
` (4 subsequent siblings)
8 siblings, 1 reply; 14+ messages in thread
From: Joel Fernandes @ 2013-09-30 15:13 UTC (permalink / raw)
To: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson
Cc: Paul Walmsley, Rob Herring, Pawel Moll, Mark Rutland,
Stephen Warren, Ian Campbell, Rob Landley, Tony Lindgren,
Russell King, Mark A. Greer, open list:OPEN FIRMWARE AND...,
open list:DOCUMENTATION, open list
From: "Mark A. Greer" <mgreer@animalcreek.com>
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@ti.com: Dropped interrupt-parent propert]
CC: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
---
.../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
diff --git a/Documentation/devicetree/bindings/crypto/omap-aes.txt b/Documentation/devicetree/bindings/crypto/omap-aes.txt
new file mode 100644
index 0000000..4bb1e27
--- /dev/null
+++ b/Documentation/devicetree/bindings/crypto/omap-aes.txt
@@ -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@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";
+ };
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 8a9802e..94ee427 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -23,3 +23,7 @@
&sham {
status = "okay";
};
+
+&aes {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index d59e51c..86463fa 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -526,3 +526,7 @@
&sham {
status = "okay";
};
+
+&aes {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index d45a330..f577e65 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -428,3 +428,7 @@
&sham {
status = "okay";
};
+
+&aes {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 299710b..0daa1b2 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -719,5 +719,15 @@
dmas = <&edma 36>;
dma-names = "rx";
};
+
+ aes: aes@53500000 {
+ compatible = "ti,omap4-aes";
+ ti,hwmods = "aes";
+ reg = <0x53500000 0xa0>;
+ interrupts = <102>;
+ dmas = <&edma 6
+ &edma 5>;
+ dma-names = "tx", "rx";
+ };
};
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v2 4/9] ARM: dts: Add AES data and documentation for AM33XX
2013-09-30 15:13 ` [PATCH v2 4/9] ARM: dts: Add AES " Joel Fernandes
@ 2013-10-04 14:33 ` Mark Rutland
2013-10-05 18:29 ` Joel Fernandes
0 siblings, 1 reply; 14+ messages in thread
From: Mark Rutland @ 2013-10-04 14:33 UTC (permalink / raw)
To: Joel Fernandes
Cc: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson, Paul Walmsley, rob.herring@calxeda.com,
Pawel Moll, Stephen Warren, Ian Campbell, Rob Landley,
Tony Lindgren, Russell King, Mark A. Greer,
open list:OPEN FIRMWARE AND..., open list:DOCUMENTATION,
open list
On Mon, Sep 30, 2013 at 04:13:01PM +0100, Joel Fernandes wrote:
> From: "Mark A. Greer" <mgreer@animalcreek.com>
>
> 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@ti.com: Dropped interrupt-parent propert]
>
> CC: Paul Walmsley <paul@pwsan.com>
> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
> ---
> .../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
>
> diff --git a/Documentation/devicetree/bindings/crypto/omap-aes.txt b/Documentation/devicetree/bindings/crypto/omap-aes.txt
> new file mode 100644
> index 0000000..4bb1e27
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/crypto/omap-aes.txt
> @@ -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.
Similar comments to the SHAM module here:
* s/interrupt number/interrupt-specifier/
* Drop interrupt-parent.
* s/AES odule/AES module/
> +
> +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/
> +- 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).
> +
> +Example:
> + /* AM335x */
> + aes: aes@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>;
> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
> index 8a9802e..94ee427 100644
> --- a/arch/arm/boot/dts/am335x-bone.dts
> +++ b/arch/arm/boot/dts/am335x-bone.dts
> @@ -23,3 +23,7 @@
> &sham {
> status = "okay";
> };
> +
> +&aes {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> index d59e51c..86463fa 100644
> --- a/arch/arm/boot/dts/am335x-evm.dts
> +++ b/arch/arm/boot/dts/am335x-evm.dts
> @@ -526,3 +526,7 @@
> &sham {
> status = "okay";
> };
> +
> +&aes {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
> index d45a330..f577e65 100644
> --- a/arch/arm/boot/dts/am335x-evmsk.dts
> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
> @@ -428,3 +428,7 @@
> &sham {
> status = "okay";
> };
> +
> +&aes {
> + status = "okay";
> +};
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index 299710b..0daa1b2 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -719,5 +719,15 @@
> dmas = <&edma 36>;
> dma-names = "rx";
> };
> +
> + aes: aes@53500000 {
> + compatible = "ti,omap4-aes";
> + ti,hwmods = "aes";
> + reg = <0x53500000 0xa0>;
> + interrupts = <102>;
> + dmas = <&edma 6
> + &edma 5>;
Bracketing here too, please.
Cheers,
Mark.
> + dma-names = "tx", "rx";
> + };
> };
> };
> --
> 1.8.1.2
>
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH v2 4/9] ARM: dts: Add AES data and documentation for AM33XX
2013-10-04 14:33 ` Mark Rutland
@ 2013-10-05 18:29 ` Joel Fernandes
0 siblings, 0 replies; 14+ messages in thread
From: Joel Fernandes @ 2013-10-05 18:29 UTC (permalink / raw)
To: Mark Rutland
Cc: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson, Paul Walmsley, rob.herring@calxeda.com,
Pawel Moll, Stephen Warren, Ian Campbell, Rob Landley,
Tony Lindgren, Russell King, Mark A. Greer,
open list:OPEN FIRMWARE AND..., DOCUMENTATION, open list
These patches were not authored by me but I'll go ahead and fix them up anyway.
On 10/04/2013 09:33 AM, Mark Rutland wrote:
> On Mon, Sep 30, 2013 at 04:13:01PM +0100, Joel Fernandes wrote:
>> From: "Mark A. Greer" <mgreer@animalcreek.com>
>>
>> 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@ti.com: Dropped interrupt-parent propert]
>>
>> CC: Paul Walmsley <paul@pwsan.com>
>> Signed-off-by: Mark A. Greer <mgreer@animalcreek.com>
>> ---
>> .../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
>>
>> diff --git a/Documentation/devicetree/bindings/crypto/omap-aes.txt b/Documentation/devicetree/bindings/crypto/omap-aes.txt
>> new file mode 100644
>> index 0000000..4bb1e27
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/crypto/omap-aes.txt
>> @@ -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.
>
> Similar comments to the SHAM module here:
>
> * s/interrupt number/interrupt-specifier/
> * Drop interrupt-parent.
> * s/AES odule/AES module/
Ok, done.
>> +
>> +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/
>
>> +- 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.
> 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.
>> +
>> +Example:
>> + /* AM335x */
>> + aes: aes@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>;
Ok changed as above.
>
>> diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
>> index 8a9802e..94ee427 100644
>> --- a/arch/arm/boot/dts/am335x-bone.dts
>> +++ b/arch/arm/boot/dts/am335x-bone.dts
>> @@ -23,3 +23,7 @@
>> &sham {
>> status = "okay";
>> };
>> +
>> +&aes {
>> + status = "okay";
>> +};
>> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
>> index d59e51c..86463fa 100644
>> --- a/arch/arm/boot/dts/am335x-evm.dts
>> +++ b/arch/arm/boot/dts/am335x-evm.dts
>> @@ -526,3 +526,7 @@
>> &sham {
>> status = "okay";
>> };
>> +
>> +&aes {
>> + status = "okay";
>> +};
>> diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
>> index d45a330..f577e65 100644
>> --- a/arch/arm/boot/dts/am335x-evmsk.dts
>> +++ b/arch/arm/boot/dts/am335x-evmsk.dts
>> @@ -428,3 +428,7 @@
>> &sham {
>> status = "okay";
>> };
>> +
>> +&aes {
>> + status = "okay";
>> +};
>> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
>> index 299710b..0daa1b2 100644
>> --- a/arch/arm/boot/dts/am33xx.dtsi
>> +++ b/arch/arm/boot/dts/am33xx.dtsi
>> @@ -719,5 +719,15 @@
>> dmas = <&edma 36>;
>> dma-names = "rx";
>> };
>> +
>> + aes: aes@53500000 {
>> + compatible = "ti,omap4-aes";
>> + ti,hwmods = "aes";
>> + reg = <0x53500000 0xa0>;
>> + interrupts = <102>;
>> + dmas = <&edma 6
>> + &edma 5>;
>
> Bracketing here too, please.
Done.
Thanks,
-Joel
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 5/9] am33xx: dts: Fix AES interrupt number
[not found] <1380553986-15910-1-git-send-email-joelf@ti.com>
` (3 preceding siblings ...)
2013-09-30 15:13 ` [PATCH v2 4/9] ARM: dts: Add AES " Joel Fernandes
@ 2013-09-30 15:13 ` Joel Fernandes
2013-10-04 14:19 ` Benoit Cousson
2013-09-30 15:13 ` [PATCH v2 6/9] ARM: am437x: dts: Add AES node for am437x Joel Fernandes
` (3 subsequent siblings)
8 siblings, 1 reply; 14+ messages in thread
From: Joel Fernandes @ 2013-09-30 15:13 UTC (permalink / raw)
To: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson
Cc: Joel Fernandes, Tony Lindgren, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, Russell King,
open list:OMAP DEVICE TREE..., open list
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
arch/arm/boot/dts/am33xx.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 0daa1b2..d7be90a 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -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";
--
1.8.1.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH v2 5/9] am33xx: dts: Fix AES interrupt number
2013-09-30 15:13 ` [PATCH v2 5/9] am33xx: dts: Fix AES interrupt number Joel Fernandes
@ 2013-10-04 14:19 ` Benoit Cousson
0 siblings, 0 replies; 14+ messages in thread
From: Benoit Cousson @ 2013-10-04 14:19 UTC (permalink / raw)
To: Joel Fernandes
Cc: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Tony Lindgren, Rob Herring, Pawel Moll, Mark Rutland,
Stephen Warren, Ian Campbell, Russell King,
open list:OMAP DEVICE TREE..., open list
On 30/09/2013 17:13, Joel Fernandes wrote:
> Signed-off-by: Joel Fernandes <joelf@ti.com>
Even if this is obvious, a small changelog is always recommended.
Thanks,
Benoit
> ---
> arch/arm/boot/dts/am33xx.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index 0daa1b2..d7be90a 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -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";
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 6/9] ARM: am437x: dts: Add AES node for am437x
[not found] <1380553986-15910-1-git-send-email-joelf@ti.com>
` (4 preceding siblings ...)
2013-09-30 15:13 ` [PATCH v2 5/9] am33xx: dts: Fix AES interrupt number Joel Fernandes
@ 2013-09-30 15:13 ` Joel Fernandes
2013-09-30 15:13 ` [PATCH v2 7/9] ARM: am437x: dts: Add DES " Joel Fernandes
` (2 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Joel Fernandes @ 2013-09-30 15:13 UTC (permalink / raw)
To: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson
Cc: Joel Fernandes, Rob Herring, Pawel Moll, Mark Rutland,
Stephen Warren, Ian Campbell, Russell King,
open list:OPEN FIRMWARE AND..., open list
AM437x SoC has AES module similar to the one on OMAP4.
Add DT node for the same.
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
arch/arm/boot/dts/am4372.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 0fe393a..7e9ff75 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -411,5 +411,12 @@
ti,hwmods = "epwmss5";
status = "disabled";
};
+
+ aes: aes@53501000 {
+ compatible = "ti,omap4-aes";
+ ti,hwmods = "aes";
+ reg = <0x53501000 0xa0>;
+ interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
+ };
};
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 7/9] ARM: am437x: dts: Add DES node for am437x
[not found] <1380553986-15910-1-git-send-email-joelf@ti.com>
` (5 preceding siblings ...)
2013-09-30 15:13 ` [PATCH v2 6/9] ARM: am437x: dts: Add AES node for am437x Joel Fernandes
@ 2013-09-30 15:13 ` Joel Fernandes
2013-09-30 15:13 ` [PATCH v2 8/9] ARM: dts: AM33XX: Add LCDC info into am335x-evm Joel Fernandes
2013-09-30 15:13 ` [PATCH v2 9/9] dts: boneblack: add pinmux and hdmi node to enable display Joel Fernandes
8 siblings, 0 replies; 14+ messages in thread
From: Joel Fernandes @ 2013-09-30 15:13 UTC (permalink / raw)
To: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson
Cc: Joel Fernandes, Rob Herring, Pawel Moll, Mark Rutland,
Stephen Warren, Ian Campbell, Russell King,
open list:OPEN FIRMWARE AND..., open list
AM437x SoC has a DES3DES module similar to the one on OMAP4.
Add DT node for the same.
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
arch/arm/boot/dts/am4372.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi
index 7e9ff75..a403172 100644
--- a/arch/arm/boot/dts/am4372.dtsi
+++ b/arch/arm/boot/dts/am4372.dtsi
@@ -418,5 +418,12 @@
reg = <0x53501000 0xa0>;
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
};
+
+ des: des@53701000 {
+ compatible = "ti,omap4-des";
+ ti,hwmods = "des";
+ reg = <0x53701000 0xa0>;
+ interrupts = <GIC_SPI 130 IRQ_TYPE_LEVEL_HIGH>;
+ };
};
};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 8/9] ARM: dts: AM33XX: Add LCDC info into am335x-evm
[not found] <1380553986-15910-1-git-send-email-joelf@ti.com>
` (6 preceding siblings ...)
2013-09-30 15:13 ` [PATCH v2 7/9] ARM: am437x: dts: Add DES " Joel Fernandes
@ 2013-09-30 15:13 ` Joel Fernandes
2013-09-30 15:13 ` [PATCH v2 9/9] dts: boneblack: add pinmux and hdmi node to enable display Joel Fernandes
8 siblings, 0 replies; 14+ messages in thread
From: Joel Fernandes @ 2013-09-30 15:13 UTC (permalink / raw)
To: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson
Cc: Joel Fernandes, Tony Lindgren, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, Russell King,
open list:OMAP DEVICE TREE..., open list
From: Benoit Parrot <bparrot@ti.com>
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
Signed-off-by: Benoit Parrot <bparrot@ti.com>
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
arch/arm/boot/dts/am335x-evm.dts | 71 ++++++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/am33xx.dtsi | 9 +++++
2 files changed, 80 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 86463fa..b73f41f 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -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";
};
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index d7be90a..f870d0b 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -682,6 +682,15 @@
status = "disabled";
};
+ lcdc: lcdc@4830e000 {
+ compatible = "ti,am33xx-tilcdc";
+ reg = <0x4830e000 0x1000>;
+ interrupt-parent = <&intc>;
+ interrupts = <36>;
+ ti,hwmods = "lcdc";
+ status = "disabled";
+ };
+
tscadc: tscadc@44e0d000 {
compatible = "ti,am3359-tscadc";
reg = <0x44e0d000 0x1000>;
--
1.8.1.2
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH v2 9/9] dts: boneblack: add pinmux and hdmi node to enable display
[not found] <1380553986-15910-1-git-send-email-joelf@ti.com>
` (7 preceding siblings ...)
2013-09-30 15:13 ` [PATCH v2 8/9] ARM: dts: AM33XX: Add LCDC info into am335x-evm Joel Fernandes
@ 2013-09-30 15:13 ` Joel Fernandes
8 siblings, 0 replies; 14+ messages in thread
From: Joel Fernandes @ 2013-09-30 15:13 UTC (permalink / raw)
To: Linux OMAP List, Linux ARM Kernel List, Linux MMC List,
Benoit Cousson
Cc: Joel Fernandes, Tony Lindgren, Rob Herring, Pawel Moll,
Mark Rutland, Stephen Warren, Ian Campbell, Russell King,
open list:OMAP DEVICE TREE..., open list
From: Darren Etheridge <detheridge@ti.com>
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.
Signed-off-by: Darren Etheridge <detheridge@ti.com>
Signed-off-by: Joel Fernandes <joelf@ti.com>
---
arch/arm/boot/dts/am335x-boneblack.dts | 48 ++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index 16b3bea..6b71ad9 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -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";
+ };
+};
--
1.8.1.2
^ permalink raw reply related [flat|nested] 14+ messages in thread