Redmi 5A was made by wingtech like Redmi 4A (rolex) and Redmi GO (tiare). They are very similar, make a common base from riva for avoid unnecessary code duplications.
Signed-off-by: Barnabás Czémán <[email protected]> --- arch/arm64/boot/dts/qcom/Makefile | 1 - ...iaomi-riva.dts => msm8917-xiaomi-wingtech.dtsi} | 45 +--------------------- 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 6d87be639aac..e68e161cfec0 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -81,7 +81,6 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt86518.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt86528.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8917-xiaomi-riva.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8929-wingtech-wt82918hd.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8937-xiaomi-land.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8939-asus-z00t.dtb diff --git a/arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts b/arch/arm64/boot/dts/qcom/msm8917-xiaomi-wingtech.dtsi similarity index 84% rename from arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts rename to arch/arm64/boot/dts/qcom/msm8917-xiaomi-wingtech.dtsi index 1bfb16f90ddd..f0a534106e11 100644 --- a/arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts +++ b/arch/arm64/boot/dts/qcom/msm8917-xiaomi-wingtech.dtsi @@ -13,12 +13,9 @@ /delete-node/ &qseecom_mem; / { - model = "Xiaomi Redmi 5A (riva)"; - compatible = "xiaomi,riva", "qcom,msm8917"; chassis-type = "handset"; qcom,msm-id = <QCOM_ID_MSM8917 0>; - qcom,board-id = <0x1000b 1>, <0x1000b 2>; pwm_backlight: backlight { compatible = "pwm-backlight"; @@ -28,17 +25,6 @@ pwm_backlight: backlight { default-brightness-level = <128>; }; - battery: battery { - compatible = "simple-battery"; - charge-full-design-microamp-hours = <3000000>; - energy-full-design-microwatt-hours = <11500000>; - constant-charge-current-max-microamp = <1000000>; - constant-charge-voltage-max-microvolt = <4400000>; - precharge-current-microamp = <256000>; - charge-term-current-microamp = <60000>; - voltage-min-design-microvolt = <3400000>; - }; - chosen { #address-cells = <2>; #size-cells = <2>; @@ -104,7 +90,7 @@ framebuffer_mem: memory@90001000 { &blsp1_i2c3 { status = "okay"; - touchscreen@38 { + edt_ft5306: touchscreen@38 { compatible = "edt,edt-ft5306"; reg = <0x38>; interrupts-extended = <&tlmm 65 IRQ_TYPE_LEVEL_LOW>; @@ -115,27 +101,8 @@ touchscreen@38 { iovcc-supply = <&pm8937_l5>; touchscreen-size-x = <720>; touchscreen-size-y = <1280>; - }; -}; -&blsp2_i2c1 { - status = "okay"; - - bq27426@55 { - compatible = "ti,bq27426"; - reg = <0x55>; - monitored-battery = <&battery>; - }; - - bq25601@6b { - compatible = "ti,bq25601"; - reg = <0x6b>; - interrupts-extended = <&tlmm 61 IRQ_TYPE_EDGE_FALLING>; - pinctrl-0 = <&bq25601_int_default>; - pinctrl-names = "default"; - input-voltage-limit-microvolt = <4400000>; - input-current-limit-microamp = <1000000>; - monitored-battery = <&battery>; + status = "disabled"; }; }; @@ -280,7 +247,6 @@ pm8937_l23: l23 { regulator-max-microvolt = <1200000>; }; }; - }; &sdhc_1 { @@ -306,13 +272,6 @@ &sleep_clk { }; &tlmm { - bq25601_int_default: bq25601-int-default-state { - pins = "gpio61"; - function = "gpio"; - drive-strength = <2>; - bias-pull-up; - }; - gpio_keys_default: gpio-keys-default-state { pins = "gpio91"; function = "gpio"; -- 2.53.0
