From 22c341549d9f342233ad581390d5c216f4d22a03 Mon Sep 17 00:00:00 2001 From: Vladimir Barinov Date: Sun, 5 Nov 2017 18:39:23 +0300 Subject: V3MSK boards update - remove CANFD0 since conflicts with HDMI on pinmux - enable i2c3 on kf - deploy v3msk-vb --- .../0040-arm64-dts-renesas-add-ADAS-boards.patch | 21 ++++++++++++++++----- .../recipes-kernel/linux/linux-renesas_4.9.bbappend | 1 + 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch index 7b34dce..1c45cd1 100644 --- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch +++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch @@ -14085,7 +14085,7 @@ new file mode 100644 index 0000000..4467ab3 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/r8a7797-v3msk-kf.dts -@@ -0,0 +1,567 @@ +@@ -0,0 +1,578 @@ +/* + * Device Tree Source for the V3MSK Kingfisher board on r8a7797 + * @@ -14104,12 +14104,12 @@ index 0000000..4467ab3 +}; + +&canfd { -+ pinctrl-0 = <&canfd0_pins &canfd1_pins>; ++ pinctrl-0 = ; + pinctrl-names = "default"; + status = "okay"; + + channel0 { -+ status = "okay"; ++ status = "disabled"; + }; + + channel1 { @@ -14157,6 +14157,12 @@ index 0000000..4467ab3 +}; + +&i2c3 { ++ pinctrl-0 = <&i2c3_pins>; ++ pinctrl-names = "default"; ++ status = "okay"; ++ ++ clock-frequency = <400000>; ++ + i2cswitch4: pca9548@71 { + compatible = "nxp,pca9548"; + #address-cells = <1>; @@ -14522,6 +14528,11 @@ index 0000000..4467ab3 + groups = "canfd1_data"; + function = "canfd1"; + }; ++ ++ i2c3_pins: i2c3 { ++ groups = "i2c3"; ++ function = "i2c3"; ++ }; +}; + +&vin0 { @@ -14680,12 +14691,12 @@ index 0000000..edc41ad +}; + +&canfd { -+ pinctrl-0 = <&canfd0_pins &canfd1_pins>; ++ pinctrl-0 = ; + pinctrl-names = "default"; + status = "okay"; + + channel0 { -+ status = "okay"; ++ status = "disabled"; + }; + + channel1 { diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend index 893d43a..01446c4 100644 --- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend +++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend @@ -105,4 +105,5 @@ KERNEL_DEVICETREE_append_eagle = " \ KERNEL_DEVICETREE_append_v3msk = " \ renesas/r8a7797-v3msk.dtb \ renesas/r8a7797-v3msk-kf.dtb \ + renesas/r8a7797-v3msk-vb.dtb \ " -- cgit 1.2.3-korg