kernel: bump 5.15 to 5.15.153
Removed because they are upstream:
generic/backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=c5c0760adc260d55265c086b9efb350ea6dda38b
generic/pending-5.15/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=448cc8b5f743985f6d1d98aa4efb386fef4c3bf2
generic/pending-5.15/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=9fcadd125044007351905d40c405fadc2d3bb6d6
Add new configuration symbols for tegra target.
Tested-by: Stijn Segers <foss@volatilesystems.org>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit fb2c6e9d4d)
This commit is contained in:
@@ -43,10 +43,10 @@
|
||||
memory@40000000 {
|
||||
- reg = <0 0x40000000 0 0x20000000>;
|
||||
+ reg = <0 0x40000000 0 0x40000000>;
|
||||
device_type = "memory";
|
||||
};
|
||||
|
||||
reg_1p8v: regulator-1p8v {
|
||||
@@ -132,22 +130,22 @@
|
||||
@@ -133,22 +131,22 @@
|
||||
|
||||
port@0 {
|
||||
reg = <0>;
|
||||
@@ -73,7 +73,7 @@
|
||||
};
|
||||
|
||||
port@4 {
|
||||
@@ -236,15 +234,28 @@
|
||||
@@ -237,15 +235,28 @@
|
||||
|
||||
&pcie {
|
||||
pinctrl-names = "default";
|
||||
@@ -103,7 +103,7 @@
|
||||
/* eMMC is shared pin with parallel NAND */
|
||||
emmc_pins_default: emmc-pins-default {
|
||||
mux {
|
||||
@@ -521,11 +532,11 @@
|
||||
@@ -522,11 +533,11 @@
|
||||
};
|
||||
|
||||
&sata {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
};
|
||||
|
||||
chosen {
|
||||
@@ -160,22 +161,22 @@
|
||||
@@ -161,22 +162,22 @@
|
||||
|
||||
port@1 {
|
||||
reg = <1>;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
@@ -564,12 +564,16 @@
|
||||
@@ -565,12 +565,16 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
@@ -259,14 +259,42 @@
|
||||
@@ -260,14 +260,42 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
@@ -539,6 +539,65 @@
|
||||
@@ -540,6 +540,65 @@
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
@@ -580,7 +580,7 @@
|
||||
@@ -581,7 +581,7 @@
|
||||
reg = <0x140000 0x0080000>;
|
||||
};
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
label = "Factory";
|
||||
reg = <0x1c0000 0x0100000>;
|
||||
};
|
||||
@@ -641,5 +641,6 @@
|
||||
@@ -642,5 +642,6 @@
|
||||
&wmac {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&wmac_pins>;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
@@ -160,6 +160,10 @@
|
||||
@@ -161,6 +161,10 @@
|
||||
switch@0 {
|
||||
compatible = "mediatek,mt7531";
|
||||
reg = <0>;
|
||||
|
||||
@@ -434,7 +434,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
if (!master->can_dma(master, NULL, trans)) {
|
||||
if (trans->rx_buf) {
|
||||
cnt = mdata->xfer_len / 4;
|
||||
@@ -716,6 +812,274 @@ static irqreturn_t mtk_spi_interrupt(int
|
||||
@@ -718,6 +814,274 @@ static irqreturn_t mtk_spi_interrupt(int
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
@@ -709,7 +709,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
static int mtk_spi_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master;
|
||||
@@ -739,6 +1103,7 @@ static int mtk_spi_probe(struct platform
|
||||
@@ -741,6 +1105,7 @@ static int mtk_spi_probe(struct platform
|
||||
master->can_dma = mtk_spi_can_dma;
|
||||
master->setup = mtk_spi_setup;
|
||||
master->set_cs_timing = mtk_spi_set_hw_cs_timing;
|
||||
@@ -717,7 +717,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
of_id = of_match_node(mtk_spi_of_match, pdev->dev.of_node);
|
||||
if (!of_id) {
|
||||
@@ -755,6 +1120,14 @@ static int mtk_spi_probe(struct platform
|
||||
@@ -757,6 +1122,14 @@ static int mtk_spi_probe(struct platform
|
||||
|
||||
if (mdata->dev_comp->must_tx)
|
||||
master->flags = SPI_MASTER_MUST_TX;
|
||||
@@ -732,7 +732,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
if (mdata->dev_comp->need_pad_sel) {
|
||||
mdata->pad_num = of_property_count_u32_elems(
|
||||
@@ -831,25 +1204,40 @@ static int mtk_spi_probe(struct platform
|
||||
@@ -833,25 +1206,40 @@ static int mtk_spi_probe(struct platform
|
||||
goto err_put_master;
|
||||
}
|
||||
|
||||
@@ -778,7 +778,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
pm_runtime_enable(&pdev->dev);
|
||||
|
||||
@@ -862,25 +1250,12 @@ static int mtk_spi_probe(struct platform
|
||||
@@ -864,25 +1252,12 @@ static int mtk_spi_probe(struct platform
|
||||
goto err_disable_runtime_pm;
|
||||
}
|
||||
|
||||
@@ -805,7 +805,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
}
|
||||
|
||||
if (mdata->dev_comp->dma_ext)
|
||||
@@ -902,6 +1277,10 @@ static int mtk_spi_probe(struct platform
|
||||
@@ -904,6 +1279,10 @@ static int mtk_spi_probe(struct platform
|
||||
|
||||
err_disable_runtime_pm:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
@@ -816,7 +816,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
err_put_master:
|
||||
spi_master_put(master);
|
||||
|
||||
@@ -920,8 +1299,10 @@ static int mtk_spi_remove(struct platfor
|
||||
@@ -922,8 +1301,10 @@ static int mtk_spi_remove(struct platfor
|
||||
|
||||
mtk_spi_reset(mdata);
|
||||
|
||||
@@ -828,7 +828,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
pm_runtime_put_noidle(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
@@ -940,8 +1321,10 @@ static int mtk_spi_suspend(struct device
|
||||
@@ -942,8 +1323,10 @@ static int mtk_spi_suspend(struct device
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -840,7 +840,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -958,11 +1341,20 @@ static int mtk_spi_resume(struct device
|
||||
@@ -960,11 +1343,20 @@ static int mtk_spi_resume(struct device
|
||||
dev_err(dev, "failed to enable spi_clk (%d)\n", ret);
|
||||
return ret;
|
||||
}
|
||||
@@ -862,7 +862,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -974,10 +1366,13 @@ static int mtk_spi_runtime_suspend(struc
|
||||
@@ -976,10 +1368,13 @@ static int mtk_spi_runtime_suspend(struc
|
||||
struct spi_master *master = dev_get_drvdata(dev);
|
||||
struct mtk_spi *mdata = spi_master_get_devdata(master);
|
||||
|
||||
@@ -878,7 +878,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -988,13 +1383,31 @@ static int mtk_spi_runtime_resume(struct
|
||||
@@ -990,13 +1385,31 @@ static int mtk_spi_runtime_resume(struct
|
||||
struct mtk_spi *mdata = spi_master_get_devdata(master);
|
||||
int ret;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
@@ -553,6 +553,7 @@
|
||||
@@ -554,6 +554,7 @@
|
||||
spi-tx-bus-width = <4>;
|
||||
spi-rx-bus-width = <4>;
|
||||
nand-ecc-engine = <&snfi>;
|
||||
|
||||
@@ -97,7 +97,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
if (mdata->dev_comp->need_pad_sel && spi->cs_gpiod)
|
||||
/* CS de-asserted, gpiolib will handle inversion */
|
||||
gpiod_direction_output(spi->cs_gpiod, 0);
|
||||
@@ -1115,6 +1103,10 @@ static int mtk_spi_probe(struct platform
|
||||
@@ -1117,6 +1105,10 @@ static int mtk_spi_probe(struct platform
|
||||
mdata = spi_master_get_devdata(master);
|
||||
mdata->dev_comp = of_id->data;
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
|
||||
--- a/drivers/spi/spi-mt65xx.c
|
||||
+++ b/drivers/spi/spi-mt65xx.c
|
||||
@@ -800,6 +800,21 @@ static irqreturn_t mtk_spi_interrupt(int
|
||||
@@ -802,6 +802,21 @@ static irqreturn_t mtk_spi_interrupt(int
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
static int mtk_spi_mem_adjust_op_size(struct spi_mem *mem,
|
||||
struct spi_mem_op *op)
|
||||
{
|
||||
@@ -1092,6 +1107,7 @@ static int mtk_spi_probe(struct platform
|
||||
@@ -1094,6 +1109,7 @@ static int mtk_spi_probe(struct platform
|
||||
master->setup = mtk_spi_setup;
|
||||
master->set_cs_timing = mtk_spi_set_hw_cs_timing;
|
||||
master->use_gpio_descriptors = true;
|
||||
|
||||
@@ -138,7 +138,7 @@ Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
|
||||
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
@@ -302,18 +302,16 @@
|
||||
@@ -303,18 +303,16 @@
|
||||
};
|
||||
};
|
||||
|
||||
@@ -166,7 +166,7 @@ Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
|
||||
&pio {
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
|
||||
@@ -232,18 +232,16 @@
|
||||
@@ -233,18 +233,16 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
@@ -318,7 +318,7 @@
|
||||
@@ -319,7 +319,7 @@
|
||||
/* Attention: GPIO 90 is used to switch between PCIe@1,0 and
|
||||
* SATA functions. i.e. output-high: PCIe, output-low: SATA
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||
@@ -645,5 +645,28 @@
|
||||
@@ -646,5 +646,28 @@
|
||||
};
|
||||
|
||||
&wmac {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/spi/spi-mt65xx.c
|
||||
+++ b/drivers/spi/spi-mt65xx.c
|
||||
@@ -1231,10 +1231,16 @@ static int mtk_spi_probe(struct platform
|
||||
@@ -1233,10 +1233,16 @@ static int mtk_spi_probe(struct platform
|
||||
goto err_disable_spi_hclk;
|
||||
}
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
}
|
||||
|
||||
mdata->spi_clk_hz = clk_get_rate(mdata->spi_clk);
|
||||
@@ -1285,6 +1291,8 @@ static int mtk_spi_probe(struct platform
|
||||
@@ -1287,6 +1293,8 @@ static int mtk_spi_probe(struct platform
|
||||
|
||||
err_disable_runtime_pm:
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
Reference in New Issue
Block a user