summaryrefslogtreecommitdiff
path: root/arch/arm64/boot
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2019-04-28 12:40:48 -0700
committerOlof Johansson <olof@lixom.net>2019-04-28 12:40:48 -0700
commitf5d6e8c077915c84d8b544bc02e3df2f0910c193 (patch)
treee0d145883af000dc5043ccfcad3cdb76f920b46d /arch/arm64/boot
parent14d55a3df44a288a4d273dff2a5f08ae06614774 (diff)
parent6e0c67e34ffced703abb573d6266104b08bc95d4 (diff)
Merge tag 'sunxi-dt-for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/dt
Allwinner DT changes for 5.2 This PR is pretty significant, but it been mostly about: - Fixing the DTC warnings in most of our DT. We're now down to 2 warnings, from several thousands. - Fixing a good number of minor issues, typos, and so on thanks to the DT validation tools - Describe the MBUS controller and the special DMA RAM mapping on the A13 - Add support for the LRADC on the A83t - Add support for the I2C bus used for the PMIC on the A33 - Start using the DT annotation /omit-if-no-ref/ on our pinctrl nodes * tag 'sunxi-dt-for-5.2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (65 commits) ARM: dts: sun8i: a83t: Enable USB OTG controller on some boards ARM: dtsi: axp81x: add USB power supply node ARM: dts: sun5i: Reorder pinctrl nodes ARM: dts: sun6i: i7: Remove useless property ARM: dts: sun4i: lime: Fix the USB PHY ID detect GPIO properties ARM: dts: sun4i: protab2: Remove stale pinctrl-names entry ARM: dts: sunxi: Remove useless phy-names from EHCI and OHCI ARM: dts: sun8i: v40: bananapi-m2-berry: Sort device node dereferences. ARM: dts: sun5i: Add the MBUS controller dt-bindings: sunxi: Add compatible for OrangePi 3 board ARM: dts: sun8i: a83t: Add I2C2 pinmux setting for PE pins dt-bindings: arm: sunxi: Add Beelink GS1 board ARM: dts: sun8i: tbs-a711: Add support for volume keys input ARM: dts: sunxi: Add R_LRADC support for A83T ARM: dts: sunxi: Improve A33 NAND transfers by using DMA ARM: dts: sun8i: tbs-a711: Enable UART2 (for NEO-6M GPS module) ARM: dts: sunxi: Remove useless pinctrl nodes ARM: dts: sunxi: Remove pinctrl groups setting bias ARM: dts: sunxi: Remove useless address and size cells ARM: dts: sunxi: Conform to DT spec for NAND controller ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot')
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts2
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts2
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts2
-rw-r--r--arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index 7793ebb5d2b8..0a56c0c23ba1 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@ -104,7 +104,7 @@
};
&codec_analog {
- hpvcc-supply = <&reg_eldo1>;
+ cpvdd-supply = <&reg_eldo1>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index c0b9cc7a6b3a..b7ac6374b178 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -80,7 +80,7 @@
};
&codec_analog {
- hpvcc-supply = <&reg_eldo1>;
+ cpvdd-supply = <&reg_eldo1>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index d22736a62481..78c82a665c84 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -94,7 +94,7 @@
};
&codec_analog {
- hpvcc-supply = <&reg_eldo1>;
+ cpvdd-supply = <&reg_eldo1>;
status = "okay";
};
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
index d2651f284aa0..9d20e13f0c02 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine.dtsi
@@ -48,7 +48,7 @@
#include <dt-bindings/gpio/gpio.h>
&codec_analog {
- hpvcc-supply = <&reg_eldo1>;
+ cpvdd-supply = <&reg_eldo1>;
};
&mmc0 {