Commit 3f74cd04 authored by Serge Semin's avatar Serge Semin Committed by Damien Le Moal
Browse files

ata: libahci_platform: Parse ports-implemented property in resources getter 



The ports-implemented property is mainly used on the OF-based platforms
with no ports mapping initialized by a bootloader/BIOS firmware. Seeing
the same of_property_read_u32()-based pattern has already been implemented
in the generic AHCI LLDD (glue) driver and in the Mediatek, St AHCI
drivers let's move the property read procedure to the generic
ahci_platform_get_resources() method. Thus we'll have the forced ports
mapping feature supported for each OF-based platform which requires that,
and stop re-implementing the same pattern in there a bit simplifying the
code.

Signed-off-by: default avatarSerge Semin <Sergey.Semin@baikalelectronics.ru>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 3c132ea6

drivers/ata/ahci_mtk.c

+0 −2
Original line number Diff line number Diff line
@@ -118,8 +118,6 @@ static int mtk_ahci_parse_property(struct ahci_host_priv *hpriv, 
				   SYS_CFG_SATA_EN);

	}



	of_property_read_u32(np, "ports-implemented", &hpriv->force_port_map);



	return 0;

}

drivers/ata/ahci_platform.c

+0 −3
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ static int ahci_probe(struct platform_device *pdev) 
	if (rc)

		return rc;



	of_property_read_u32(dev->of_node,

			     "ports-implemented", &hpriv->force_port_map);



	if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))

		hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;

drivers/ata/ahci_st.c

+0 −3
Original line number Diff line number Diff line
@@ -168,9 +168,6 @@ static int st_ahci_probe(struct platform_device *pdev) 


	st_ahci_configure_oob(hpriv->mmio);



	of_property_read_u32(dev->of_node,

			     "ports-implemented", &hpriv->force_port_map);



	err = ahci_platform_init_host(pdev, hpriv, &st_ahci_port_info,

				      &ahci_platform_sht);

	if (err) {

drivers/ata/libahci_platform.c

+3 −0
Original line number Diff line number Diff line
@@ -485,6 +485,9 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, 
		goto err_out;

	}



	of_property_read_u32(dev->of_node,

			     "ports-implemented", &hpriv->force_port_map);



	if (child_nodes) {

		for_each_child_of_node(dev->of_node, child) {

			u32 port;