Unverified Commit 5eba504b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-fixes-for-6.17' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 6865ed7d a5d7a8ab

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

+1 −1
Original line number Diff line number Diff line
@@ -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 */

arch/arm/boot/dts/allwinner/sun8i-r40.dtsi

+1 −1

File changed.

Contains only whitespace changes.

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

+1 −1

File changed.

Contains only whitespace changes.

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

+1 −1

File changed.

Contains only whitespace changes.

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

+1 −1

File changed.

Contains only whitespace changes.