diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-12 10:38:54 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-07-12 10:38:54 +0000 |
| commit | 7c7e5c4276090357f57d9a43ba0d25a167b2a83c (patch) | |
| tree | 4935c53a401a00be6a8092cfadfc2a69cef47df4 /target/linux/mvebu | |
| parent | b2314679b639ddc338ef69d27ce4d959b250f754 (diff) | |
| download | upstream-7c7e5c4276090357f57d9a43ba0d25a167b2a83c.tar.gz upstream-7c7e5c4276090357f57d9a43ba0d25a167b2a83c.tar.bz2 upstream-7c7e5c4276090357f57d9a43ba0d25a167b2a83c.zip | |
mvebu: make patches apply against 3.18.18 again
commit r46299 broke the mvebu target because one patch does not apply
any more. This commit closes #20070.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 46303
Diffstat (limited to 'target/linux/mvebu')
6 files changed, 10 insertions, 11 deletions
diff --git a/target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch b/target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch index 5259e05ccb..ed36d680eb 100644 --- a/target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch +++ b/target/linux/mvebu/patches-3.18/015-move_armada_370_xp_pinctrl_node_definition.patch @@ -387,7 +387,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> gpio0: gpio@18100 { compatible = "marvell,orion-gpio"; reg = <0x18100 0x40>; -@@ -306,3 +245,63 @@ +@@ -314,3 +253,63 @@ }; }; }; @@ -497,7 +497,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> system-controller@18200 { compatible = "marvell,armada-370-xp-system-controller"; reg = <0x18200 0x500>; -@@ -238,3 +201,38 @@ +@@ -246,3 +209,38 @@ }; }; }; diff --git a/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch b/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch index 2d289706ad..4cccdb3b97 100644 --- a/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch +++ b/target/linux/mvebu/patches-3.18/016-common_armada_xp_uart2_3_pinctrl.patch @@ -35,7 +35,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> reg = <0x12300 0x100>; reg-shift = <2>; interrupts = <44>; -@@ -235,4 +239,14 @@ +@@ -243,4 +247,14 @@ "mpp33", "mpp34", "mpp35"; marvell,function = "sd0"; }; diff --git a/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch b/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch index 668d55dd07..9085db00d2 100644 --- a/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch +++ b/target/linux/mvebu/patches-3.18/017-define_and_use_common_armada_xp_spi_pinctrl_setting.patch @@ -54,7 +54,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> i2c0: i2c@11000 { compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; reg = <0x11000 0x100>; -@@ -240,6 +245,12 @@ +@@ -248,6 +253,12 @@ marvell,function = "sd0"; }; diff --git a/target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch b/target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch index e8f9d308cb..ca7b13bed4 100644 --- a/target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch +++ b/target/linux/mvebu/patches-3.18/018-normalize_pinctrl_entries_for_armada_socs.patch @@ -69,7 +69,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> }; --- a/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi -@@ -212,7 +212,7 @@ +@@ -220,7 +220,7 @@ }; &pinctrl { @@ -78,7 +78,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", "mpp4", "mpp5", "mpp6", "mpp7", -@@ -223,7 +223,7 @@ +@@ -231,7 +231,7 @@ marvell,function = "ge0"; }; @@ -87,7 +87,7 @@ Signed-off-by: Jason Cooper <jason@lakedaemon.net> marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", "mpp4", "mpp5", "mpp6", "mpp7", -@@ -231,7 +231,7 @@ +@@ -239,7 +239,7 @@ marvell,function = "ge0"; }; diff --git a/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch b/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch index fd75366e38..07f8e2994d 100644 --- a/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch +++ b/target/linux/mvebu/patches-3.18/023-pinctrl-mvebu-a38x-Add-UART1-muxing-options.patch @@ -17,9 +17,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- a/drivers/pinctrl/mvebu/pinctrl-armada-38x.c +++ b/drivers/pinctrl/mvebu/pinctrl-armada-38x.c -@@ -145,14 +145,16 @@ static struct mvebu_mpp_mode armada_38x_ +@@ -146,13 +146,15 @@ static struct mvebu_mpp_mode armada_38x_ MPP_VAR_FUNCTION(2, "ptp", "event_req", V_88F6810_PLUS), - MPP_VAR_FUNCTION(3, "pcie0", "clkreq", V_88F6810_PLUS), + MPP_VAR_FUNCTION(3, "ge0", "txerr", V_88F6810_PLUS), MPP_VAR_FUNCTION(4, "sata1", "prsnt", V_88F6810_PLUS), - MPP_VAR_FUNCTION(5, "ua0", "cts", V_88F6810_PLUS)), + MPP_VAR_FUNCTION(5, "ua0", "cts", V_88F6810_PLUS), @@ -28,7 +28,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> MPP_VAR_FUNCTION(0, "gpio", NULL, V_88F6810_PLUS), MPP_VAR_FUNCTION(1, "ge0", "txclk", V_88F6810_PLUS), MPP_VAR_FUNCTION(2, "ptp", "clk", V_88F6810_PLUS), - MPP_VAR_FUNCTION(3, "pcie1", "rstout", V_88F6820_PLUS), MPP_VAR_FUNCTION(4, "sata0", "prsnt", V_88F6810_PLUS), - MPP_VAR_FUNCTION(5, "ua0", "rts", V_88F6810_PLUS)), + MPP_VAR_FUNCTION(5, "ua0", "rts", V_88F6810_PLUS), diff --git a/target/linux/mvebu/patches-3.18/140-alias_mdio_node.patch b/target/linux/mvebu/patches-3.18/140-alias_mdio_node.patch index baca023e05..818fae74e6 100644 --- a/target/linux/mvebu/patches-3.18/140-alias_mdio_node.patch +++ b/target/linux/mvebu/patches-3.18/140-alias_mdio_node.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi -@@ -237,7 +237,7 @@ +@@ -236,7 +236,7 @@ status = "disabled"; }; |