mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-12-28 07:54:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 6865ed7ddc a5d7a8ab4b
commit 5eba504bb2
5 changed files with 5 additions and 5 deletions
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 */