aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-5.4
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/mvebu/patches-5.4')
-rw-r--r--target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch2
-rw-r--r--target/linux/mvebu/patches-5.4/721-net-phy-aquantia-enable-AQR112-and-AQR412.patch8
-rw-r--r--target/linux/mvebu/patches-5.4/722-net-phy-aquantia-Add-AQR113-driver-support.patch4
-rw-r--r--target/linux/mvebu/patches-5.4/723-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch4
4 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch b/target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch
index 00d2b30d58..9285f50368 100644
--- a/target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch
+++ b/target/linux/mvebu/patches-5.4/007-gpio-mvebu-avoid_error_message_for_optional_IRQ.patch
@@ -20,7 +20,7 @@ Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
-@@ -1248,7 +1248,7 @@ static int mvebu_gpio_probe(struct platf
+@@ -1251,7 +1251,7 @@ static int mvebu_gpio_probe(struct platf
* pins.
*/
for (i = 0; i < 4; i++) {
diff --git a/target/linux/mvebu/patches-5.4/721-net-phy-aquantia-enable-AQR112-and-AQR412.patch b/target/linux/mvebu/patches-5.4/721-net-phy-aquantia-enable-AQR112-and-AQR412.patch
index 843aa7dc9e..d072041fd0 100644
--- a/target/linux/mvebu/patches-5.4/721-net-phy-aquantia-enable-AQR112-and-AQR412.patch
+++ b/target/linux/mvebu/patches-5.4/721-net-phy-aquantia-enable-AQR112-and-AQR412.patch
@@ -27,7 +27,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
#define MDIO_PHYXS_VEND_IF_STATUS 0xe812
#define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3)
-@@ -121,6 +124,29 @@
+@@ -123,6 +126,29 @@
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL2 BIT(1)
#define VEND1_GLOBAL_INT_VEND_MASK_GLOBAL3 BIT(0)
@@ -57,7 +57,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
struct aqr107_hw_stat {
const char *name;
int reg;
-@@ -241,6 +267,51 @@ static int aqr_config_aneg(struct phy_de
+@@ -254,6 +280,51 @@ static int aqr_config_aneg(struct phy_de
return genphy_c45_check_and_restart_aneg(phydev, changed);
}
@@ -109,7 +109,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
static int aqr_config_intr(struct phy_device *phydev)
{
bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED;
-@@ -682,6 +753,22 @@ static struct phy_driver aqr_driver[] =
+@@ -695,6 +766,22 @@ static struct phy_driver aqr_driver[] =
.ack_interrupt = aqr_ack_interrupt,
.read_status = aqr_read_status,
},
@@ -132,7 +132,7 @@ Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com>
};
module_phy_driver(aqr_driver);
-@@ -692,7 +779,9 @@ static struct mdio_device_id __maybe_unu
+@@ -705,7 +792,9 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR105) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
diff --git a/target/linux/mvebu/patches-5.4/722-net-phy-aquantia-Add-AQR113-driver-support.patch b/target/linux/mvebu/patches-5.4/722-net-phy-aquantia-Add-AQR113-driver-support.patch
index 2db24149c9..5c0c52c083 100644
--- a/target/linux/mvebu/patches-5.4/722-net-phy-aquantia-Add-AQR113-driver-support.patch
+++ b/target/linux/mvebu/patches-5.4/722-net-phy-aquantia-Add-AQR113-driver-support.patch
@@ -18,7 +18,7 @@ Add a new entry for AQR113 PHY_ID
#define PHY_ID_AQCS109 0x03a1b5c2
#define PHY_ID_AQR405 0x03a1b4b0
#define PHY_ID_AQR412 0x03a1b712
-@@ -762,6 +763,14 @@ static struct phy_driver aqr_driver[] =
+@@ -775,6 +776,14 @@ static struct phy_driver aqr_driver[] =
.read_status = aqr107_read_status,
},
{
@@ -33,7 +33,7 @@ Add a new entry for AQR113 PHY_ID
PHY_ID_MATCH_MODEL(PHY_ID_AQR412),
.name = "Aquantia AQR412",
.config_aneg = aqr_config_aneg_set_prot,
-@@ -780,6 +789,7 @@ static struct mdio_device_id __maybe_unu
+@@ -793,6 +802,7 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },
diff --git a/target/linux/mvebu/patches-5.4/723-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch b/target/linux/mvebu/patches-5.4/723-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
index a348f79417..209daeb41b 100644
--- a/target/linux/mvebu/patches-5.4/723-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
+++ b/target/linux/mvebu/patches-5.4/723-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch
@@ -21,7 +21,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
#define PHY_ID_AQR113 0x31c31c40
#define PHY_ID_AQCS109 0x03a1b5c2
#define PHY_ID_AQR405 0x03a1b4b0
-@@ -763,6 +765,22 @@ static struct phy_driver aqr_driver[] =
+@@ -776,6 +778,22 @@ static struct phy_driver aqr_driver[] =
.read_status = aqr107_read_status,
},
{
@@ -44,7 +44,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
PHY_ID_MATCH_MODEL(PHY_ID_AQR113),
.name = "Aquantia AQR113",
.config_aneg = aqr_config_aneg,
-@@ -789,6 +807,8 @@ static struct mdio_device_id __maybe_unu
+@@ -802,6 +820,8 @@ static struct mdio_device_id __maybe_unu
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR106) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR107) },
{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },