mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
mvebu fixes for 4.12 (part 2)
Fix Openblock A6 (kirkwood base board) nand partition overlap -----BEGIN PGP SIGNATURE----- iIEEABECAEEWIQQYqXDMF3cvSLY+g9cLBhiOFHI71QUCWUk5OCMcZ3JlZ29yeS5j bGVtZW50QGZyZWUtZWxlY3Ryb25zLmNvbQAKCRALBhiOFHI71U78AJ9xNveT0mFP V051g9F26b0NkoQgkQCfV3jCKKZ817CsTT1dssbyMDk3OQI= =TtCL -----END PGP SIGNATURE----- Merge tag 'mvebu-fixes-4.12-2' of git://git.infradead.org/linux-mvebu into next/fixes-non-critical mvebu fixes for 4.12 (part 2) Fix Openblock A6 (kirkwood base board) nand partition overlap * tag 'mvebu-fixes-4.12-2' of git://git.infradead.org/linux-mvebu: ARM: dts: kirkwood: Fix Openblock A6 nand partition overlap arm64: marvell: dts: fix interrupts in 7k/8k crypto nodes
This commit is contained in:
commit
ff9e0e3b09
3 changed files with 3 additions and 5 deletions
|
@ -141,7 +141,7 @@ partition@90000 {
|
|||
|
||||
partition@d4000 {
|
||||
label = "test";
|
||||
reg = <0xd4000 0x24000>;
|
||||
reg = <0xd4000 0x20000>;
|
||||
};
|
||||
|
||||
partition@f4000 {
|
||||
|
|
|
@ -231,8 +231,7 @@ cpm_sdhci0: sdhci@780000 {
|
|||
cpm_crypto: crypto@800000 {
|
||||
compatible = "inside-secure,safexcel-eip197";
|
||||
reg = <0x800000 0x200000>;
|
||||
interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING
|
||||
| IRQ_TYPE_LEVEL_HIGH)>,
|
||||
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>,
|
||||
|
|
|
@ -221,8 +221,7 @@ cps_trng: trng@760000 {
|
|||
cps_crypto: crypto@800000 {
|
||||
compatible = "inside-secure,safexcel-eip197";
|
||||
reg = <0x800000 0x200000>;
|
||||
interrupts = <GIC_SPI 34 (IRQ_TYPE_EDGE_RISING
|
||||
| IRQ_TYPE_LEVEL_HIGH)>,
|
||||
interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 278 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
|
||||
<GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
|
||||
|
|
Loading…
Reference in a new issue