Some fixes and enhancements for MPC8569E-MDS boards
Subsystems (5)
cover Some fixes and enhancements for MPC8569E-MDS boards
Hi all,
Here are few fixes and improvements for MPC8569E-MDS boards.
Thanks,
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
PATCH 1/6 powerpc/85xx: Add PCI IDs for MPC8569 family processors
This patch adds PCI IDs for MPC8569 and MPC8569E processors, plus adds appropriate quirks for these IDs, and thus makes PCI-E actually work on MPC8569E-MDS boards.
--- arch/powerpc/sysdev/fsl_pci.c | 2 ++ include/linux/pci_ids.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
arch/powerpc/sysdev/fsl_pci.c +2 -0
@@ -285,6 +285,8 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8543, quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8547E , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8545E , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8545 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8569E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8569 , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8568E , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8568 , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_MPC8567E , quirk_fsl_pcie_header);
include/linux/pci_ids.h +2 -0
@@ -2274,6 +2274,8 @@#define PCI_DEVICE_ID_MPC8547E 0x0018#define PCI_DEVICE_ID_MPC8545E 0x0019#define PCI_DEVICE_ID_MPC8545 0x001a +#define PCI_DEVICE_ID_MPC8569E 0x0061 +#define PCI_DEVICE_ID_MPC8569 0x0060#define PCI_DEVICE_ID_MPC8568E 0x0020#define PCI_DEVICE_ID_MPC8568 0x0021#define PCI_DEVICE_ID_MPC8567E 0x0022
Signature · 1 line
1.6.2.2
PATCH 2/6 powerpc/85xx: Fix mpc8569emds' crypto node to include SNOW unit
In reply to Anton Vorontsovfsl,exec-units-mask should be 0xbfe to include SNOW unit in MPC8569E's security engine.
--- arch/powerpc/boot/dts/mpc8569mds.dts | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/boot/dts/mpc8569mds.dts +1 -1
@@ -222,7 +222,7 @@ interrupt-parent = <&mpic>; fsl,num-channels = <4>; fsl,channel-fifo-len = <24>; - fsl,exec-units-mask = <0x9fe>; + fsl,exec-units-mask = <0xbfe>; fsl,descriptor-types-mask = <0x3ab0ebf>; };
Signature · 1 line
1.6.2.2
PATCH 3/6 powerpc/85xx: Fix reg and interrupts for mpc8569emds' localbus, add NAND
In reply to Anton VorontsovThis patch fixes bogus reg = <> property in the localbus node, and fixes interrupt property (should be "interrupts").
Also add node for NAND support.
--- arch/powerpc/boot/dts/mpc8569mds.dts | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-)
arch/powerpc/boot/dts/mpc8569mds.dts +9 -2
@@ -53,13 +53,14 @@ #address-cells = <2>; #size-cells = <1>; compatible = "fsl,mpc8569-elbc", "fsl,elbc", "simple-bus"; - reg = <0 0xe0005000 0 0x1000>; - interrupt = <19 2>; + reg = <0xe0005000 0x1000>; + interrupts = <19 2>; interrupt-parent = <&mpic>; ranges = <0x0 0x0 0xfe000000 0x02000000 0x1 0x0 0xf8000000 0x00008000 0x2 0x0 0xf0000000 0x04000000 + 0x3 0x0 0xfc000000 0x00008000 0x4 0x0 0xf8008000 0x00008000 0x5 0x0 0xf8010000 0x00008000>;
@@ -77,6 +78,12 @@ reg = <1 0 0x8000>; }; + nand@3,0 { + compatible = "fsl,mpc8569-fcm-nand", + "fsl,elbc-fcm-nand"; + reg = <3 0 0x8000>; + }; + pib@4,0 { compatible = "fsl,mpc8569mds-pib"; reg = <4 0 0x8000>;
Signature · 1 line
1.6.2.2
PATCH 4/6 powerpc/85xx: Add eSDHC support for MPC8569E-MDS boards
In reply to Anton VorontsovNote that eSDHC and DUART0 are mutually exclusive on MPC8569E-MDS boards. Default option is DUART0, so eSDHC is disabled by default. U-Boot will fixup device tree if eSDHC should be used instead of DUART0.
--- arch/powerpc/boot/dts/mpc8569mds.dts | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/powerpc/boot/dts/mpc8569mds.dts +10 -0
@@ -221,6 +221,16 @@ }; }; + sdhci@2e000 { + compatible = "fsl,mpc8569-esdhc", "fsl,mpc8536-esdhc"; + reg = <0x2e000 0x1000>; + interrupts = <72 0x8>; + interrupt-parent = <&mpic>; + /* Filled in by U-Boot */ + clock-frequency = <0>; + status = "disabled"; + }; + crypto@30000 { compatible = "fsl,sec3.1", "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
Signature · 1 line
1.6.2.2
PATCH 5/6 powerpc/85xx: Enable Serial RapidIO for MPC85xx MDS boards
In reply to Anton VorontsovSelect HAS_RAPIDIO symbol and add rio nodes for MPC8568E-MDS and MPC8569E-MDS boards.
--- arch/powerpc/boot/dts/mpc8568mds.dts | 17 +++++++++++++++++ arch/powerpc/boot/dts/mpc8569mds.dts | 17 +++++++++++++++++ arch/powerpc/platforms/85xx/Kconfig | 1 + 3 files changed, 35 insertions(+), 0 deletions(-)
arch/powerpc/boot/dts/mpc8568mds.dts +17 -0
@@ -26,6 +26,7 @@ serial1 = &serial1; pci0 = &pci0; pci1 = &pci1; + rapidio0 = &rio0; }; cpus {
@@ -539,4 +540,20 @@ 0x0 0x800000>; }; }; + + rio0: rapidio@e00c00000 { + #address-cells = <2>; + #size-cells = <2>; + compatible = "fsl,mpc8568-rapidio", "fsl,rapidio-delta"; + reg = <0xe00c0000 0x20000>; + ranges = <0x0 0x0 0xc0000000 0x0 0x20000000>; + interrupts = <48 2 /* error */ + 49 2 /* bell_outb */ + 50 2 /* bell_inb */ + 53 2 /* msg1_tx */ + 54 2 /* msg1_rx */ + 55 2 /* msg2_tx */ + 56 2 /* msg2_rx */>; + interrupt-parent = <&mpic>; + }; };
arch/powerpc/boot/dts/mpc8569mds.dts +17 -0
@@ -25,6 +25,7 @@ ethernet2 = &enet2; ethernet3 = &enet3; pci1 = &pci1; + rapidio0 = &rio0; }; cpus {
@@ -528,4 +529,20 @@ 0x0 0x800000>; }; }; + + rio0: rapidio@e00c00000 { + #address-cells = <2>; + #size-cells = <2>; + compatible = "fsl,mpc8569-rapidio", "fsl,rapidio-delta"; + reg = <0xe00c0000 0x20000>; + ranges = <0x0 0x0 0xc0000000 0x0 0x20000000>; + interrupts = <48 2 /* error */ + 49 2 /* bell_outb */ + 50 2 /* bell_inb */ + 53 2 /* msg1_tx */ + 54 2 /* msg1_rx */ + 55 2 /* msg2_tx */ + 56 2 /* msg2_rx */>; + interrupt-parent = <&mpic>; + }; };
arch/powerpc/platforms/85xx/Kconfig +1 -0
@@ -34,6 +34,7 @@ config MPC85xx_MDS bool "Freescale MPC85xx MDS" select DEFAULT_UIMAGE select PHYLIB + select HAS_RAPIDIO help This option enables support for the MPC85xx MDS board
Signature · 1 line
1.6.2.2
PATCH 6/6 powerpc/85xx: Add STMicro M25P40 serial flash support for MPC8569E-MDS
In reply to Anton VorontsovFor serial flash support we need to:
- Add QE Par IO Bank E device tree node, a GPIO from this bank is used for SPI chip-select line;
- Add serial-flash node;
- Add proper module alias into of/base.c.
--- arch/powerpc/boot/dts/mpc8569mds.dts | 26 +++++++++++++++++++++++--- drivers/of/base.c | 1 + 2 files changed, 24 insertions(+), 3 deletions(-)
arch/powerpc/boot/dts/mpc8569mds.dts +23 -3
@@ -260,10 +260,21 @@ }; par_io@e0100 { + #address-cells = <1>; + #size-cells = <1>; reg = <0xe0100 0x100>; + ranges = <0x0 0xe0100 0x100>; device_type = "par_io"; num-ports = <7>; + qe_pio_e: gpio-controller@80 { + #gpio-cells = <2>; + compatible = "fsl,mpc8569-qe-pario-bank", + "fsl,mpc8323-qe-pario-bank"; + reg = <0x80 0x18>; + gpio-controller; + }; + pio1: ucc_pin@01 { pio-map = < /* port pin dir open_drain assignment has_irq */
@@ -369,12 +380,21 @@ }; spi@4c0 { - cell-index = <0>; - compatible = "fsl,spi"; + #address-cells = <1>; + #size-cells = <0>; + compatible = "fsl,mpc8569-qe-spi", "fsl,spi"; reg = <0x4c0 0x40>; + cell-index = <0>; interrupts = <2>; interrupt-parent = <&qeic>; - mode = "cpu"; + gpios = <&qe_pio_e 30 0>; + mode = "cpu-qe"; + + serial-flash@0 { + compatible = "stm,m25p40"; + reg = <0>; + spi-max-frequency = <25000000>; + }; }; spi@500 {
drivers/of/base.c +1 -0
@@ -447,6 +447,7 @@ struct of_modalias_table {static struct of_modalias_table of_modalias_table[] = { {"fsl,mcu-mpc8349emitx" ,"mcu-mpc8349emitx" }, {"mmc-spi-slot" ,"mmc_spi" }, + {"stm,m25p40" ,"m25p80" }, };/**
Signature · 1 line
1.6.2.2
Kumar Gala
AppliedRe: [PATCH 1/6] powerpc/85xx: Add PCI IDs for MPC8569 family processors
In reply to Anton VorontsovQuoted 9 lines · Anton Vorontsov
This patch adds PCI IDs for MPC8569 and MPC8569E processors, plus adds appropriate quirks for these IDs, and thus makes PCI-E actually work on MPC8569E-MDS boards.
Signed-off-by Anton Vorontsov <[email protected]>---
arch/powerpc/sysdev/fsl_pci.c | 2 ++ include/linux/pci_ids.h | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-)
applied to next
- k
Kumar Gala
AppliedRe: [PATCH 2/6] powerpc/85xx: Fix mpc8569emds' crypto node to include SNOW unit
In reply to Anton VorontsovQuoted 7 lines · Anton Vorontsov
fsl,exec-units-mask should be
0xbfeto include SNOW unit in MPC8569E's security engine.Signed-off-by Anton Vorontsov <[email protected]>---
arch/powerpc/boot/dts/mpc8569mds.dts| 2 +-1 files changed, 1 insertions(+), 1 deletions(-)
applied to next
- k
Kumar Gala
AppliedRe: [PATCH 3/6] powerpc/85xx: Fix reg and interrupts for mpc8569emds' localbus, add NAND
In reply to Anton VorontsovQuoted 9 lines · Anton Vorontsov
This patch fixes bogus reg = <> property in the localbus node, and fixes interrupt property (should be "interrupts").
Also add node for NAND support.
Signed-off-by Anton Vorontsov <[email protected]>---
arch/powerpc/boot/dts/mpc8569mds.dts| 11 +++++++++--1 files changed, 9 insertions(+), 2 deletions(-)
applied to next
- k
Kumar Gala
AppliedRe: [PATCH 5/6] powerpc/85xx: Enable Serial RapidIO for MPC85xx MDS boards
In reply to Anton VorontsovQuoted 9 lines · Anton Vorontsov
Select
HAS_RAPIDIOsymbol and add rio nodes for MPC8568E-MDS and MPC8569E-MDS boards.Signed-off-by Anton Vorontsov <[email protected]>---
arch/powerpc/boot/dts/mpc8568mds.dts | 17 +++++++++++++++++ arch/powerpc/boot/dts/mpc8569mds.dts | 17 +++++++++++++++++ arch/powerpc/platforms/85xx/Kconfig | 1 + 3 files changed, 35 insertions(+), 0 deletions(-)
applied to next
- k
Kumar Gala
AppliedRe: [PATCH 4/6] powerpc/85xx: Add eSDHC support for MPC8569E-MDS boards
In reply to Anton VorontsovQuoted 9 lines · Anton Vorontsov
Note that eSDHC and DUART0 are mutually exclusive on MPC8569E-MDS boards. Default option is DUART0, so eSDHC is disabled by default. U-Boot will fixup device tree if eSDHC should be used instead of DUART0.
Signed-off-by Anton Vorontsov <[email protected]>---
arch/powerpc/boot/dts/mpc8569mds.dts| 10 ++++++++++1 files changed, 10 insertions(+), 0 deletions(-)
tweaked the .dts to use fsl,esdhc
applied to next
- k
Kumar Gala
AppliedRe: [PATCH 6/6] powerpc/85xx: Add STMicro M25P40 serial flash support for MPC8569E-MDS
In reply to Anton VorontsovQuoted 7 lines · Anton Vorontsov
For serial flash support we need to:
- Add QE Par IO Bank E device tree node, a GPIO from this bank is used for SPI chip-select line;
- Add serial-flash node;
- Add proper module alias intoof/base.c.
Quoted 5 lines
Signed-off-by Anton Vorontsov <[email protected]>---
arch/powerpc/boot/dts/mpc8569mds.dts| 26 +++++++++++++++++++++++---drivers/of/base.c| 1 +2 files changed, 24 insertions(+), 3 deletions(-)
applied to next
- k