Revert "qualcommax: ipq807x: mx4200v2: fix LED controller"

This reverts commit 7ce4ed4829fafdd37a57681304ea91e3749bc3c8.

Turns out that this requires more work, so revert to prevent making the
LED uncontrollable.

Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v1.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v1.dts
index 12897419bbd23de5a851887eabd6a7d5ce408477..7946e5c54d3d44c2b175e9051780640d6a6f08b3 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v1.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v1.dts
@@ -11,35 +11,6 @@
        compatible = "linksys,mx4200v1", "qcom,ipq8074";
 };
 
-&blsp1_i2c2 {
-
-       led-controller@62 {
-               compatible = "nxp,pca9633";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0x62>;
-               nxp,hw-blink;
-
-               led_system_red: led@0 {
-                       reg = <0>;
-                       color = <LED_COLOR_ID_RED>;
-                       function = LED_FUNCTION_STATUS;
-               };
-
-               led_system_green: led@1 {
-                       reg = <1>;
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_STATUS;
-               };
-
-               led_system_blue: led@2 {
-                       reg = <2>;
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_STATUS;
-               };
-       };
-};
-
 &wifi {
        status = "okay";
 

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v2.dts
index c1779a2d4882d8e463646b7796100eaaa5bba159..44e1b72f16a7cb03cecc9abee3f5e4c26abba487 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v2.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200v2.dts
@@ -10,32 +10,6 @@
        compatible = "linksys,mx4200v2", "qcom,ipq8074";
 };
 
-&blsp1_i2c2 {
-
-       led-controller@58 {
-               compatible = "st,led1202";
-               reg = <0x58>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               led_system_green: led@0 {
-                       reg = <0>;
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_STATUS;
-               };
-               led_system_red: led@1 {
-                       reg = <1>;
-                       color = <LED_COLOR_ID_RED>;
-                       function = LED_FUNCTION_STATUS;
-               };
-               led_system_blue: led@2 {
-                       reg = <2>;
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_STATUS;
-               };
-       };
-};
-
 &wifi {
        status = "okay";
 

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4300.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4300.dts
index d09710b9c4799b8c950045af9c0fd2082adaa3f1..1477019ab941d098ac54567ef6a1039763906efd 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4300.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4300.dts
@@ -242,35 +242,6 @@
        };
 };
 
-&blsp1_i2c2 {
-
-       led-controller@62 {
-               compatible = "nxp,pca9633";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <0x62>;
-               nxp,hw-blink;
-
-               led_system_red: led@0 {
-                       reg = <0>;
-                       color = <LED_COLOR_ID_RED>;
-                       function = LED_FUNCTION_STATUS;
-               };
-
-               led_system_green: led@1 {
-                       reg = <1>;
-                       color = <LED_COLOR_ID_GREEN>;
-                       function = LED_FUNCTION_STATUS;
-               };
-
-               led_system_blue: led@2 {
-                       reg = <2>;
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_STATUS;
-               };
-       };
-};
-
 &dp2 {
        status = "okay";
        phy-handle = <&qca8075_1>;

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4x00.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4x00.dtsi
index 2dca7ffd3bf1611493e64e21faab1b639755543d..84e68dae356bac7e73d1bf87e04b82eb35509129 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4x00.dtsi
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4x00.dtsi
@@ -94,6 +94,32 @@
 
 &blsp1_i2c2 {
        status = "okay";
+
+       led-controller@62 {
+               compatible = "nxp,pca9633";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               reg = <0x62>;
+               nxp,hw-blink;
+
+               led_system_red: led@0 {
+                       reg = <0>;
+                       color = <LED_COLOR_ID_RED>;
+                       function = LED_FUNCTION_STATUS;
+               };
+
+               led_system_green: led@1 {
+                       reg = <1>;
+                       color = <LED_COLOR_ID_GREEN>;
+                       function = LED_FUNCTION_STATUS;
+               };
+
+               led_system_blue: led@2 {
+                       reg = <2>;
+                       color = <LED_COLOR_ID_BLUE>;
+                       function = LED_FUNCTION_STATUS;
+               };
+       };
 };
 
 &mdio {

diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk
index 731c2ba0caa1289e62db490e1163eeafcd8231fc..260b358ce896555cf55bbc42be9e2fda53009055 100644 (file)
--- a/target/linux/qualcommax/image/ipq807x.mk
+++ b/target/linux/qualcommax/image/ipq807x.mk
@@ -167,6 +167,7 @@ define Device/linksys_mx
        SOC := ipq8072
        IMAGES += factory.bin
        IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=$$$$(DEVICE_MODEL)
+       DEVICE_PACKAGES := kmod-leds-pca963x
 endef
 
 define Device/linksys_mx4x00
@@ -179,15 +180,13 @@ define Device/linksys_mx4200v1
        $(call Device/linksys_mx4x00)
        DEVICE_MODEL := MX4200
        DEVICE_VARIANT := v1
-       DEVICE_PACKAGES += kmod-bluetooth kmod-leds-pca963x
+       DEVICE_PACKAGES += kmod-bluetooth
 endef
 TARGET_DEVICES += linksys_mx4200v1
 
 define Device/linksys_mx4200v2
-       $(call Device/linksys_mx4x00)
-       DEVICE_MODEL := MX4200
+       $(call Device/linksys_mx4200v1)
        DEVICE_VARIANT := v2
-       DEVICE_PACKAGES += kmod-bluetooth kmod-leds-st1202
 endef
 TARGET_DEVICES += linksys_mx4200v2
 
@@ -199,7 +198,6 @@ define Device/linksys_mx4300
        KERNEL_SIZE := 8192k
        IMAGE_SIZE := 171264k
        NAND_SIZE := 1024m
-       DEVICE_PACKAGES += kmod-leds-pca963x
 endef
 TARGET_DEVICES += linksys_mx4300
 
@@ -207,7 +205,7 @@ define Device/linksys_mx5300
        $(call Device/linksys_mx)
        DEVICE_MODEL := MX5300
        DEVICE_PACKAGES += kmod-rtc-ds1307 ipq-wifi-linksys_mx5300 \
-               kmod-ath10k-ct ath10k-firmware-qca9984-ct kmod-leds-pca963x
+               kmod-ath10k-ct ath10k-firmware-qca9984-ct
 endef
 TARGET_DEVICES += linksys_mx5300
 
@@ -215,7 +213,7 @@ define Device/linksys_mx8500
        $(call Device/linksys_mx)
        DEVICE_MODEL := MX8500
        DEVICE_PACKAGES += ipq-wifi-linksys_mx8500 kmod-ath11k-pci \
-               ath11k-firmware-qcn9074 kmod-bluetooth kmod-leds-pca963x
+               ath11k-firmware-qcn9074 kmod-bluetooth
 endef
 TARGET_DEVICES += linksys_mx8500