Unverified Commit 52d38cff authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt-for-6.5-1' of... 

Merge tag 'sunxi-dt-for-6.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt

- fix DCLK clock names
- new board ICnova A20 ADB4006
- add D1 SPI node
- add bluetooth node for chip board
- add extra mmc2 pinmux to sun5i
- add axp209 iio-hwmon node

* tag 'sunxi-dt-for-6.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: dts: axp209: Add iio-hwmon node for internal temperature
  ARM: dts: sun5i: Add port E pinmux settings for mmc2
  ARM: dts: sun5i: chip: Enable bluetooth
  riscv: dts: allwinner: d1: Add SPI controllers node
  arm: dts: sunxi: Add ICnova A20 ADB4006 board
  dt-bindings: arm: sunxi: add ICnova A20 ADB4006 binding
  ARM: dts: sunxi: rename tcon's clock output

Link: https://lore.kernel.org/r/20230609210452.GA17638@jernej-laptop


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a9c7f8d0 09d199b6

Documentation/devicetree/bindings/arm/sunxi.yaml

+6 −0
Original line number Diff line number Diff line
@@ -305,6 +305,12 @@ properties: 
          - const: allwinner,i12-tvbox

          - const: allwinner,sun7i-a20



      - description: ICnova A20 ADB4006

        items:

          - const: incircuit,icnova-a20-adb4006

          - const: incircuit,icnova-a20

          - const: allwinner,sun7i-a20



      - description: ICNova A20 SWAC

        items:

          - const: incircuit,icnova-a20-swac

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1337,6 +1337,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ 
	sun7i-a20-hummingbird.dtb \

	sun7i-a20-itead-ibox.dtb \

	sun7i-a20-i12-tvbox.dtb \

	sun7i-a20-icnova-a20-adb4006.dtb \

	sun7i-a20-icnova-swac.dtb \

	sun7i-a20-lamobo-r1.dtb \

	sun7i-a20-linutronix-testbox-v2.dtb \

arch/arm/boot/dts/axp209.dtsi

+7 −0
Original line number Diff line number Diff line
@@ -48,6 +48,13 @@ 
 * http://dl.linux-sunxi.org/AXP/AXP209%20Datasheet%20v1.0_cn.pdf

 */



/ {

	pmic-temp {

		compatible = "iio-hwmon";

		io-channels = <&axp_adc 4>; /* Internal temperature */

	};

};



&axp209 {

	compatible = "x-powers,axp209";

	interrupt-controller;

arch/arm/boot/dts/sun5i-r8-chip.dts

+6 −0
Original line number Diff line number Diff line
@@ -255,6 +255,12 @@ 
	pinctrl-0 = <&uart3_pg_pins>,

		    <&uart3_cts_rts_pg_pins>;

	status = "okay";



	bluetooth {

		compatible = "realtek,rtl8723bs-bt";

		device-wake-gpios = <&axp_gpio 3 GPIO_ACTIVE_HIGH>;

		host-wake-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>; /* PB3 */

	};

};



&usb_otg {

arch/arm/boot/dts/sun5i.dtsi

+10 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ 
			clock-names = "ahb",

				      "tcon-ch0",

				      "tcon-ch1";

			clock-output-names = "tcon-pixel-clock";

			clock-output-names = "tcon-data-clock";

			#clock-cells = <0>;

			status = "disabled";
@@ -517,6 +517,15 @@ 
				bias-pull-up;

			};



			/omit-if-no-ref/

			mmc2_4bit_pe_pins: mmc2-4bit-pe-pins {

				pins = "PE4", "PE5", "PE6", "PE7",

				       "PE8", "PE9";

				function = "mmc2";

				drive-strength = <30>;

				bias-pull-up;

			};



			mmc2_8bit_pins: mmc2-8bit-pins {

				pins = "PC6", "PC7", "PC8", "PC9",

				       "PC10", "PC11", "PC12", "PC13",