diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile index c90e6dbb9653..6057533126f3 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -8,8 +8,6 @@ dtb-y += g12b_a311d_w400.dtb dtb-y += g12b_a311d_w400_buildroot.dtb endif 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_drm.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/meson64_odroidc3_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts deleted file mode 100644 index 1be53aa9fd87..000000000000 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts +++ /dev/null @@ -1,78 +0,0 @@ -/* - * arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts - * - * Copyright (C) 2018 Hardkernel Co., Ltd. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - */ - -#include "meson64_odroidc3.dts" - -/ { - firmware { - android { - compatible = "android,firmware"; - vbmeta { - compatible = "android,vbmeta"; - parts = "boot,system,vendor"; - by_name_prefix="/dev/block"; - }; - fstab { - compatible = "android,fstab"; - system { - compatible = "android,system"; - dev = "/dev/block/system"; - type = "ext4"; - mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; - fsmgr_flags = "wait"; - }; - vendor { - compatible = "android,vendor"; - dev = "/dev/block/vendor"; - type = "ext4"; - mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; - fsmgr_flags = "wait"; - }; - odm { - compatible = "android,odm"; - dev = "/dev/block/odm"; - type = "vfat"; - mnt_flags = "rw"; - fsmgr_flags = "wait"; - }; - }; - }; - }; -}; - -&custom_maps { - mapnum = <1>; - map0 = <&map_0>; - map_0: map_0 { - mapname = "hardkernel-remote"; - customcode = <0x4db2>; - release_delay = <80>; - size = <12>; - keymap = ; - }; -}; diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts deleted file mode 100644 index 74b5c1b77d54..000000000000 --- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts +++ /dev/null @@ -1,78 +0,0 @@ -/* - * arch/arm64/boot/dts/amlogic/meson64_odroidc3_android.dts - * - * Copyright (C) 2018 Hardkernel Co., Ltd. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - */ - -#include "meson64_odroidn2.dts" - -/ { - firmware { - android { - compatible = "android,firmware"; - vbmeta { - compatible = "android,vbmeta"; - parts = "boot,system,vendor"; - by_name_prefix="/dev/block"; - }; - fstab { - compatible = "android,fstab"; - system { - compatible = "android,system"; - dev = "/dev/block/system"; - type = "ext4"; - mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; - fsmgr_flags = "wait"; - }; - vendor { - compatible = "android,vendor"; - dev = "/dev/block/vendor"; - type = "ext4"; - mnt_flags = "ro,barrier=1,inode_readahead_blks=8"; - fsmgr_flags = "wait"; - }; - odm { - compatible = "android,odm"; - dev = "/dev/block/odm"; - type = "vfat"; - mnt_flags = "rw"; - fsmgr_flags = "wait"; - }; - }; - }; - }; -}; - -&custom_maps { - mapnum = <1>; - map0 = <&map_0>; - map_0: map_0 { - mapname = "hardkernel-remote"; - customcode = <0x4db2>; - release_delay = <80>; - size = <12>; - keymap = ; - }; -};