Commit 175a366f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-dt64-for-5.1-2' of... 

Merge tag 'sunxi-dt64-for-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt

Allwinner arm64 DT changes for 5.1, take 2

Our usual round of DT changes for the arm64 Allwinner SoCs:
  - Enabling of the various power supplies on most a64 boards
  - H6 SRAM controller support
  - A64 CSI support

* tag 'sunxi-dt64-for-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux

:
  arm64: dts: allwinner: a64: Enable PMIC power supplies on various boards
  arm64: dts: allwinner: a64: teres-i: enable power supplies
  arm64: dts: allwinner: h6: Add support for the SRAM C1 section
  dt-bindings: sram: sunxi: Add compatible for the H6 SRAM C1
  arm64: dts: allwinner: a64: Add A64 CSI controller
  arm64: dts: allwinner: h6: Move GIC device node fix base address ordering

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 51098f76 a24270af

Documentation/devicetree/bindings/sram/sunxi-sram.txt

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ The valid sections compatible for H5 are: 


The valid sections compatible for H6 are:

    - allwinner,sun50i-h6-sram-c, allwinner,sun50i-a64-sram-c

    - allwinner,sun50i-h6-sram-c1, allwinner,sun4i-a10-sram-c1



The valid sections compatible for F1C100s are:

    - allwinner,suniv-f1c100s-sram-d, allwinner,sun4i-a10-sram-d

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+8 −0
Original line number Diff line number Diff line
@@ -222,6 +222,14 @@ 


#include "axp803.dtsi"



&ac_power_supply {

	status = "okay";

};



&battery_power_supply {

	status = "okay";

};



&reg_aldo1 {

	/*

	 * This regulator also drives the PE pingroup GPIOs,

arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,10 @@ 


#include "axp803.dtsi"



&ac_power_supply {

	status = "okay";

};



&reg_aldo2 {

	regulator-always-on;

	regulator-min-microvolt = <1800000>;

arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts

+8 −0
Original line number Diff line number Diff line
@@ -177,6 +177,14 @@ 


#include "axp803.dtsi"



&ac_power_supply {

	status = "okay";

};



&battery_power_supply {

	status = "okay";

};



&reg_aldo1 {

	regulator-always-on;

	regulator-min-microvolt = <2800000>;

arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts

+8 −0
Original line number Diff line number Diff line
@@ -193,6 +193,14 @@ 


#include "axp803.dtsi"



&ac_power_supply {

	status = "okay";

};



&battery_power_supply {

	status = "okay";

};



&reg_aldo1 {

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE