aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTang Yuantian <Yuantian.Tang@freescale.com>2015-10-29 02:22:15 -0400
committerTejun Heo <tj@kernel.org>2015-10-30 20:52:15 -0400
commitd19f9aaf01341bd02da3aca3197751f52155551a (patch)
tree3e4af26964d321414dad7f1a4d696084d0871c60
parent5f8e7f17f6f5472d8029c22b1b8d3f9a4b1c8dff (diff)
ahci: qoriq: Rename LS2085A SoC support code to LS2080A
Freescale is renaming the LS2085A SoC to LS2080A. This patch addresses the same. Signed-off-by: Tang Yuantian <Yuantian.Tang@freescale.com> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt2
-rw-r--r--drivers/ata/ahci_qoriq.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
index b614e3b1008b..3aafe27f8cc6 100644
--- a/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
@@ -3,7 +3,7 @@ Binding for Freescale QorIQ AHCI SATA Controller
3Required properties: 3Required properties:
4 - reg: Physical base address and size of the controller's register area. 4 - reg: Physical base address and size of the controller's register area.
5 - compatible: Compatibility string. Must be 'fsl,<chip>-ahci', where 5 - compatible: Compatibility string. Must be 'fsl,<chip>-ahci', where
6 chip could be ls1021a, ls2085a, ls1043a etc. 6 chip could be ls1021a, ls2080a, ls1043a etc.
7 - clocks: Input clock specifier. Refer to common clock bindings. 7 - clocks: Input clock specifier. Refer to common clock bindings.
8 - interrupts: Interrupt specifier. Refer to interrupt binding. 8 - interrupts: Interrupt specifier. Refer to interrupt binding.
9 9
diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c
index 58c1a94b9a41..b9b691e83e17 100644
--- a/drivers/ata/ahci_qoriq.c
+++ b/drivers/ata/ahci_qoriq.c
@@ -45,7 +45,7 @@
45enum ahci_qoriq_type { 45enum ahci_qoriq_type {
46 AHCI_LS1021A, 46 AHCI_LS1021A,
47 AHCI_LS1043A, 47 AHCI_LS1043A,
48 AHCI_LS2085A, 48 AHCI_LS2080A,
49}; 49};
50 50
51struct ahci_qoriq_priv { 51struct ahci_qoriq_priv {
@@ -57,7 +57,7 @@ struct ahci_qoriq_priv {
57static const struct of_device_id ahci_qoriq_of_match[] = { 57static const struct of_device_id ahci_qoriq_of_match[] = {
58 { .compatible = "fsl,ls1021a-ahci", .data = (void *)AHCI_LS1021A}, 58 { .compatible = "fsl,ls1021a-ahci", .data = (void *)AHCI_LS1021A},
59 { .compatible = "fsl,ls1043a-ahci", .data = (void *)AHCI_LS1043A}, 59 { .compatible = "fsl,ls1043a-ahci", .data = (void *)AHCI_LS1043A},
60 { .compatible = "fsl,ls2085a-ahci", .data = (void *)AHCI_LS2085A}, 60 { .compatible = "fsl,ls2080a-ahci", .data = (void *)AHCI_LS2080A},
61 {}, 61 {},
62}; 62};
63MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match); 63MODULE_DEVICE_TABLE(of, ahci_qoriq_of_match);
@@ -159,7 +159,7 @@ static int ahci_qoriq_phy_init(struct ahci_host_priv *hpriv)
159 break; 159 break;
160 160
161 case AHCI_LS1043A: 161 case AHCI_LS1043A:
162 case AHCI_LS2085A: 162 case AHCI_LS2080A:
163 writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1); 163 writel(AHCI_PORT_PHY_1_CFG, reg_base + PORT_PHY1);
164 break; 164 break;
165 } 165 }