[PATCH] sunxi: DT: A64: update devicetree files
Jernej Škrabec
jernej.skrabec at siol.net
Wed Apr 21 23:16:48 CEST 2021
Hi Andre!
Dne sreda, 21. april 2021 ob 11:27:12 CEST je Andre Przywara napisal(a):
> Import updated devicetree file from Linux v5.12-rc8.
>
> Besides some node and audio port renames this changes the PHY modes to
> either rgmii-id or rgmii-txid. From the board files the Pinephone sees
> a lot of updates.
>
> This also adds the long missing USB PHY property for controller 0, which
> allows the U-Boot PHY driver to eventually use port 0 in host mode
> (pending another U-Boot patch).
>
> Signed-off-by: Andre Przywara <andre.przywara at arm.com>
> ---
> arch/arm/dts/sun50i-a64-bananapi-m64.dts | 16 ++--
> arch/arm/dts/sun50i-a64-nanopi-a64.dts | 2 +-
> arch/arm/dts/sun50i-a64-orangepi-win.dts | 10 +--
> arch/arm/dts/sun50i-a64-pine64-lts.dts | 15 ++++
> arch/arm/dts/sun50i-a64-pine64-plus.dts | 2 +-
> arch/arm/dts/sun50i-a64-pine64.dts | 8 +-
> arch/arm/dts/sun50i-a64-pinebook.dts | 13 ++-
> arch/arm/dts/sun50i-a64-pinephone-1.0.dts | 7 +-
> arch/arm/dts/sun50i-a64-pinephone-1.1.dts | 7 +-
> arch/arm/dts/sun50i-a64-pinephone-1.2.dts | 16 +++-
> arch/arm/dts/sun50i-a64-pinephone.dtsi | 90 +++++++++++++++----
> .../dts/sun50i-a64-pinetab-early-adopter.dts | 26 ++++++
> arch/arm/dts/sun50i-a64-pinetab.dts | 13 ++-
> arch/arm/dts/sun50i-a64-sopine-baseboard.dts | 11 +--
> arch/arm/dts/sun50i-a64-sopine.dtsi | 3 +-
> arch/arm/dts/sun50i-a64-teres-i.dts | 12 +--
> arch/arm/dts/sun50i-a64.dtsi | 40 ++++++---
> 17 files changed, 215 insertions(+), 76 deletions(-)
> create mode 100644 arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts
>
> diff --git a/arch/arm/dts/sun50i-a64-bananapi-m64.dts b/arch/arm/dts/sun50i-
a64-bananapi-m64.dts
> index 883f217efb8..f7fe9fa50cb 100644
> --- a/arch/arm/dts/sun50i-a64-bananapi-m64.dts
> +++ b/arch/arm/dts/sun50i-a64-bananapi-m64.dts
> @@ -36,18 +36,18 @@
> leds {
> compatible = "gpio-leds";
>
> - pwr-led {
> + led-0 {
> label = "bananapi-m64:red:pwr";
> gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /*
PD24 */
> default-state = "on";
> };
>
> - green {
> + led-1 {
> label = "bananapi-m64:green:user";
> gpios = <&pio 4 14 GPIO_ACTIVE_HIGH>; /*
PE14 */
> };
>
> - blue {
> + led-2 {
> label = "bananapi-m64:blue:user";
> gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; /*
PE15 */
> };
> @@ -105,7 +105,7 @@
> &emac {
> pinctrl-names = "default";
> pinctrl-0 = <&rgmii_pins>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-handle = <&ext_rgmii_phy>;
> phy-supply = <®_dc1sw>;
> status = "okay";
> @@ -331,10 +331,10 @@
> "Microphone", "Microphone
Jack",
> "Microphone", "Onboard
Microphone";
> simple-audio-card,routing =
> - "Left DAC", "AIF1 Slot 0 Left",
> - "Right DAC", "AIF1 Slot 0 Right",
> - "AIF1 Slot 0 Left ADC", "Left ADC",
> - "AIF1 Slot 0 Right ADC", "Right ADC",
> + "Left DAC", "DACL",
> + "Right DAC", "DACR",
> + "ADCL", "Left ADC",
> + "ADCR", "Right ADC",
> "Headphone Jack", "HP",
> "MIC2", "Microphone Jack",
> "Onboard Microphone", "MBIAS",
> diff --git a/arch/arm/dts/sun50i-a64-nanopi-a64.dts b/arch/arm/dts/sun50i-
a64-nanopi-a64.dts
> index e58db8a6cab..09b3c7fb82c 100644
> --- a/arch/arm/dts/sun50i-a64-nanopi-a64.dts
> +++ b/arch/arm/dts/sun50i-a64-nanopi-a64.dts
> @@ -35,7 +35,7 @@
> leds {
> compatible = "gpio-leds";
>
> - blue {
> + led {
> label = "nanopi-a64:blue:status";
> gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24
*/
> };
> diff --git a/arch/arm/dts/sun50i-a64-orangepi-win.dts b/arch/arm/dts/sun50i-
a64-orangepi-win.dts
> index fde9c7a99b1..70e31743f0b 100644
> --- a/arch/arm/dts/sun50i-a64-orangepi-win.dts
> +++ b/arch/arm/dts/sun50i-a64-orangepi-win.dts
> @@ -120,7 +120,7 @@
> &emac {
> pinctrl-names = "default";
> pinctrl-0 = <&rgmii_pins>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-handle = <&ext_rgmii_phy>;
> phy-supply = <®_gmac_3v3>;
> status = "okay";
> @@ -330,10 +330,10 @@
> "Microphone", "Microphone
Jack",
> "Microphone", "Onboard
Microphone";
> simple-audio-card,routing =
> - "Left DAC", "AIF1 Slot 0 Left",
> - "Right DAC", "AIF1 Slot 0 Right",
> - "AIF1 Slot 0 Left ADC", "Left ADC",
> - "AIF1 Slot 0 Right ADC", "Right ADC",
> + "Left DAC", "DACL",
> + "Right DAC", "DACR",
> + "ADCL", "Left ADC",
> + "ADCR", "Right ADC",
> "Headphone Jack", "HP",
> "MIC2", "Microphone Jack",
> "Onboard Microphone", "MBIAS",
> diff --git a/arch/arm/dts/sun50i-a64-pine64-lts.dts b/arch/arm/dts/sun50i-
a64-pine64-lts.dts
> index 302e24be0a3..e79ce49e7e6 100644
> --- a/arch/arm/dts/sun50i-a64-pine64-lts.dts
> +++ b/arch/arm/dts/sun50i-a64-pine64-lts.dts
> @@ -1,10 +1,25 @@
> // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> // Copyright (c) 2018 ARM Ltd.
>
> +#include <dt-bindings/leds/common.h>
> #include "sun50i-a64-sopine-baseboard.dts"
>
> / {
> model = "Pine64 LTS";
> compatible = "pine64,pine64-lts", "allwinner,sun50i-r18",
> "allwinner,sun50i-a64";
> +
> + leds {
> + compatible = "gpio-leds";
> +
> + led {
> + function = LED_FUNCTION_STATUS;
> + color = <LED_COLOR_ID_BLUE>;
> + gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7
*/
> + };
> + };
> +};
> +
> +&mmc0 {
> + cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */
> };
Do you really want to use this version? Today I got another report that this
doesn't work. Or do you plan to fix it in -rc release?
Best regards,
Jernej
> diff --git a/arch/arm/dts/sun50i-a64-pine64-plus.dts b/arch/arm/dts/sun50i-
a64-pine64-plus.dts
> index b26181cf909..b54099b654c 100644
> --- a/arch/arm/dts/sun50i-a64-pine64-plus.dts
> +++ b/arch/arm/dts/sun50i-a64-pine64-plus.dts
> @@ -13,7 +13,7 @@
> &emac {
> pinctrl-names = "default";
> pinctrl-0 = <&rgmii_pins>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-txid";
> phy-handle = <&ext_rgmii_phy>;
> status = "okay";
> };
> diff --git a/arch/arm/dts/sun50i-a64-pine64.dts b/arch/arm/dts/sun50i-a64-
pine64.dts
> index 2165f238af1..329cf276561 100644
> --- a/arch/arm/dts/sun50i-a64-pine64.dts
> +++ b/arch/arm/dts/sun50i-a64-pine64.dts
> @@ -261,11 +261,11 @@
> simple-audio-card,widgets = "Microphone", "Microphone Jack",
> "Headphone", "Headphone
Jack";
> simple-audio-card,routing =
> - "Left DAC", "AIF1 Slot 0 Left",
> - "Right DAC", "AIF1 Slot 0 Right",
> + "Left DAC", "DACL",
> + "Right DAC", "DACR",
> "Headphone Jack", "HP",
> - "AIF1 Slot 0 Left ADC", "Left ADC",
> - "AIF1 Slot 0 Right ADC", "Right ADC",
> + "ADCL", "Left ADC",
> + "ADCR", "Right ADC",
> "MIC2", "Microphone Jack";
> status = "okay";
> };
> diff --git a/arch/arm/dts/sun50i-a64-pinebook.dts b/arch/arm/dts/sun50i-a64-
pinebook.dts
> index 64b1c54f87c..7ae16541d14 100644
> --- a/arch/arm/dts/sun50i-a64-pinebook.dts
> +++ b/arch/arm/dts/sun50i-a64-pinebook.dts
> @@ -126,8 +126,6 @@
> };
>
> &ehci0 {
> - phys = <&usbphy 0>;
> - phy-names = "usb";
> status = "okay";
> };
>
> @@ -169,6 +167,7 @@
> pinctrl-0 = <&mmc2_pins>, <&mmc2_ds_pin>;
> vmmc-supply = <®_dcdc1>;
> vqmmc-supply = <®_eldo1>;
> + max-frequency = <200000000>;
> bus-width = <8>;
> non-removable;
> cap-mmc-hw-reset;
> @@ -177,8 +176,6 @@
> };
>
> &ohci0 {
> - phys = <&usbphy 0>;
> - phy-names = "usb";
> status = "okay";
> };
>
> @@ -374,15 +371,15 @@
> "Headphone", "Headphone
Jack",
> "Speaker", "Internal
Speaker";
> simple-audio-card,routing =
> - "Left DAC", "AIF1 Slot 0 Left",
> - "Right DAC", "AIF1 Slot 0 Right",
> + "Left DAC", "DACL",
> + "Right DAC", "DACR",
> "Speaker Amp INL", "LINEOUT",
> "Speaker Amp INR", "LINEOUT",
> "Internal Speaker", "Speaker Amp OUTL",
> "Internal Speaker", "Speaker Amp OUTR",
> "Headphone Jack", "HP",
> - "AIF1 Slot 0 Left ADC", "Left ADC",
> - "AIF1 Slot 0 Right ADC", "Right ADC",
> + "ADCL", "Left ADC",
> + "ADCR", "Right ADC",
> "Internal Microphone Left", "MBIAS",
> "MIC1", "Internal Microphone Left",
> "Internal Microphone Right", "HBIAS",
> diff --git a/arch/arm/dts/sun50i-a64-pinephone-1.0.dts b/arch/arm/dts/sun50i-
a64-pinephone-1.0.dts
> index 0c42272106a..fb65319a3bd 100644
> --- a/arch/arm/dts/sun50i-a64-pinephone-1.0.dts
> +++ b/arch/arm/dts/sun50i-a64-pinephone-1.0.dts
> @@ -7,5 +7,10 @@
>
> / {
> model = "Pine64 PinePhone Developer Batch (1.0)";
> - compatible = "pine64,pinephone-1.0", "allwinner,sun50i-a64";
> + compatible = "pine64,pinephone-1.0", "pine64,pinephone",
"allwinner,sun50i-a64";
> +};
> +
> +&sgm3140 {
> + enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
> + flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
> };
> diff --git a/arch/arm/dts/sun50i-a64-pinephone-1.1.dts b/arch/arm/dts/sun50i-
a64-pinephone-1.1.dts
> index 3e99a87e9ce..5e59d375217 100644
> --- a/arch/arm/dts/sun50i-a64-pinephone-1.1.dts
> +++ b/arch/arm/dts/sun50i-a64-pinephone-1.1.dts
> @@ -7,7 +7,7 @@
>
> / {
> model = "Pine64 PinePhone Braveheart (1.1)";
> - compatible = "pine64,pinephone-1.1", "allwinner,sun50i-a64";
> + compatible = "pine64,pinephone-1.1", "pine64,pinephone",
"allwinner,sun50i-a64";
> };
>
> &backlight {
> @@ -28,3 +28,8 @@
> num-interpolated-steps = <50>;
> default-brightness-level = <400>;
> };
> +
> +&sgm3140 {
> + enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
> + flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
> +};
> diff --git a/arch/arm/dts/sun50i-a64-pinephone-1.2.dts b/arch/arm/dts/sun50i-
a64-pinephone-1.2.dts
> index a9f5b670c9b..4e7e237cb46 100644
> --- a/arch/arm/dts/sun50i-a64-pinephone-1.2.dts
> +++ b/arch/arm/dts/sun50i-a64-pinephone-1.2.dts
> @@ -7,7 +7,12 @@
>
> / {
> model = "Pine64 PinePhone (1.2)";
> - compatible = "pine64,pinephone-1.2", "allwinner,sun50i-a64";
> + compatible = "pine64,pinephone-1.2", "pine64,pinephone",
"allwinner,sun50i-a64";
> +
> + wifi_pwrseq: wifi-pwrseq {
> + compatible = "mmc-pwrseq-simple";
> + reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
> + };
> };
>
> &backlight {
> @@ -38,3 +43,12 @@
> interrupt-parent = <&pio>;
> interrupts = <1 1 IRQ_TYPE_EDGE_RISING>; /* PB1 */
> };
> +
> +&mmc1 {
> + mmc-pwrseq = <&wifi_pwrseq>;
> +};
> +
> +&sgm3140 {
> + enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
> + flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
> +};
> diff --git a/arch/arm/dts/sun50i-a64-pinephone.dtsi b/arch/arm/dts/sun50i-
a64-pinephone.dtsi
> index 25150aba749..9f69d489a81 100644
> --- a/arch/arm/dts/sun50i-a64-pinephone.dtsi
> +++ b/arch/arm/dts/sun50i-a64-pinephone.dtsi
> @@ -13,6 +13,7 @@
>
> / {
> aliases {
> + ethernet0 = &rtl8723cs;
> serial0 = &uart0;
> };
>
> @@ -20,6 +21,7 @@
> compatible = "pwm-backlight";
> pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>;
> enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
> + power-supply = <®_ps>;
> /* Backlight configuration differs per PinePhone
revision. */
> };
>
> @@ -30,25 +32,51 @@
> leds {
> compatible = "gpio-leds";
>
> - blue {
> + led-0 {
> function = LED_FUNCTION_INDICATOR;
> color = <LED_COLOR_ID_BLUE>;
> gpios = <&pio 3 20 GPIO_ACTIVE_HIGH>; /*
PD20 */
> };
>
> - green {
> + led-1 {
> function = LED_FUNCTION_INDICATOR;
> color = <LED_COLOR_ID_GREEN>;
> gpios = <&pio 3 18 GPIO_ACTIVE_HIGH>; /*
PD18 */
> };
>
> - red {
> + led-2 {
> function = LED_FUNCTION_INDICATOR;
> color = <LED_COLOR_ID_RED>;
> gpios = <&pio 3 19 GPIO_ACTIVE_HIGH>; /*
PD19 */
> };
> };
>
> + reg_ps: ps-regulator {
> + compatible = "regulator-fixed";
> + regulator-name = "ps";
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5000000>;
> + regulator-boot-on;
> + };
> +
> + reg_vbat_wifi: vbat-wifi {
> + compatible = "regulator-fixed";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-name = "vbat-wifi";
> + };
> +
> + sgm3140: led-controller {
> + compatible = "sgmicro,sgm3140";
> + vin-supply = <®_dcdc1>;
> +
> + sgm3140_flash: led {
> + function = LED_FUNCTION_FLASH;
> + color = <LED_COLOR_ID_WHITE>;
> + flash-max-timeout-us = <250000>;
> + };
> + };
> +
> speaker_amp: audio-amplifier {
> compatible = "simple-audio-amplifier";
> enable-gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PC7 */
> @@ -142,15 +170,23 @@
> status = "okay";
>
> /* Magnetometer */
> - lis3mdl: lis3mdl at 1e {
> + lis3mdl: magnetometer at 1e {
> compatible = "st,lis3mdl-magn";
> reg = <0x1e>;
> vdd-supply = <®_dldo1>;
> vddio-supply = <®_dldo1>;
> };
>
> + /* Light/proximity sensor */
> + light-sensor at 48 {
> + compatible = "sensortek,stk3311";
> + reg = <0x48>;
> + interrupt-parent = <&pio>;
> + interrupts = <1 0 IRQ_TYPE_EDGE_FALLING>; /* PB0 */
> + };
> +
> /* Accelerometer/gyroscope */
> - mpu6050 at 68 {
> + accelerometer at 68 {
> compatible = "invensense,mpu6050";
> reg = <0x68>;
> interrupt-parent = <&pio>;
> @@ -167,6 +203,7 @@
>
> &lradc {
> vref-supply = <®_aldo3>;
> + wakeup-source;
> status = "okay";
>
> button-200 {
> @@ -195,6 +232,20 @@
> status = "okay";
> };
>
> +&mmc1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&mmc1_pins>;
> + vmmc-supply = <®_vbat_wifi>;
> + vqmmc-supply = <®_dldo4>;
> + bus-width = <4>;
> + non-removable;
> + status = "okay";
> +
> + rtl8723cs: wifi at 1 {
> + reg = <1>;
> + };
> +};
> +
> &mmc2 {
> pinctrl-names = "default";
> pinctrl-0 = <&mmc2_pins>;
> @@ -251,10 +302,6 @@
>
> #include "axp803.dtsi"
>
> -&ac_power_supply {
> - status = "okay";
> -};
> -
> &battery_power_supply {
> status = "okay";
> };
> @@ -274,8 +321,8 @@
>
> ®_aldo3 {
> regulator-always-on;
> - regulator-min-microvolt = <2700000>;
> - regulator-max-microvolt = <3300000>;
> + regulator-min-microvolt = <3000000>;
> + regulator-max-microvolt = <3000000>;
> regulator-name = "vcc-pll-avcc";
> };
>
> @@ -392,10 +439,10 @@
> "Internal Speaker", "Speaker Amp OUTR",
> "Speaker Amp INL", "LINEOUT",
> "Speaker Amp INR", "LINEOUT",
> - "Left DAC", "AIF1 Slot 0 Left",
> - "Right DAC", "AIF1 Slot 0 Right",
> - "AIF1 Slot 0 Left ADC", "Left ADC",
> - "AIF1 Slot 0 Right ADC", "Right ADC",
> + "Left DAC", "DACL",
> + "Right DAC", "DACR",
> + "ADCL", "Left ADC",
> + "ADCR", "Right ADC",
> "Internal Microphone", "MBIAS",
> "MIC1", "Internal Microphone",
> "Headset Microphone", "HBIAS",
> @@ -408,6 +455,19 @@
> status = "okay";
> };
>
> +&uart1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
> + status = "okay";
> +
> + bluetooth {
> + compatible = "realtek,rtl8723cs-bt";
> + device-wake-gpios = <&pio 7 6 GPIO_ACTIVE_LOW>; /* PH6
*/
> + enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
> + host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5
*/
> + };
> +};
> +
> /* Connected to the modem (hardware flow control can't be used) */
> &uart3 {
> pinctrl-names = "default";
> diff --git a/arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts b/arch/arm/
dts/sun50i-a64-pinetab-early-adopter.dts
> new file mode 100644
> index 00000000000..6265360ce62
> --- /dev/null
> +++ b/arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts
> @@ -0,0 +1,26 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Copyright (C) 2020 Icenowy Zheng <icenowy at aosc.io>
> + *
> + */
> +
> +/dts-v1/;
> +
> +#include "sun50i-a64-pinetab.dts"
> +
> +/ {
> + model = "PineTab, Early Adopter's version";
> + compatible = "pine64,pinetab-early-adopter", "allwinner,sun50i-
a64";
> +};
> +
> +&dsi {
> + /delete-node/ panel at 0;
> +
> + panel at 0 {
> + compatible = "feixin,k101-im2byl02", "ilitek,ili9881c";
> + reg = <0>;
> + power-supply = <®_dc1sw>;
> + reset-gpios = <&pio 3 24 GPIO_ACTIVE_LOW>; /* PD24 */
> + backlight = <&backlight>;
> + };
> +};
> diff --git a/arch/arm/dts/sun50i-a64-pinetab.dts b/arch/arm/dts/sun50i-a64-
pinetab.dts
> index dc4ab6b434f..422a8507f67 100644
> --- a/arch/arm/dts/sun50i-a64-pinetab.dts
> +++ b/arch/arm/dts/sun50i-a64-pinetab.dts
> @@ -14,7 +14,7 @@
> #include <dt-bindings/pwm/pwm.h>
>
> / {
> - model = "PineTab";
> + model = "PineTab, Development Sample";
> compatible = "pine64,pinetab", "allwinner,sun50i-a64";
>
> aliases {
> @@ -122,9 +122,6 @@
> status = "okay";
>
> port {
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> csi_ep: endpoint {
> remote-endpoint = <&ov5640_ep>;
> bus-width = <8>;
> @@ -421,15 +418,15 @@
> "Headphone", "Headphone
Jack",
> "Speaker", "Internal
Speaker";
> simple-audio-card,routing =
> - "Left DAC", "AIF1 Slot 0 Left",
> - "Right DAC", "AIF1 Slot 0 Right",
> + "Left DAC", "DACL",
> + "Right DAC", "DACR",
> "Speaker Amp INL", "LINEOUT",
> "Speaker Amp INR", "LINEOUT",
> "Internal Speaker", "Speaker Amp OUTL",
> "Internal Speaker", "Speaker Amp OUTR",
> "Headphone Jack", "HP",
> - "AIF1 Slot 0 Left ADC", "Left ADC",
> - "AIF1 Slot 0 Right ADC", "Right ADC",
> + "ADCL", "Left ADC",
> + "ADCR", "Right ADC",
> "Internal Microphone Left", "MBIAS",
> "MIC1", "Internal Microphone Left",
> "Internal Microphone Right", "HBIAS",
> diff --git a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts b/arch/arm/dts/
sun50i-a64-sopine-baseboard.dts
> index 2f6ea9f3f6a..e22b94c8364 100644
> --- a/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
> +++ b/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
> @@ -79,7 +79,7 @@
> &emac {
> pinctrl-names = "default";
> pinctrl-0 = <&rgmii_pins>;
> - phy-mode = "rgmii";
> + phy-mode = "rgmii-id";
> phy-handle = <&ext_rgmii_phy>;
> phy-supply = <®_dc1sw>;
> status = "okay";
> @@ -111,6 +111,7 @@
> bus-width = <8>;
> non-removable;
> cap-mmc-hw-reset;
> + mmc-hs200-1_8v;
> status = "okay";
> };
>
> @@ -159,11 +160,11 @@
> simple-audio-card,widgets = "Microphone", "Microphone Jack",
> "Headphone", "Headphone
Jack";
> simple-audio-card,routing =
> - "Left DAC", "AIF1 Slot 0 Left",
> - "Right DAC", "AIF1 Slot 0 Right",
> + "Left DAC", "DACL",
> + "Right DAC", "DACR",
> "Headphone Jack", "HP",
> - "AIF1 Slot 0 Left ADC", "Left ADC",
> - "AIF1 Slot 0 Right ADC", "Right ADC",
> + "ADCL", "Left ADC",
> + "ADCR", "Right ADC",
> "MIC2", "Microphone Jack";
> status = "okay";
> };
> diff --git a/arch/arm/dts/sun50i-a64-sopine.dtsi b/arch/arm/dts/sun50i-a64-
sopine.dtsi
> index c48692b06e1..df62044ff7a 100644
> --- a/arch/arm/dts/sun50i-a64-sopine.dtsi
> +++ b/arch/arm/dts/sun50i-a64-sopine.dtsi
> @@ -32,10 +32,9 @@
> pinctrl-names = "default";
> pinctrl-0 = <&mmc0_pins>;
> vmmc-supply = <®_dcdc1>;
> - non-removable;
> disable-wp;
> bus-width = <4>;
> - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
> + cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 push-pull switch */
> status = "okay";
> };
>
> diff --git a/arch/arm/dts/sun50i-a64-teres-i.dts b/arch/arm/dts/sun50i-a64-
teres-i.dts
> index f5df5f705b7..f0a16f355e2 100644
> --- a/arch/arm/dts/sun50i-a64-teres-i.dts
> +++ b/arch/arm/dts/sun50i-a64-teres-i.dts
> @@ -52,12 +52,12 @@
> leds {
> compatible = "gpio-leds";
>
> - capslock {
> + led-0 {
> label = "teres-i:green:capslock";
> gpios = <&pio 2 7 GPIO_ACTIVE_HIGH>; /* PC7
*/
> };
>
> - numlock {
> + led-1 {
> label = "teres-i:green:numlock";
> gpios = <&pio 2 4 GPIO_ACTIVE_HIGH>; /* PC4
*/
> };
> @@ -340,10 +340,10 @@
> "Microphone", "Internal
Microphone",
> "Speaker", "Internal
Speaker";
> simple-audio-card,routing =
> - "Left DAC", "AIF1 Slot 0 Left",
> - "Right DAC", "AIF1 Slot 0 Right",
> - "AIF1 Slot 0 Left ADC", "Left ADC",
> - "AIF1 Slot 0 Right ADC", "Right ADC",
> + "Left DAC", "DACL",
> + "Right DAC", "DACR",
> + "ADCL", "Left ADC",
> + "ADCR", "Right ADC",
> "Headphone Jack", "HP",
> "Speaker Amp INL", "LINEOUT",
> "Speaker Amp INR", "LINEOUT",
> diff --git a/arch/arm/dts/sun50i-a64.dtsi b/arch/arm/dts/sun50i-a64.dtsi
> index 8dfbcd14407..57786fc120c 100644
> --- a/arch/arm/dts/sun50i-a64.dtsi
> +++ b/arch/arm/dts/sun50i-a64.dtsi
> @@ -51,7 +51,7 @@
> reg = <0>;
> enable-method = "psci";
> next-level-cache = <&L2>;
> - clocks = <&ccu 21>;
> + clocks = <&ccu CLK_CPUX>;
> clock-names = "cpu";
> #cooling-cells = <2>;
> };
> @@ -62,7 +62,7 @@
> reg = <1>;
> enable-method = "psci";
> next-level-cache = <&L2>;
> - clocks = <&ccu 21>;
> + clocks = <&ccu CLK_CPUX>;
> clock-names = "cpu";
> #cooling-cells = <2>;
> };
> @@ -73,7 +73,7 @@
> reg = <2>;
> enable-method = "psci";
> next-level-cache = <&L2>;
> - clocks = <&ccu 21>;
> + clocks = <&ccu CLK_CPUX>;
> clock-names = "cpu";
> #cooling-cells = <2>;
> };
> @@ -84,7 +84,7 @@
> reg = <3>;
> enable-method = "psci";
> next-level-cache = <&L2>;
> - clocks = <&ccu 21>;
> + clocks = <&ccu CLK_CPUX>;
> clock-names = "cpu";
> #cooling-cells = <2>;
> };
> @@ -139,10 +139,10 @@
> simple-audio-card,mclk-fs = <128>;
> simple-audio-card,aux-devs = <&codec_analog>;
> simple-audio-card,routing =
> - "Left DAC", "AIF1 Slot 0 Left",
> - "Right DAC", "AIF1 Slot 0 Right",
> - "AIF1 Slot 0 Left ADC", "Left
ADC",
> - "AIF1 Slot 0 Right ADC", "Right
ADC";
> + "Left DAC", "DACL",
> + "Right DAC", "DACR",
> + "ADCL", "Left ADC",
> + "ADCR", "Right ADC";
> status = "disabled";
>
> cpudai: simple-audio-card,cpu {
> @@ -157,6 +157,7 @@
> timer {
> compatible = "arm,armv8-timer";
> allwinner,erratum-unknown1;
> + arm,no-tick-in-suspend;
> interrupts = <GIC_PPI 13
> (GIC_CPU_MASK_SIMPLE(4) |
IRQ_TYPE_LEVEL_HIGH)>,
> <GIC_PPI 14
> @@ -513,7 +514,7 @@
> resets = <&ccu RST_BUS_MMC2>;
> reset-names = "ahb";
> interrupts = <GIC_SPI 62
IRQ_TYPE_LEVEL_HIGH>;
> - max-frequency = <200000000>;
> + max-frequency = <150000000>;
> status = "disabled";
> #address-cells = <1>;
> #size-cells = <0>;
> @@ -592,6 +593,8 @@
> <&ccu CLK_USB_OHCI0>;
> resets = <&ccu RST_BUS_OHCI0>,
> <&ccu RST_BUS_EHCI0>;
> + phys = <&usbphy 0>;
> + phy-names = "usb";
> status = "disabled";
> };
>
> @@ -602,6 +605,8 @@
> clocks = <&ccu CLK_BUS_OHCI0>,
> <&ccu CLK_USB_OHCI0>;
> resets = <&ccu RST_BUS_OHCI0>;
> + phys = <&usbphy 0>;
> + phy-names = "usb";
> status = "disabled";
> };
>
> @@ -845,6 +850,20 @@
> status = "disabled";
> };
>
> + i2s2: i2s at 1c22800 {
> + #sound-dai-cells = <0>;
> + compatible = "allwinner,sun50i-a64-i2s",
> + "allwinner,sun8i-h3-i2s";
> + reg = <0x01c22800 0x400>;
> + interrupts = <GIC_SPI 15
IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&ccu CLK_BUS_I2S2>, <&ccu
CLK_I2S2>;
> + clock-names = "apb", "mod";
> + resets = <&ccu RST_BUS_I2S2>;
> + dma-names = "rx", "tx";
> + dmas = <&dma 27>, <&dma 27>;
> + status = "disabled";
> + };
> +
> dai: dai at 1c22c00 {
> #sound-dai-cells = <0>;
> compatible = "allwinner,sun50i-a64-codec-
i2s";
> @@ -860,7 +879,8 @@
>
> codec: codec at 1c22e00 {
> #sound-dai-cells = <0>;
> - compatible = "allwinner,sun8i-a33-codec";
> + compatible = "allwinner,sun50i-a64-codec",
> + "allwinner,sun8i-a33-codec";
> reg = <0x01c22e00 0x600>;
> interrupts = <GIC_SPI 28
IRQ_TYPE_LEVEL_HIGH>;
> clocks = <&ccu CLK_BUS_CODEC>, <&ccu
CLK_AC_DIG>;
> --
> 2.17.5
>
>
More information about the U-Boot
mailing list