IXP4xx: add Ethernet and NPE support for IXP43x CPU. (5ca328d2) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm/mach-ixp4xx/ixp4xx_npe.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -575,8 +575,8 @@ int npe_load_firmware(struct npe npe, const char name, struct device *dev)
		for (i = 0; i < image->size; i++)
		image->data[i] = swab32(image->data[i]);

		if (!cpu_is_ixp46x() && ((image->id >> 28) & 0xF /* device ID */)) {
		print_npe(KERN_INFO, npe, "IXP46x firmware ignored on "
		if (cpu_is_ixp42x() && ((image->id >> 28) & 0xF /* device ID */)) {
		print_npe(KERN_INFO, npe, "IXP43x/IXP46x firmware ignored on "
		"IXP42x\n");
		goto err;
		}
		@@ -596,7 +596,7 @@ int npe_load_firmware(struct npe npe, const char name, struct device *dev)
		"revision 0x%X:%X\n", (image->id >> 16) & 0xFF,
		(image->id >> 8) & 0xFF, image->id & 0xFF);

		if (!cpu_is_ixp46x()) {
		if (cpu_is_ixp42x()) {
		if (!npe->id)
		instr_size = NPE_A_42X_INSTR_SIZE;
		else

+13 −7

Original line number	Diff line number	Diff line
		@@ -335,11 +335,20 @@ static int ixp4xx_mdio_register(void)
		if (!(mdio_bus = mdiobus_alloc()))
		return -ENOMEM;

		if (cpu_is_ixp43x()) {
		/* IXP43x lacks NPE-B and uses NPE-C for MII PHY access */
		if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEC_ETH))
		return -ENOSYS;
		mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthC_BASE_VIRT;
		} else {
		/* All MII PHY accesses use NPE-B Ethernet registers */
		spin_lock_init(&mdio_lock);
		if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEB_ETH0))
		return -ENOSYS;
		mdio_regs = (struct eth_regs __iomem *)IXP4XX_EthB_BASE_VIRT;
		__raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
		}

		__raw_writel(DEFAULT_CORE_CNTRL, &mdio_regs->core_control);
		spin_lock_init(&mdio_lock);
		mdio_bus->name = "IXP4xx MII Bus";
		mdio_bus->read = &ixp4xx_mdio_read;
		mdio_bus->write = &ixp4xx_mdio_write;
		@@ -1250,9 +1259,6 @@ static struct platform_driver ixp4xx_eth_driver = {
		static int __init eth_init_module(void)
		{
		int err;
		if (!(ixp4xx_read_feature_bits() & IXP4XX_FEATURE_NPEB_ETH0))
		return -ENOSYS;

		if ((err = ixp4xx_mdio_register()))
		return err;
		return platform_driver_register(&ixp4xx_eth_driver);