Synchronize the Amlogic ARM64 dts from mainline Linux 4.13.5
In the preparation of the support of the Amlogic P212 board,
import the corresponding meson-gxl-s905x-p212.dts file.
Signed-off-by: Neil Armstrong
---
arch/arm/dts/Makefile | 3 +-
arch/arm/dts/meson-gx.dtsi| 13 +-
arch/arm/dts/meson-gxbb-odroidc2.dts | 108 ++---
arch/arm/dts/meson-gxbb.dtsi | 220 +++
arch/arm/dts/meson-gxl-mali.dtsi | 43 ++
arch/arm/dts/meson-gxl-s905x-p212.dts | 95 +
arch/arm/dts/meson-gxl-s905x-p212.dtsi| 173
arch/arm/dts/meson-gxl-s905x.dtsi | 55 +++
arch/arm/dts/meson-gxl.dtsi | 628 ++
include/dt-bindings/gpio/meson-gxl-gpio.h | 131 +++
10 files changed, 1326 insertions(+), 143 deletions(-)
create mode 100644 arch/arm/dts/meson-gxl-mali.dtsi
create mode 100644 arch/arm/dts/meson-gxl-s905x-p212.dts
create mode 100644 arch/arm/dts/meson-gxl-s905x-p212.dtsi
create mode 100644 arch/arm/dts/meson-gxl-s905x.dtsi
create mode 100644 arch/arm/dts/meson-gxl.dtsi
create mode 100644 include/dt-bindings/gpio/meson-gxl-gpio.h
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 5b90280..8a07f53 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -54,7 +54,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \
rk3399-puma-ddr1866.dtb \
rv1108-evb.dtb
dtb-$(CONFIG_ARCH_MESON) += \
- meson-gxbb-odroidc2.dtb
+ meson-gxbb-odroidc2.dtb \
+ meson-gxl-s905x-p212.dtb
dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
tegra20-medcom-wide.dtb \
tegra20-paz00.dtb \
diff --git a/arch/arm/dts/meson-gx.dtsi b/arch/arm/dts/meson-gx.dtsi
index 436b875..738ed68 100644
--- a/arch/arm/dts/meson-gx.dtsi
+++ b/arch/arm/dts/meson-gx.dtsi
@@ -200,7 +200,7 @@
};
scpi_sensors: sensors {
- compatible = "arm,scpi-sensors";
+ compatible = "amlogic,meson-gxbb-scpi-sensors",
"arm,scpi-sensors";
#thermal-sensor-cells = <1>;
};
};
@@ -304,6 +304,15 @@
status = "disabled";
};
+ spicc: spi@8d80 {
+ compatible = "amlogic,meson-gx-spicc";
+ reg = <0x0 0x08d80 0x0 0x80>;
+ interrupts = ;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
spifc: spi@8c80 {
compatible = "amlogic,meson-gx-spifc",
"amlogic,meson-gxbb-spifc";
reg = <0x0 0x08c80 0x0 0x80>;
@@ -391,7 +400,7 @@
};
pwm_AO_ab: pwm@550 {
- compatible = "amlogic,meson-gx-pwm",
"amlogic,meson-gxbb-pwm";
+ compatible = "amlogic,meson-gx-ao-pwm",
"amlogic,meson-gxbb-ao-pwm";
reg = <0x0 0x00550 0x0 0x10>;
#pwm-cells = <3>;
status = "disabled";
diff --git a/arch/arm/dts/meson-gxbb-odroidc2.dts
b/arch/arm/dts/meson-gxbb-odroidc2.dts
index 54a9c6a..d147c85 100644
--- a/arch/arm/dts/meson-gxbb-odroidc2.dts
+++ b/arch/arm/dts/meson-gxbb-odroidc2.dts
@@ -137,16 +137,6 @@
};
};
-&scpi_clocks {
- status = "disabled";
-};
-
-&uart_AO {
- status = "okay";
- pinctrl-0 = <&uart_ao_a_pins>;
- pinctrl-names = "default";
-};
-
ðmac {
status = "okay";
pinctrl-0 = <ð_rgmii_pins>;
@@ -172,6 +162,33 @@
};
};
+&gpio_ao {
+ /*
+* WARNING: The USB Hub on the Odroid-C2 needs a reset signal
+* to be turned high in order to be detected by the USB Controller
+* This signal should be handled by a USB specific power sequence
+* in order to reset the Hub when USB bus is powered down.
+*/
+ usb-hub {
+ gpio-hog;
+ gpios = ;
+ output-high;
+ line-name = "usb-hub-reset";
+ };
+};
+
+&i2c_A {
+ status = "okay";
+ pinctrl-0 = <&i2c_a_pins>;
+ pinctrl-names = "default";
+};
+
+&ir {
+ status = "okay";
+ pinctrl-0 = <&remote_input_ao_pins>;
+ pinctrl-names = "default";
+};
+
&pinctrl_aobus {
gpio-line-names = "UART TX", "UART RX", "VCCK En", "TF 3V3/1V8 En",
"USB HUB nRESET", "USB OTG Power En",
@@ -223,55 +240,15 @@
"";
};
-&ir {
- status = "okay";
- pinctrl-0 = <&remote_input_ao_pins>;
- pinctrl-names = "default";
-};
-
-&i2c_A {
- status = "okay";
- pinctrl-0 = <&i2c_a_pins>;
- pinctrl-names = "default";
-};
-
