Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata (86579aa4) · Commits · 戴 / test

Pull libata fixes from Tejun Heo: "Two driver fixes. One is for an ahci_mvebu controller config bug and the other fixes pata_octeon_cf build issue" * 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: pata_octeon_cf: fix broken build ata: ahci_mvebu: Fix wrongly set base address for the MBus window setting

drivers/ata/ahci_mvebu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ static void ahci_mvebu_mbus_config(struct ahci_host_priv *hpriv,
		writel((cs->mbus_attr << 8) \|
		(dram->mbus_dram_target_id << 4) \| 1,
		hpriv->mmio + AHCI_WINDOW_CTRL(i));
		writel(cs->base, hpriv->mmio + AHCI_WINDOW_BASE(i));
		writel(cs->base >> 16, hpriv->mmio + AHCI_WINDOW_BASE(i));
		writel(((cs->size - 1) & 0xffff0000),
		hpriv->mmio + AHCI_WINDOW_SIZE(i));
		}

drivers/ata/pata_octeon_cf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1053,7 +1053,7 @@ static struct of_device_id octeon_cf_match[] = {
		},
		{},
		};
		MODULE_DEVICE_TABLE(of, octeon_i2c_match);
		MODULE_DEVICE_TABLE(of, octeon_cf_match);

		static struct platform_driver octeon_cf_driver = {
		.probe = octeon_cf_probe,

Admin message