diff mbox series

arm64: dts: meson-g12b-khadas-vim3: fix missing frddr_a node

Message ID 20200415095927.3780-1-christianshewitt@gmail.com (mailing list archive)
State Mainlined
Commit 5ac0869fb39b1c1ba84d4d75c550f82e0bf44c96
Headers show
Series arm64: dts: meson-g12b-khadas-vim3: fix missing frddr_a node | expand

Commit Message

Christian Hewitt April 15, 2020, 9:59 a.m. UTC
From: Christian Hewitt <christianshewitt@gmail.com>

The frddr_a node was accidently deleted when creating a common dtsi for the
Khadas VIM3/VIM3L boards, preventing audio from working on the VIM3.

Fixes: 4f26cc1c96c9 ("arm64: dts: khadas-vim3: move common nodes into meson-khadas-vim3.dtsi")
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Christian Hewitt April 17, 2020, 5:59 a.m. UTC | #1
> On 15 Apr 2020, at 1:59 pm, chewitt <christianshewitt@gmail.com> wrote:
> 
> From: Christian Hewitt <christianshewitt@gmail.com>
> 
> The frddr_a node was accidently deleted when creating a common dtsi for the
> Khadas VIM3/VIM3L boards, preventing audio from working on the VIM3.
> 
> Fixes: 4f26cc1c96c9 ("arm64: dts: khadas-vim3: move common nodes into meson-khadas-vim3.dtsi")
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
> arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ++++
> 1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
> index c33e85fbdaba..c6c8caed8327 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
> @@ -154,6 +154,10 @@
> 	clock-latency = <50000>;
> };
> 
> +&frddr_a {
> +	status = "okay";
> +};
> +
> &frddr_b {
> 	status = "okay";
> };
> -- 
> 2.17.1

NB: I appears the same change was sent by Neil in [1] as a fix to 5.4, but
this appears to have been dropped/missed somewhere.

[1] https://patchwork.kernel.org/patch/11198535/
Jerome Brunet April 21, 2020, 2:15 p.m. UTC | #2
On Wed 15 Apr 2020 at 11:59, chewitt <christianshewitt@gmail.com> wrote:

> From: Christian Hewitt <christianshewitt@gmail.com>
>
> The frddr_a node was accidently deleted when creating a common dtsi for the
> Khadas VIM3/VIM3L boards, preventing audio from working on the VIM3.
>
> Fixes: 4f26cc1c96c9 ("arm64: dts: khadas-vim3: move common nodes into meson-khadas-vim3.dtsi")
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>

Reviewed-by: Jerome Brunet <jbrunet@baylibre.com>
Tested-by: Jerome Brunet <jbrunet@baylibre.com>

> ---
>  arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
> index c33e85fbdaba..c6c8caed8327 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
> @@ -154,6 +154,10 @@
>  	clock-latency = <50000>;
>  };
>  
> +&frddr_a {
> +	status = "okay";
> +};
> +
>  &frddr_b {
>  	status = "okay";
>  };
Kevin Hilman April 29, 2020, 6:46 p.m. UTC | #3
Christian Hewitt <christianshewitt@gmail.com> writes:

>> On 15 Apr 2020, at 1:59 pm, chewitt <christianshewitt@gmail.com> wrote:
>> 
>> From: Christian Hewitt <christianshewitt@gmail.com>
>> 
>> The frddr_a node was accidently deleted when creating a common dtsi for the
>> Khadas VIM3/VIM3L boards, preventing audio from working on the VIM3.
>> 
>> Fixes: 4f26cc1c96c9 ("arm64: dts: khadas-vim3: move common nodes into meson-khadas-vim3.dtsi")
>> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
>> ---
>> arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi | 4 ++++
>> 1 file changed, 4 insertions(+)
>> 
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
>> index c33e85fbdaba..c6c8caed8327 100644
>> --- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
>> +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
>> @@ -154,6 +154,10 @@
>> 	clock-latency = <50000>;
>> };
>> 
>> +&frddr_a {
>> +	status = "okay";
>> +};
>> +
>> &frddr_b {
>> 	status = "okay";
>> };
>> -- 
>> 2.17.1
>
> NB: I appears the same change was sent by Neil in [1] as a fix to 5.4, but
> this appears to have been dropped/missed somewhere.
>
> [1] https://patchwork.kernel.org/patch/11198535/

Hmm, not sure how I dropped that one.  I applied (again) the original
from Neil (with updated tags from Jerome) and queued as fix for v5.7-rc.

Sorry,

Kevin
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
index c33e85fbdaba..c6c8caed8327 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
@@ -154,6 +154,10 @@ 
 	clock-latency = <50000>;
 };
 
+&frddr_a {
+	status = "okay";
+};
+
 &frddr_b {
 	status = "okay";
 };