ast-bmc: Rename LPC FW cycle helpers

[ Upstream commit 8972e44 ]

Introduce some consistency for readability and make the names better
reflect the nature of the tests.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>

hw/ast-bmc/ast-io.c

@@ -316,12 +316,12 @@ void ast_io_init(void)
 	ast_setup_sio_irq_polarity();
 }
 
-bool ast_is_mbox_pnor(void)
+bool ast_lpc_fw_is_mbox(void)
 {
 	return dt_find_compatible_node(dt_root, NULL, "mbox");
 }
 
-bool ast_is_ahb_lpc_pnor(void)
+bool ast_lpc_fw_is_flash(void)
 {
 	uint8_t boot_version;
 	uint8_t boot_flags;

include/ast.h

@@ -74,8 +74,8 @@ void ast_ahb_writel(uint32_t val, uint32_t reg);
 uint32_t ast_ahb_readl(uint32_t reg);
 
 void ast_io_init(void);
-bool ast_is_ahb_lpc_pnor(void);
-bool ast_is_mbox_pnor(void);
+bool ast_lpc_fw_is_flash(void);
+bool ast_lpc_fw_is_mbox(void);
 bool ast_scratch_reg_is_mbox(void);
 
 /* UART configuration */

platforms/astbmc/pnor.c

@@ -33,7 +33,7 @@ int pnor_init(void)
 	int rc;
 	bool do_mbox;
 
-	do_mbox = ast_is_mbox_pnor();
+	do_mbox = ast_lpc_fw_is_mbox();
 	if (do_mbox) {
 		rc = mbox_flash_init(&bl);
 	} else {
@@ -43,7 +43,7 @@ int pnor_init(void)
 		 * FW reads & writes).
 		 */
 
-		if (ast_is_ahb_lpc_pnor())
+		if (ast_lpc_fw_is_flash())
 			rc = ast_sf_open(AST_SF_TYPE_PNOR, &pnor_ctrl);
 		else {
 			printf("PLAT: Memboot detected\n");