| Message ID | 20231109094504.131265-1-avkrasnov@salutedevices.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] arm64: dts: amlogic: meson-axg: pinctrl node for NAND | expand |
On 09/11/2023 10:45, Arseniy Krasnov wrote: > Add pinctrl node for the Meson NAND controller. > > Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> > --- > Changelog: > v1 -> v2: > * Rename node name 'nand_all_pins' -> 'nand-all-pins'. > > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 23 ++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > index a49aa62e3f9f..7e5ac9db93f8 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > @@ -432,6 +432,27 @@ mux-1 { > }; > }; > > + nand_all_pins: nand-all-pins { > + mux { > + groups = "emmc_nand_d0", > + "emmc_nand_d1", > + "emmc_nand_d2", > + "emmc_nand_d3", > + "emmc_nand_d4", > + "emmc_nand_d5", > + "emmc_nand_d6", > + "emmc_nand_d7", > + "nand_ce0", > + "nand_ale", > + "nand_cle", > + "nand_wen_clk", > + "nand_ren_wr"; > + function = "nand"; > + input-enable; > + bias-pull-up; > + }; > + }; > + > emmc_ds_pins: emmc_ds { > mux { > groups = "emmc_ds"; > @@ -1913,6 +1934,8 @@ nfc: nand-controller@7800 { > reg = <0x0 0x7800 0x0 0x100>, > <0x0 0x7000 0x0 0x800>; > reg-names = "nfc", "emmc"; > + pinctrl-0 = <&nand_all_pins>; > + pinctrl-names = "default"; > #address-cells = <1>; > #size-cells = <0>; > interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Hi, On Thu, 09 Nov 2023 12:45:04 +0300, Arseniy Krasnov wrote: > Add pinctrl node for the Meson NAND controller. > > Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.8/arm64-dt) [1/1] arm64: dts: amlogic: meson-axg: pinctrl node for NAND https://git.kernel.org/amlogic/c/be18d53c32b2bbb211f4be599cafdb9d9ecab040 These changes has been applied on the intermediate git tree [1]. The v6.8/arm64-dt branch will then be sent via a formal Pull Request to the Linux SoC maintainers for inclusion in their intermediate git branches in order to be sent to Linus during the next merge window, or sooner if it's a set of fixes. In the cases of fixes, those will be merged in the current release candidate kernel and as soon they appear on the Linux master branch they will be backported to the previous Stable and Long-Stable kernels [2]. The intermediate git branches are merged daily in the linux-next tree [3], people are encouraged testing these pre-release kernels and report issues on the relevant mailing-lists. If problems are discovered on those changes, please submit a signed-off-by revert patch followed by a corrective changeset. [1] https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git [3] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index a49aa62e3f9f..7e5ac9db93f8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -432,6 +432,27 @@ mux-1 { }; }; + nand_all_pins: nand-all-pins { + mux { + groups = "emmc_nand_d0", + "emmc_nand_d1", + "emmc_nand_d2", + "emmc_nand_d3", + "emmc_nand_d4", + "emmc_nand_d5", + "emmc_nand_d6", + "emmc_nand_d7", + "nand_ce0", + "nand_ale", + "nand_cle", + "nand_wen_clk", + "nand_ren_wr"; + function = "nand"; + input-enable; + bias-pull-up; + }; + }; + emmc_ds_pins: emmc_ds { mux { groups = "emmc_ds"; @@ -1913,6 +1934,8 @@ nfc: nand-controller@7800 { reg = <0x0 0x7800 0x0 0x100>, <0x0 0x7000 0x0 0x800>; reg-names = "nfc", "emmc"; + pinctrl-0 = <&nand_all_pins>; + pinctrl-names = "default"; #address-cells = <1>; #size-cells = <0>; interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>;
Add pinctrl node for the Meson NAND controller. Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> --- Changelog: v1 -> v2: * Rename node name 'nand_all_pins' -> 'nand-all-pins'. arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+)