[PATCH v4] arm64: dts: ti: am642-evm: Add overlay for NAND expansion card
Roger Quadros
rogerq at kernel.org
Fri Apr 12 04:24:38 PDT 2024
Hi Vignesh & Nishanth,
On 05/03/2024 12:35, Roger Quadros wrote:
> The NAND expansion card plugs in over the HSE (High Speed Expansion)
> connector. Add support for it.
>
> We add the ranges property to the GPMC node instead of the NAND
> overlay file to prevent below warnings.
>
> /fragment at 3/__overlay__: Relying on default #address-cells value
> /fragment at 3/__overlay__: Relying on default #size-cells value
>
> As GPMC is dedicated for NAND use on this board, it should be OK.
>
> Signed-off-by: Roger Quadros <rogerq at kernel.org>
Could you please pick this for -next?
It should apply cleanly.
> ---
> Changelog:
> v4:
> - Rebased on ti-next/ti-k3-dt-for-v6.9
>
> v3:
> https://lore.kernel.org/all/20240123201312.23187-1-rogerq@kernel.org/
> - Fix dtc warning by moving ranges property into the GPMC node
> - update licence to GPL-2.0-only OR MIT and Copyright year to 2024
> - don't drop k3-am642-evm.dtb target from Makefile
>
> v2:
> - Don't leave k3-am642-evm-nand.dtbo as an orphan. Make k3-am642-evm-nand.dtb
> with the overlay applied on the base board.
> ---
> arch/arm64/boot/dts/ti/Makefile | 2 +
> arch/arm64/boot/dts/ti/k3-am642-evm-nand.dtso | 139 ++++++++++++++++++++++++++
> arch/arm64/boot/dts/ti/k3-am642-evm.dts | 4 +
> 3 files changed, 145 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile
> index 9a722c2473fb..8cceca6d6756 100644
> --- a/arch/arm64/boot/dts/ti/Makefile
> +++ b/arch/arm64/boot/dts/ti/Makefile
> @@ -47,6 +47,8 @@ dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-icssg1-dualemac.dtbo
> dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t.dtb
> dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-pcie.dtb
> dtb-$(CONFIG_ARCH_K3) += k3-am642-hummingboard-t-usb3.dtb
> +k3-am642-evm-nand-dtbs := k3-am642-evm.dtb k3-am642-evm-nand.dtbo
> +dtb-$(CONFIG_ARCH_K3) += k3-am642-evm-nand.dtb
> dtb-$(CONFIG_ARCH_K3) += k3-am642-phyboard-electra-rdk.dtb
> dtb-$(CONFIG_ARCH_K3) += k3-am642-sk.dtb
> dtb-$(CONFIG_ARCH_K3) += k3-am642-tqma64xxl-mbax4xxl.dtb
> diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm-nand.dtso b/arch/arm64/boot/dts/ti/k3-am642-evm-nand.dtso
> new file mode 100644
> index 000000000000..3d1c2111ec88
> --- /dev/null
> +++ b/arch/arm64/boot/dts/ti/k3-am642-evm-nand.dtso
> @@ -0,0 +1,139 @@
> +// SPDX-License-Identifier: GPL-2.0-only OR MIT
> +/**
> + * DT overlay for HSE NAND expansion card on AM642 EVM
> + *
> + * Copyright (C) 2021-2024 Texas Instruments Incorporated - https://www.ti.com/
> + */
> +
> +/dts-v1/;
> +/plugin/;
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/interrupt-controller/irq.h>
> +#include "k3-pinctrl.h"
> +
> +&main_pmx0 {
> + gpmc0_pins_default: gpmc0-pins-default {
> + pinctrl-single,pins = <
> + AM64X_IOPAD(0x0094, PIN_INPUT, 7) /* (T19) GPMC0_BE1n.GPIO0_36 */
> +
> + AM64X_IOPAD(0x003c, PIN_INPUT, 0) /* (T20) GPMC0_AD0 */
> + AM64X_IOPAD(0x0040, PIN_INPUT, 0) /* (U21) GPMC0_AD1 */
> + AM64X_IOPAD(0x0064, PIN_INPUT, 0) /* (R16) GPMC0_AD10 */
> + AM64X_IOPAD(0x0068, PIN_INPUT, 0) /* (W20) GPMC0_AD11 */
> + AM64X_IOPAD(0x006c, PIN_INPUT, 0) /* (W21) GPMC0_AD12 */
> + AM64X_IOPAD(0x0070, PIN_INPUT, 0) /* (V18) GPMC0_AD13 */
> + AM64X_IOPAD(0x0074, PIN_INPUT, 0) /* (Y21) GPMC0_AD14 */
> + AM64X_IOPAD(0x0078, PIN_INPUT, 0) /* (Y20) GPMC0_AD15 */
> + AM64X_IOPAD(0x0044, PIN_INPUT, 0) /* (T18) GPMC0_AD2 */
> + AM64X_IOPAD(0x0048, PIN_INPUT, 0) /* (U20) GPMC0_AD3 */
> + AM64X_IOPAD(0x004c, PIN_INPUT, 0) /* (U18) GPMC0_AD4 */
> + AM64X_IOPAD(0x0050, PIN_INPUT, 0) /* (U19) GPMC0_AD5 */
> + AM64X_IOPAD(0x0054, PIN_INPUT, 0) /* (V20) GPMC0_AD6 */
> + AM64X_IOPAD(0x0058, PIN_INPUT, 0) /* (V21) GPMC0_AD7 */
> + AM64X_IOPAD(0x005c, PIN_INPUT, 0) /* (V19) GPMC0_AD8 */
> + AM64X_IOPAD(0x0060, PIN_INPUT, 0) /* (T17) GPMC0_AD9 */
> + AM64X_IOPAD(0x0098, PIN_INPUT_PULLUP, 0) /* (W19) GPMC0_WAIT0 */
> + AM64X_IOPAD(0x009c, PIN_INPUT_PULLUP, 0) /* (Y18) GPMC0_WAIT1 */
> + AM64X_IOPAD(0x00a8, PIN_OUTPUT_PULLUP, 0) /* (R19) GPMC0_CSn0 */
> + AM64X_IOPAD(0x00ac, PIN_OUTPUT_PULLUP, 0) /* (R20) GPMC0_CSn1 */
> + AM64X_IOPAD(0x00b0, PIN_OUTPUT_PULLUP, 0) /* (P19) GPMC0_CSn2 */
> + AM64X_IOPAD(0x00b4, PIN_OUTPUT_PULLUP, 0) /* (R21) GPMC0_CSn3 */
> + AM64X_IOPAD(0x007c, PIN_OUTPUT, 0) /* (R17) GPMC0_CLK */
> + AM64X_IOPAD(0x0084, PIN_OUTPUT, 0) /* (P16) GPMC0_ADVn_ALE */
> + AM64X_IOPAD(0x0088, PIN_OUTPUT, 0) /* (R18) GPMC0_OEn_REn */
> + AM64X_IOPAD(0x008c, PIN_OUTPUT, 0) /* (T21) GPMC0_WEn */
> + AM64X_IOPAD(0x0090, PIN_OUTPUT, 0) /* (P17) GPMC0_BE0n_CLE */
> + AM64X_IOPAD(0x00a0, PIN_OUTPUT_PULLUP, 0) /* (N16) GPMC0_WPn */
> + AM64X_IOPAD(0x00a4, PIN_OUTPUT, 0) /* (N17) GPMC0_DIR */
> + >;
> + };
> +};
> +
> +&main_gpio0 {
> + gpio0-36 {
> + gpio-hog;
> + gpios = <36 0>;
> + input;
> + line-name = "GPMC0_MUX_DIR";
> + };
> +};
> +
> +&elm0 {
> + status = "okay";
> +};
> +
> +&gpmc0 {
> + status = "okay";
> + pinctrl-names = "default";
> + pinctrl-0 = <&gpmc0_pins_default>;
> + #address-cells = <2>;
> + #size-cells = <1>;
> +
> + nand at 0,0 {
> + compatible = "ti,am64-nand";
> + reg = <0 0 64>; /* device IO registers */
> + interrupt-parent = <&gpmc0>;
> + interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
> + <1 IRQ_TYPE_NONE>; /* termcount */
> + rb-gpios = <&gpmc0 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */
> + ti,nand-xfer-type = "prefetch-polled";
> + ti,nand-ecc-opt = "bch8"; /* BCH8: Bootrom limitation */
> + ti,elm-id = <&elm0>;
> + nand-bus-width = <8>;
> + gpmc,device-width = <1>;
> + gpmc,sync-clk-ps = <0>;
> + gpmc,cs-on-ns = <0>;
> + gpmc,cs-rd-off-ns = <40>;
> + gpmc,cs-wr-off-ns = <40>;
> + gpmc,adv-on-ns = <0>;
> + gpmc,adv-rd-off-ns = <25>;
> + gpmc,adv-wr-off-ns = <25>;
> + gpmc,we-on-ns = <0>;
> + gpmc,we-off-ns = <20>;
> + gpmc,oe-on-ns = <3>;
> + gpmc,oe-off-ns = <30>;
> + gpmc,access-ns = <30>;
> + gpmc,rd-cycle-ns = <40>;
> + gpmc,wr-cycle-ns = <40>;
> + gpmc,bus-turnaround-ns = <0>;
> + gpmc,cycle2cycle-delay-ns = <0>;
> + gpmc,clk-activation-ns = <0>;
> + gpmc,wr-access-ns = <40>;
> + gpmc,wr-data-mux-bus-ns = <0>;
> +
> + partitions {
> + compatible = "fixed-partitions";
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + partition at 0 {
> + label = "NAND.tiboot3";
> + reg = <0x00000000 0x00200000>; /* 2M */
> + };
> + partition at 200000 {
> + label = "NAND.tispl";
> + reg = <0x00200000 0x00200000>; /* 2M */
> + };
> + partition at 400000 {
> + label = "NAND.tiboot3.backup"; /* 2M */
> + reg = <0x00400000 0x00200000>; /* BootROM looks at 4M */
> + };
> + partition at 600000 {
> + label = "NAND.u-boot";
> + reg = <0x00600000 0x00400000>; /* 4M */
> + };
> + partition at a00000 {
> + label = "NAND.u-boot-env";
> + reg = <0x00a00000 0x00040000>; /* 256K */
> + };
> + partition at a40000 {
> + label = "NAND.u-boot-env.backup";
> + reg = <0x00a40000 0x00040000>; /* 256K */
> + };
> + partition at a80000 {
> + label = "NAND.file-system";
> + reg = <0x00a80000 0x3f580000>;
> + };
> + };
> + };
> +};
> diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> index 53fe1d065ddb..44ac324fc7bb 100644
> --- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> @@ -818,3 +818,7 @@ icssg1_phy1: ethernet-phy at f {
> rx-internal-delay-ps = <2000>;
> };
> };
> +
> +&gpmc0 {
> + ranges = <0 0 0x00 0x51000000 0x01000000>; /* CS0 space. Min partition = 16MB */
> +};
>
> ---
> base-commit: bbef42084cc170cbfc035bf784f2ff055c939d7e
> change-id: 20240305-for-v6-9-am642-evm-nand-bd7ad1f808e9
>
> Best regards,
--
cheers,
-roger
More information about the linux-arm-kernel
mailing list