| Message ID | 20230302063402.42708-4-zelong.dong@amlogic.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: rc: meson-s4: support RC_DRIVER_SCANCODE driver | expand |
On 02/03/2023 07:34, zelong dong wrote: > From: Zelong Dong <zelong.dong@amlogic.com> > > Add the IR controller device of Meson-S4 SoC family, and enable > hardware IR decoder. > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > --- > .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 6 ++++++ > arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 16 ++++++++++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts > index 8ffbcb2b1ac5..4d3a81b3b762 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts > @@ -28,3 +28,9 @@ memory@0 { > &uart_B { > status = "okay"; > }; > + > +&ir { > + status = "disabled"; > + pinctrl-0 = <&remote_pins>; > + pinctrl-names = "default"; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi > index ad50cba42d19..309352a83eda 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi > @@ -106,6 +106,14 @@ gpio: bank@4000 { > #gpio-cells = <2>; > gpio-ranges = <&periphs_pinctrl 0 0 82>; > }; > + > + remote_pins: remote_pin { No underscores in node names, Best regards, Krzysztof
On 02/03/2023 07:34, zelong dong wrote: > From: Zelong Dong <zelong.dong@amlogic.com> > > Add the IR controller device of Meson-S4 SoC family, and enable > hardware IR decoder. > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > --- > .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 6 ++++++ > arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 16 ++++++++++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts > index 8ffbcb2b1ac5..4d3a81b3b762 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts > @@ -28,3 +28,9 @@ memory@0 { > &uart_B { > status = "okay"; > }; > + > +&ir { > + status = "disabled"; Why is this disabled ? disabled state is already set in dtsi, it should be "okay". Neil > + pinctrl-0 = <&remote_pins>; > + pinctrl-names = "default"; > +}; > diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi > index ad50cba42d19..309352a83eda 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi > @@ -106,6 +106,14 @@ gpio: bank@4000 { > #gpio-cells = <2>; > gpio-ranges = <&periphs_pinctrl 0 0 82>; > }; > + > + remote_pins: remote_pin { > + mux { > + groups = "remote_in"; > + function = "remote_in"; > + bias-disable; > + }; > + }; > }; > > gpio_intc: interrupt-controller@4080 { > @@ -133,6 +141,14 @@ reset: reset-controller@2000 { > reg = <0x0 0x2000 0x0 0x98>; > #reset-cells = <1>; > }; > + > + ir: ir@84000 { > + compatible = "amlogic,meson-s4-ir"; > + reg = <0x0 0x84040 0x0 0x54>; > + interrupts = <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>; > + amlogic,ir-support-hw-decode; > + status = "disabled"; > + }; > }; > }; > };
On Thu, Mar 02, 2023 at 02:34:02PM +0800, zelong dong wrote: > From: Zelong Dong <zelong.dong@amlogic.com> > > Add the IR controller device of Meson-S4 SoC family, and enable > hardware IR decoder. > > Signed-off-by: Zelong Dong <zelong.dong@amlogic.com> > --- > .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 6 ++++++ > arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 16 ++++++++++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts > index 8ffbcb2b1ac5..4d3a81b3b762 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts > @@ -28,3 +28,9 @@ memory@0 { > &uart_B { > status = "okay"; > }; > + > +&ir { > + status = "disabled"; > + pinctrl-0 = <&remote_pins>; > + pinctrl-names = "default"; > +}; I think dts and dtsi changes should be splitted to two different patchsets. Why do we need dts changes if ir node is disabled by default and you don't enable it here? [...]
diff --git a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts index 8ffbcb2b1ac5..4d3a81b3b762 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts +++ b/arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts @@ -28,3 +28,9 @@ memory@0 { &uart_B { status = "okay"; }; + +&ir { + status = "disabled"; + pinctrl-0 = <&remote_pins>; + pinctrl-names = "default"; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi index ad50cba42d19..309352a83eda 100644 --- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi @@ -106,6 +106,14 @@ gpio: bank@4000 { #gpio-cells = <2>; gpio-ranges = <&periphs_pinctrl 0 0 82>; }; + + remote_pins: remote_pin { + mux { + groups = "remote_in"; + function = "remote_in"; + bias-disable; + }; + }; }; gpio_intc: interrupt-controller@4080 { @@ -133,6 +141,14 @@ reset: reset-controller@2000 { reg = <0x0 0x2000 0x0 0x98>; #reset-cells = <1>; }; + + ir: ir@84000 { + compatible = "amlogic,meson-s4-ir"; + reg = <0x0 0x84040 0x0 0x54>; + interrupts = <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>; + amlogic,ir-support-hw-decode; + status = "disabled"; + }; }; }; };