gpmi-nand@00112000 is now called nand-controller@112000 and usdhc@0219c000 now goes by mmc@219c000. Instead of adopting the new names, let's use the aliases, which are supposed to be mores stable.
While at it, use an absolute path reference in the board DT. Signed-off-by: Ahmad Fatoum <[email protected]> --- arch/arm/boards/karo-tx6x/board.c | 4 ++-- arch/arm/dts/imx6qdl-tx6x.dtsi | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boards/karo-tx6x/board.c b/arch/arm/boards/karo-tx6x/board.c index 2a141be61af6..ec66749558b9 100644 --- a/arch/arm/boards/karo-tx6x/board.c +++ b/arch/arm/boards/karo-tx6x/board.c @@ -112,12 +112,12 @@ static int tx6x_devices_init(void) if (sbmr1 & (1 << 7)) { imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT); of_device_enable_and_register_by_name("environment-nand"); - of_device_enable_and_register_by_name("gpmi-nand@00112000"); + of_device_enable_and_register_by_alias("nand"); } else { imx6_bbu_internal_mmc_register_handler("eMMC", "/dev/mmc3.boot0", BBU_HANDLER_FLAG_DEFAULT); of_device_enable_and_register_by_name("environment-emmc"); - of_device_enable_and_register_by_name("usdhc@0219c000"); + of_device_enable_and_register_by_alias("mmc3"); } diff --git a/arch/arm/dts/imx6qdl-tx6x.dtsi b/arch/arm/dts/imx6qdl-tx6x.dtsi index 2d7a4f833039..139b735b6d4c 100644 --- a/arch/arm/dts/imx6qdl-tx6x.dtsi +++ b/arch/arm/dts/imx6qdl-tx6x.dtsi @@ -14,10 +14,10 @@ device-path = &usdhc4, "partname:boot1"; }; }; +}; - gpio-keys { - status = "disabled"; - }; +&{/gpio-keys} { + status = "disabled"; }; &fec { -- 2.30.2
