[PATCH v1] arm: dts: meson-axg: add NAND controller node for AXG

[neil.armstrong at linaro.org]

On 26/04/2024 10:40, Arseniy Krasnov wrote:
> Hi,
> 
> On 26.04.2024 11:21, Neil Armstrong wrote:
>> Hi,
>>
>> On 25/04/2024 19:50, Arseniy Krasnov wrote:
>>> nfc: Synced from Linux commit 7ca2ef33179f ("Linux 6.6-rc1")
>>> nand_all_pins: Synced from Linux commit be18d53c32b2 ("Linux 6.7-rc3")
>>
>> No need to sync DT anymore, this is handled by OF_UPSTREAM and for next release
>> it's already aligned with v6.9 DT.
>>
>> Please try your patches with master or next branch of U-Boot repo.
> 
> Ok, so I can remove "Synced from" from commit description, thus make it empty, and test that patch applies correctly
> on uboot master/ next ?

It won't apply because arch/arm/dts/meson-axg.dtsi doesn't exist anymore, DT comes
from dts/upstream, however if you need to add u-boot specific changes you can
still update arch/arm/dts/meson-axgi-u-boot.dtsi

Neil

> 
> Thanks
> 
>>
>> Neil
>>
>>>
>>> Signed-off-by: Arseniy Krasnov <avkrasnov at salutedevices.com>
>>> ---
>>>    arch/arm/dts/meson-axg.dtsi | 36 ++++++++++++++++++++++++++++++++++++
>>>    1 file changed, 36 insertions(+)
>>>
>>> diff --git a/arch/arm/dts/meson-axg.dtsi b/arch/arm/dts/meson-axg.dtsi
>>> index 3f5254eeb4..4f6fdd5523 100644
>>> --- a/arch/arm/dts/meson-axg.dtsi
>>> +++ b/arch/arm/dts/meson-axg.dtsi
>>> @@ -430,6 +430,27 @@
>>>                        };
>>>                    };
>>>    +                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";
>>> @@ -1906,6 +1927,21 @@
>>>                    resets = <&reset RESET_SD_EMMC_C>;
>>>                };
>>>    +            nfc: nand-controller at 7800 {
>>> +                compatible = "amlogic,meson-axg-nfc";
>>> +                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>;
>>> +                clocks = <&clkc CLKID_SD_EMMC_C>,
>>> +                     <&clkc CLKID_FCLK_DIV2>;
>>> +                clock-names = "core", "device";
>>> +            };
>>> +
>>>                usb2_phy1: phy at 9020 {
>>>                    compatible = "amlogic,meson-gxl-usb2-phy";
>>>                    #phy-cells = <0>;
>>