diff --git a/MAINTAINERS b/MAINTAINERS index 819a5c2b9217..3a1c0c263d42 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14643,6 +14643,8 @@ AMLOGIC DTBO PARTITION M: Xindong Xu F: arch/arm64/boot/dts/amlogic/common_overlay_dt.dts F: arch/arm/boot/dts/amlogic/common_overlay_dt.dts +F: arch/arm64/boot/dts/amlogic/android_p_overlay_dt.dts +F: arch/arm/boot/dts/amlogic/android_p_overlay_dt.dts AMLOGIC DTS M: Luan Yuan diff --git a/arch/arm/boot/dts/amlogic/android_p_overlay_dt.dts b/arch/arm/boot/dts/amlogic/android_p_overlay_dt.dts new file mode 100644 index 000000000000..778f84dc72ab --- /dev/null +++ b/arch/arm/boot/dts/amlogic/android_p_overlay_dt.dts @@ -0,0 +1,30 @@ +/* + * arch/arm/boot/dts/amlogic/android_p_overlay_dt.dts + * + * Copyright (C) 2017 Amlogic, Inc. 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. + * + */ + +/dts-v1/; +/plugin/; + + +&amlogic_battery { + compatible = "amlogic, dummy-battery"; + status = "okay"; +}; + +&amlogic_charger { + compatible = "amlogic, dummy-charger"; + status = "okay"; +}; diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts index 6c64e2c80989..76e20d2762dd 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211.dts @@ -151,14 +151,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; gpioleds { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts index 6bca2a5137f6..74ec44c01106 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u211_1g.dts @@ -152,14 +152,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; gpioleds { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts index dee8afaf6c9d..1004379dd191 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212.dts @@ -151,14 +151,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; gpioleds { diff --git a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts index dae759d71634..547e68b264fc 100644 --- a/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts +++ b/arch/arm/boot/dts/amlogic/g12a_s905x2_u212_1g.dts @@ -156,14 +156,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; gpioleds { diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts index 6169a283ca38..51b5c52110d7 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_1g.dts @@ -150,14 +150,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; bt-dev{ diff --git a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts index 13a27d19438d..22175b616c21 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p212_2g.dts @@ -156,14 +156,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; bt-dev{ diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts index fc12eb914de1..fb4e842d460f 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_1g.dts @@ -162,14 +162,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; vpu { diff --git a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts index 06eb3d72520c..aab11d5d4903 100644 --- a/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -162,14 +162,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; vpu { diff --git a/arch/arm/boot/dts/amlogic/gxl_skt.dts b/arch/arm/boot/dts/amlogic/gxl_skt.dts index 0fba076a9058..6ba0818984cd 100644 --- a/arch/arm/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm/boot/dts/amlogic/gxl_skt.dts @@ -147,14 +147,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; bt-dev{ diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm/boot/dts/amlogic/txl_t962_p321.dts index 0fe9b710655c..c896f12a95d0 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p321.dts @@ -162,14 +162,14 @@ }; }; /* end of reserved-memory */ - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; secmon { diff --git a/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts b/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts index 497959beda23..5548335d502f 100644 --- a/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts +++ b/arch/arm/boot/dts/amlogic/txl_t962_p321_720p.dts @@ -162,14 +162,14 @@ }; }; /* end of reserved-memory */ - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; secmon { diff --git a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts index f22c16b93be9..215d50676d79 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962e_r321.dts @@ -213,13 +213,13 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; ethmac: ethernet@0xff3f0000 { diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts index e383801a5374..7e057d94586d 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_1g.dts @@ -178,14 +178,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; /* for external keypad */ diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts index d2575d3d8b92..e5f94bfd022c 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_2g.dts @@ -175,14 +175,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; /* for external keypad */ diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts index aa905d34ec47..970ae170f83a 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r311_720p.dts @@ -172,14 +172,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; /* for external keypad */ diff --git a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts index 499aef0c19b5..dd614f178f72 100644 --- a/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts +++ b/arch/arm/boot/dts/amlogic/txlx_t962x_r314.dts @@ -178,14 +178,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; /* for external keypad */ diff --git a/arch/arm64/boot/dts/amlogic/android_p_overlay_dt.dts b/arch/arm64/boot/dts/amlogic/android_p_overlay_dt.dts new file mode 100644 index 000000000000..dc46ec32a657 --- /dev/null +++ b/arch/arm64/boot/dts/amlogic/android_p_overlay_dt.dts @@ -0,0 +1,29 @@ +/* + * arch/arm64/boot/dts/amlogic/android_p_overlay_dt.dts + * + * Copyright (C) 2017 Amlogic, Inc. 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. + * + */ + +/dts-v1/; +/plugin/; + +&amlogic_battery { + compatible = "amlogic, dummy-battery"; + status = "okay"; +}; + +&amlogic_charger { + compatible = "amlogic, dummy-charger"; + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts index b252a14d4be8..6d415887c84e 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211.dts @@ -151,14 +151,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; gpioleds { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts index 5e9028e87807..e0564dd2943f 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u211_1g.dts @@ -152,14 +152,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogc_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; gpioleds { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts index 5204c3568269..bcd08a225109 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212.dts @@ -151,14 +151,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; gpioleds { diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts index f528968ed8b6..6f414af19619 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905x2_u212_1g.dts @@ -152,14 +152,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; gpioleds { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts index 0ceedde3a09b..b19d82825be7 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_1g.dts @@ -145,14 +145,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; bt-dev{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts index e459645608e1..7f0e75702e99 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p212_2g.dts @@ -154,14 +154,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; bt-dev{ diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts index ba50836de8e7..25ff34c41936 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_1g.dts @@ -158,14 +158,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; vpu { diff --git a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts index 04e706d35c4a..b3dae7c545b3 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_p241_v2-1g.dts @@ -159,14 +159,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; vpu { diff --git a/arch/arm64/boot/dts/amlogic/gxl_skt.dts b/arch/arm64/boot/dts/amlogic/gxl_skt.dts index e12c7c461f9c..6af8cb46e015 100644 --- a/arch/arm64/boot/dts/amlogic/gxl_skt.dts +++ b/arch/arm64/boot/dts/amlogic/gxl_skt.dts @@ -146,14 +146,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; bt-dev{ diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts index cd028a123d13..446bf37091e4 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts @@ -154,14 +154,14 @@ }; }; /* end of reserved-memory */ - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; secmon { diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts index 0cadc7187ff3..8e154af23a53 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321_720p.dts @@ -154,14 +154,14 @@ }; }; /* end of reserved-memory */ - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; secmon { diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts index 68b2bcdb7850..34b1bcb814ba 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts @@ -212,13 +212,13 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; ethmac: ethernet@0xff3f0000 { diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts index 6c6ce883e08d..c3f97d50c934 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_1g.dts @@ -172,14 +172,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; /* for external keypad */ diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts index e99ed7ff98d8..f1aa69e21e45 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_2g.dts @@ -172,14 +172,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; /* for external keypad */ diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts index 7643c1e47dca..f1ab9ec83930 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311_720p.dts @@ -172,14 +172,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; /* for external keypad */ diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts index 4a7db34c7d03..efc13a566b46 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r314.dts @@ -173,14 +173,14 @@ }; }; - dummy-battery { + amlogic_battery:dummy-battery { compatible = "amlogic, dummy-battery"; - status = "okay"; + status = "disabled"; }; - dummy-charger { + amlogic_charger:dummy-charger { compatible = "amlogic, dummy-charger"; - status = "okay"; + status = "disabled"; }; /* for external keypad */