Add CAN/CANFD/XHCI, fix build for CANFD

7 files changed, 179 insertions, 24 deletions

diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0011-can-rcar_canfd-add-enable-and-standby-control-pins.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0011-can-rcar_canfd-add-enable-and-standby-control-pins.patch
index c35cacc..60834a9 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0011-can-rcar_canfd-add-enable-and-standby-control-pins.patch
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0011-can-rcar_canfd-add-enable-and-standby-control-pins.patch
@@ -87,17 +87,10 @@ index 15a14c5..4aa670d 100644
  
  	if (of_property_read_bool(pdev->dev.of_node, "renesas,no-can-fd"))
  		fdmode = false;			/* Classical CAN only mode */
-@@ -1552,6 +1555,33 @@ static int rcar_canfd_probe(struct platform_device *pdev)
+@@ -1552,6 +1555,26 @@ static int rcar_canfd_probe(struct platform_device *pdev)
  			goto fail_channel;
  	}
  
-+	of_property_read_u32(pdev->dev.of_node,
-+			     "renesas,can-clock-select", &clock_select);
-+	if (clock_select >= ARRAY_SIZE(clock_names)) {
-+		err = -EINVAL;
-+		dev_err(&pdev->dev, "invalid CAN clock selected\n");
-+		goto fail_dev;
-+	}
 +	gpriv->enable_pin = of_get_gpio_flags(pdev->dev.of_node, 0, &enable_flags);
 +	gpriv->standby_pin = of_get_gpio_flags(pdev->dev.of_node, 1, &standby_flags);
 +
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0034-arm64-dts-r8a7795-es1-h3ulcb-kf-add-ADAS-board.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0034-arm64-dts-r8a7795-es1-h3ulcb-kf-add-ADAS-board.patch
index e558d23..74c2b53 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0034-arm64-dts-r8a7795-es1-h3ulcb-kf-add-ADAS-board.patch
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0034-arm64-dts-r8a7795-es1-h3ulcb-kf-add-ADAS-board.patch
@@ -9,8 +9,8 @@ Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
 ---
  arch/arm64/boot/dts/renesas/Makefile               |    1 +
  .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf-v1.dts  |  240 +++
- .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts     | 1569 ++++++++++++++++++++
- 3 files changed, 1810 insertions(+)
+ .../boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts     | 1623 ++++++++++++++++++++
+ 3 files changed, 1864 insertions(+)
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf-v1.dts
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
 
@@ -274,10 +274,10 @@ index 0000000..0c6cca7
 +};
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
 new file mode 100644
-index 0000000..fdc0b5a
+index 0000000..493604d
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
-@@ -0,0 +1,1569 @@
+@@ -0,0 +1,1623 @@
 +/*
 + * Device Tree Source for the H3ULCB Kingfisher board on r8a7795 ES1.x
 + *
@@ -556,6 +556,26 @@ index 0000000..fdc0b5a
 +		groups = "usb0";
 +		function = "usb0";
 +	};
++
++	can0_pins: can0 {
++		groups = "can0_data_a";
++		function = "can0";
++	};
++
++	can1_pins: can1 {
++		groups = "can1_data";
++		function = "can1";
++	};
++
++	canfd0_pins: canfd0 {
++		groups = "canfd0_data_a";
++		function = "canfd0";
++	};
++
++	canfd1_pins: canfd1 {
++		groups = "canfd1_data";
++		function = "canfd1";
++	};
 +};
 +
 +&gpio0 {
@@ -1847,6 +1867,40 @@ index 0000000..fdc0b5a
 +&ohci0 {
 +	status = "okay";
 +};
++
++&xhci0 {
++	status = "okay";
++};
++
++&can0 {
++	pinctrl-0 = <&can0_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	renesas,can-clock-select = <0x0>;
++};
++
++&can1 {
++	pinctrl-0 = <&can1_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	renesas,can-clock-select = <0x0>;
++};
++
++&canfd {
++	pinctrl-0 = <&canfd0_pins &canfd1_pins>;
++	pinctrl-names = "default";
++	status = "disabled";
++
++	channel0 {
++		status = "okay";
++	};
++
++	channel1 {
++		status = "okay";
++	};
++};
 -- 
 1.9.1
 
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0037-arm64-dts-r8a7796-m3ulcb-kf-add-ADAS-board.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0037-arm64-dts-r8a7796-m3ulcb-kf-add-ADAS-board.patch
index f9548ea..9407c87 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0037-arm64-dts-r8a7796-m3ulcb-kf-add-ADAS-board.patch
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0037-arm64-dts-r8a7796-m3ulcb-kf-add-ADAS-board.patch
@@ -8,9 +8,9 @@ M3ULCB.View board on R8A7796
 Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
 ---
  arch/arm64/boot/dts/renesas/Makefile               |    1 +
- .../boot/dts/renesas/r8a7796-m3ulcb-kf-v1.dts      |  235 +++++
- arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts  | 1103 ++++++++++++++++++++
- 3 files changed, 1339 insertions(+)
+ .../boot/dts/renesas/r8a7796-m3ulcb-kf-v1.dts      |  235 ++++
+ arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts  | 1151 ++++++++++++++++++++
+ 3 files changed, 1387 insertions(+)
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf-v1.dts
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
 
@@ -269,10 +269,10 @@ index 0000000..f77ef0f
 +};
 diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
 new file mode 100644
-index 0000000..82faaa1
+index 0000000..a61d752
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts
-@@ -0,0 +1,1097 @@
+@@ -0,0 +1,1151 @@
 +/*
 + * Device Tree Source for the M3ULCB Kingfisher board on r8a7796
 + *
@@ -551,6 +551,26 @@ index 0000000..82faaa1
 +		groups = "usb0";
 +		function = "usb0";
 +	};
++
++	can0_pins: can0 {
++		groups = "can0_data_a";
++		function = "can0";
++	};
++
++	can1_pins: can1 {
++		groups = "can1_data";
++		function = "can1";
++	};
++
++	canfd0_pins: canfd0 {
++		groups = "canfd0_data_a";
++		function = "canfd0";
++	};
++
++	canfd1_pins: canfd1 {
++		groups = "canfd1_data";
++		function = "canfd1";
++	};
 +};
 +
 +&gpio0 {
@@ -1370,6 +1390,40 @@ index 0000000..82faaa1
 +&ohci0 {
 +	status = "okay";
 +};
++
++&xhci0 {
++	status = "okay";
++};
++
++&can0 {
++	pinctrl-0 = <&can0_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	renesas,can-clock-select = <0x0>;
++};
++
++&can1 {
++	pinctrl-0 = <&can1_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	renesas,can-clock-select = <0x0>;
++};
++
++&canfd {
++	pinctrl-0 = <&canfd0_pins &canfd1_pins>;
++	pinctrl-names = "default";
++	status = "disabled";
++
++	channel0 {
++		status = "okay";
++	};
++
++	channel1 {
++		status = "okay";
++	};
++};
 -- 
 1.9.1
 
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0041-arm64-dts-r8a7795-h3ulcb-kf-add-ADAS-board.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0041-arm64-dts-r8a7795-h3ulcb-kf-add-ADAS-board.patch
index a0144b7..2e307e8 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0041-arm64-dts-r8a7795-h3ulcb-kf-add-ADAS-board.patch
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0041-arm64-dts-r8a7795-h3ulcb-kf-add-ADAS-board.patch
@@ -9,8 +9,8 @@ Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
 ---
  arch/arm64/boot/dts/renesas/Makefile               |    1 +
  .../boot/dts/renesas/r8a7795-h3ulcb-kf-v1.dts      |  240 +++
- arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts  | 1565 ++++++++++++++++++++
- 3 files changed, 1806 insertions(+)
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts  | 1619 ++++++++++++++++++++
+ 3 files changed, 1860 insertions(+)
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf-v1.dts
  create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
 
@@ -274,10 +274,10 @@ index 0000000..3485652
 +};
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
 new file mode 100644
-index 0000000..78c708f
+index 0000000..738ce21
 --- /dev/null
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
-@@ -0,0 +1,1565 @@
+@@ -0,0 +1,1619 @@
 +/*
 + * Device Tree Source for the H3ULCB Kingfisher board on r8a7795
 + *
@@ -556,6 +556,26 @@ index 0000000..78c708f
 +		groups = "usb0";
 +		function = "usb0";
 +	};
++
++	can0_pins: can0 {
++		groups = "can0_data_a";
++		function = "can0";
++	};
++
++	can1_pins: can1 {
++		groups = "can1_data";
++		function = "can1";
++	};
++
++	canfd0_pins: canfd0 {
++		groups = "canfd0_data_a";
++		function = "canfd0";
++	};
++
++	canfd1_pins: canfd1 {
++		groups = "canfd1_data";
++		function = "canfd1";
++	};
 +};
 +
 +&gpio0 {
@@ -1843,6 +1863,40 @@ index 0000000..78c708f
 +&ohci0 {
 +	status = "okay";
 +};
++
++&xhci0 {
++	status = "okay";
++};
++
++&can0 {
++	pinctrl-0 = <&can0_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	renesas,can-clock-select = <0x0>;
++};
++
++&can1 {
++	pinctrl-0 = <&can1_pins>;
++	pinctrl-names = "default";
++	status = "okay";
++
++	renesas,can-clock-select = <0x0>;
++};
++
++&canfd {
++	pinctrl-0 = <&canfd0_pins &canfd1_pins>;
++	pinctrl-names = "default";
++	status = "disabled";
++
++	channel0 {
++		status = "okay";
++	};
++
++	channel1 {
++		status = "okay";
++	};
++};
 -- 
 1.9.1
 
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/h3ulcb.cfg b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/h3ulcb.cfg
index 0e0ade7..f8f1a3b 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/h3ulcb.cfg
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/h3ulcb.cfg
@@ -5,7 +5,7 @@ CONFIG_CAN_RAW=y
 CONFIG_CAN_DEV=y
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_RCAR=y
-CONFIG_CANFD_RCAR=y
+CONFIG_CAN_RCAR_CANFD=y
 CONFIG_EXTRA_FIRMWARE="r8a779x_usb3_v2.dlmem"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_BLK_DEV_NVME=m
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/m3ulcb.cfg b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/m3ulcb.cfg
index 0e0ade7..f8f1a3b 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/m3ulcb.cfg
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/m3ulcb.cfg
@@ -5,7 +5,7 @@ CONFIG_CAN_RAW=y
 CONFIG_CAN_DEV=y
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_RCAR=y
-CONFIG_CANFD_RCAR=y
+CONFIG_CAN_RCAR_CANFD=y
 CONFIG_EXTRA_FIRMWARE="r8a779x_usb3_v2.dlmem"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_BLK_DEV_NVME=m
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/salvator-x.cfg b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/salvator-x.cfg
index c5fd6fd..955c69b 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/salvator-x.cfg
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/salvator-x.cfg
@@ -5,7 +5,7 @@ CONFIG_CAN_RAW=y
 CONFIG_CAN_DEV=y
 CONFIG_CAN_CALC_BITTIMING=y
 CONFIG_CAN_RCAR=y
-CONFIG_CANFD_RCAR=y
+CONFIG_CAN_RCAR_CANFD=y
 CONFIG_EXTRA_FIRMWARE="r8a779x_usb3_v2.dlmem"
 CONFIG_EXTRA_FIRMWARE_DIR="firmware"
 CONFIG_VIDEO_ADV_DEBUG=y