Merge tag 'amlogic-fixes' of... (b99bba09) · Commits · 戴 / test

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -400,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";

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,8 +109,8 @@
		status = "okay";
		pinctrl-0 = <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>;
		pinctrl-names = "default";
		clocks = <&clkc CLKID_FCLK_DIV4>;
		clock-names = "clkin0";
		clocks = <&xtal> , <&xtal>;
		clock-names = "clkin0", "clkin1" ;
		};

		&pwm_ef {

arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts

+91 −12

Original line number	Diff line number	Diff line
		@@ -10,12 +10,20 @@

		#include <dt-bindings/input/input.h>

		#include "meson-gxl-s905x-p212.dtsi"
		#include "meson-gxl-s905x.dtsi"

		/ {
		compatible = "libretech,cc", "amlogic,s905x", "amlogic,meson-gxl";
		model = "Libre Technology CC";

		aliases {
		serial0 = &uart_AO;
		};

		chosen {
		stdout-path = "serial0:115200n8";
		};

		cvbs-connector {
		compatible = "composite-video-connector";

		@@ -26,6 +34,11 @@
		};
		};

		emmc_pwrseq: emmc-pwrseq {
		compatible = "mmc-pwrseq-emmc";
		reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
		};

		hdmi-connector {
		compatible = "hdmi-connector";
		type = "a";
		@@ -53,6 +66,39 @@
		linux,default-trigger = "heartbeat";
		};
		};

		memory@0 {
		device_type = "memory";
		reg = <0x0 0x0 0x0 0x80000000>;
		};

		vcc_3v3: regulator-vcc_3v3 {
		compatible = "regulator-fixed";
		regulator-name = "VCC_3V3";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		};

		vcc_card: regulator-vcc-card {
		compatible = "regulator-gpio";

		regulator-name = "VCC_CARD";
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <3300000>;

		gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>;
		gpios-states = <0>;

		states = <3300000 0>,
		<1800000 1>;
		};

		vddio_boot: regulator-vddio_boot {
		compatible = "regulator-fixed";
		regulator-name = "VDDIO_BOOT";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		};
		};

		&cvbs_vdac_port {
		@@ -61,6 +107,16 @@
		};
		};

		&ethmac {
		status = "okay";
		};

		&ir {
		status = "okay";
		pinctrl-0 = <&remote_input_ao_pins>;
		pinctrl-names = "default";
		};

		&hdmi_tx {
		status = "okay";
		pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
		@@ -73,20 +129,43 @@
		};
		};

		/*
		* The following devices exists but are exposed on the general
		* purpose GPIO header. End user may well decide to use those pins
		* for another purpose
		*/
		/* SD card */
		&sd_emmc_b {
		status = "okay";
		pinctrl-0 = <&sdcard_pins>;
		pinctrl-names = "default";

		bus-width = <4>;
		cap-sd-highspeed;
		max-frequency = <100000000>;
		disable-wp;

		cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_HIGH>;
		cd-inverted;

		&sd_emmc_a {
		status = "disabled";
		vmmc-supply = <&vcc_3v3>;
		vqmmc-supply = <&vcc_card>;
		};

		&uart_A {
		status = "disabled";
		/* eMMC */
		&sd_emmc_c {
		status = "okay";
		pinctrl-0 = <&emmc_pins>;
		pinctrl-names = "default";

		bus-width = <8>;
		cap-mmc-highspeed;
		max-frequency = <50000000>;
		non-removable;
		disable-wp;

		mmc-pwrseq = <&emmc_pwrseq>;
		vmmc-supply = <&vcc_3v3>;
		vqmmc-supply = <&vddio_boot>;
		};

		&wifi32k {
		status = "disabled";
		&uart_AO {
		status = "okay";
		pinctrl-0 = <&uart_ao_a_pins>;
		pinctrl-names = "default";
		};

Admin message