Commit 721ad321 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Meson-GXL-internal-phy' 

Neil Armstrong says:

====================
ARM64: Add Internal PHY support for Meson GXL

The Amlogic Meson GXL SoCs have an internal RMII PHY that is muxed with the
external RGMII pins.

In order to support switching between the two PHYs links, extended registers
size for mdio-mux-mmioreg must be added.

The DT related patches submitted as RFC in [3] will be sent in a separate
patchset due to multiple patchsets and DTSI migrations.

Changes since v2 RFC patchset at : [3]
 - Change phy Kconfig/Makefile alphabetic order
 - GXL dtsi cleanup

Changes since original RFC patchset at : [2]
 - Remove meson8b experimental phy switching
 - Switch to mdio-mux-mmioreg with extennded size support
 - Add internal phy support for S905x and p231
 - Add external PHY support for p230

[1] http://lkml.kernel.org/r/1477932286-27482-1-git-send-email-narmstrong@baylibre.com
[2] http://lkml.kernel.org/r/1477060838-14164-1-git-send-email-narmstrong@baylibre.com
[3] http://lkml.kernel.org/r/1477932987-27871-1-git-send-email-narmstrong@baylibre.com


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ddc5e157 7334b3e4

Documentation/devicetree/bindings/net/mdio-mux-mmioreg.txt

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Properties for an MDIO bus multiplexer controlled by a memory-mapped device 
This is a special case of a MDIO bus multiplexer.  A memory-mapped device,

like an FPGA, is used to control which child bus is connected.  The mdio-mux

node must be a child of the memory-mapped device.  The driver currently only

supports devices with eight-bit registers.

supports devices with 8, 16 or 32-bit registers.



Required properties in addition to the generic multiplexer properties:
@@ -11,7 +11,7 @@ Required properties in addition to the generic multiplexer properties: 


- reg : integer, contains the offset of the register that controls the bus

	multiplexer.  The size field in the 'reg' property is the size of

	register, and must therefore be 1.

	register, and must therefore be 1, 2, or 4.



- mux-mask : integer, contains an eight-bit mask that specifies which

	bits in the register control the actual bus multiplexer.  The

drivers/net/phy/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -277,6 +277,11 @@ config MARVELL_PHY 
	---help---

	  Currently has a driver for the 88E1011S



config MESON_GXL_PHY

	tristate "Amlogic Meson GXL Internal PHY"

	---help---

	  Currently has a driver for the Amlogic Meson GXL Internal PHY



config MICREL_PHY

	tristate "Micrel PHYs"

	---help---

drivers/net/phy/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ obj-$(CONFIG_INTEL_XWAY_PHY) += intel-xway.o 
obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o

obj-$(CONFIG_LXT_PHY)		+= lxt.o

obj-$(CONFIG_MARVELL_PHY)	+= marvell.o

obj-$(CONFIG_MESON_GXL_PHY)	+= meson-gxl.o

obj-$(CONFIG_MICREL_KS8995MA)	+= spi_ks8995.o

obj-$(CONFIG_MICREL_PHY)	+= micrel.o

obj-$(CONFIG_MICROCHIP_PHY)	+= microchip.o

drivers/net/phy/mdio-mux-mmioreg.c

+47 −13
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
struct mdio_mux_mmioreg_state {

	void *mux_handle;

	phys_addr_t phys;

	uint8_t mask;

	unsigned int iosize;

	unsigned int mask;

};



/*
@@ -47,12 +48,14 @@ static int mdio_mux_mmioreg_switch_fn(int current_child, int desired_child, 
	struct mdio_mux_mmioreg_state *s = data;



	if (current_child ^ desired_child) {

		void __iomem *p = ioremap(s->phys, 1);

		uint8_t x, y;



		void __iomem *p = ioremap(s->phys, s->iosize);

		if (!p)

			return -ENOMEM;



		switch (s->iosize) {

		case sizeof(uint8_t): {

			uint8_t x, y;



			x = ioread8(p);

			y = (x & ~s->mask) | desired_child;

			if (x != y) {
@@ -60,6 +63,34 @@ static int mdio_mux_mmioreg_switch_fn(int current_child, int desired_child, 
				pr_debug("%s: %02x -> %02x\n", __func__, x, y);

			}



			break;

		}

		case sizeof(uint16_t): {

			uint16_t x, y;



			x = ioread16(p);

			y = (x & ~s->mask) | desired_child;

			if (x != y) {

				iowrite16((x & ~s->mask) | desired_child, p);

				pr_debug("%s: %04x -> %04x\n", __func__, x, y);

			}



			break;

		}

		case sizeof(uint32_t): {

			uint32_t x, y;



			x = ioread32(p);

			y = (x & ~s->mask) | desired_child;

			if (x != y) {

				iowrite32((x & ~s->mask) | desired_child, p);

				pr_debug("%s: %08x -> %08x\n", __func__, x, y);

			}



			break;

		}

		}



		iounmap(p);

	}
@@ -88,8 +119,11 @@ static int mdio_mux_mmioreg_probe(struct platform_device *pdev) 
	}

	s->phys = res.start;



	if (resource_size(&res) != sizeof(uint8_t)) {

		dev_err(&pdev->dev, "only 8-bit registers are supported\n");

	s->iosize = resource_size(&res);

	if (s->iosize != sizeof(uint8_t) &&

	    s->iosize != sizeof(uint16_t) &&

	    s->iosize != sizeof(uint32_t)) {

		dev_err(&pdev->dev, "only 8/16/32-bit registers are supported\n");

		return -EINVAL;

	}
@@ -98,8 +132,8 @@ static int mdio_mux_mmioreg_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev, "missing or invalid mux-mask property\n");

		return -ENODEV;

	}

	if (be32_to_cpup(iprop) > 255) {

		dev_err(&pdev->dev, "only 8-bit registers are supported\n");

	if (be32_to_cpup(iprop) >= BIT(s->iosize * 8)) {

		dev_err(&pdev->dev, "only 8/16/32-bit registers are supported\n");

		return -EINVAL;

	}

	s->mask = be32_to_cpup(iprop);

drivers/net/phy/meson-gxl.c

0 → 100644
+81 −0
Original line number Diff line number Diff line 
/*

 * Amlogic Meson GXL Internal PHY Driver

 *

 * Copyright (C) 2015 Amlogic, Inc. All rights reserved.

 * Copyright (C) 2016 BayLibre, SAS. All rights reserved.

 * Author: Neil Armstrong <narmstrong@baylibre.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 */

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/mii.h>

#include <linux/ethtool.h>

#include <linux/phy.h>

#include <linux/netdevice.h>



static int meson_gxl_config_init(struct phy_device *phydev)

{

	/* Enable Analog and DSP register Bank access by */

	phy_write(phydev, 0x14, 0x0000);

	phy_write(phydev, 0x14, 0x0400);

	phy_write(phydev, 0x14, 0x0000);

	phy_write(phydev, 0x14, 0x0400);



	/* Write Analog register 23 */

	phy_write(phydev, 0x17, 0x8E0D);

	phy_write(phydev, 0x14, 0x4417);



	/* Enable fractional PLL */

	phy_write(phydev, 0x17, 0x0005);

	phy_write(phydev, 0x14, 0x5C1B);



	/* Program fraction FR_PLL_DIV1 */

	phy_write(phydev, 0x17, 0x029A);

	phy_write(phydev, 0x14, 0x5C1D);



	/* Program fraction FR_PLL_DIV1 */

	phy_write(phydev, 0x17, 0xAAAA);

	phy_write(phydev, 0x14, 0x5C1C);



	return 0;

}



static struct phy_driver meson_gxl_phy[] = {

	{

		.phy_id		= 0x01814400,

		.phy_id_mask	= 0xfffffff0,

		.name		= "Meson GXL Internal PHY",

		.features	= PHY_BASIC_FEATURES,

		.flags		= PHY_IS_INTERNAL,

		.config_init	= meson_gxl_config_init,

		.config_aneg	= genphy_config_aneg,

		.aneg_done      = genphy_aneg_done,

		.read_status	= genphy_read_status,

		.suspend        = genphy_suspend,

		.resume         = genphy_resume,

	},

};



static struct mdio_device_id __maybe_unused meson_gxl_tbl[] = {

	{ 0x01814400, 0xfffffff0 },

	{ }

};



module_phy_driver(meson_gxl_phy);



MODULE_DEVICE_TABLE(mdio, meson_gxl_tbl);



MODULE_DESCRIPTION("Amlogic Meson GXL Internal PHY driver");

MODULE_AUTHOR("Baoqi wang");

MODULE_AUTHOR("Neil Armstrong <narmstrong@baylibre.com>");

MODULE_LICENSE("GPL");

CRA Git | Maintained and supported by SUSTech CRA and CCSE