119 lines
3.4 KiB
Text
119 lines
3.4 KiB
Text
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
|
|
index aea6809500d7..0f1520723c15 100644
|
|
--- a/arch/arm/boot/dts/mt7623.dtsi
|
|
+++ b/arch/arm/boot/dts/mt7623.dtsi
|
|
@@ -1055,7 +1055,13 @@ led_pins_a: leds-alt {
|
|
pins-leds {
|
|
pinmux = <MT7623_PIN_239_EXT_SDIO0_FUNC_GPIO239>,
|
|
<MT7623_PIN_240_EXT_XCS_FUNC_GPIO240>,
|
|
- <MT7623_PIN_241_EXT_SCK_FUNC_GPIO241>;
|
|
+ <MT7623_PIN_241_EXT_SCK_FUNC_GPIO241>,
|
|
+ <MT7623_PIN_18_PCM_CLK_FUNC_GPIO18>,
|
|
+ <MT7623_PIN_19_PCM_SYNC_FUNC_GPIO19>,
|
|
+ <MT7623_PIN_21_PCM_TX_FUNC_GPIO21>,
|
|
+ <MT7623_PIN_22_EINT0_FUNC_GPIO22>,
|
|
+ <MT7623_PIN_24_EINT2_FUNC_GPIO24>,
|
|
+ <MT7623_PIN_25_EINT3_FUNC_GPIO25>;
|
|
};
|
|
};
|
|
|
|
diff --git a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
|
|
index e96aa0ed1ebd..9767c41b70fa 100644
|
|
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
|
|
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts
|
|
@@ -126,6 +126,42 @@ red {
|
|
gpios = <&pio 239 GPIO_ACTIVE_LOW>;
|
|
default-state = "off";
|
|
};
|
|
+
|
|
+ cust-0 {
|
|
+ label = "bpi-r2:pio:cust0";
|
|
+ gpios = <&pio 18 GPIO_ACTIVE_HIGH>;
|
|
+ default-state = "off";
|
|
+ };
|
|
+
|
|
+ cust-1 {
|
|
+ label = "bpi-r2:pio:cust1";
|
|
+ gpios = <&pio 19 GPIO_ACTIVE_HIGH>;
|
|
+ default-state = "off";
|
|
+ };
|
|
+
|
|
+ cust-2 {
|
|
+ label = "bpi-r2:pio:cust2";
|
|
+ gpios = <&pio 21 GPIO_ACTIVE_HIGH>;
|
|
+ default-state = "off";
|
|
+ };
|
|
+
|
|
+ cust-3 {
|
|
+ label = "bpi-r2:pio:cust3";
|
|
+ gpios = <&pio 22 GPIO_ACTIVE_HIGH>;
|
|
+ default-state = "off";
|
|
+ };
|
|
+
|
|
+ cust-4 {
|
|
+ label = "bpi-r2:pio:cust4";
|
|
+ gpios = <&pio 24 GPIO_ACTIVE_HIGH>;
|
|
+ default-state = "off";
|
|
+ };
|
|
+
|
|
+ cust-5 {
|
|
+ label = "bpi-r2:pio:cust5";
|
|
+ gpios = <&pio 25 GPIO_ACTIVE_HIGH>;
|
|
+ default-state = "off";
|
|
+ };
|
|
};
|
|
|
|
memory@80000000 {
|
|
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
|
|
index a67cac15a724..a159906eede4 100644
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -1660,6 +1660,7 @@ mt7530_setup(struct dsa_switch *ds)
|
|
ds->mtu_enforcement_ingress = true;
|
|
|
|
if (priv->id == ID_MT7530) {
|
|
+ /*
|
|
regulator_set_voltage(priv->core_pwr, 1000000, 1000000);
|
|
ret = regulator_enable(priv->core_pwr);
|
|
if (ret < 0) {
|
|
@@ -1675,6 +1676,7 @@ mt7530_setup(struct dsa_switch *ds)
|
|
ret);
|
|
return ret;
|
|
}
|
|
+ */
|
|
}
|
|
|
|
/* Reset whole chip through gpio pin or memory-mapped registers for
|
|
@@ -2730,6 +2732,7 @@ mt7530_probe(struct mdio_device *mdiodev)
|
|
|
|
priv->id = priv->info->id;
|
|
|
|
+ /*
|
|
if (priv->id == ID_MT7530) {
|
|
priv->core_pwr = devm_regulator_get(&mdiodev->dev, "core");
|
|
if (IS_ERR(priv->core_pwr))
|
|
@@ -2739,6 +2742,7 @@ mt7530_probe(struct mdio_device *mdiodev)
|
|
if (IS_ERR(priv->io_pwr))
|
|
return PTR_ERR(priv->io_pwr);
|
|
}
|
|
+ */
|
|
|
|
/* Not MCM that indicates switch works as the remote standalone
|
|
* integrated circuit so the GPIO pin would be used to complete
|
|
@@ -2770,6 +2774,7 @@ mt7530_remove(struct mdio_device *mdiodev)
|
|
struct mt7530_priv *priv = dev_get_drvdata(&mdiodev->dev);
|
|
int ret = 0;
|
|
|
|
+ /*
|
|
ret = regulator_disable(priv->core_pwr);
|
|
if (ret < 0)
|
|
dev_err(priv->dev,
|
|
@@ -2779,7 +2784,7 @@ mt7530_remove(struct mdio_device *mdiodev)
|
|
if (ret < 0)
|
|
dev_err(priv->dev, "Failed to disable io pwr: %d\n",
|
|
ret);
|
|
-
|
|
+ */
|
|
dsa_unregister_switch(priv->ds);
|
|
mutex_destroy(&priv->reg_mutex);
|
|
}
|