tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'sunxi-fixes-for-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Mostly some fixes for a fallout in a PHY driver that pointed out errors
in our DTs. Along with that, Jernej agreed to be a reviewer!

* tag 'sunxi-fixes-for-5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm64: dts: allwinner: h5: OrangePi Prime: Fix ethernet node
arm64: dts: allwinner: a64: bananapi-m64: Enable RGMII RX/TX delay on PHY
arm64: dts: allwinner: h5: libretech-all-h5-cc: Enable RGMII RX/TX delay on PHY
ARM: dts: sunxi: bananapi-m2-plus: Enable RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun9i: Enable both RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun8i: a83t: Enable both RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun8i: h3: orangepi-plus2e: Enable RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun7i: bananapi-m1-plus: Enable RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun7i: cubietruck: Enable RGMII RX/TX delay on Ethernet PHY
ARM: dts: sun6i: a31-hummingbird: Enable RGMII RX/TX delay on Ethernet PHY
Revert "arm: sun8i: orangepi-pc-plus: Set EMAC activity LEDs to active high"
ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix ethernet node
arm64: dts: allwinner: h5: OrangePi PC2: Fix ethernet node
arm64: dts: allwinner: a64: Pine64 Plus: Fix ethernet node
arm64: dts: allwinner: a64: OrangePi Win: Fix ethernet node
arm64: dts: allwinner: Pine H64: Enable both RGMII RX/TX delay
arm64: dts: allwinner: beelink-gs1: Enable both RGMII RX/TX delay
arm64: dts: allwinner: pinetab: Drop unnecessary address/size-cells information
MAINTAINERS: Add Jernej Škrabec as a reviewer for Allwinner SoCs support

Link: https://lore.kernel.org/r/d1a1a6a6-fca4-4f1b-93b3-f2f6963b4e04.lettre@localhost
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann b57d5437 7e47a750

+19 -26
+1
MAINTAINERS
··· 1546 1546 ARM/Allwinner sunXi SoC support 1547 1547 M: Maxime Ripard <mripard@kernel.org> 1548 1548 M: Chen-Yu Tsai <wens@csie.org> 1549 + R: Jernej Skrabec <jernej.skrabec@siol.net> 1549 1550 L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 1550 1551 S: Maintained 1551 1552 T: git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git
+1 -1
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
··· 154 154 pinctrl-names = "default"; 155 155 pinctrl-0 = <&gmac_rgmii_pins>; 156 156 phy-handle = <&phy1>; 157 - phy-mode = "rgmii"; 157 + phy-mode = "rgmii-id"; 158 158 status = "okay"; 159 159 }; 160 160
+1 -1
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
··· 130 130 pinctrl-names = "default"; 131 131 pinctrl-0 = <&gmac_rgmii_pins>; 132 132 phy-handle = <&phy1>; 133 - phy-mode = "rgmii"; 133 + phy-mode = "rgmii-id"; 134 134 phy-supply = <&reg_gmac_3v3>; 135 135 status = "okay"; 136 136 };
+1 -1
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
··· 151 151 pinctrl-names = "default"; 152 152 pinctrl-0 = <&gmac_rgmii_pins>; 153 153 phy-handle = <&phy1>; 154 - phy-mode = "rgmii"; 154 + phy-mode = "rgmii-id"; 155 155 status = "okay"; 156 156 }; 157 157
+1 -1
arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
··· 131 131 pinctrl-0 = <&emac_rgmii_pins>; 132 132 phy-supply = <&reg_sw>; 133 133 phy-handle = <&rgmii_phy>; 134 - phy-mode = "rgmii"; 134 + phy-mode = "rgmii-id"; 135 135 allwinner,rx-delay-ps = <700>; 136 136 allwinner,tx-delay-ps = <700>; 137 137 status = "okay";
+1 -1
arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
··· 183 183 pinctrl-0 = <&emac_rgmii_pins>; 184 184 phy-supply = <&reg_dldo4>; 185 185 phy-handle = <&rgmii_phy>; 186 - phy-mode = "rgmii"; 186 + phy-mode = "rgmii-id"; 187 187 status = "okay"; 188 188 }; 189 189
-5
arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts
··· 53 53 }; 54 54 }; 55 55 56 - &emac { 57 - /* LEDs changed to active high on the plus */ 58 - /delete-property/ allwinner,leds-active-low; 59 - }; 60 - 61 56 &mmc1 { 62 57 vmmc-supply = <&reg_vcc3v3>; 63 58 bus-width = <4>;
+1 -1
arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts
··· 67 67 pinctrl-0 = <&emac_rgmii_pins>; 68 68 phy-supply = <&reg_gmac_3v3>; 69 69 phy-handle = <&ext_rgmii_phy>; 70 - phy-mode = "rgmii"; 70 + phy-mode = "rgmii-id"; 71 71 status = "okay"; 72 72 }; 73 73
+1 -1
arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts
··· 129 129 pinctrl-names = "default"; 130 130 pinctrl-0 = <&gmac_rgmii_pins>; 131 131 phy-handle = <&phy1>; 132 - phy-mode = "rgmii"; 132 + phy-mode = "rgmii-id"; 133 133 phy-supply = <&reg_dc1sw>; 134 134 status = "okay"; 135 135 };
+1 -1
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
··· 129 129 pinctrl-names = "default"; 130 130 pinctrl-0 = <&gmac_rgmii_pins>; 131 131 phy-handle = <&phy1>; 132 - phy-mode = "rgmii"; 132 + phy-mode = "rgmii-id"; 133 133 phy-supply = <&reg_cldo1>; 134 134 status = "okay"; 135 135 };
+1 -1
arch/arm/boot/dts/sun9i-a80-optimus.dts
··· 124 124 pinctrl-names = "default"; 125 125 pinctrl-0 = <&gmac_rgmii_pins>; 126 126 phy-handle = <&phy1>; 127 - phy-mode = "rgmii"; 127 + phy-mode = "rgmii-id"; 128 128 phy-supply = <&reg_cldo1>; 129 129 status = "okay"; 130 130 };
+1 -1
arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi
··· 126 126 pinctrl-0 = <&emac_rgmii_pins>; 127 127 phy-supply = <&reg_gmac_3v3>; 128 128 phy-handle = <&ext_rgmii_phy>; 129 - phy-mode = "rgmii"; 129 + phy-mode = "rgmii-id"; 130 130 131 131 status = "okay"; 132 132 };
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
··· 105 105 &emac { 106 106 pinctrl-names = "default"; 107 107 pinctrl-0 = <&rgmii_pins>; 108 - phy-mode = "rgmii"; 108 + phy-mode = "rgmii-id"; 109 109 phy-handle = <&ext_rgmii_phy>; 110 110 phy-supply = <&reg_dc1sw>; 111 111 status = "okay";
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
··· 120 120 &emac { 121 121 pinctrl-names = "default"; 122 122 pinctrl-0 = <&rgmii_pins>; 123 - phy-mode = "rgmii"; 123 + phy-mode = "rgmii-id"; 124 124 phy-handle = <&ext_rgmii_phy>; 125 125 phy-supply = <&reg_gmac_3v3>; 126 126 status = "okay";
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts
··· 13 13 &emac { 14 14 pinctrl-names = "default"; 15 15 pinctrl-0 = <&rgmii_pins>; 16 - phy-mode = "rgmii"; 16 + phy-mode = "rgmii-txid"; 17 17 phy-handle = <&ext_rgmii_phy>; 18 18 status = "okay"; 19 19 };
-3
arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
··· 122 122 status = "okay"; 123 123 124 124 port { 125 - #address-cells = <1>; 126 - #size-cells = <0>; 127 - 128 125 csi_ep: endpoint { 129 126 remote-endpoint = <&ov5640_ep>; 130 127 bus-width = <8>;
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h5-cc.dts
··· 36 36 pinctrl-0 = <&emac_rgmii_pins>; 37 37 phy-supply = <&reg_gmac_3v3>; 38 38 phy-handle = <&ext_rgmii_phy>; 39 - phy-mode = "rgmii"; 39 + phy-mode = "rgmii-id"; 40 40 /delete-property/ allwinner,leds-active-low; 41 41 status = "okay"; 42 42 };
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
··· 123 123 pinctrl-0 = <&emac_rgmii_pins>; 124 124 phy-supply = <&reg_gmac_3v3>; 125 125 phy-handle = <&ext_rgmii_phy>; 126 - phy-mode = "rgmii"; 126 + phy-mode = "rgmii-id"; 127 127 status = "okay"; 128 128 }; 129 129
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
··· 124 124 pinctrl-0 = <&emac_rgmii_pins>; 125 125 phy-supply = <&reg_gmac_3v3>; 126 126 phy-handle = <&ext_rgmii_phy>; 127 - phy-mode = "rgmii"; 127 + phy-mode = "rgmii-id"; 128 128 status = "okay"; 129 129 }; 130 130
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
··· 100 100 &emac { 101 101 pinctrl-names = "default"; 102 102 pinctrl-0 = <&ext_rgmii_pins>; 103 - phy-mode = "rgmii"; 103 + phy-mode = "rgmii-id"; 104 104 phy-handle = <&ext_rgmii_phy>; 105 105 phy-supply = <&reg_gmac_3v3>; 106 106 allwinner,rx-delay-ps = <200>;