enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ meson64-current ] more cleaning of patches

Browse Source
This commit is contained in:
tonymac32 2020-02-29 22:52:45 -05:00
parent 1b66786cd8
commit ebca3ebc95
2 changed files with 0 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
patch/kernel/meson64-current/0348-arm64-dts-meson-activate-hdmi-audio-HDMI-enabled-boa.patch
View File

@ -109,116 +109,6 @@ index 1cc9dc6..c3740ed 100644
status = "okay";
pinctrl-0 = <&eth_rgmii_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
index 5499e8d..bf3453f 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@ -65,6 +65,35 @@
};
};
};
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "meson-gx-audio";
+
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
+ simple-audio-card,dai-link@0 {
+ /* HDMI Output */
+ format = "i2s";
+ mclk-fs = <256>;
+ bitclock-master = <&aiu_i2s>;
+ frame-master = <&aiu_i2s>;
+
+ cpu {
+ sound-dai = <&aiu_i2s>;
+ };
+
+ codec {
+ sound-dai = <&hdmi_tx>;
+ };
+ };
+ };
};
&cec_AO {
@@ -74,6 +103,14 @@
hdmi-phandle = <&hdmi_tx>;
};
+&audio {
+ status = "okay";
+};
+
+&aiu_i2s {
+ status = "okay";
+};
+
&hdmi_tx {
status = "okay";
pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index 255cede..79b09f6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
@@ -84,6 +84,35 @@
regulator-always-on;
};
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "meson-gx-audio";
+
+ assigned-clocks = <&clkc CLKID_MPLL2>,
+ <&clkc CLKID_MPLL0>,
+ <&clkc CLKID_MPLL1>;
+ assigned-clock-parents = <0>, <0>, <0>;
+ assigned-clock-rates = <294912000>,
+ <270950400>,
+ <393216000>;
+
+ simple-audio-card,dai-link@0 {
+ /* HDMI Output */
+ format = "i2s";
+ mclk-fs = <256>;
+ bitclock-master = <&aiu_i2s>;
+ frame-master = <&aiu_i2s>;
+
+ cpu {
+ sound-dai = <&aiu_i2s>;
+ };
+
+ codec {
+ sound-dai = <&hdmi_tx>;
+ };
+ };
+ };
+
vcc_3v3: regulator-vcc_3v3 {
compatible = "regulator-fixed";
regulator-name = "VCC_3V3";
@@ -130,6 +159,14 @@
hdmi-phandle = <&hdmi_tx>;
};
+&audio {
+ status = "okay";
+};
+
+&aiu_i2s {
+ status = "okay";
+};
+
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
--
2.7.1

106
patch/kernel/meson64-current/z-libretech-stable-build.patch
View File

@ -891,61 +891,6 @@ index 000000000000..100a1cfeea15
+ "amlogic,meson-gxl";
+ model = "Libre Computer AML-S905D-PC";
+};
diff --git b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
index a3c67d7a70e4..440bc23c7342 100644
--- b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
+++ a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@ -63,35 +63,6 @@
};
};
};
-
- sound {
- compatible = "simple-audio-card";
- simple-audio-card,name = "meson-gx-audio";
-
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
- simple-audio-card,dai-link@0 {
- /* HDMI Output */
- format = "i2s";
- mclk-fs = <256>;
- bitclock-master = <&aiu_i2s>;
- frame-master = <&aiu_i2s>;
-
- cpu {
- sound-dai = <&aiu_i2s>;
- };
-
- codec {
- sound-dai = <&hdmi_tx>;
- };
- };
- };
};
&cec_AO {
@@ -101,14 +72,6 @@
hdmi-phandle = <&hdmi_tx>;
};
-&audio {
- status = "okay";
-};
-
-&aiu_i2s {
- status = "okay";
-};
-
&hdmi_tx {
status = "okay";
pinctrl-0 = <&hdmi_hpd_pins>, <&hdmi_i2c_pins>;
diff --git b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
index 969ee02e7429..af1cf92c1d0a 100644
--- b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts
@ -980,42 +925,6 @@ index 969ee02e7429..af1cf92c1d0a 100644
};
};
@@ -84,35 +86,6 @@
regulator-always-on;
};
- sound {
- compatible = "simple-audio-card";
- simple-audio-card,name = "meson-gx-audio";
-
- assigned-clocks = <&clkc CLKID_MPLL2>,
- <&clkc CLKID_MPLL0>,
- <&clkc CLKID_MPLL1>;
- assigned-clock-parents = <0>, <0>, <0>;
- assigned-clock-rates = <294912000>,
- <270950400>,
- <393216000>;
-
- simple-audio-card,dai-link@0 {
- /* HDMI Output */
- format = "i2s";
- mclk-fs = <256>;
- bitclock-master = <&aiu_i2s>;
- frame-master = <&aiu_i2s>;
-
- cpu {
- sound-dai = <&aiu_i2s>;
- };
-
- codec {
- sound-dai = <&hdmi_tx>;
- };
- };
- };
-
vcc_3v3: regulator-vcc_3v3 {
compatible = "regulator-fixed";
regulator-name = "VCC_3V3";
@@ -152,6 +125,39 @@
regulator-max-microvolt = <1800000>;
vin-supply = <&vcc_3v3>;
@ -1056,21 +965,6 @@ index 969ee02e7429..af1cf92c1d0a 100644
};
&cec_AO {
@@ -161,14 +167,6 @@
hdmi-phandle = <&hdmi_tx>;
};
-&audio {
- status = "okay";
-};
-
-&aiu_i2s {
- status = "okay";
-};
-
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
@@ -190,6 +188,14 @@
pinctrl-names = "default";
};