aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/dts/sun8i-h3-nanopi.dtsi
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2020-01-12 23:36:13 +0800
committerJagan Teki <jagan@amarulasolutions.com>2020-01-24 23:06:49 +0530
commitb5fe523bbc2a09069040ca70123246b251cd7daf (patch)
tree9a17c140b8bcac14e30e8e9530e3c34424c249cc /arch/arm/dts/sun8i-h3-nanopi.dtsi
parent5692e8f7b44c0794ecfe8de92bc64897518623d0 (diff)
downloadu-boot-b5fe523bbc2a09069040ca70123246b251cd7daf.zip
u-boot-b5fe523bbc2a09069040ca70123246b251cd7daf.tar.gz
u-boot-b5fe523bbc2a09069040ca70123246b251cd7daf.tar.bz2
sunxi: H3/H5 Sync DT files from upstream Linux kernel as of next-20200108
Sync the device tree files and device tree header files from upstream Linux kernel, as of 2020-01-08. The commit synced to in the sunxi repo 98d25b0b266d Merge branch 'sunxi/dt-for-5.6' into sunxi/for-next which is also part of next-20200108. Changes brought in include: - cleanup of pinmux node names - addition of Security ID, MBUS, CSI, crypto engine, video codec, pmu, and thermal sensor device nodes for both SoCs - addition of deinterlacing engine device node on H3 - cleanup of RTC device node and addition of its clocks - various board cleanups and improvements - removal of pinmux node for GPIO lines - cpufreq / DVFS - HDMI output - UART-based Bluetooth - audio codec - USB ports - new boards Most of the changes don't concern U-boot. Signed-off-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
Diffstat (limited to 'arch/arm/dts/sun8i-h3-nanopi.dtsi')
-rw-r--r--arch/arm/dts/sun8i-h3-nanopi.dtsi25
1 files changed, 1 insertions, 24 deletions
diff --git a/arch/arm/dts/sun8i-h3-nanopi.dtsi b/arch/arm/dts/sun8i-h3-nanopi.dtsi
index f110ee3..4df29a6 100644
--- a/arch/arm/dts/sun8i-h3-nanopi.dtsi
+++ b/arch/arm/dts/sun8i-h3-nanopi.dtsi
@@ -59,8 +59,6 @@
leds {
compatible = "gpio-leds";
- pinctrl-names = "default";
- pinctrl-0 = <&leds_npi>, <&leds_r_npi>;
status {
label = "nanopi:blue:status";
@@ -78,8 +76,6 @@
r_gpio_keys {
compatible = "gpio-keys";
input-name = "k1";
- pinctrl-names = "default";
- pinctrl-0 = <&sw_r_npi>;
k1 {
label = "k1";
@@ -104,28 +100,9 @@
status = "okay";
};
-&pio {
- leds_npi: led_pins {
- pins = "PA10";
- function = "gpio_out";
- };
-};
-
-&r_pio {
- leds_r_npi: led_pins {
- pins = "PL10";
- function = "gpio_out";
- };
-
- sw_r_npi: key_pins {
- pins = "PL3";
- function = "gpio_in";
- };
-};
-
&uart0 {
pinctrl-names = "default";
- pinctrl-0 = <&uart0_pins_a>;
+ pinctrl-0 = <&uart0_pa_pins>;
status = "okay";
};