Message ID | 20160221112949.GB5387@panicking (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi, On Sun, 21 Feb 2016 12:29:53 +0100 Michael Trimarchi wrote: > Add support for GPMI nand controller. > > Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > --- > Changes V2: > - drop special IMXUL type because seems that is compatible > with IMX6Q > > arch/arm/boot/dts/imx6ul.dtsi | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi > index f4daf97..1a486ac 100644 > --- a/arch/arm/boot/dts/imx6ul.dtsi > +++ b/arch/arm/boot/dts/imx6ul.dtsi > @@ -142,6 +142,39 @@ > reg = <0x00900000 0x20000>; > }; > > + dma_apbh: dma-apbh@01804000 { > + compatible = "fsl,imx6ul-dma-apbh", "fsl,imx28-dma-apbh"; > + reg = <0x01804000 0x2000>; > + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, > + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; > + interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; > + #dma-cells = <1>; > + dma-channels = <4>; > + clocks = <&clks IMX6UL_CLK_APBHDMA>; > + }; > + > + gpmi: gpmi-nand@01806000 { > + compatible = "fsl,imx6q-gpmi-nand"; > You should still add an imx6ul specific compatible (likewise to the dma_apbh). Lothar Waßmann
Hi Lothar On Mon, Feb 22, 2016 at 9:26 AM, Lothar Waßmann <LW@karo-electronics.de> wrote: > Hi, > > On Sun, 21 Feb 2016 12:29:53 +0100 Michael Trimarchi wrote: >> Add support for GPMI nand controller. >> >> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> >> --- >> Changes V2: >> - drop special IMXUL type because seems that is compatible >> with IMX6Q >> >> arch/arm/boot/dts/imx6ul.dtsi | 33 +++++++++++++++++++++++++++++++++ >> 1 file changed, 33 insertions(+) >> >> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi >> index f4daf97..1a486ac 100644 >> --- a/arch/arm/boot/dts/imx6ul.dtsi >> +++ b/arch/arm/boot/dts/imx6ul.dtsi >> @@ -142,6 +142,39 @@ >> reg = <0x00900000 0x20000>; >> }; >> >> + dma_apbh: dma-apbh@01804000 { >> + compatible = "fsl,imx6ul-dma-apbh", "fsl,imx28-dma-apbh"; >> + reg = <0x01804000 0x2000>; >> + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, >> + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, >> + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, >> + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; >> + interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; >> + #dma-cells = <1>; >> + dma-channels = <4>; >> + clocks = <&clks IMX6UL_CLK_APBHDMA>; >> + }; >> + >> + gpmi: gpmi-nand@01806000 { >> + compatible = "fsl,imx6q-gpmi-nand"; >> > You should still add an imx6ul specific compatible (likewise to the > dma_apbh). > I understand your point but this seems that imx6q and imx6sx are defined in the same way Michael > > > Lothar Waßmann
Hi, On Sun, 20 Mar 2016 09:44:19 +0100 Michael Trimarchi wrote: > Hi Lothar > > On Mon, Feb 22, 2016 at 9:26 AM, Lothar Waßmann <LW@karo-electronics.de> wrote: > > Hi, > > > > On Sun, 21 Feb 2016 12:29:53 +0100 Michael Trimarchi wrote: > >> Add support for GPMI nand controller. > >> > >> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> > >> --- > >> Changes V2: > >> - drop special IMXUL type because seems that is compatible > >> with IMX6Q > >> > >> arch/arm/boot/dts/imx6ul.dtsi | 33 +++++++++++++++++++++++++++++++++ > >> 1 file changed, 33 insertions(+) > >> > >> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi > >> index f4daf97..1a486ac 100644 > >> --- a/arch/arm/boot/dts/imx6ul.dtsi > >> +++ b/arch/arm/boot/dts/imx6ul.dtsi > >> @@ -142,6 +142,39 @@ > >> reg = <0x00900000 0x20000>; > >> }; > >> > >> + dma_apbh: dma-apbh@01804000 { > >> + compatible = "fsl,imx6ul-dma-apbh", "fsl,imx28-dma-apbh"; > >> + reg = <0x01804000 0x2000>; > >> + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, > >> + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, > >> + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, > >> + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; > >> + interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; > >> + #dma-cells = <1>; > >> + dma-channels = <4>; > >> + clocks = <&clks IMX6UL_CLK_APBHDMA>; > >> + }; > >> + > >> + gpmi: gpmi-nand@01806000 { > >> + compatible = "fsl,imx6q-gpmi-nand"; > >> > > You should still add an imx6ul specific compatible (likewise to the > > dma_apbh). > > > > I understand your point but this seems that imx6q and imx6sx are > defined in the same way > That doesn't mean they are correct. I got the same comment from Lucas Stach in <1452678036.3694.51.camel@pengutronix.de> Lothar Waßmann
Hi On Mon, Mar 21, 2016 at 10:47 AM, Lothar Waßmann <LW@karo-electronics.de> wrote: > Hi, > > On Sun, 20 Mar 2016 09:44:19 +0100 Michael Trimarchi wrote: >> Hi Lothar >> >> On Mon, Feb 22, 2016 at 9:26 AM, Lothar Waßmann <LW@karo-electronics.de> wrote: >> > Hi, >> > >> > On Sun, 21 Feb 2016 12:29:53 +0100 Michael Trimarchi wrote: >> >> Add support for GPMI nand controller. >> >> >> >> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> >> >> --- >> >> Changes V2: >> >> - drop special IMXUL type because seems that is compatible >> >> with IMX6Q >> >> >> >> arch/arm/boot/dts/imx6ul.dtsi | 33 +++++++++++++++++++++++++++++++++ >> >> 1 file changed, 33 insertions(+) >> >> >> >> diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi >> >> index f4daf97..1a486ac 100644 >> >> --- a/arch/arm/boot/dts/imx6ul.dtsi >> >> +++ b/arch/arm/boot/dts/imx6ul.dtsi >> >> @@ -142,6 +142,39 @@ >> >> reg = <0x00900000 0x20000>; >> >> }; >> >> >> >> + dma_apbh: dma-apbh@01804000 { >> >> + compatible = "fsl,imx6ul-dma-apbh", "fsl,imx28-dma-apbh"; >> >> + reg = <0x01804000 0x2000>; >> >> + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, >> >> + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, >> >> + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, >> >> + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; >> >> + interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; >> >> + #dma-cells = <1>; >> >> + dma-channels = <4>; >> >> + clocks = <&clks IMX6UL_CLK_APBHDMA>; >> >> + }; >> >> + >> >> + gpmi: gpmi-nand@01806000 { >> >> + compatible = "fsl,imx6q-gpmi-nand"; >> >> >> > You should still add an imx6ul specific compatible (likewise to the >> > dma_apbh). >> > >> >> I understand your point but this seems that imx6q and imx6sx are >> defined in the same way >> > That doesn't mean they are correct. I got the same comment from Lucas > Stach in <1452678036.3694.51.camel@pengutronix.de> > Ok, it's fine. I will fix it and re-post the series Michael > > Lothar Waßmann
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index f4daf97..1a486ac 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi @@ -142,6 +142,39 @@ reg = <0x00900000 0x20000>; }; + dma_apbh: dma-apbh@01804000 { + compatible = "fsl,imx6ul-dma-apbh", "fsl,imx28-dma-apbh"; + reg = <0x01804000 0x2000>; + interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3"; + #dma-cells = <1>; + dma-channels = <4>; + clocks = <&clks IMX6UL_CLK_APBHDMA>; + }; + + gpmi: gpmi-nand@01806000 { + compatible = "fsl,imx6q-gpmi-nand"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x01806000 0x2000>, <0x01808000 0x4000>; + reg-names = "gpmi-nand", "bch"; + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "bch"; + clocks = <&clks IMX6UL_CLK_GPMI_IO>, + <&clks IMX6UL_CLK_GPMI_APB>, + <&clks IMX6UL_CLK_GPMI_BCH>, + <&clks IMX6UL_CLK_GPMI_BCH_APB>, + <&clks IMX6UL_CLK_PER_BCH>; + clock-names = "gpmi_io", "gpmi_apb", "gpmi_bch", + "gpmi_bch_apb", "per1_bch"; + dmas = <&dma_apbh 0>; + dma-names = "rx-tx"; + status = "disabled"; + }; + aips1: aips-bus@02000000 { compatible = "fsl,aips-bus", "simple-bus"; #address-cells = <1>;
Add support for GPMI nand controller. Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com> --- Changes V2: - drop special IMXUL type because seems that is compatible with IMX6Q arch/arm/boot/dts/imx6ul.dtsi | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)