From 3736b86e062ad9a7ebbdb097434b7ae930b5302c Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Wed, 2 Jan 2019 14:41:27 +0900 Subject: [PATCH] ODROID-N2/C3: arch/arm64: rename _odroid*.dts to 'meson64_odroid*.dts' Change-Id: Iebdb89126627cb19e3a93cc99cd8d37f3638c1ce Signed-off-by: Dongjin Kim --- arch/arm64/boot/dts/amlogic/Makefile | 10 +++++----- .../{s905d2_odroidc3.dts => meson64_odroidc3.dts} | 2 +- ...roidc3_android.dts => meson64_odroidc3_android.dts} | 4 ++-- .../{s922d_odroidn2.dts => meson64_odroidn2.dts} | 2 +- ...roidn2_android.dts => meson64_odroidn2_android.dts} | 4 ++-- ...roidn2_spibios.dts => meson64_odroidn2_spibios.dts} | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) rename arch/arm64/boot/dts/amlogic/{s905d2_odroidc3.dts => meson64_odroidc3.dts} (99%) rename arch/arm64/boot/dts/amlogic/{s905d2_odroidc3_android.dts => meson64_odroidc3_android.dts} (95%) rename arch/arm64/boot/dts/amlogic/{s922d_odroidn2.dts => meson64_odroidn2.dts} (99%) rename arch/arm64/boot/dts/amlogic/{s922d_odroidn2_android.dts => meson64_odroidn2_android.dts} (95%) rename arch/arm64/boot/dts/amlogic/{s922d_odroidn2_spibios.dts => meson64_odroidn2_spibios.dts} (99%) diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile index 7b35763d7c36..fa27926f0519 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -5,8 +5,8 @@ dtb-y += g12a_s905d2_u200_buildroot.dtb dtb-y += g12a_s905d2_u200_drm_buildroot.dtb dtb-y += g12b_a311d_w400.dtb dtb-y += g12b_a311d_w400_buildroot.dtb -dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += s905d2_odroidc3.dtb -dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += s905d2_odroidc3_android.dtb -dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += s922d_odroidn2.dtb -dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += s922d_odroidn2_android.dtb -dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += s922d_odroidn2_spibios.dtb +dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += meson64_odroidc3.dtb +dtb-$(CONFIG_ARCH_MESON64_ODROIDC3) += meson64_odroidc3_android.dtb +dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2.dtb +dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_android.dtb +dtb-$(CONFIG_ARCH_MESON64_ODROIDN2) += meson64_odroidn2_spibios.dtb diff --git a/arch/arm64/boot/dts/amlogic/s905d2_odroidc3.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts similarity index 99% rename from arch/arm64/boot/dts/amlogic/s905d2_odroidc3.dts rename to arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts index 00260f08538f..cb6a7e34276f 100644 --- a/arch/arm64/boot/dts/amlogic/s905d2_odroidc3.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts @@ -1,5 +1,5 @@ /* - * arch/arm64/boot/dts/amlogic/s905d2_odroidc3.dts + * arch/arm64/boot/dts/amlogic/meson64_odroidc3.dts * * Copyright (C) 2018 Hardkernel Co., Ltd. All rights reserved. * diff --git a/arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts similarity index 95% rename from arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts rename to arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts index b81dd7bdff88..1be53aa9fd87 100644 --- a/arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts @@ -1,5 +1,5 @@ /* - * arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts + * arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts * * Copyright (C) 2018 Hardkernel Co., Ltd. All rights reserved. * @@ -15,7 +15,7 @@ * */ -#include "s905d2_odroidc3.dts" +#include "meson64_odroidc3.dts" / { firmware { diff --git a/arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts similarity index 99% rename from arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts rename to arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts index 6ed5c7106f85..7308979acc78 100644 --- a/arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts @@ -1,5 +1,5 @@ /* - * arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts + * arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts * * Copyright (C) 2018 Hardkernel Co,. Ltd. All rights reserved. * diff --git a/arch/arm64/boot/dts/amlogic/s922d_odroidn2_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts similarity index 95% rename from arch/arm64/boot/dts/amlogic/s922d_odroidn2_android.dts rename to arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts index d718a8ce4905..74b5c1b77d54 100644 --- a/arch/arm64/boot/dts/amlogic/s922d_odroidn2_android.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts @@ -1,5 +1,5 @@ /* - * arch/arm64/boot/dts/amlogic/s905d2_odroidc3_android.dts + * arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts * * Copyright (C) 2018 Hardkernel Co., Ltd. All rights reserved. * @@ -15,7 +15,7 @@ * */ -#include "s922d_odroidn2.dts" +#include "meson64_odroidn2.dts" / { firmware { diff --git a/arch/arm64/boot/dts/amlogic/s922d_odroidn2_spibios.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_spibios.dts similarity index 99% rename from arch/arm64/boot/dts/amlogic/s922d_odroidn2_spibios.dts rename to arch/arm64/boot/dts/amlogic/meson64_odroidn2_spibios.dts index 09d0a0dc1cd4..ff407a891e0d 100644 --- a/arch/arm64/boot/dts/amlogic/s922d_odroidn2_spibios.dts +++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_spibios.dts @@ -1,5 +1,5 @@ /* - * arch/arm64/boot/dts/amlogic/s922d_odroidn2.dts + * arch/arm64/boot/dts/amlogic/meson64_odroidn2.dts * * Copyright (C) 2018 Hardkernel Co,. Ltd. All rights reserved. *