Skip to content

Commit 339bbee

Browse files
EvilOlafigorpecovnik
authored andcommitted
meson64: rewrite current patches
1 parent 0077547 commit 339bbee

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

patch/kernel/archive/meson64-6.18/hwmon-emc2305-fixups-for-driver.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,15 @@ index 111111111111..222222222222 100644
185185
}
186186

187187
static umode_t
188-
@@ -657,6 +728,7 @@ static int emc2305_probe(struct i2c_client *client)
188+
@@ -655,6 +726,7 @@ static int emc2305_probe(struct i2c_client *client)
189189
data->pwm_min[i] = pdata->pwm_min[i];
190190
data->pwm_freq[i] = pdata->pwm_freq[i];
191191
}
192192
+ data->pwm_max = EMC2305_FAN_MAX;
193193
} else {
194194
data->max_state = EMC2305_FAN_MAX_STATE;
195195
data->pwm_separate = false;
196-
@@ -666,12 +738,24 @@ static int emc2305_probe(struct i2c_client *client)
196+
@@ -664,12 +736,24 @@ static int emc2305_probe(struct i2c_client *client)
197197
data->pwm_min[i] = EMC2305_FAN_MIN;
198198
data->pwm_freq[i] = base_freq_table[3];
199199
}

patch/kernel/archive/meson64-6.18/x-PATCH-v7-2-2-PCI-dwc-Remove-redundant-MPS-configuration.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ diff --git a/drivers/pci/controller/dwc/pci-meson.c b/drivers/pci/controller/dwc
1818
index 111111111111..222222222222 100644
1919
--- a/drivers/pci/controller/dwc/pci-meson.c
2020
+++ b/drivers/pci/controller/dwc/pci-meson.c
21-
@@ -257,22 +257,6 @@ static int meson_size_to_payload(struct meson_pcie *mp, int size)
21+
@@ -272,22 +272,6 @@ static int meson_size_to_payload(struct meson_pcie *mp, int size)
2222
return fls(size) - 8;
2323
}
2424

@@ -41,7 +41,7 @@ index 111111111111..222222222222 100644
4141
static void meson_set_max_rd_req_size(struct meson_pcie *mp, int size)
4242
{
4343
struct dw_pcie *pci = &mp->pci;
44-
@@ -347,7 +331,6 @@ static int meson_pcie_host_init(struct dw_pcie_rp *pp)
44+
@@ -362,7 +346,6 @@ static int meson_pcie_host_init(struct dw_pcie_rp *pp)
4545

4646
pp->bridge->ops = &meson_pci_ops;
4747

0 commit comments

Comments
 (0)