Skip to content

Commit

Permalink
rk3328-dts-roc-cc-audio-supplies(:1)
Browse files Browse the repository at this point in the history 
Original-Subject: [ARCHEOLOGY] [ rockchip64 ] rk3328 and renegade sound and dts clean
> X-Git-Archeology: > recovered message: > Adds k5.5 audio pipeline dts entries, adds audio to Renegade, cleans up some dts mess in renegade
> X-Git-Archeology: > recovered message: > - Note:  PulseAudio seems to need to toggle a couple times before audio will play.  That is not addressed in this patch.
> X-Git-Archeology: - Revision 18b24717be9639b65b86db3dbcf2b42fe73ca12c: armbian/build@18b2471
> X-Git-Archeology:   Date: Sun, 02 Feb 2020 18:26:29 -0500
> X-Git-Archeology:   From: tonymac32 <tonymckahan@gmail.com>
> X-Git-Archeology:   Subject: [ rockchip64 ] rk3328 and renegade sound and dts clean
> X-Git-Archeology: 
> X-Git-Archeology: - Revision 812245def37a695bce9e7ece148b2920d82c8b37: armbian/build@812245d
> X-Git-Archeology:   Date: Sat, 18 Jul 2020 23:07:01 +0200
> X-Git-Archeology:   From: Werner <EvilOlaf@users.noreply.github.com>
> X-Git-Archeology:   Subject: Move rockchip/64 current to 5.7.y (#2099)
> X-Git-Archeology: 
> X-Git-Archeology: - Revision 8fc20a15b12561e76e92d5bd29b5afd1c62f08ac: armbian/build@8fc20a1
> X-Git-Archeology:   Date: Thu, 08 Oct 2020 01:56:28 -0400
> X-Git-Archeology:   From: Tony <tonymckahan@gmail.com>
> X-Git-Archeology:   Subject: Add files via upload
> X-Git-Archeology: 
> X-Git-Archeology: - Revision b3a768e2af8940d2b3b8d5f5c7919e93838d9c92: armbian/build@b3a768e
> X-Git-Archeology:   Date: Thu, 08 Oct 2020 01:59:31 -0400
> X-Git-Archeology:   From: Tony <tonymckahan@gmail.com>
> X-Git-Archeology:   Subject: Fix typo on supply voltage
> X-Git-Archeology: 
> X-Git-Archeology: - Revision e36ce875b025e112127cf8cc2d34825ebfe36569: armbian/build@e36ce87
> X-Git-Archeology:   Date: Tue, 10 Nov 2020 21:43:13 +0100
> X-Git-Archeology:   From: Piotr Szczepanik <piter75@gmail.com>
> X-Git-Archeology:   Subject: Switched rockchip64-current to linux 5.9.y (#2309)
> X-Git-Archeology: 
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: armbian/build@0cdffb2
> X-Git-Archeology:   Date: Wed, 24 Mar 2021 19:01:53 +0100
> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology:   Subject: Renaming DEV branch to EDGE (#2704)
> X-Git-Archeology: 
> X-Git-Archeology: - Revision 67599e3dbbe707b8c3d3b2b0b6788ed86e184308: armbian/build@67599e3
> X-Git-Archeology:   Date: Sun, 25 Jul 2021 16:02:44 -0400
> X-Git-Archeology:   From: tonymac32 <tonymckahan@gmail.com>
> X-Git-Archeology:   Subject: [ rockchip64 ] fix RK3328 build issues
> X-Git-Archeology: 
> X-Git-Archeology: - Revision 744ea89a589d62cb6f409baab60fc6664520bc39: armbian/build@744ea89
> X-Git-Archeology:   Date: Wed, 08 Sep 2021 17:51:34 +0200
> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology:   Subject: Bumping EDGE kernel to 5.14.y (#3125)
> X-Git-Archeology: 
> X-Git-Archeology: - Revision a71ef23575940b363e86a143d6ec781f95f1dbde: armbian/build@a71ef23
> X-Git-Archeology:   Date: Sun, 26 Sep 2021 08:35:58 +0000
> X-Git-Archeology:   From: Paolo Sabatino <paolo.sabatino@gmail.com>
> X-Git-Archeology:   Subject: rockchip64: tidy up rk3328 patches
> X-Git-Archeology: 
> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: armbian/build@92f1a22
> X-Git-Archeology:   Date: Fri, 16 Dec 2022 13:38:13 +0100
> X-Git-Archeology:   From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
> X-Git-Archeology:   Subject: Re-add rockchip64 6.0 patches (#4575)
> X-Git-Archeology: 
X-Armbian: Patch-File: rk3328-dts-roc-cc-audio-supplies
X-Armbian: Patch-File-Counter: 1
X-Armbian: Patch-Rel-Directory: patch/kernel/archive/rockchip64-6.1
X-Armbian: Patch-Type: kernel
X-Armbian: Patch-Root-Type: core
X-Armbian: Patch-Sub-Type: common
X-Armbian: Original-Subject: [ARCHEOLOGY] [ rockchip64 ] rk3328 and renegade sound and dts clean
  • Loading branch information
@Tonymac32
Tonymac32 authored and Armbian AutoPatcher committed Feb 2, 2020
1 parent 8c12a02 commit 48452ee
Showing 1 changed file with 64 additions and 21 deletions.
85 changes: 64 additions & 21 deletions arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,9 @@
#clock-cells = <0>;
};

dc_12v: dc-12v {
compatible = "regulator-fixed";
regulator-name = "dc_12v";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
};

vcc_sd: sdmmc-regulator {
compatible = "regulator-fixed";
gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_LOW>;
gpio = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&sdmmc0m1_pin>;
regulator-boot-on;
Expand All @@ -74,12 +65,12 @@
vin-supply = <&vcc_io>;
};

vcc_sdio: sdmmcio-regulator {
vccio_sd: sdmmcio-regulator {
compatible = "regulator-gpio";
gpios = <&grf_gpio 0 GPIO_ACTIVE_HIGH>;
states = <1800000 0x1>,
<3300000 0x0>;
regulator-name = "vcc_sdio";
regulator-name = "vccio_sd";
regulator-type = "voltage";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
Expand All @@ -101,11 +92,8 @@
vcc_sys: vcc-sys {
compatible = "regulator-fixed";
regulator-name = "vcc_sys";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vin-supply = <&dc_12v>;
};

vcc_phy: vcc-phy-regulator {
Expand Down Expand Up @@ -134,8 +122,25 @@
mode = <0x05>;
};
};

ir-receiver {
compatible = "gpio-ir-receiver";
gpios = <&gpio2 RK_PA2 GPIO_ACTIVE_LOW>;
pinctrl-0 = <&ir_int>;
pinctrl-names = "default";
};
};

&analog_sound {
simple-audio-card,name = "TRS Jack";
status = "okay";
};

&codec {
status = "okay";
};


&analog_sound {
status = "okay";
};
Expand Down Expand Up @@ -174,7 +179,6 @@
&emmc {
bus-width = <8>;
cap-mmc-highspeed;
max-frequency = <150000000>;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
non-removable;
Expand Down Expand Up @@ -204,6 +208,10 @@
status = "okay";
};

&gpu {
mali-supply = <&vdd_logic>;
};

&hdmi {
status = "okay";
};
Expand All @@ -216,6 +224,10 @@
status = "okay";
};

&hdmi_sound {
status = "okay";
};

&i2c1 {
status = "okay";

Expand Down Expand Up @@ -243,8 +255,9 @@
regulators {
vdd_logic: DCDC_REG1 {
regulator-name = "vdd_logic";
regulator-min-microvolt = <712500>;
regulator-max-microvolt = <1450000>;
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1175000>;
regulator-ramp-delay = <12500>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
Expand All @@ -255,8 +268,9 @@

vdd_arm: DCDC_REG2 {
regulator-name = "vdd_arm";
regulator-min-microvolt = <712500>;
regulator-min-microvolt = <950000>;
regulator-max-microvolt = <1450000>;
regulator-ramp-delay = <12500>;
regulator-always-on;
regulator-boot-on;
regulator-state-mem {
Expand Down Expand Up @@ -333,19 +347,33 @@
status = "okay";
};

&i2s0 {
status = "okay";
};

&i2s1 {
status = "okay";
};

&io_domains {
status = "okay";

vccio1-supply = <&vcc_io>;
vccio2-supply = <&vcc18_emmc>;
vccio3-supply = <&vcc_sdio>;
vccio3-supply = <&vccio_sd>;
vccio4-supply = <&vcc_18>;
vccio5-supply = <&vcc_io>;
vccio6-supply = <&vcc_io>;
pmuio-supply = <&vcc_io>;
};

&pinctrl {
ir {
ir_int: ir-int {
rockchip,pins = <2 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

pmic {
pmic_int_l: pmic-int-l {
rockchip,pins = <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>;
Expand All @@ -372,11 +400,26 @@
sd-uhs-sdr50;
sd-uhs-sdr104;
vmmc-supply = <&vcc_sd>;
vqmmc-supply = <&vcc_sdio>;
vqmmc-supply = <&vccio_sd>;
status = "okay";
};

&spdif {
pinctrl-0 = <&spdifm0_tx>;
status = "okay";
};

&spdif_out {
status = "okay";
};

&spdif_sound {
status = "okay";
};

&tsadc {
rockchip,hw-tshut-mode = <0>;
rockchip,hw-tshut-polarity = <0>;
status = "okay";
};

Expand Down

0 comments on commit 48452ee

Please sign in to comment.