| Message ID | 151ddece1e1427d0b69c4ff11b86a69b6a035d0d.1496730576.git-series.stefan@agner.ch |
|---|---|
| State | Not Applicable |
| Headers | show |
On Tue, Jun 6, 2017 at 3:30 AM, Stefan Agner <stefan@agner.ch> wrote: > Add i.MX 7 APBH DMA and GPMI NAND modules. > > Signed-off-by: Stefan Agner <stefan@agner.ch> Tested on a imx7d-sdb: [ 1.303543] nand: device found, Manufacturer ID: 0xec, Chip ID: 0xd5 [ 1.309999] nand: Samsung NAND 2GiB 3,3V 8-bit [ 1.314467] nand: 2048 MiB, MLC, erase size: 256 KiB, page size: 2048, OOB size: 64 [ 1.346007] gpmi-nand 33002000.gpmi-nand: driver registered. Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
On 06/06/2017 01:30 AM, Stefan Agner wrote: > Add i.MX 7 APBH DMA and GPMI NAND modules. > > Signed-off-by: Stefan Agner <stefan@agner.ch> > --- > arch/arm/boot/dts/imx7s.dtsi | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi > index c4f12fd..d71acd8 100644 > --- a/arch/arm/boot/dts/imx7s.dtsi > +++ b/arch/arm/boot/dts/imx7s.dtsi > @@ -995,5 +995,37 @@ > status = "disabled"; > }; > }; > + > + dma_apbh: dma-apbh@33000000 { > + compatible = "fsl,imx7d-dma-apbh", "fsl,imx28-dma-apbh"; > + reg = <0x33000000 0x2000>; > + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; > + #dma-cells = <1>; > + dma-channels = <4>; > + clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; > + clock-names = "dma_apbh_bch", "dma_apbh_io"; please remove the clock names, I am good with all other changes. > + }; > + > + gpmi: gpmi-nand@33002000{ > + compatible = "fsl,imx7d-gpmi-nand"; > + #address-cells = <1>; > + #size-cells = <1>; > + reg = <0x33002000 0x2000>, <0x33004000 0x4000>; > + reg-names = "gpmi-nand", "bch"; > + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "bch"; > + clocks = <&clks IMX7D_NAND_RAWNAND_CLK>, > + <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; > + clock-names = "gpmi_io", "gpmi_bch_apb"; > + dmas = <&dma_apbh 0>; > + dma-names = "rx-tx"; > + status = "disabled"; > + assigned-clocks = <&clks IMX7D_NAND_ROOT_SRC>; > + assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_500M_CLK>; > + }; > }; > };
On 2017-06-07 08:33, Han Xu wrote: > On 06/06/2017 01:30 AM, Stefan Agner wrote: >> Add i.MX 7 APBH DMA and GPMI NAND modules. >> >> Signed-off-by: Stefan Agner <stefan@agner.ch> >> --- >> arch/arm/boot/dts/imx7s.dtsi | 32 ++++++++++++++++++++++++++++++++ >> 1 file changed, 32 insertions(+) >> >> diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi >> index c4f12fd..d71acd8 100644 >> --- a/arch/arm/boot/dts/imx7s.dtsi >> +++ b/arch/arm/boot/dts/imx7s.dtsi >> @@ -995,5 +995,37 @@ >> status = "disabled"; >> }; >> }; >> + >> + dma_apbh: dma-apbh@33000000 { >> + compatible = "fsl,imx7d-dma-apbh", "fsl,imx28-dma-apbh"; >> + reg = <0x33000000 0x2000>; >> + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, >> + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, >> + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, >> + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; >> + interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; >> + #dma-cells = <1>; >> + dma-channels = <4>; >> + clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; >> + clock-names = "dma_apbh_bch", "dma_apbh_io"; > > please remove the clock names, I am good with all other changes. Oh missed that, will do and send v6. -- Stefan >> + }; >> + >> + gpmi: gpmi-nand@33002000{ >> + compatible = "fsl,imx7d-gpmi-nand"; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + reg = <0x33002000 0x2000>, <0x33004000 0x4000>; >> + reg-names = "gpmi-nand", "bch"; >> + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; >> + interrupt-names = "bch"; >> + clocks = <&clks IMX7D_NAND_RAWNAND_CLK>, >> + <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; >> + clock-names = "gpmi_io", "gpmi_bch_apb"; >> + dmas = <&dma_apbh 0>; >> + dma-names = "rx-tx"; >> + status = "disabled"; >> + assigned-clocks = <&clks IMX7D_NAND_ROOT_SRC>; >> + assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_500M_CLK>; >> + }; >> }; >> };
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index c4f12fd..d71acd8 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -995,5 +995,37 @@ status = "disabled"; }; }; + + dma_apbh: dma-apbh@33000000 { + compatible = "fsl,imx7d-dma-apbh", "fsl,imx28-dma-apbh"; + reg = <0x33000000 0x2000>; + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; + #dma-cells = <1>; + dma-channels = <4>; + clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; + clock-names = "dma_apbh_bch", "dma_apbh_io"; + }; + + gpmi: gpmi-nand@33002000{ + compatible = "fsl,imx7d-gpmi-nand"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x33002000 0x2000>, <0x33004000 0x4000>; + reg-names = "gpmi-nand", "bch"; + interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "bch"; + clocks = <&clks IMX7D_NAND_RAWNAND_CLK>, + <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>; + clock-names = "gpmi_io", "gpmi_bch_apb"; + dmas = <&dma_apbh 0>; + dma-names = "rx-tx"; + status = "disabled"; + assigned-clocks = <&clks IMX7D_NAND_ROOT_SRC>; + assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_500M_CLK>; + }; }; };
Add i.MX 7 APBH DMA and GPMI NAND modules. Signed-off-by: Stefan Agner <stefan@agner.ch> --- arch/arm/boot/dts/imx7s.dtsi | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)