From: Jianxiong Pan Date: Thu, 22 Nov 2018 02:59:25 +0000 (+0800) Subject: fdto: peripheral driver support dtbo [2/4] X-Git-Tag: hardkernel-4.9.236-104~2098 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=97d13207152474bf9198930e657ec0e04ab08930;p=platform%2Fkernel%2Flinux-amlogic.git fdto: peripheral driver support dtbo [2/4] PD#SWPL-2193 Problem: Node dummy-battery and dummy-charger are android version dependent, and should be "fdt overlayed" Solution: Add fdt overlay file android_p_overlay_dt.dts, and configure dummy-battery and dummy-charger in it Verify: Locally on P212 and R311 Change-Id: I75a27a0ad1253556cae5273f36e0eb828291fd73 Signed-off-by: Jianxiong Pan Signed-off-by: jiamin ma --- diff --git a/MAINTAINERS b/MAINTAINERS index d7f443e..48595af 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14647,6 +14647,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 0000000..778f84d --- /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 6c64e2c..76e20d2 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 6bca2a5..74ec44c 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 dee8afa..1004379 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 dae759d..547e68b 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 6169a28..51b5c52 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 13a27d1..22175b6 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 fc12eb9..fb4e842 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 06eb3d7..aab11d5 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 0fba076..6ba0818 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 93eb319..2e7881f 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 4a14e60..cb241a6 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 8340c0d..36f67ec 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 e383801..7e057d9 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 d2575d3..e5f94bf 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 aa905d3..970ae17 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 499aef0..dd614f1 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 0000000..dc46ec3 --- /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 b252a14..6d41588 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 5e9028e..e0564dd 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 5204c35..bcd08a2 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 f528968..6f414af 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 0ceedde..b19d828 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 e459645..7f0e757 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 ba50836..25ff34c 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 04e706d..b3dae7c 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 e12c7c4..6af8cb4 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 09240bf..f34656c 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 3a13b31..8b42608 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 6a30d396..752a88c 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 6c6ce88..c3f97d5 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 e99ed7f..f1aa69e 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 7643c1e..f1ab9ec 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 4a7db34..efc13a5 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 */