On Tue, Oct 27, 2015 at 03:48:03PM +0900, Jaedon Shin wrote:
> The BCM7xxx ARM-based and MIPS-based platforms share a similar hardware
> block for AHCI SATA3.
>
> The BCM7425 is flagship chipset of 40nm class. Other MIPS-based 40nm
> chipsets has same hardware block. so the compatible string may be use
> brcm,bcm7425-ahci.
>
> Signed-off-by: Jaedon Shin <jaedon.shin@xxxxxxxxx>
> ---
> Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt | 4 ++--
> drivers/ata/Kconfig | 2 +-
> drivers/ata/ahci_brcmstb.c | 1 +
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt b/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt
> index 4650c0aff6b3..488a383ce202 100644
> --- a/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt
> +++ b/Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt
> @@ -4,8 +4,8 @@ SATA nodes are defined to describe on-chip Serial ATA controllers.
> Each SATA controller should have its own node.
>
> Required properties:
> -- compatible : compatible list, may contain "brcm,bcm7445-ahci" and/or
> - "brcm,sata3-ahci"
> +- compatible : compatible list, may contain "brcm,bcm7445-ahci" or
> + "brcm,bcm7425-ahci" or "brcm,sata3-ahci"
If you're going to spin this series anyway, you might as well turn this
into a list, with one compatible string per line. That way it's easier
to expand if needed.
Brian
> - reg : register mappings for AHCI and SATA_TOP_CTRL
> - reg-names : "ahci" and "top-ctrl"
> - interrupts : interrupt mapping for SATA IRQ
> diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
> index 15e40ee62a94..8f535a88a0c7 100644
> --- a/drivers/ata/Kconfig
> +++ b/drivers/ata/Kconfig
> @@ -100,7 +100,7 @@ config SATA_AHCI_PLATFORM
>
> config AHCI_BRCMSTB
> tristate "Broadcom STB AHCI SATA support"
> - depends on ARCH_BRCMSTB
> + depends on ARCH_BRCMSTB || BMIPS_GENERIC
> help
> This option enables support for the AHCI SATA3 controller found on
> STB SoC's.
> diff --git a/drivers/ata/ahci_brcmstb.c b/drivers/ata/ahci_brcmstb.c
> index a2df76698adb..e53962cb48ee 100644
> --- a/drivers/ata/ahci_brcmstb.c
> +++ b/drivers/ata/ahci_brcmstb.c
> @@ -343,6 +343,7 @@ static int brcm_ahci_remove(struct platform_device *pdev)
>
> static const struct of_device_id ahci_of_match[] = {
> {.compatible = "brcm,bcm7445-ahci"},
> + {.compatible = "brcm,bcm7425-ahci"},
> {},
> };
> MODULE_DEVICE_TABLE(of, ahci_of_match);
> --
> 2.6.2
>
