OpenWrt – Diff between revs 2 and 3

Subversion Repositories:

?pathlinks?

Rev 2 – Details – Blame – Last modification – View Log

 	rtl8366_smi_write_bits(smi, 0x01, 1);
 	return 0;
 }
-static int __rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
+int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
+{
 	unsigned long flags;
 	u8 lo = 0;
 	rtl8366_smi_stop(smi);
 	spin_unlock_irqrestore(&smi->lock, flags);
 	return ret;
-}
-/* Read/write via mdiobus */
-#define MDC_MDIO_CTRL0_REG		31
-#define MDC_MDIO_START_REG		29
-#define MDC_MDIO_CTRL1_REG		21
-#define MDC_MDIO_ADDRESS_REG		23
-#define MDC_MDIO_DATA_WRITE_REG		24
-#define MDC_MDIO_DATA_READ_REG		25
-#define MDC_MDIO_START_OP		0xFFFF
-#define MDC_MDIO_ADDR_OP		0x000E
-#define MDC_MDIO_READ_OP		0x0001
-#define MDC_MDIO_WRITE_OP		0x0003
-#define MDC_REALTEK_PHY_ADDR		0x0
-int __rtl8366_mdio_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
-{
-	u32 phy_id = MDC_REALTEK_PHY_ADDR;
-	struct mii_bus *mbus = smi->ext_mbus;
-	BUG_ON(in_interrupt());
-	mutex_lock(&mbus->mdio_lock);
-	/* Write Start command to register 29 */
-	mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
-	/* Write address control code to register 31 */
-	mbus->write(mbus, phy_id, MDC_MDIO_CTRL0_REG, MDC_MDIO_ADDR_OP);
-	/* Write Start command to register 29 */
-	mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
-	/* Write address to register 23 */
-	mbus->write(mbus, phy_id, MDC_MDIO_ADDRESS_REG, addr);
-	/* Write Start command to register 29 */
-	mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
-	/* Write read control code to register 21 */
-	mbus->write(mbus, phy_id, MDC_MDIO_CTRL1_REG, MDC_MDIO_READ_OP);
-	/* Write Start command to register 29 */
-	mbus->write(smi->ext_mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
-	/* Read data from register 25 */
-	*data = mbus->read(mbus, phy_id, MDC_MDIO_DATA_READ_REG);
-	mutex_unlock(&mbus->mdio_lock);
-	return 0;
-}
-static int __rtl8366_mdio_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
-{
-	u32 phy_id = MDC_REALTEK_PHY_ADDR;
-	struct mii_bus *mbus = smi->ext_mbus;
-	BUG_ON(in_interrupt());
-	mutex_lock(&mbus->mdio_lock);
-	/* Write Start command to register 29 */
-	mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
-	/* Write address control code to register 31 */
-	mbus->write(mbus, phy_id, MDC_MDIO_CTRL0_REG, MDC_MDIO_ADDR_OP);
-	/* Write Start command to register 29 */
-	mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
-	/* Write address to register 23 */
-	mbus->write(mbus, phy_id, MDC_MDIO_ADDRESS_REG, addr);
-	/* Write Start command to register 29 */
-	mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
-	/* Write data to register 24 */
-	mbus->write(mbus, phy_id, MDC_MDIO_DATA_WRITE_REG, data);
-	/* Write Start command to register 29 */
-	mbus->write(mbus, phy_id, MDC_MDIO_START_REG, MDC_MDIO_START_OP);
-	/* Write data control code to register 21 */
-	mbus->write(mbus, phy_id, MDC_MDIO_CTRL1_REG, MDC_MDIO_WRITE_OP);
-	mutex_unlock(&mbus->mdio_lock);
-	return 0;
-}
-int rtl8366_smi_read_reg(struct rtl8366_smi *smi, u32 addr, u32 *data)
-{
-	if (smi->ext_mbus)
-		return __rtl8366_mdio_read_reg(smi, addr, data);
-	else
-		return __rtl8366_smi_read_reg(smi, addr, data);
+}
 EXPORT_SYMBOL_GPL(rtl8366_smi_read_reg);
 static int __rtl8366_smi_write_reg(struct rtl8366_smi *smi,
 	return ret;
+}
 int rtl8366_smi_write_reg(struct rtl8366_smi *smi, u32 addr, u32 data)
-{
-	if (smi->ext_mbus)
-		return __rtl8366_mdio_write_reg(smi, addr, data);
-	else
+{
-		return __rtl8366_smi_write_reg(smi, addr, data, true);
+	return __rtl8366_smi_write_reg(smi, addr, data, true);
+}
 EXPORT_SYMBOL_GPL(rtl8366_smi_write_reg);
 EXPORT_SYMBOL_GPL(rtl8366_smi_rmwr);
 static int rtl8366_reset(struct rtl8366_smi *smi)
+{
 	if (smi->hw_reset) {
-		smi->hw_reset(smi, true);
+		smi->hw_reset(true);
 		msleep(RTL8366_SMI_HW_STOP_DELAY);
-		smi->hw_reset(smi, false);
+		smi->hw_reset(false);
 		msleep(RTL8366_SMI_HW_START_DELAY);
 		return 0;
+	}
 static int __rtl8366_smi_init(struct rtl8366_smi *smi, const char *name)
+{
-	int err;
+	int err;
-	if (!smi->ext_mbus) {
-		err = gpio_request(smi->gpio_sda, name);
+	err = gpio_request(smi->gpio_sda, name);
-		if (err) {
+	if (err) {
-			printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",
+		printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",
-				smi->gpio_sda, err);
+			smi->gpio_sda, err);
-			goto err_out;
+		goto err_out;
-		}
+	}
-		err = gpio_request(smi->gpio_sck, name);
+	err = gpio_request(smi->gpio_sck, name);
-		if (err) {
+	if (err) {
-			printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",
-				smi->gpio_sck, err);
+		printk(KERN_ERR "rtl8366_smi: gpio_request failed for %u, err=%d\n",
-			goto err_free_sda;
+			smi->gpio_sck, err);
 		goto err_free_sda;
+	}
 	spin_lock_init(&smi->lock);
 	/* start the switch */
+}
 static void __rtl8366_smi_cleanup(struct rtl8366_smi *smi)
+{
 	if (smi->hw_reset)
-		smi->hw_reset(smi, true);
+		smi->hw_reset(true);
-	if (!smi->ext_mbus) {
-		gpio_free(smi->gpio_sck);
-		gpio_free(smi->gpio_sda);
+	gpio_free(smi->gpio_sck);
 	gpio_free(smi->gpio_sda);
+}
 	err = __rtl8366_smi_init(smi, dev_name(smi->parent));
 	if (err)
-		goto err_out;
+		goto err_out;
-	if (!smi->ext_mbus)
-		dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n",
-			 smi->gpio_sda, smi->gpio_sck);
-	else
+	dev_info(smi->parent, "using GPIO pins %u (SDA) and %u (SCK)\n",
-		dev_info(smi->parent, "using MDIO bus '%s'\n", smi->ext_mbus->name);
+		 smi->gpio_sda, smi->gpio_sck);
 	err = smi->ops->detect(smi);
 	__rtl8366_smi_cleanup(smi);
+}
 EXPORT_SYMBOL_GPL(rtl8366_smi_cleanup);
-#ifdef CONFIG_OF
-static void rtl8366_smi_reset(struct rtl8366_smi *smi, bool active)
-{
-	if (active)
-		reset_control_assert(smi->reset);
-	else
-		reset_control_deassert(smi->reset);
-}
 #ifdef CONFIG_OF
 int rtl8366_smi_probe_of(struct platform_device *pdev, struct rtl8366_smi *smi)
+{
 	int sck = of_get_named_gpio(pdev->dev.of_node, "gpio-sck", 0);
-	int sda = of_get_named_gpio(pdev->dev.of_node, "gpio-sda", 0);
-	struct device_node *np = pdev->dev.of_node;
-	struct device_node *mdio_node;
-	mdio_node = of_parse_phandle(np, "mii-bus", 0);
-	if (!mdio_node) {
-		dev_err(&pdev->dev, "cannot find mdio node phandle");
-		goto try_gpio;
-	}
-	smi->ext_mbus = of_mdio_find_bus(mdio_node);
-	if (!smi->ext_mbus) {
-		dev_info(&pdev->dev,
-			"cannot find mdio bus from bus handle (yet)");
-		goto try_gpio;
-	}
-	return 0;
 	int sda = of_get_named_gpio(pdev->dev.of_node, "gpio-sda", 0);
-try_gpio:
-	if (!gpio_is_valid(sck) || !gpio_is_valid(sda)) {
-		if (!mdio_node) {
+	if (!gpio_is_valid(sck) || !gpio_is_valid(sda)) {
-			dev_err(&pdev->dev, "gpios missing in devictree\n");
-			return -EINVAL;
-		} else {
-			return -EPROBE_DEFER;
+		dev_err(&pdev->dev, "gpios missing in devictree\n");
 		return -EINVAL;
+	}
-	smi->gpio_sda = sda;
-	smi->gpio_sck = sck;
 	smi->reset = devm_reset_control_get(&pdev->dev, "switch");
-	if (!IS_ERR(smi->reset))
+	smi->gpio_sda = sda;
-		smi->hw_reset = rtl8366_smi_reset;
+	smi->gpio_sck = sck;
 	return smi;
 free_smi:
 	kfree(smi);
-	return ERR_PTR(err);
+	return NULL;
+}
 EXPORT_SYMBOL_GPL(rtl8366_smi_probe);