* [PATCH v6 0/3] ARM: dts: imx7: add NAND support
@ 2017-06-08 22:34 Stefan Agner
2017-06-08 22:34 ` [PATCH v6 1/3] clk: imx7d: create clocks behind rawnand clock gate Stefan Agner
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Stefan Agner @ 2017-06-08 22:34 UTC (permalink / raw)
To: shawnguo, kernel, sboyd
Cc: aisheng.dong, dwmw2, computersforpeace, boris.brezillon,
marek.vasut, richard, robh+dt, mark.rutland, han.xu,
fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel,
linux-clk, linux-kernel, Stefan Agner
This revision alters the clock tree such that the clock required by
the APBH DMA (NAND_USDHC_BUS_CLK_ROOT _after_ gate CCGR20) is available
as an independent clock.
So far the gate CCGR20 was used by the NAND_ROOT_CLK only. A previous
patch added the NAND_ROOT_CLK to the APBH DMA which lead the clock
gate CCGR20 getting enabled:
https://patchwork.ozlabs.org/patch/551967/
The data sheet seems to indicate that the APBH DMA only uses hclk which
is connected to NAND_USDHC_BUS_CLK_ROOT, but also through gate CCGR20.
Tests seem to confirm this wiring.
By adding a new clock IMX7D_NAND_USDHC_BUS_RAWNAND_CLK we can assign
a clock which also enables the shared CCGR20 gate without changing the
DMA driver. This better reflects the true wiring and encapsulates the
SoC specific clock wiring in the clock tree instead leaking it into
the driver code.
The wording "rawnand" has been taken from Table 5-12, Module APBHDMA
in the i.MX 7 Reference Manual.
Versions 2 and earlier also included NAND driver changes, which are
already merged.
--
Stefan
Changes since v5:
- Remove clock-names from dma-apbh node
Changes since v4:
- Introduce *_RAWNAND_CLK which represent clocks after CCGR20
- Use *_RAWNAND_CLK for APBH DMA and GPMI NAND
- Use assigned-clocks to set a reasonable parent for NAND_ROOT_SRC
Changes since v3:
- Only specify IMX7D_NAND_USDHC_BUS_ROOT_CLK which seems to be sufficent
Changes since v2:
- Dropped driver changes, alreay merged
Changes since v1:
- Make clks_count const
- Introduce IS_IMX7D for i.MX 7 SoC's and make it part of GPMI_IS_MX6
Stefan Agner (3):
clk: imx7d: create clocks behind rawnand clock gate
ARM: dts: imx7: add GPMI NAND and APBH DMA
ARM: dts: imx7-colibri: add NAND support
arch/arm/boot/dts/imx7-colibri.dtsi | 9 ++++++++-
arch/arm/boot/dts/imx7s.dtsi | 31 ++++++++++++++++++++++++++-
drivers/clk/imx/clk-imx7d.c | 6 +++--
include/dt-bindings/clock/imx7d-clock.h | 4 ++-
4 files changed, 47 insertions(+), 3 deletions(-)
base-commit: e2bb3be2c6c623ff0bad975dc9435531f450f0c5
--
git-series 0.9.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v6 1/3] clk: imx7d: create clocks behind rawnand clock gate 2017-06-08 22:34 [PATCH v6 0/3] ARM: dts: imx7: add NAND support Stefan Agner @ 2017-06-08 22:34 ` Stefan Agner 2017-06-09 19:16 ` Han Xu 2017-06-20 1:01 ` Stephen Boyd 2017-06-08 22:34 ` [PATCH v6 2/3] ARM: dts: imx7: add GPMI NAND and APBH DMA Stefan Agner ` (2 subsequent siblings) 3 siblings, 2 replies; 11+ messages in thread From: Stefan Agner @ 2017-06-08 22:34 UTC (permalink / raw) To: shawnguo, kernel, sboyd Cc: aisheng.dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, han.xu, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel, Stefan Agner The rawnand clock gate gates two clocks, NAND_USDHC_BUS_CLK_ROOT and NAND_CLK_ROOT. However, the gate has been in the chain of the latter only. This does not allow to use the NAND_USDHC_BUS_CLK_ROOT only, e.g. as required by APBH-Bridge-DMA. Add new clocks which represent the clock after the gate, and use a shared clock gate to correctly model the hardware. Signed-off-by: Stefan Agner <stefan@agner.ch> Tested-by: Fabio Estevam <fabio.estevam@nxp.com> --- drivers/clk/imx/clk-imx7d.c | 6 ++++-- include/dt-bindings/clock/imx7d-clock.h | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index 93b0364..e364060 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -25,6 +25,7 @@ static u32 share_count_sai1; static u32 share_count_sai2; static u32 share_count_sai3; +static u32 share_count_nand; static struct clk_div_table test_div_table[] = { { .val = 3, .div = 1, }, @@ -748,7 +749,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_ENET2_TIME_ROOT_DIV] = imx_clk_divider2("enet2_time_post_div", "enet2_time_pre_div", base + 0xa880, 0, 6); clks[IMX7D_ENET_PHY_REF_ROOT_DIV] = imx_clk_divider2("enet_phy_ref_post_div", "enet_phy_ref_pre_div", base + 0xa900, 0, 6); clks[IMX7D_EIM_ROOT_DIV] = imx_clk_divider2("eim_post_div", "eim_pre_div", base + 0xa980, 0, 6); - clks[IMX7D_NAND_ROOT_DIV] = imx_clk_divider2("nand_post_div", "nand_pre_div", base + 0xaa00, 0, 6); + clks[IMX7D_NAND_ROOT_CLK] = imx_clk_divider2("nand_root_clk", "nand_pre_div", base + 0xaa00, 0, 6); clks[IMX7D_QSPI_ROOT_DIV] = imx_clk_divider2("qspi_post_div", "qspi_pre_div", base + 0xaa80, 0, 6); clks[IMX7D_USDHC1_ROOT_DIV] = imx_clk_divider2("usdhc1_post_div", "usdhc1_pre_div", base + 0xab00, 0, 6); clks[IMX7D_USDHC2_ROOT_DIV] = imx_clk_divider2("usdhc2_post_div", "usdhc2_pre_div", base + 0xab80, 0, 6); @@ -825,7 +826,8 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) clks[IMX7D_ENET2_TIME_ROOT_CLK] = imx_clk_gate4("enet2_time_root_clk", "enet2_time_post_div", base + 0x4510, 0); clks[IMX7D_ENET_PHY_REF_ROOT_CLK] = imx_clk_gate4("enet_phy_ref_root_clk", "enet_phy_ref_post_div", base + 0x4520, 0); clks[IMX7D_EIM_ROOT_CLK] = imx_clk_gate4("eim_root_clk", "eim_post_div", base + 0x4160, 0); - clks[IMX7D_NAND_ROOT_CLK] = imx_clk_gate4("nand_root_clk", "nand_post_div", base + 0x4140, 0); + clks[IMX7D_NAND_RAWNAND_CLK] = imx_clk_gate2_shared2("nand_rawnand_clk", "nand_root_clk", base + 0x4140, 0, &share_count_nand); + clks[IMX7D_NAND_USDHC_BUS_RAWNAND_CLK] = imx_clk_gate2_shared2("nand_usdhc_rawnand_clk", "nand_usdhc_root_clk", base + 0x4140, 0, &share_count_nand); clks[IMX7D_QSPI_ROOT_CLK] = imx_clk_gate4("qspi_root_clk", "qspi_post_div", base + 0x4150, 0); clks[IMX7D_USDHC1_ROOT_CLK] = imx_clk_gate4("usdhc1_root_clk", "usdhc1_post_div", base + 0x46c0, 0); clks[IMX7D_USDHC2_ROOT_CLK] = imx_clk_gate4("usdhc2_root_clk", "usdhc2_post_div", base + 0x46d0, 0); diff --git a/include/dt-bindings/clock/imx7d-clock.h b/include/dt-bindings/clock/imx7d-clock.h index a7a1a50..de62a83 100644 --- a/include/dt-bindings/clock/imx7d-clock.h +++ b/include/dt-bindings/clock/imx7d-clock.h @@ -450,5 +450,7 @@ #define IMX7D_CLK_ARM 437 #define IMX7D_CKIL 438 #define IMX7D_OCOTP_CLK 439 -#define IMX7D_CLK_END 440 +#define IMX7D_NAND_RAWNAND_CLK 440 +#define IMX7D_NAND_USDHC_BUS_RAWNAND_CLK 441 +#define IMX7D_CLK_END 442 #endif /* __DT_BINDINGS_CLOCK_IMX7D_H */ -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v6 1/3] clk: imx7d: create clocks behind rawnand clock gate 2017-06-08 22:34 ` [PATCH v6 1/3] clk: imx7d: create clocks behind rawnand clock gate Stefan Agner @ 2017-06-09 19:16 ` Han Xu 2017-06-20 1:01 ` Stephen Boyd 1 sibling, 0 replies; 11+ messages in thread From: Han Xu @ 2017-06-09 19:16 UTC (permalink / raw) To: Stefan Agner, shawnguo, kernel, sboyd Cc: A.S. Dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel On 06/08/2017 05:34 PM, Stefan Agner wrote: > The rawnand clock gate gates two clocks, NAND_USDHC_BUS_CLK_ROOT > and NAND_CLK_ROOT. However, the gate has been in the chain of the > latter only. This does not allow to use the NAND_USDHC_BUS_CLK_ROOT > only, e.g. as required by APBH-Bridge-DMA. > > Add new clocks which represent the clock after the gate, and use a > shared clock gate to correctly model the hardware. > > Signed-off-by: Stefan Agner <stefan@agner.ch> > Tested-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Han Xu <han.xu@nxp.com> > --- > drivers/clk/imx/clk-imx7d.c | 6 ++++-- > include/dt-bindings/clock/imx7d-clock.h | 4 +++- > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c > index 93b0364..e364060 100644 > --- a/drivers/clk/imx/clk-imx7d.c > +++ b/drivers/clk/imx/clk-imx7d.c > @@ -25,6 +25,7 @@ > static u32 share_count_sai1; > static u32 share_count_sai2; > static u32 share_count_sai3; > +static u32 share_count_nand; > > static struct clk_div_table test_div_table[] = { > { .val = 3, .div = 1, }, > @@ -748,7 +749,7 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) > clks[IMX7D_ENET2_TIME_ROOT_DIV] = imx_clk_divider2("enet2_time_post_div", "enet2_time_pre_div", base + 0xa880, 0, 6); > clks[IMX7D_ENET_PHY_REF_ROOT_DIV] = imx_clk_divider2("enet_phy_ref_post_div", "enet_phy_ref_pre_div", base + 0xa900, 0, 6); > clks[IMX7D_EIM_ROOT_DIV] = imx_clk_divider2("eim_post_div", "eim_pre_div", base + 0xa980, 0, 6); > - clks[IMX7D_NAND_ROOT_DIV] = imx_clk_divider2("nand_post_div", "nand_pre_div", base + 0xaa00, 0, 6); > + clks[IMX7D_NAND_ROOT_CLK] = imx_clk_divider2("nand_root_clk", "nand_pre_div", base + 0xaa00, 0, 6); > clks[IMX7D_QSPI_ROOT_DIV] = imx_clk_divider2("qspi_post_div", "qspi_pre_div", base + 0xaa80, 0, 6); > clks[IMX7D_USDHC1_ROOT_DIV] = imx_clk_divider2("usdhc1_post_div", "usdhc1_pre_div", base + 0xab00, 0, 6); > clks[IMX7D_USDHC2_ROOT_DIV] = imx_clk_divider2("usdhc2_post_div", "usdhc2_pre_div", base + 0xab80, 0, 6); > @@ -825,7 +826,8 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) > clks[IMX7D_ENET2_TIME_ROOT_CLK] = imx_clk_gate4("enet2_time_root_clk", "enet2_time_post_div", base + 0x4510, 0); > clks[IMX7D_ENET_PHY_REF_ROOT_CLK] = imx_clk_gate4("enet_phy_ref_root_clk", "enet_phy_ref_post_div", base + 0x4520, 0); > clks[IMX7D_EIM_ROOT_CLK] = imx_clk_gate4("eim_root_clk", "eim_post_div", base + 0x4160, 0); > - clks[IMX7D_NAND_ROOT_CLK] = imx_clk_gate4("nand_root_clk", "nand_post_div", base + 0x4140, 0); > + clks[IMX7D_NAND_RAWNAND_CLK] = imx_clk_gate2_shared2("nand_rawnand_clk", "nand_root_clk", base + 0x4140, 0, &share_count_nand); > + clks[IMX7D_NAND_USDHC_BUS_RAWNAND_CLK] = imx_clk_gate2_shared2("nand_usdhc_rawnand_clk", "nand_usdhc_root_clk", base + 0x4140, 0, &share_count_nand); > clks[IMX7D_QSPI_ROOT_CLK] = imx_clk_gate4("qspi_root_clk", "qspi_post_div", base + 0x4150, 0); > clks[IMX7D_USDHC1_ROOT_CLK] = imx_clk_gate4("usdhc1_root_clk", "usdhc1_post_div", base + 0x46c0, 0); > clks[IMX7D_USDHC2_ROOT_CLK] = imx_clk_gate4("usdhc2_root_clk", "usdhc2_post_div", base + 0x46d0, 0); > diff --git a/include/dt-bindings/clock/imx7d-clock.h b/include/dt-bindings/clock/imx7d-clock.h > index a7a1a50..de62a83 100644 > --- a/include/dt-bindings/clock/imx7d-clock.h > +++ b/include/dt-bindings/clock/imx7d-clock.h > @@ -450,5 +450,7 @@ > #define IMX7D_CLK_ARM 437 > #define IMX7D_CKIL 438 > #define IMX7D_OCOTP_CLK 439 > -#define IMX7D_CLK_END 440 > +#define IMX7D_NAND_RAWNAND_CLK 440 > +#define IMX7D_NAND_USDHC_BUS_RAWNAND_CLK 441 > +#define IMX7D_CLK_END 442 > #endif /* __DT_BINDINGS_CLOCK_IMX7D_H */ ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 1/3] clk: imx7d: create clocks behind rawnand clock gate 2017-06-08 22:34 ` [PATCH v6 1/3] clk: imx7d: create clocks behind rawnand clock gate Stefan Agner 2017-06-09 19:16 ` Han Xu @ 2017-06-20 1:01 ` Stephen Boyd 1 sibling, 0 replies; 11+ messages in thread From: Stephen Boyd @ 2017-06-20 1:01 UTC (permalink / raw) To: Stefan Agner Cc: shawnguo, kernel, aisheng.dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, han.xu, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel On 06/08, Stefan Agner wrote: > The rawnand clock gate gates two clocks, NAND_USDHC_BUS_CLK_ROOT > and NAND_CLK_ROOT. However, the gate has been in the chain of the > latter only. This does not allow to use the NAND_USDHC_BUS_CLK_ROOT > only, e.g. as required by APBH-Bridge-DMA. > > Add new clocks which represent the clock after the gate, and use a > shared clock gate to correctly model the hardware. > > Signed-off-by: Stefan Agner <stefan@agner.ch> > Tested-by: Fabio Estevam <fabio.estevam@nxp.com> > --- Applied to clk-next -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v6 2/3] ARM: dts: imx7: add GPMI NAND and APBH DMA 2017-06-08 22:34 [PATCH v6 0/3] ARM: dts: imx7: add NAND support Stefan Agner 2017-06-08 22:34 ` [PATCH v6 1/3] clk: imx7d: create clocks behind rawnand clock gate Stefan Agner @ 2017-06-08 22:34 ` Stefan Agner 2017-06-09 19:17 ` Han Xu 2017-06-08 22:34 ` [PATCH v6 3/3] ARM: dts: imx7-colibri: add NAND support Stefan Agner 2017-06-14 15:11 ` [PATCH v6 0/3] ARM: dts: imx7: " Shawn Guo 3 siblings, 1 reply; 11+ messages in thread From: Stefan Agner @ 2017-06-08 22:34 UTC (permalink / raw) To: shawnguo, kernel, sboyd Cc: aisheng.dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, han.xu, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel, Stefan Agner Add i.MX 7 APBH DMA and GPMI NAND modules. Signed-off-by: Stefan Agner <stefan@agner.ch> Tested-by: Fabio Estevam <fabio.estevam@nxp.com> --- arch/arm/boot/dts/imx7s.dtsi | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index c4f12fd..4902f62 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi @@ -995,5 +995,36 @@ 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>; + }; + + 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>; + }; }; }; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v6 2/3] ARM: dts: imx7: add GPMI NAND and APBH DMA 2017-06-08 22:34 ` [PATCH v6 2/3] ARM: dts: imx7: add GPMI NAND and APBH DMA Stefan Agner @ 2017-06-09 19:17 ` Han Xu 0 siblings, 0 replies; 11+ messages in thread From: Han Xu @ 2017-06-09 19:17 UTC (permalink / raw) To: Stefan Agner, shawnguo, kernel, sboyd Cc: A.S. Dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel On 06/08/2017 05:34 PM, Stefan Agner wrote: > Add i.MX 7 APBH DMA and GPMI NAND modules. > > Signed-off-by: Stefan Agner <stefan@agner.ch> > Tested-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Han Xu <han.xu@nxp.com> > --- > arch/arm/boot/dts/imx7s.dtsi | 31 +++++++++++++++++++++++++++++++ > 1 file changed, 31 insertions(+) > > diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi > index c4f12fd..4902f62 100644 > --- a/arch/arm/boot/dts/imx7s.dtsi > +++ b/arch/arm/boot/dts/imx7s.dtsi > @@ -995,5 +995,36 @@ > 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>; > + }; > + > + 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>; > + }; > }; > }; ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v6 3/3] ARM: dts: imx7-colibri: add NAND support 2017-06-08 22:34 [PATCH v6 0/3] ARM: dts: imx7: add NAND support Stefan Agner 2017-06-08 22:34 ` [PATCH v6 1/3] clk: imx7d: create clocks behind rawnand clock gate Stefan Agner 2017-06-08 22:34 ` [PATCH v6 2/3] ARM: dts: imx7: add GPMI NAND and APBH DMA Stefan Agner @ 2017-06-08 22:34 ` Stefan Agner 2017-06-09 19:17 ` Han Xu 2017-06-14 15:11 ` [PATCH v6 0/3] ARM: dts: imx7: " Shawn Guo 3 siblings, 1 reply; 11+ messages in thread From: Stefan Agner @ 2017-06-08 22:34 UTC (permalink / raw) To: shawnguo, kernel, sboyd Cc: aisheng.dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, han.xu, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel, Stefan Agner The Colibri iMX7 modules come with 512MB on-module SLC NAND flash populated. Make use of it by enabling the GPMI controller. Signed-off-by: Stefan Agner <stefan@agner.ch> Tested-by: Fabio Estevam <fabio.estevam@nxp.com> --- arch/arm/boot/dts/imx7-colibri.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 2d87489..ad4ce19 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -106,6 +106,15 @@ fsl,magic-packet; }; +&gpmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpmi_nand>; + fsl,use-minimum-ecc; + nand-on-flash-bbt; + nand-ecc-mode = "hw"; + status = "okay"; +}; + &i2c1 { clock-frequency = <100000>; pinctrl-names = "default"; -- git-series 0.9.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v6 3/3] ARM: dts: imx7-colibri: add NAND support 2017-06-08 22:34 ` [PATCH v6 3/3] ARM: dts: imx7-colibri: add NAND support Stefan Agner @ 2017-06-09 19:17 ` Han Xu 0 siblings, 0 replies; 11+ messages in thread From: Han Xu @ 2017-06-09 19:17 UTC (permalink / raw) To: Stefan Agner, shawnguo, kernel, sboyd Cc: A.S. Dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel On 06/08/2017 05:34 PM, Stefan Agner wrote: > The Colibri iMX7 modules come with 512MB on-module SLC NAND flash > populated. Make use of it by enabling the GPMI controller. > > Signed-off-by: Stefan Agner <stefan@agner.ch> > Tested-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Han Xu <han.xu@nxp.com> > --- > arch/arm/boot/dts/imx7-colibri.dtsi | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi > index 2d87489..ad4ce19 100644 > --- a/arch/arm/boot/dts/imx7-colibri.dtsi > +++ b/arch/arm/boot/dts/imx7-colibri.dtsi > @@ -106,6 +106,15 @@ > fsl,magic-packet; > }; > > +&gpmi { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_gpmi_nand>; > + fsl,use-minimum-ecc; > + nand-on-flash-bbt; > + nand-ecc-mode = "hw"; > + status = "okay"; > +}; > + > &i2c1 { > clock-frequency = <100000>; > pinctrl-names = "default"; ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 0/3] ARM: dts: imx7: add NAND support 2017-06-08 22:34 [PATCH v6 0/3] ARM: dts: imx7: add NAND support Stefan Agner ` (2 preceding siblings ...) 2017-06-08 22:34 ` [PATCH v6 3/3] ARM: dts: imx7-colibri: add NAND support Stefan Agner @ 2017-06-14 15:11 ` Shawn Guo 2017-08-02 2:41 ` Stefan Agner 3 siblings, 1 reply; 11+ messages in thread From: Shawn Guo @ 2017-06-14 15:11 UTC (permalink / raw) To: Stefan Agner Cc: kernel, sboyd, aisheng.dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, han.xu, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel On Thu, Jun 08, 2017 at 03:34:46PM -0700, Stefan Agner wrote: > Stefan Agner (3): > clk: imx7d: create clocks behind rawnand clock gate > ARM: dts: imx7: add GPMI NAND and APBH DMA > ARM: dts: imx7-colibri: add NAND support Both dts patches look good to me. Please ping me after the clk patch lands on mainline. Shawn ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 0/3] ARM: dts: imx7: add NAND support 2017-06-14 15:11 ` [PATCH v6 0/3] ARM: dts: imx7: " Shawn Guo @ 2017-08-02 2:41 ` Stefan Agner 2017-08-03 1:13 ` Shawn Guo 0 siblings, 1 reply; 11+ messages in thread From: Stefan Agner @ 2017-08-02 2:41 UTC (permalink / raw) To: Shawn Guo Cc: kernel, sboyd, aisheng.dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, han.xu, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel Hi Shawn, On 2017-06-14 08:11, Shawn Guo wrote: > On Thu, Jun 08, 2017 at 03:34:46PM -0700, Stefan Agner wrote: >> Stefan Agner (3): >> clk: imx7d: create clocks behind rawnand clock gate >> ARM: dts: imx7: add GPMI NAND and APBH DMA >> ARM: dts: imx7-colibri: add NAND support > > Both dts patches look good to me. Please ping me after the clk patch > lands on mainline. The clk patch landed in mainline. These two patches seem to apply fine still. Can you queue them for -next? FWIW, tested it on a Colibri iMX7 using v3.13-rc3, works fine after reverting the GPC changes (see my other email with subject "i.MX 7 boot freeze with 4.13-rc3"). -- Stefan ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v6 0/3] ARM: dts: imx7: add NAND support 2017-08-02 2:41 ` Stefan Agner @ 2017-08-03 1:13 ` Shawn Guo 0 siblings, 0 replies; 11+ messages in thread From: Shawn Guo @ 2017-08-03 1:13 UTC (permalink / raw) To: Stefan Agner Cc: kernel, sboyd, aisheng.dong, dwmw2, computersforpeace, boris.brezillon, marek.vasut, richard, robh+dt, mark.rutland, han.xu, fabio.estevam, LW, linux-mtd, devicetree, linux-arm-kernel, linux-clk, linux-kernel On Tue, Aug 01, 2017 at 07:41:41PM -0700, Stefan Agner wrote: > Hi Shawn, > > On 2017-06-14 08:11, Shawn Guo wrote: > > On Thu, Jun 08, 2017 at 03:34:46PM -0700, Stefan Agner wrote: > >> Stefan Agner (3): > >> clk: imx7d: create clocks behind rawnand clock gate > >> ARM: dts: imx7: add GPMI NAND and APBH DMA > >> ARM: dts: imx7-colibri: add NAND support > > > > Both dts patches look good to me. Please ping me after the clk patch > > lands on mainline. > > The clk patch landed in mainline. These two patches seem to apply fine > still. Can you queue them for -next? Just applied. Thanks for reminding. Shawn ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-08-03 1:15 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-06-08 22:34 [PATCH v6 0/3] ARM: dts: imx7: add NAND support Stefan Agner 2017-06-08 22:34 ` [PATCH v6 1/3] clk: imx7d: create clocks behind rawnand clock gate Stefan Agner 2017-06-09 19:16 ` Han Xu 2017-06-20 1:01 ` Stephen Boyd 2017-06-08 22:34 ` [PATCH v6 2/3] ARM: dts: imx7: add GPMI NAND and APBH DMA Stefan Agner 2017-06-09 19:17 ` Han Xu 2017-06-08 22:34 ` [PATCH v6 3/3] ARM: dts: imx7-colibri: add NAND support Stefan Agner 2017-06-09 19:17 ` Han Xu 2017-06-14 15:11 ` [PATCH v6 0/3] ARM: dts: imx7: " Shawn Guo 2017-08-02 2:41 ` Stefan Agner 2017-08-03 1:13 ` Shawn Guo
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).