Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dd207c9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-dt64-3' of... 

Merge tag 'amlogic-dt64-3' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Amlogic 64-bit DT updates for v4.19, round 3
- add DT support for AXG Audio

* tag 'amlogic-dt64-3' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic

:
  arm64: dts: meson-axg: add spdif-dit codec
  arm64: dts: meson-axg: add lineout codec
  arm64: dts: meson-axg: add linein codec
  arm64: dts: meson-axg: add tdm interfaces
  arm64: dts: meson-axg: add tdmout formatters
  arm64: dts: meson-axg: add tdmin formatters
  arm64: dts: meson-axg: add spdifout
  arm64: dts: meson-axg: add audio arb reset controller
  arm64: dts: meson-axg: add usb power regulator
  arm64: dts: meson-axg: add vcc 5v regulator on the s400
  arm64: dts: meson-axg: improve power supplies description

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7f27a622 f2ac479f

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

+57 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
		regulator-name = "12V";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		regulator-always-on;

	};



	vddio_boot: regulator-vddio_boot {
@@ -72,6 +73,8 @@ 
		regulator-name = "VDDIO_BOOT";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};



	vddao_3v3: regulator-vddao_3v3 {
@@ -79,6 +82,8 @@ 
		regulator-name = "VDDAO_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&main_12v>;

		regulator-always-on;

	};



	vddio_ao18: regulator-vddio_ao18 {
@@ -86,6 +91,8 @@ 
		regulator-name = "VDDIO_AO18";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};



	vcc_3v3: regulator-vcc_3v3 {
@@ -93,6 +100,30 @@ 
		regulator-name = "VCC_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vddao_3v3>;

		regulator-always-on;

	};



	vcc_5v: regulator-vcc_5v {

		compatible = "regulator-fixed";

		regulator-name = "VCC5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&main_12v>;



		gpio = <&gpio_ao GPIOAO_13 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	usb_pwr: regulator-usb_pwr {

		compatible = "regulator-fixed";

		regulator-name = "USB_PWR";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&vcc_5v>;



		gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	emmc_pwrseq: emmc-pwrseq {
@@ -147,6 +178,32 @@ 
			gpios = <&gpio_speaker 2 0>;

		};

	};



	linein: audio-codec@0 {

		#sound-dai-cells = <0>;

		compatible = "everest,es7241";

		VDDA-supply = <&vcc_3v3>;

		VDDP-supply = <&vcc_3v3>;

		VDDD-supply = <&vcc_3v3>;

		status = "okay";

		sound-name-prefix = "Linein";

	};



	lineout: audio-codec@1 {

		#sound-dai-cells = <0>;

		compatible = "everest,es7154";

		VDD-supply = <&vcc_3v3>;

		PVDD-supply = <&vcc_5v>;

		status = "okay";

		sound-name-prefix = "Lineout";

	};



	spdif_dit: audio-codec@2 {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

		status = "okay";

		sound-name-prefix = "DIT";

	};

};



&ethmac {

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

+149 −0
Original line number Diff line number Diff line
@@ -92,6 +92,39 @@ 
		method = "smc";

	};



	tdmif_a: audio-controller@0 {

		compatible = "amlogic,axg-tdm-iface";

		#sound-dai-cells = <0>;

		sound-name-prefix = "TDM_A";

		clocks = <&clkc_audio AUD_CLKID_MST_A_MCLK>,

			 <&clkc_audio AUD_CLKID_MST_A_SCLK>,

			 <&clkc_audio AUD_CLKID_MST_A_LRCLK>;

		clock-names = "mclk", "sclk", "lrclk";

		status = "disabled";

	};



	tdmif_b: audio-controller@1 {

		compatible = "amlogic,axg-tdm-iface";

		#sound-dai-cells = <0>;

		sound-name-prefix = "TDM_B";

		clocks = <&clkc_audio AUD_CLKID_MST_B_MCLK>,

			 <&clkc_audio AUD_CLKID_MST_B_SCLK>,

			 <&clkc_audio AUD_CLKID_MST_B_LRCLK>;

		clock-names = "mclk", "sclk", "lrclk";

		status = "disabled";

	};



	tdmif_c: audio-controller@2 {

		compatible = "amlogic,axg-tdm-iface";

		#sound-dai-cells = <0>;

		sound-name-prefix = "TDM_C";

		clocks = <&clkc_audio AUD_CLKID_MST_C_MCLK>,

			 <&clkc_audio AUD_CLKID_MST_C_SCLK>,

			 <&clkc_audio AUD_CLKID_MST_C_LRCLK>;

		clock-names = "mclk", "sclk", "lrclk";

		status = "disabled";

	};



	timer {

		compatible = "arm,armv8-timer";

		interrupts = <GIC_PPI 13
@@ -189,6 +222,122 @@ 


				resets = <&reset RESET_AUDIO>;

			};



			arb: reset-controller@280 {

				compatible = "amlogic,meson-axg-audio-arb";

				reg = <0x0 0x280 0x0 0x4>;

				#reset-cells = <1>;

				clocks = <&clkc_audio AUD_CLKID_DDR_ARB>;

			};



			tdmin_a: audio-controller@300 {

				compatible = "amlogic,axg-tdmin";

				reg = <0x0 0x300 0x0 0x40>;

				sound-name-prefix = "TDMIN_A";

				clocks = <&clkc_audio AUD_CLKID_TDMIN_A>,

					 <&clkc_audio AUD_CLKID_TDMIN_A_SCLK>,

					 <&clkc_audio AUD_CLKID_TDMIN_A_SCLK_SEL>,

					 <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>,

					 <&clkc_audio AUD_CLKID_TDMIN_A_LRCLK>;

				clock-names = "pclk", "sclk", "sclk_sel",

					      "lrclk", "lrclk_sel";

				status = "disabled";

			};



			tdmin_b: audio-controller@340 {

				compatible = "amlogic,axg-tdmin";

				reg = <0x0 0x340 0x0 0x40>;

				sound-name-prefix = "TDMIN_B";

				clocks = <&clkc_audio AUD_CLKID_TDMIN_B>,

					 <&clkc_audio AUD_CLKID_TDMIN_B_SCLK>,

					 <&clkc_audio AUD_CLKID_TDMIN_B_SCLK_SEL>,

					 <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>,

					 <&clkc_audio AUD_CLKID_TDMIN_B_LRCLK>;

				clock-names = "pclk", "sclk", "sclk_sel",

					      "lrclk", "lrclk_sel";

				status = "disabled";

			};



			tdmin_c: audio-controller@380 {

				compatible = "amlogic,axg-tdmin";

				reg = <0x0 0x380 0x0 0x40>;

				sound-name-prefix = "TDMIN_C";

				clocks = <&clkc_audio AUD_CLKID_TDMIN_C>,

					 <&clkc_audio AUD_CLKID_TDMIN_C_SCLK>,

					 <&clkc_audio AUD_CLKID_TDMIN_C_SCLK_SEL>,

					 <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>,

					 <&clkc_audio AUD_CLKID_TDMIN_C_LRCLK>;

				clock-names = "pclk", "sclk", "sclk_sel",

					      "lrclk", "lrclk_sel";

				status = "disabled";

			};



			tdmin_lb: audio-controller@3c0 {

				compatible = "amlogic,axg-tdmin";

				reg = <0x0 0x3c0 0x0 0x40>;

				sound-name-prefix = "TDMIN_LB";

				clocks = <&clkc_audio AUD_CLKID_TDMIN_LB>,

					 <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK>,

					 <&clkc_audio AUD_CLKID_TDMIN_LB_SCLK_SEL>,

					 <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>,

					 <&clkc_audio AUD_CLKID_TDMIN_LB_LRCLK>;

				clock-names = "pclk", "sclk", "sclk_sel",

					      "lrclk", "lrclk_sel";

				status = "disabled";

			};



			spdifout: audio-controller@480 {

				compatible = "amlogic,axg-spdifout";

				reg = <0x0 0x480 0x0 0x50>;

				#sound-dai-cells = <0>;

				sound-name-prefix = "SPDIFOUT";

				clocks = <&clkc_audio AUD_CLKID_SPDIFOUT>,

					 <&clkc_audio AUD_CLKID_SPDIFOUT_CLK>;

				clock-names = "pclk", "mclk";

				status = "disabled";

			};



			tdmout_a: audio-controller@500 {

				compatible = "amlogic,axg-tdmout";

				reg = <0x0 0x500 0x0 0x40>;

				sound-name-prefix = "TDMOUT_A";

				clocks = <&clkc_audio AUD_CLKID_TDMOUT_A>,

					 <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK>,

					 <&clkc_audio AUD_CLKID_TDMOUT_A_SCLK_SEL>,

					 <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>,

					 <&clkc_audio AUD_CLKID_TDMOUT_A_LRCLK>;

				clock-names = "pclk", "sclk", "sclk_sel",

					      "lrclk", "lrclk_sel";

				status = "disabled";

			};



			tdmout_b: audio-controller@540 {

				compatible = "amlogic,axg-tdmout";

				reg = <0x0 0x540 0x0 0x40>;

				sound-name-prefix = "TDMOUT_B";

				clocks = <&clkc_audio AUD_CLKID_TDMOUT_B>,

					 <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK>,

					 <&clkc_audio AUD_CLKID_TDMOUT_B_SCLK_SEL>,

					 <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>,

					 <&clkc_audio AUD_CLKID_TDMOUT_B_LRCLK>;

				clock-names = "pclk", "sclk", "sclk_sel",

					      "lrclk", "lrclk_sel";

				status = "disabled";

			};



			tdmout_c: audio-controller@580 {

				compatible = "amlogic,axg-tdmout";

				reg = <0x0 0x580 0x0 0x40>;

				sound-name-prefix = "TDMOUT_C";

				clocks = <&clkc_audio AUD_CLKID_TDMOUT_C>,

					 <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK>,

					 <&clkc_audio AUD_CLKID_TDMOUT_C_SCLK_SEL>,

					 <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>,

					 <&clkc_audio AUD_CLKID_TDMOUT_C_LRCLK>;

				clock-names = "pclk", "sclk", "sclk_sel",

					      "lrclk", "lrclk_sel";

				status = "disabled";

			};

		};



		cbus: bus@ffd00000 {