db410c: replace reset driver with psci

[u-boot] / board / qualcomm / dragonboard410c / dragonboard410c.c

diff --git a/board/qualcomm/dragonboard410c/dragonboard410c.c b/board/qualcomm/dragonboard410c/dragonboard410c.c
index 818ae04dfd015c2c0d6c1b9ed0e4c1db9bd4a1b5..b9bf55ba31e53bb0ab7d990ec251b588533d8165 100644 (file)
--- a/board/qualcomm/dragonboard410c/dragonboard410c.c
+++ b/board/qualcomm/dragonboard410c/dragonboard410c.c
@@ -10,21 +10,29 @@
 #include <dm.h>
 #include <usb.h>
 #include <asm/gpio.h>
+#include <fdt_support.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+/* pointer to the device tree ammended by the firmware */
+extern const void *fw_dtb;
+
+static char wlan_mac[ARP_HLEN];
+static char bt_mac[ARP_HLEN];
+
 int dram_init(void)
 {
        gd->ram_size = PHYS_SDRAM_1_SIZE;
        return 0;
 }
 
-void dram_init_banksize(void)
+int dram_init_banksize(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-}
 
+       return 0;
+}
 
 int board_prepare_usb(enum usb_init_type type)
 {
@@ -51,8 +59,8 @@ int board_prepare_usb(enum usb_init_type type)
                        printf("Failed to find usb_hub_reset_pm dt node.\n");
                        return node;
                }
-               ret = gpio_request_by_name_nodev(gd->fdt_blob, node, "gpios", 0,
-                                                &hub_reset, 0);
+               ret = gpio_request_by_name_nodev(offset_to_ofnode(node),
+                                                "gpios", 0, &hub_reset, 0);
                if (ret < 0) {
                        printf("Failed to request usb_hub_reset_pm gpio.\n");
                        return ret;
@@ -67,8 +75,8 @@ int board_prepare_usb(enum usb_init_type type)
                        printf("Failed to find usb_sw_sel_pm dt node.\n");
                        return 0;
                }
-               ret = gpio_request_by_name_nodev(gd->fdt_blob, node, "gpios", 0,
-                                                &usb_sel, 0);
+               ret = gpio_request_by_name_nodev(offset_to_ofnode(node),
+                                                "gpios", 0, &usb_sel, 0);
                if (ret < 0) {
                        printf("Failed to request usb_sw_sel_pm gpio.\n");
                        return ret;
@@ -94,11 +102,6 @@ int board_prepare_usb(enum usb_init_type type)
        return 0;
 }
 
-int board_init(void)
-{
-       return 0;
-}
-
 /* Check for vol- button - if pressed - stop autoboot */
 int misc_init_r(void)
 {
@@ -119,16 +122,57 @@ int misc_init_r(void)
                return 0;
        }
 
-       if (gpio_request_by_name_nodev(gd->fdt_blob, node, "gpios", 0, &resin,
-                                      0)) {
+       if (gpio_request_by_name_nodev(offset_to_ofnode(node), "gpios", 0,
+                                      &resin, 0)) {
                printf("Failed to request key_vol_down button.\n");
                return 0;
        }
 
        if (dm_gpio_get_value(&resin)) {
-               setenv("bootdelay", "-1");
+               env_set("bootdelay", "-1");
                printf("Power button pressed - dropping to console.\n");
        }
 
        return 0;
 }
+
+int board_init(void)
+{
+       int offset, len;
+       const char *mac;
+
+       /* take a copy of the firmware information (the user could unknownly
+          overwrite that DDR via tftp or other means)  */
+
+       offset = fdt_node_offset_by_compatible(fw_dtb, -1, "qcom,wcnss-wlan");
+       if (offset >= 0) {
+               mac = fdt_getprop(fw_dtb, offset, "local-mac-address", &len);
+               if (mac)
+                       memcpy(wlan_mac, mac, ARP_HLEN);
+       }
+
+       offset = fdt_node_offset_by_compatible(fw_dtb, -1, "qcom,wcnss-bt");
+       if (offset >= 0) {
+               mac = fdt_getprop(fw_dtb, offset, "local-bd-address", &len);
+               if (mac)
+                       memcpy(bt_mac, mac, ARP_HLEN);
+       }
+
+       return 0;
+}
+
+int ft_board_setup(void *blob, bd_t *bd)
+{
+       do_fixup_by_compat(blob, "qcom,wcnss-wlan", "local-mac-address",
+                          wlan_mac, ARP_HLEN, 1);
+
+       do_fixup_by_compat(blob, "qcom,wcnss-bt", "local-bd-address",
+                          bt_mac, ARP_HLEN, 1);
+
+       return 0;
+}
+
+void reset_cpu(ulong addr)
+{
+       psci_system_reset();
+}