Message ID | 20230118072656.18845-15-marcel@ziswiler.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm64: dts: freescale: prepare and add apalis imx8 support | expand |
On 18/01/2023 08:26, Marcel Ziswiler wrote: > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > Add Apalis CAN1, CAN2 and optional CAN3 functionality. > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > --- > > Changes in v4: > - New patch adding flexcan functionality. > > .../boot/dts/freescale/imx8-apalis-eval.dtsi | 10 +++++++++- > .../dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 10 +++++++++- > .../dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 12 +++++++++++- > .../boot/dts/freescale/imx8-apalis-v1.1.dtsi | 18 +++++++++++++++--- > 4 files changed, 44 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi > index 003bc5377ce7..3212877773e3 100644 > --- a/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi > @@ -35,7 +35,15 @@ &fec1 { > status = "okay"; > }; > > -/* TODO: CAN */ > +/* Apalis CAN1 */ Squash the patch. Best regards, Krzysztof
On Wed, 2023-01-18 at 15:01 +0100, Krzysztof Kozlowski wrote: > On 18/01/2023 08:26, Marcel Ziswiler wrote: > > From: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > > > Add Apalis CAN1, CAN2 and optional CAN3 functionality. > > > > Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> > > --- > > > > Changes in v4: > > - New patch adding flexcan functionality. > > > > .../boot/dts/freescale/imx8-apalis-eval.dtsi | 10 +++++++++- > > .../dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 10 +++++++++- > > .../dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 12 +++++++++++- > > .../boot/dts/freescale/imx8-apalis-v1.1.dtsi | 18 +++++++++++++++--- > > 4 files changed, 44 insertions(+), 6 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/imx8- > > apalis-eval.dtsi > > index 003bc5377ce7..3212877773e3 100644 > > --- a/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi > > +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi > > @@ -35,7 +35,15 @@ &fec1 { > > status = "okay"; > > }; > > > > -/* TODO: CAN */ > > +/* Apalis CAN1 */ > > Squash the patch. Ditto. > Best regards, > Krzysztof
diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi index 003bc5377ce7..3212877773e3 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-eval.dtsi @@ -35,7 +35,15 @@ &fec1 { status = "okay"; }; -/* TODO: CAN */ +/* Apalis CAN1 */ +&flexcan1 { + status = "okay"; +}; + +/* Apalis CAN2 */ +&flexcan2 { + status = "okay"; +}; /* TODO: GPU */ diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi index 97a7db1f875b..6e248d05992f 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi @@ -75,7 +75,15 @@ &fec1 { status = "okay"; }; -/* TODO: CAN */ +/* Apalis CAN1 */ +&flexcan1 { + status = "okay"; +}; + +/* Apalis CAN2 */ +&flexcan2 { + status = "okay"; +}; /* TODO: GPU */ diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi index 4186c6c9d5ec..d221f3aee241 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi @@ -105,7 +105,17 @@ &fec1 { status = "okay"; }; -/* TODO: CAN */ +/* Apalis CAN1 */ +&flexcan1 { + xceiver-supply = <®_can1_supply>; + status = "okay"; +}; + +/* Apalis CAN2 */ +&flexcan2 { + xceiver-supply = <®_can2_supply>; + status = "okay"; +}; /* TODO: GPU */ diff --git a/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi b/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi index 5508f0daf579..545618799852 100644 --- a/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi @@ -268,11 +268,23 @@ ethphy0: ethernet-phy@7 { }; }; -/* TODO: Apalis CAN1 (driver upstream but device tree part missing) */ +/* Apalis CAN1 */ +&flexcan1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; +}; -/* TODO: Apalis CAN2 (driver upstream but device tree part missing) */ +/* Apalis CAN2 */ +&flexcan2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; +}; -/* TODO: Apalis CAN3 (optional, driver upstream but device tree part missing) */ +/* Apalis CAN3 (optional) */ +&flexcan3 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan3>; +}; /* TODO: Apalis HDMI1 */