| Message ID | 20230828133647.3712644-1-avkrasnov@salutedevices.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v1] arm64: dts: amlogic: meson-axg: Meson NAND node | expand |
On 28/08/2023 15:36, Arseniy Krasnov wrote: > Add description of the Meson NAND controller node. > > Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> > --- > arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > index 768d0ed78dbe..a49aa62e3f9f 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi > @@ -1908,6 +1908,19 @@ sd_emmc_c: mmc@7000 { > resets = <&reset RESET_SD_EMMC_C>; > }; > > + nfc: nand-controller@7800 { > + compatible = "amlogic,meson-axg-nfc"; > + reg = <0x0 0x7800 0x0 0x100>, > + <0x0 0x7000 0x0 0x800>; > + reg-names = "nfc", "emmc"; > + #address-cells = <1>; > + #size-cells = <0>; > + interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; > + clocks = <&clkc CLKID_SD_EMMC_C>, > + <&clkc CLKID_FCLK_DIV2>; > + clock-names = "core", "device"; > + }; > + > usb2_phy1: phy@9020 { > compatible = "amlogic,meson-gxl-usb2-phy"; > #phy-cells = <0>; Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Hi, On Mon, 28 Aug 2023 16:36:47 +0300, Arseniy Krasnov wrote: > Add description of the Meson NAND controller node. > > Thanks, Applied to https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git (v6.7/arm64-dt) [1/1] arm64: dts: amlogic: meson-axg: Meson NAND node https://git.kernel.org/amlogic/c/7ca2ef33179f4e1887727c1b5fac39721db8050e These changes has been applied on the intermediate git tree [1]. The v6.7/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 768d0ed78dbe..a49aa62e3f9f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -1908,6 +1908,19 @@ sd_emmc_c: mmc@7000 { resets = <&reset RESET_SD_EMMC_C>; }; + nfc: nand-controller@7800 { + compatible = "amlogic,meson-axg-nfc"; + reg = <0x0 0x7800 0x0 0x100>, + <0x0 0x7000 0x0 0x800>; + reg-names = "nfc", "emmc"; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <GIC_SPI 34 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_SD_EMMC_C>, + <&clkc CLKID_FCLK_DIV2>; + clock-names = "core", "device"; + }; + usb2_phy1: phy@9020 { compatible = "amlogic,meson-gxl-usb2-phy"; #phy-cells = <0>;
Add description of the Meson NAND controller node. Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)