Commit a00b7910 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

wifi: mt76: move leds field in leds struct 



This is a preliminary patch to support per-phy leds.

Tested-by: default avatarFrank Wunderlich <frank-w@public-files.de>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 0ffcb2a6

drivers/net/wireless/mediatek/mt76/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ mt76_register_debugfs_fops(struct mt76_phy *phy, 
	if (!dir)

		return NULL;



	debugfs_create_u8("led_pin", 0600, dir, &dev->led_pin);

	debugfs_create_u8("led_pin", 0600, dir, &dev->leds.pin);

	debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg);

	debugfs_create_file_unsafe("regval", 0600, dir, dev, fops);

	debugfs_create_file_unsafe("napi_threaded", 0600, dir, dev,

drivers/net/wireless/mediatek/mt76/mac80211.c

+9 −9
Original line number Diff line number Diff line
@@ -198,14 +198,14 @@ static int mt76_led_init(struct mt76_dev *dev) 
	struct ieee80211_hw *hw = dev->hw;

	int led_pin;



	if (!dev->led_cdev.brightness_set && !dev->led_cdev.blink_set)

	if (!dev->leds.cdev.brightness_set && !dev->leds.cdev.blink_set)

		return 0;



	snprintf(dev->led_name, sizeof(dev->led_name),

	snprintf(dev->leds.name, sizeof(dev->leds.name),

		 "mt76-%s", wiphy_name(hw->wiphy));



	dev->led_cdev.name = dev->led_name;

	dev->led_cdev.default_trigger =

	dev->leds.cdev.name = dev->leds.name;

	dev->leds.cdev.default_trigger =

		ieee80211_create_tpt_led_trigger(hw,

					IEEE80211_TPT_LEDTRIG_FL_RADIO,

					mt76_tpt_blink,
@@ -214,20 +214,20 @@ static int mt76_led_init(struct mt76_dev *dev) 
	np = of_get_child_by_name(np, "led");

	if (np) {

		if (!of_property_read_u32(np, "led-sources", &led_pin))

			dev->led_pin = led_pin;

		dev->led_al = of_property_read_bool(np, "led-active-low");

			dev->leds.pin = led_pin;

		dev->leds.al = of_property_read_bool(np, "led-active-low");

		of_node_put(np);

	}



	return led_classdev_register(dev->dev, &dev->led_cdev);

	return led_classdev_register(dev->dev, &dev->leds.cdev);

}



static void mt76_led_cleanup(struct mt76_dev *dev)

{

	if (!dev->led_cdev.brightness_set && !dev->led_cdev.blink_set)

	if (!dev->leds.cdev.brightness_set && !dev->leds.cdev.blink_set)

		return;



	led_classdev_unregister(&dev->led_cdev);

	led_classdev_unregister(&dev->leds.cdev);

}



static void mt76_init_stream_cap(struct mt76_phy *phy,

drivers/net/wireless/mediatek/mt76/mt76.h

+7 −5
Original line number Diff line number Diff line
@@ -812,11 +812,6 @@ struct mt76_dev { 


	u32 debugfs_reg;



	struct led_classdev led_cdev;

	char led_name[32];

	bool led_al;

	u8 led_pin;



	u8 csa_complete;



	u32 rxfilter;
@@ -835,6 +830,13 @@ struct mt76_dev { 
		struct mt76_usb usb;

		struct mt76_sdio sdio;

	};



	struct {

		struct led_classdev cdev;

		char name[32];

		bool al;

		u8 pin;

	} leds;

};



struct mt76_power_limits {

drivers/net/wireless/mediatek/mt76/mt7603/init.c

+10 −10
Original line number Diff line number Diff line
@@ -341,15 +341,15 @@ static void mt7603_led_set_config(struct mt76_dev *mt76, u8 delay_on, 
	      FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |

	      FIELD_PREP(MT_LED_STATUS_ON, delay_on);



	addr = mt7603_reg_map(dev, MT_LED_STATUS_0(mt76->led_pin));

	addr = mt7603_reg_map(dev, MT_LED_STATUS_0(mt76->leds.pin));

	mt76_wr(dev, addr, val);

	addr = mt7603_reg_map(dev, MT_LED_STATUS_1(mt76->led_pin));

	addr = mt7603_reg_map(dev, MT_LED_STATUS_1(mt76->leds.pin));

	mt76_wr(dev, addr, val);



	val = MT_LED_CTRL_REPLAY(mt76->led_pin) |

	      MT_LED_CTRL_KICK(mt76->led_pin);

	if (mt76->led_al)

		val |= MT_LED_CTRL_POLARITY(mt76->led_pin);

	val = MT_LED_CTRL_REPLAY(mt76->leds.pin) |

	      MT_LED_CTRL_KICK(mt76->leds.pin);

	if (mt76->leds.al)

		val |= MT_LED_CTRL_POLARITY(mt76->leds.pin);

	addr = mt7603_reg_map(dev, MT_LED_CTRL);

	mt76_wr(dev, addr, val);

}
@@ -359,7 +359,7 @@ static int mt7603_led_set_blink(struct led_classdev *led_cdev, 
				unsigned long *delay_off)

{

	struct mt76_dev *mt76 = container_of(led_cdev, struct mt76_dev,

					     led_cdev);

					     leds.cdev);

	u8 delta_on, delta_off;



	delta_off = max_t(u8, *delay_off / 10, 1);
@@ -373,7 +373,7 @@ static void mt7603_led_set_brightness(struct led_classdev *led_cdev, 
				      enum led_brightness brightness)

{

	struct mt76_dev *mt76 = container_of(led_cdev, struct mt76_dev,

					     led_cdev);

					     leds.cdev);



	if (!brightness)

		mt7603_led_set_config(mt76, 0, 0xff);
@@ -535,8 +535,8 @@ int mt7603_register_device(struct mt7603_dev *dev) 


	/* init led callbacks */

	if (IS_ENABLED(CONFIG_MT76_LEDS)) {

		dev->mt76.led_cdev.brightness_set = mt7603_led_set_brightness;

		dev->mt76.led_cdev.blink_set = mt7603_led_set_blink;

		dev->mt76.leds.cdev.brightness_set = mt7603_led_set_brightness;

		dev->mt76.leds.cdev.blink_set = mt7603_led_set_blink;

	}



	wiphy->reg_notifier = mt7603_regd_notifier;

drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c

+9 −9
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ mt7615_led_set_config(struct led_classdev *led_cdev, 
	struct mt76_dev *mt76;

	u32 val, addr;



	mt76 = container_of(led_cdev, struct mt76_dev, led_cdev);

	mt76 = container_of(led_cdev, struct mt76_dev, leds.cdev);

	dev = container_of(mt76, struct mt7615_dev, mt76);



	if (!mt76_connac_pm_ref(&dev->mphy, &dev->pm))
@@ -84,15 +84,15 @@ mt7615_led_set_config(struct led_classdev *led_cdev, 
	      FIELD_PREP(MT_LED_STATUS_OFF, delay_off) |

	      FIELD_PREP(MT_LED_STATUS_ON, delay_on);



	addr = mt7615_reg_map(dev, MT_LED_STATUS_0(mt76->led_pin));

	addr = mt7615_reg_map(dev, MT_LED_STATUS_0(mt76->leds.pin));

	mt76_wr(dev, addr, val);

	addr = mt7615_reg_map(dev, MT_LED_STATUS_1(mt76->led_pin));

	addr = mt7615_reg_map(dev, MT_LED_STATUS_1(mt76->leds.pin));

	mt76_wr(dev, addr, val);



	val = MT_LED_CTRL_REPLAY(mt76->led_pin) |

	      MT_LED_CTRL_KICK(mt76->led_pin);

	if (mt76->led_al)

		val |= MT_LED_CTRL_POLARITY(mt76->led_pin);

	val = MT_LED_CTRL_REPLAY(mt76->leds.pin) |

	      MT_LED_CTRL_KICK(mt76->leds.pin);

	if (mt76->leds.al)

		val |= MT_LED_CTRL_POLARITY(mt76->leds.pin);

	addr = mt7615_reg_map(dev, MT_LED_CTRL);

	mt76_wr(dev, addr, val);
@@ -133,8 +133,8 @@ int mt7615_register_device(struct mt7615_dev *dev) 


	/* init led callbacks */

	if (IS_ENABLED(CONFIG_MT76_LEDS)) {

		dev->mt76.led_cdev.brightness_set = mt7615_led_set_brightness;

		dev->mt76.led_cdev.blink_set = mt7615_led_set_blink;

		dev->mt76.leds.cdev.brightness_set = mt7615_led_set_brightness;

		dev->mt76.leds.cdev.blink_set = mt7615_led_set_blink;

	}



	ret = mt7622_wmac_init(dev);