github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 03:27:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Allwinner fixes for 6.17

Browse Source 
Two device tree style cleanups from the device tree maintainers.
 -----BEGIN PGP SIGNATURE-----
 
 iQJCBAABCgAsFiEE2nN1m/hhnkhOWjtHOJpUIZwPJDAFAmjK4l0OHHdlbnNAY3Np
 ZS5vcmcACgkQOJpUIZwPJDAdNxAAyr4rjXOMg5hNdhoAJYHoB8OtfzXBfPNk7gSH
 n5EIZqJsH4yUBHY/ULrCeePRXb9RczsrV6vSucRT2RnejUhMf8XXDHSY9GO5KJZV
 muhGpHGeijVDi1MgGdUKA3TOE7HFGMDHwHOhn0kxZFpUIl5uLzQGhhzH4yVg9RDU
 s6xqyeTAg3LQmSwS7wJIcT2W26+Ggj0KeqDb5II5UfWKgxcib9oo/WjzEGNpVOYr
 FqoDbboF/K9pHTaJGdUMJnKL6Fu647owc+uwL4UJFlS8jdKtQ10/bysdIZ41hvjr
 bZvfxTFz7UvnGeWbzulMs8nVl4ifPGsJEPpe17gZ9E111TpZqClJAHeJNt4ajKZ/
 Wx8QOZr2qsfnEl34U9IixUUdfsdTvWWSRduJOet+kj9FCPBOPw9sX4eshOZVT3uV
 OcZeLlVgUTUI9QH2yWUDb0s9m4evSv+QZF2jAl6zADw7OCO2mkLOc1/2dhJFMc0X
 88Q/wGiB1bD94Su5VNwAp6afcopMNYeXuZfRTTJ3mexOQ5S2akpiLDE41y+SQb9p
 uUcc4DDHlZZzKLe6wFMbbqSROUq/LqSPOBa8OGBOblgGZeVtIsyO6Kg7NFdJ30Ij
 +qvst6ny1wbohQf5D1F23DWCCDnIPFf0X+GAJ1JzR4eW2HPASYrE7refV9uds+hC
 s32yPxQ=
 =VlZ3
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmjTA4EACgkQmmx57+YA
 GNng4g//Ug+NDzj217MjXMNogJkc/MZoJh7QJuW6YiH7++XykJ9RH4drbXvYDm/K
 dYP9u39j4ZUtrL8CJe1YxOOQxHXKG6IK69FMqRDiGQcWFBWsVZprAlEFRnMluM5J
 b/Pq78fFZhJjL9absM2oFkz0Se0a9MzIxvDJYKO+WeLqxKIwRBdaGzhEuiejmemC
 lupZbE/kh05gY1i8oGy5njbSjoFSVkftkNbRpYbUXErpclppFV53DEv393Zg7SSI
 EQuzeDY8NFC7KBGBvaJvSdOOeW9VRugVhWUvU+SEqeSQbdZc/LuQmYmfHS50W8np
 7KQ/5znXQXr8JBUmh/GkxTTFYCiZdOA21r3/8hBiku0144ZBsw+x5sBOhUOW2eQg
 l+l+xZzDnP586mPJz/MbluiV5l4ibup060HN8Ws8zJfi4jUkOeKCMUDIUAC1UrJb
 xaQilNilTN/2UgeRFCztq3IOP/lLPRlA+gPy7Kozn3I3Zk5nhKd+MpBd1kIpv/WD
 Nteskf00YC1R656j+3Of7OywoTXeotmUm/R6Byihxf8qcU4Euo4bgTcLNfdknDvN
 gEi3yW1gj/rqO7ZxVhr9KIY/wMexwlXGZsanjFfgRZpepc+k+PJ4xkP1jVqYIIcN
 0F953PgnJD8vfP66CI8HsArYTek7zEzkeu5meBE/WDg1ZFIlcuM=
 =pWOK
 -----END PGP SIGNATURE-----

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

Allwinner fixes for 6.17

Two device tree style cleanups from the device tree maintainers.

* tag 'sunxi-fixes-for-6.17' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  riscv: dts: allwinner: rename devterm i2c-gpio node to comply with binding
  ARM: dts: allwinner: Minor whitespace cleanup

Link: https://lore.kernel.org/r/aMrsUfkTWx8g3bJ7@wens.tw
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-09-23 22:30:55 +02:00
commit 5eba504bb2
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/allwinner/sun4i-a10-olinuxino-lime.dts
View File

@ -218,7 +218,7 @@ &usb_otg {
&usbphy {
usb0_id_det-gpios = <&pio 7 4 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 (GPIO_ACTIVE_HIGH | GPIO_PULL_UP)>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>;
usb0_vbus-supply = <&reg_usb0_vbus>;
usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay";

2
arch/arm/boot/dts/allwinner/sun8i-q8-common.dtsi
View File

@ -82,7 +82,7 @@ &de {
};
&ehci0 {
status = "okay";
status = "okay";
};
&mmc1 {

2
arch/arm/boot/dts/allwinner/sun8i-r40.dtsi
View File

@ -705,7 +705,7 @@ uart2_pi_pins: uart2-pi-pins {
};
/omit-if-no-ref/
uart2_rts_cts_pi_pins: uart2-rts-cts-pi-pins{
uart2_rts_cts_pi_pins: uart2-rts-cts-pi-pins {
pins = "PI16", "PI17";
function = "uart2";
};

2
arch/arm/boot/dts/allwinner/sun8i-v3s-netcube-kumquat.dts
View File

@ -29,7 +29,7 @@ chosen {
clk_can0: clock-can0 {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <40000000>;
clock-frequency = <40000000>;
};
gpio-keys {

2
arch/riscv/boot/dts/allwinner/sun20i-d1-devterm-v3.14.dts
View File

@ -17,7 +17,7 @@ fan {
#cooling-cells = <2>;
};
i2c-gpio-0 {
i2c-0 {
compatible = "i2c-gpio";
sda-gpios = <&pio 3 14 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; /* PD14/GPIO44 */
scl-gpios = <&pio 3 15 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; /* PD15/GPIO45 */