diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 8 | ||||
| -rw-r--r-- | drivers/ata/ahci-tegra.c | 32 |
2 files changed, 23 insertions, 17 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index af6b128ab429..4b03ddc03b7b 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -1530,7 +1530,13 @@ static void __init tegra_cardhu_init(void) cardhu_pmon_init(); cardhu_sensors_init(); cardhu_setup_bluesleep(); - cardhu_sata_init(); + /* + * if you want to add support for SATA in your board + * then add your board check here like + * board_info.board_id == BOARD_E1186 + */ + if (board_info.board_id == BOARD_PM315) + cardhu_sata_init(); //audio_wired_jack_init(); cardhu_pins_state_init(); cardhu_emc_init(); diff --git a/drivers/ata/ahci-tegra.c b/drivers/ata/ahci-tegra.c index 5c58da143c5a..39cf4acf0ae6 100644 --- a/drivers/ata/ahci-tegra.c +++ b/drivers/ata/ahci-tegra.c @@ -258,10 +258,10 @@ static int tegra_ahci_controller_resume(struct platform_device *pdev); static int tegra_ahci_suspend(struct platform_device *pdev, pm_message_t mesg); static int tegra_ahci_resume(struct platform_device *pdev); static enum port_idle_status tegra_ahci_is_port_idle(struct ata_port *ap); -static enum port_idle_status tegra_ahci_is_port_slumber(struct ata_port *ap); static bool tegra_ahci_are_all_ports_idle(struct ata_host *host); -static bool tegra_ahci_are_all_ports_slumber(struct ata_host *host); #ifdef CONFIG_TEGRA_SATA_IDLE_POWERGATE +static enum port_idle_status tegra_ahci_is_port_slumber(struct ata_port *ap); +static bool tegra_ahci_are_all_ports_slumber(struct ata_host *host); static unsigned int tegra_ahci_qc_issue(struct ata_queued_cmd *qc); static int tegra_ahci_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline); @@ -1623,6 +1623,20 @@ static enum port_idle_status tegra_ahci_is_port_idle(struct ata_port *ap) return PORT_IS_IDLE; } +/* check if all supported ports are idle (no outstanding commands) */ +static bool tegra_ahci_are_all_ports_idle(struct ata_host *host) +{ int i; + struct ata_port *ap; + + for (i = 0; i < host->n_ports; i++) { + ap = host->ports[i]; + if (ap && (tegra_ahci_is_port_idle(ap) == PORT_IS_NOT_IDLE)) + return false; + } + return true; +} + +#ifdef CONFIG_TEGRA_SATA_IDLE_POWERGATE static enum port_idle_status tegra_ahci_is_port_slumber(struct ata_port *ap) { void __iomem *port_mmio = ahci_port_base(ap); @@ -1638,19 +1652,6 @@ static enum port_idle_status tegra_ahci_is_port_slumber(struct ata_port *ap) return PORT_IS_IDLE_NOT_SLUMBER; } -/* check if all supported ports are idle (no outstanding commands) */ -static bool tegra_ahci_are_all_ports_idle(struct ata_host *host) -{ int i; - struct ata_port *ap; - - for (i = 0; i < host->n_ports; i++) { - ap = host->ports[i]; - if (ap && (tegra_ahci_is_port_idle(ap) == PORT_IS_NOT_IDLE)) - return false; - } - return true; -} - /* check if all supported ports are in slumber */ static bool tegra_ahci_are_all_ports_slumber(struct ata_host *host) { int i; @@ -1664,7 +1665,6 @@ static bool tegra_ahci_are_all_ports_slumber(struct ata_host *host) return true; } -#ifdef CONFIG_TEGRA_SATA_IDLE_POWERGATE static void tegra_ahci_to_add_idle_timer(struct ata_host *host) { struct tegra_ahci_host_priv *tegra_hpriv; |