* [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses
@ 2017-12-31 11:23 Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 1/9] ARM: dts: lager: use demuxer for IIC2/I2C2 Wolfram Sang
` (10 more replies)
0 siblings, 11 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang
Here is the updated series to add the I2C IP core switcher to all busses of
Gen2 boards where some kind of switching is possible (mostly to/from GPIO).
These patches were tested locally on Lager and Alt, and remotely on Koelsch,
Porter and Gose. We have no Silk board available but the patch follows the same
style as the other patches. In addition, these patches have been double-checked
by vimdiff-comparing the i2c-bus blobs before and after this patchset.
As discussed previously: the tested boards boot fine. No regression encountered
there. However, changing masters at runtime for HDMI-named busses and PWR-named
busses will likely cause kernel warnings and maybe OOPSes. This is due to the
rebind-issues in the V4L and regulator subsystems. For the former, fixing is
WIP. For the latter, it is unknown how to deal with rebinding in general (but
I'd need to look at this issue again if this is desired). It was decided that
we consider those follow-up problems which should not hold back these patches
anymore. The EXIO named busses seemed to work fine as far as this could be
remotely tested.
Changes since V1:
* fixed I2C4 pinmux for Koelsch and Gose (thanks Geert for the report!)
* rebased to current renesas/dt-for-v4.16
* fixed typo in branch name (s/topc/topic/)
The branch can be found here:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/topic/ip-switch-rework-2017
It is based on v4.15-rc1 + renesas/dt-for-v4.16 merged in.
Please review, comment...
Thanks,
Wolfram
Wolfram Sang (9):
ARM: dts: lager: use demuxer for IIC2/I2C2
ARM: dts: lager: use demuxer for IIC3/I2C3
ARM: dts: koelsch: use demuxer for I2C2
ARM: dts: koelsch: use demuxer for I2C4
ARM: dts: porter: use demuxer for I2C2
ARM: dts: alt: use demuxer for I2C1
ARM: dts: silk: use demuxer for I2C1
ARM: dts: gose: use demuxer for I2C2
ARM: dts: gose: use demuxer for I2C4
arch/arm/boot/dts/r8a7790-lager.dts | 279 ++++++++++++++++++++--------------
arch/arm/boot/dts/r8a7791-koelsch.dts | 232 +++++++++++++++++-----------
arch/arm/boot/dts/r8a7791-porter.dts | 128 +++++++++-------
arch/arm/boot/dts/r8a7793-gose.dts | 252 ++++++++++++++++++------------
arch/arm/boot/dts/r8a7794-alt.dts | 53 +++++--
arch/arm/boot/dts/r8a7794-silk.dts | 128 +++++++++-------
6 files changed, 654 insertions(+), 418 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v2 1/9] ARM: dts: lager: use demuxer for IIC2/I2C2
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
@ 2017-12-31 11:23 ` Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 2/9] ARM: dts: lager: use demuxer for IIC3/I2C3 Wolfram Sang
` (9 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang, Simon Horman
Create a separate bus for HDMI related I2C slaves.
Based on work by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[wsa: rebased, removed typo in comment, fixed aliases, switched to
named GPIOS, sort SCL pins first]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm/boot/dts/r8a7790-lager.dts | 197 +++++++++++++++++++++---------------
1 file changed, 116 insertions(+), 81 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index f2ea632381e7d1..e4050dae7e8e33 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -51,8 +51,10 @@
serial0 = &scif0;
serial1 = &scifa1;
i2c8 = &gpioi2c1;
+ i2c9 = &gpioi2c2;
i2c10 = &i2cexio0;
i2c11 = &i2cexio1;
+ i2c12 = &i2chdmi;
};
chosen {
@@ -272,8 +274,18 @@
#size-cells = <0>;
compatible = "i2c-gpio";
status = "disabled";
- sda-gpios = <&gpio1 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio1 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio1 17 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ i2c-gpio,delay-us = <5>;
+ };
+
+ gpioi2c2: i2c-9 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "i2c-gpio";
+ status = "disabled";
+ scl-gpios = <&gpio5 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio5 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
i2c-gpio,delay-us = <5>;
};
@@ -308,6 +320,96 @@
#address-cells = <1>;
#size-cells = <0>;
};
+
+ /*
+ * IIC2 and I2C2 may be switched using pinmux.
+ * A fallback to GPIO is also provided.
+ */
+ i2chdmi: i2c-12 {
+ compatible = "i2c-demux-pinctrl";
+ i2c-parent = <&iic2>, <&i2c2>, <&gpioi2c2>;
+ i2c-bus-name = "i2c-hdmi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ak4643: codec@12 {
+ compatible = "asahi-kasei,ak4643";
+ #sound-dai-cells = <0>;
+ reg = <0x12>;
+ };
+
+ composite-in@20 {
+ compatible = "adi,adv7180";
+ reg = <0x20>;
+ remote = <&vin1>;
+
+ port {
+ adv7180: endpoint {
+ bus-width = <8>;
+ remote-endpoint = <&vin1ep0>;
+ };
+ };
+ };
+
+ hdmi@39 {
+ compatible = "adi,adv7511w";
+ reg = <0x39>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
+
+ adi,input-depth = <8>;
+ adi,input-colorspace = "rgb";
+ adi,input-clock = "1x";
+ adi,input-style = <1>;
+ adi,input-justification = "evenly";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7511_in: endpoint {
+ remote-endpoint = <&du_out_lvds0>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ adv7511_out: endpoint {
+ remote-endpoint = <&hdmi_con_out>;
+ };
+ };
+ };
+ };
+
+ hdmi-in@4c {
+ compatible = "adi,adv7612";
+ reg = <0x4c>;
+ interrupt-parent = <&gpio1>;
+ interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
+ default-input = <0>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7612_in: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+ };
+
+ port@2 {
+ reg = <2>;
+ adv7612_out: endpoint {
+ remote-endpoint = <&vin0ep2>;
+ };
+ };
+ };
+ };
+ };
};
&du {
@@ -437,6 +539,11 @@
function = "iic1";
};
+ i2c2_pins: i2c2 {
+ groups = "i2c2";
+ function = "i2c2";
+ };
+
iic2_pins: iic2 {
groups = "iic2";
function = "iic2";
@@ -643,90 +750,18 @@
pinctrl-names = "i2c-exio1";
};
-&iic2 {
- status = "okay";
- pinctrl-0 = <&iic2_pins>;
- pinctrl-names = "default";
+&i2c2 {
+ pinctrl-0 = <&i2c2_pins>;
+ pinctrl-names = "i2c-hdmi";
clock-frequency = <100000>;
+};
- ak4643: codec@12 {
- compatible = "asahi-kasei,ak4643";
- #sound-dai-cells = <0>;
- reg = <0x12>;
- };
-
- composite-in@20 {
- compatible = "adi,adv7180";
- reg = <0x20>;
- remote = <&vin1>;
-
- port {
- adv7180: endpoint {
- bus-width = <8>;
- remote-endpoint = <&vin1ep0>;
- };
- };
- };
-
- hdmi@39 {
- compatible = "adi,adv7511w";
- reg = <0x39>;
- interrupt-parent = <&gpio1>;
- interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
-
- adi,input-depth = <8>;
- adi,input-colorspace = "rgb";
- adi,input-clock = "1x";
- adi,input-style = <1>;
- adi,input-justification = "evenly";
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- adv7511_in: endpoint {
- remote-endpoint = <&du_out_lvds0>;
- };
- };
-
- port@1 {
- reg = <1>;
- adv7511_out: endpoint {
- remote-endpoint = <&hdmi_con_out>;
- };
- };
- };
- };
-
- hdmi-in@4c {
- compatible = "adi,adv7612";
- reg = <0x4c>;
- interrupt-parent = <&gpio1>;
- interrupts = <20 IRQ_TYPE_LEVEL_LOW>;
- default-input = <0>;
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- adv7612_in: endpoint {
- remote-endpoint = <&hdmi_con_in>;
- };
- };
+&iic2 {
+ pinctrl-0 = <&iic2_pins>;
+ pinctrl-names = "i2c-hdmi";
- port@2 {
- reg = <2>;
- adv7612_out: endpoint {
- remote-endpoint = <&vin0ep2>;
- };
- };
- };
- };
+ clock-frequency = <100000>;
};
&iic3 {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/9] ARM: dts: lager: use demuxer for IIC3/I2C3
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 1/9] ARM: dts: lager: use demuxer for IIC2/I2C2 Wolfram Sang
@ 2017-12-31 11:23 ` Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 3/9] ARM: dts: koelsch: use demuxer for I2C2 Wolfram Sang
` (8 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang, Simon Horman
Create a separate bus for da9063 PMIC and da9210 regulator
related I2C slaves.
Based on similar work for HDMI by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[wsa: rebased, corrected chip name in commit msg, updated aliases]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm/boot/dts/r8a7790-lager.dts | 84 +++++++++++++++++++++++--------------
1 file changed, 53 insertions(+), 31 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index e4050dae7e8e33..6f6e41c9fc4f6c 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -55,6 +55,7 @@
i2c10 = &i2cexio0;
i2c11 = &i2cexio1;
i2c12 = &i2chdmi;
+ i2c13 = &i2cpwr;
};
chosen {
@@ -410,6 +411,46 @@
};
};
};
+
+ /*
+ * IIC3 and I2C3 may be switched using pinmux.
+ * IIC3/I2C3 does not appear to support fallback to GPIO.
+ */
+ i2cpwr: i2c-13 {
+ compatible = "i2c-demux-pinctrl";
+ i2c-parent = <&iic3>, <&i2c3>;
+ i2c-bus-name = "i2c-pwr";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pmic@58 {
+ compatible = "dlg,da9063";
+ reg = <0x58>;
+ interrupt-parent = <&irqc0>;
+ interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-controller;
+
+ rtc {
+ compatible = "dlg,da9063-rtc";
+ };
+
+ wdt {
+ compatible = "dlg,da9063-watchdog";
+ };
+ };
+
+ vdd_dvfs: regulator@68 {
+ compatible = "dlg,da9210";
+ reg = <0x68>;
+ interrupt-parent = <&irqc0>;
+ interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+ };
};
&du {
@@ -549,6 +590,11 @@
function = "iic2";
};
+ i2c3_pins: i2c3 {
+ groups = "i2c3";
+ function = "i2c3";
+ };
+
iic3_pins: iic3 {
groups = "iic3";
function = "iic3";
@@ -764,38 +810,14 @@
clock-frequency = <100000>;
};
-&iic3 {
- pinctrl-names = "default";
- pinctrl-0 = <&iic3_pins>;
- status = "okay";
-
- pmic@58 {
- compatible = "dlg,da9063";
- reg = <0x58>;
- interrupt-parent = <&irqc0>;
- interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- interrupt-controller;
-
- rtc {
- compatible = "dlg,da9063-rtc";
- };
-
- wdt {
- compatible = "dlg,da9063-watchdog";
- };
- };
-
- vdd_dvfs: regulator@68 {
- compatible = "dlg,da9210";
- reg = <0x68>;
- interrupt-parent = <&irqc0>;
- interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+&i2c3 {
+ pinctrl-0 = <&i2c3_pins>;
+ pinctrl-names = "i2c-pwr";
+};
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <1000000>;
- regulator-boot-on;
- regulator-always-on;
- };
+&iic3 {
+ pinctrl-0 = <&iic3_pins>;
+ pinctrl-names = "i2c-pwr";
};
&pci0 {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 3/9] ARM: dts: koelsch: use demuxer for I2C2
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 1/9] ARM: dts: lager: use demuxer for IIC2/I2C2 Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 2/9] ARM: dts: lager: use demuxer for IIC3/I2C3 Wolfram Sang
@ 2017-12-31 11:23 ` Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 4/9] ARM: dts: koelsch: use demuxer for I2C4 Wolfram Sang
` (7 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang, Simon Horman
Create a separate bus for HDMI related I2C2 and provide fallback to GPIO.
Based on work for the r8a7790/lager by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[wsa: rebased, fixed aliases, switched to named GPIOs, sorted by SCL
pins]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 200 +++++++++++++++++++---------------
1 file changed, 111 insertions(+), 89 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index a50924d12b6f37..4b20db197de629 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -51,7 +51,9 @@
serial0 = &scif0;
serial1 = &scif1;
i2c9 = &gpioi2c1;
+ i2c10 = &gpioi2c2;
i2c12 = &i2cexio1;
+ i2c13 = &i2chdmi;
};
chosen {
@@ -312,8 +314,18 @@
#size-cells = <0>;
compatible = "i2c-gpio";
status = "disabled";
- sda-gpios = <&gpio7 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio7 15 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio7 16 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ i2c-gpio,delay-us = <5>;
+ };
+
+ gpioi2c2: i2c-10 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "i2c-gpio";
+ status = "disabled";
+ scl-gpios = <&gpio2 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio2 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
i2c-gpio,delay-us = <5>;
};
@@ -328,6 +340,103 @@
#address-cells = <1>;
#size-cells = <0>;
};
+
+ /*
+ * A fallback to GPIO is provided for I2C2.
+ */
+ i2chdmi: i2c-13 {
+ compatible = "i2c-demux-pinctrl";
+ i2c-parent = <&i2c2>, <&gpioi2c2>;
+ i2c-bus-name = "i2c-hdmi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ak4643: codec@12 {
+ compatible = "asahi-kasei,ak4643";
+ #sound-dai-cells = <0>;
+ reg = <0x12>;
+ };
+
+ composite-in@20 {
+ compatible = "adi,adv7180";
+ reg = <0x20>;
+ remote = <&vin1>;
+
+ port {
+ adv7180: endpoint {
+ bus-width = <8>;
+ remote-endpoint = <&vin1ep>;
+ };
+ };
+ };
+
+ hdmi@39 {
+ compatible = "adi,adv7511w";
+ reg = <0x39>;
+ interrupt-parent = <&gpio3>;
+ interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+ clocks = <&cec_clock>;
+ clock-names = "cec";
+
+ adi,input-depth = <8>;
+ adi,input-colorspace = "rgb";
+ adi,input-clock = "1x";
+ adi,input-style = <1>;
+ adi,input-justification = "evenly";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7511_in: endpoint {
+ remote-endpoint = <&du_out_rgb>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ adv7511_out: endpoint {
+ remote-endpoint = <&hdmi_con_out>;
+ };
+ };
+ };
+ };
+
+ hdmi-in@4c {
+ compatible = "adi,adv7612";
+ reg = <0x4c>;
+ interrupt-parent = <&gpio4>;
+ interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ default-input = <0>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7612_in: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+ };
+
+ port@2 {
+ reg = <2>;
+ adv7612_out: endpoint {
+ remote-endpoint = <&vin0ep2>;
+ };
+ };
+ };
+ };
+
+ eeprom@50 {
+ compatible = "renesas,r1ex24002", "atmel,24c02";
+ reg = <0x50>;
+ pagesize = <16>;
+ };
+ };
};
&du {
@@ -621,96 +730,9 @@
&i2c2 {
pinctrl-0 = <&i2c2_pins>;
- pinctrl-names = "default";
+ pinctrl-names = "i2c-hdmi";
- status = "okay";
clock-frequency = <100000>;
-
- ak4643: codec@12 {
- compatible = "asahi-kasei,ak4643";
- #sound-dai-cells = <0>;
- reg = <0x12>;
- };
-
- composite-in@20 {
- compatible = "adi,adv7180";
- reg = <0x20>;
- remote = <&vin1>;
-
- port {
- adv7180: endpoint {
- bus-width = <8>;
- remote-endpoint = <&vin1ep>;
- };
- };
- };
-
- hdmi@39 {
- compatible = "adi,adv7511w";
- reg = <0x39>;
- interrupt-parent = <&gpio3>;
- interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
- clocks = <&cec_clock>;
- clock-names = "cec";
-
- adi,input-depth = <8>;
- adi,input-colorspace = "rgb";
- adi,input-clock = "1x";
- adi,input-style = <1>;
- adi,input-justification = "evenly";
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- adv7511_in: endpoint {
- remote-endpoint = <&du_out_rgb>;
- };
- };
-
- port@1 {
- reg = <1>;
- adv7511_out: endpoint {
- remote-endpoint = <&hdmi_con_out>;
- };
- };
- };
- };
-
- hdmi-in@4c {
- compatible = "adi,adv7612";
- reg = <0x4c>;
- interrupt-parent = <&gpio4>;
- interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- default-input = <0>;
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- adv7612_in: endpoint {
- remote-endpoint = <&hdmi_con_in>;
- };
- };
-
- port@2 {
- reg = <2>;
- adv7612_out: endpoint {
- remote-endpoint = <&vin0ep2>;
- };
- };
- };
- };
-
- eeprom@50 {
- compatible = "renesas,r1ex24002", "atmel,24c02";
- reg = <0x50>;
- pagesize = <16>;
- };
};
&i2c6 {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 4/9] ARM: dts: koelsch: use demuxer for I2C4
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
` (2 preceding siblings ...)
2017-12-31 11:23 ` [PATCH v2 3/9] ARM: dts: koelsch: use demuxer for I2C2 Wolfram Sang
@ 2017-12-31 11:23 ` Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 5/9] ARM: dts: porter: use demuxer for I2C2 Wolfram Sang
` (6 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang, Simon Horman
Make it possible to fallback to GPIO for I2C4 on the EXIO-E connector.
This is based on reference work for the I2C0 core of the lager/r8a7790
by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[wsa: rebased, fixed aliases, switched to named GPIOS, fixed pinmux for I2C4]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Change since V1:
* fixed pinmux group for I2C4
arch/arm/boot/dts/r8a7791-koelsch.dts | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 4b20db197de629..f40321a1c917e7 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -52,8 +52,10 @@
serial1 = &scif1;
i2c9 = &gpioi2c1;
i2c10 = &gpioi2c2;
+ i2c11 = &gpioi2c4;
i2c12 = &i2cexio1;
i2c13 = &i2chdmi;
+ i2c14 = &i2cexio4;
};
chosen {
@@ -329,6 +331,16 @@
i2c-gpio,delay-us = <5>;
};
+ gpioi2c4: i2c-11 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "i2c-gpio";
+ status = "disabled";
+ scl-gpios = <&gpio7 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio7 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ i2c-gpio,delay-us = <5>;
+ };
+
/*
* I2C1 is routed to EXIO connector B, pins 64 (SCL) + 66 (SDA).
* A fallback to GPIO is provided.
@@ -437,6 +449,18 @@
pagesize = <16>;
};
};
+
+ /*
+ * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
+ * A fallback to GPIO is provided.
+ */
+ i2cexio4: i2c-14 {
+ compatible = "i2c-demux-pinctrl";
+ i2c-parent = <&i2c4>, <&gpioi2c4>;
+ i2c-bus-name = "i2c-exio4";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
&du {
@@ -480,6 +504,11 @@
function = "i2c2";
};
+ i2c4_pins: i2c4 {
+ groups = "i2c4_c";
+ function = "i2c4";
+ };
+
du_pins: du {
groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
function = "du";
@@ -735,6 +764,11 @@
clock-frequency = <100000>;
};
+&i2c4 {
+ pinctrl-0 = <&i2c4_pins>;
+ pinctrl-names = "i2c-exio4";
+};
+
&i2c6 {
status = "okay";
clock-frequency = <100000>;
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 5/9] ARM: dts: porter: use demuxer for I2C2
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
` (3 preceding siblings ...)
2017-12-31 11:23 ` [PATCH v2 4/9] ARM: dts: koelsch: use demuxer for I2C4 Wolfram Sang
@ 2017-12-31 11:23 ` Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 6/9] ARM: dts: alt: use demuxer for I2C1 Wolfram Sang
` (5 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang, Simon Horman
Create a separate bus for HDMI related I2C2 and provide fallback to GPIO.
Based on work for the r8a7790/lager by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[wsa: rebased, fixed aliases, switched to named GPIOs]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm/boot/dts/r8a7791-porter.dts | 128 ++++++++++++++++++++---------------
1 file changed, 75 insertions(+), 53 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index eb374956294f69..0a503a1ed95b44 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -29,6 +29,8 @@
aliases {
serial0 = &scif0;
+ i2c9 = &gpioi2c2;
+ i2c10 = &i2chdmi;
};
chosen {
@@ -135,6 +137,78 @@
clocks = <&x14_clk>;
};
};
+
+ gpioi2c2: i2c-9 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "i2c-gpio";
+ status = "disabled";
+ scl-gpios = <&gpio2 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio2 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ i2c-gpio,delay-us = <5>;
+ };
+
+ /*
+ * A fallback to GPIO is provided for I2C2.
+ */
+ i2chdmi: i2c-10 {
+ compatible = "i2c-demux-pinctrl";
+ i2c-parent = <&i2c2>, <&gpioi2c2>;
+ i2c-bus-name = "i2c-hdmi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ak4642: codec@12 {
+ compatible = "asahi-kasei,ak4642";
+ #sound-dai-cells = <0>;
+ reg = <0x12>;
+ };
+
+ composite-in@20 {
+ compatible = "adi,adv7180";
+ reg = <0x20>;
+ remote = <&vin0>;
+
+ port {
+ adv7180: endpoint {
+ bus-width = <8>;
+ remote-endpoint = <&vin0ep>;
+ };
+ };
+ };
+
+ hdmi@39 {
+ compatible = "adi,adv7511w";
+ reg = <0x39>;
+ interrupt-parent = <&gpio3>;
+ interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+
+ adi,input-depth = <8>;
+ adi,input-colorspace = "rgb";
+ adi,input-clock = "1x";
+ adi,input-style = <1>;
+ adi,input-justification = "evenly";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7511_in: endpoint {
+ remote-endpoint = <&du_out_rgb>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ adv7511_out: endpoint {
+ remote-endpoint = <&hdmi_con>;
+ };
+ };
+ };
+ };
+ };
};
&extal_clk {
@@ -296,61 +370,9 @@
&i2c2 {
pinctrl-0 = <&i2c2_pins>;
- pinctrl-names = "default";
+ pinctrl-names = "i2c-hdmi";
- status = "okay";
clock-frequency = <400000>;
-
- ak4642: codec@12 {
- compatible = "asahi-kasei,ak4642";
- #sound-dai-cells = <0>;
- reg = <0x12>;
- };
-
- composite-in@20 {
- compatible = "adi,adv7180";
- reg = <0x20>;
- remote = <&vin0>;
-
- port {
- adv7180: endpoint {
- bus-width = <8>;
- remote-endpoint = <&vin0ep>;
- };
- };
- };
-
- hdmi@39 {
- compatible = "adi,adv7511w";
- reg = <0x39>;
- interrupt-parent = <&gpio3>;
- interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
-
- adi,input-depth = <8>;
- adi,input-colorspace = "rgb";
- adi,input-clock = "1x";
- adi,input-style = <1>;
- adi,input-justification = "evenly";
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- adv7511_in: endpoint {
- remote-endpoint = <&du_out_rgb>;
- };
- };
-
- port@1 {
- reg = <1>;
- adv7511_out: endpoint {
- remote-endpoint = <&hdmi_con>;
- };
- };
- };
- };
};
&sata0 {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 6/9] ARM: dts: alt: use demuxer for I2C1
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
` (4 preceding siblings ...)
2017-12-31 11:23 ` [PATCH v2 5/9] ARM: dts: porter: use demuxer for I2C2 Wolfram Sang
@ 2017-12-31 11:23 ` Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 7/9] ARM: dts: silk: " Wolfram Sang
` (4 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang, Simon Horman
Create a separate bus for HDMI related I2C1 and provide fallback to GPIO.
Based on work for the r8a7790/lager by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[wsa: rebased, fixed aliases, switched to named GPIOs]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm/boot/dts/r8a7794-alt.dts | 53 +++++++++++++++++++++++++++------------
1 file changed, 37 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 60c6515c499660..26a883484ea814 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -18,7 +18,9 @@
aliases {
serial0 = &scif2;
+ i2c9 = &gpioi2c1;
i2c10 = &gpioi2c4;
+ i2c11 = &i2chdmi;
i2c12 = &i2cexio4;
};
@@ -138,17 +140,50 @@
clock-frequency = <148500000>;
};
+ gpioi2c1: i2c-9 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "i2c-gpio";
+ status = "disabled";
+ scl-gpios = <&gpio4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ };
+
gpioi2c4: i2c-10 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "i2c-gpio";
status = "disabled";
- sda-gpios = <&gpio4 9 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpio4 8 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio4 9 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
i2c-gpio,delay-us = <5>;
};
/*
+ * A fallback to GPIO is provided for I2C1.
+ */
+ i2chdmi: i2c-11 {
+ compatible = "i2c-demux-pinctrl";
+ i2c-parent = <&i2c1>, <&gpioi2c1>;
+ i2c-bus-name = "i2c-hdmi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ composite-in@20 {
+ compatible = "adi,adv7180";
+ reg = <0x20>;
+ remote = <&vin0>;
+
+ port {
+ adv7180: endpoint {
+ bus-width = <8>;
+ remote-endpoint = <&vin0ep>;
+ };
+ };
+ };
+ };
+
+ /*
* I2C4 is routed to EXIO connector B, pins 73 (SCL) + 74 (SDA).
* A fallback to GPIO is provided.
*/
@@ -324,23 +359,9 @@
&i2c1 {
pinctrl-0 = <&i2c1_pins>;
- pinctrl-names = "default";
+ pinctrl-names = "i2c-hdmi";
- status = "okay";
clock-frequency = <400000>;
-
- composite-in@20 {
- compatible = "adi,adv7180";
- reg = <0x20>;
- remote = <&vin0>;
-
- port {
- adv7180: endpoint {
- bus-width = <8>;
- remote-endpoint = <&vin0ep>;
- };
- };
- };
};
&i2c4 {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 7/9] ARM: dts: silk: use demuxer for I2C1
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
` (5 preceding siblings ...)
2017-12-31 11:23 ` [PATCH v2 6/9] ARM: dts: alt: use demuxer for I2C1 Wolfram Sang
@ 2017-12-31 11:23 ` Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 8/9] ARM: dts: gose: use demuxer for I2C2 Wolfram Sang
` (3 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang, Simon Horman
Create a separate bus for HDMI related I2C1 and provide fallback to GPIO.
Based on work for the r8a7790/lager by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[wsa: rebased, fixed aliases, switched to named GPIOs]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm/boot/dts/r8a7794-silk.dts | 128 ++++++++++++++++++++++---------------
1 file changed, 75 insertions(+), 53 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
index edfad0e5ac53a0..f1afe2dda13a36 100644
--- a/arch/arm/boot/dts/r8a7794-silk.dts
+++ b/arch/arm/boot/dts/r8a7794-silk.dts
@@ -31,6 +31,8 @@
aliases {
serial0 = &scif2;
+ i2c9 = &gpioi2c1;
+ i2c10 = &i2chdmi;
};
chosen {
@@ -153,6 +155,78 @@
clocks = <&x9_clk>;
};
};
+
+ gpioi2c1: i2c-9 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "i2c-gpio";
+ status = "disabled";
+ scl-gpios = <&gpio4 0 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio4 1 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ i2c-gpio,delay-us = <5>;
+ };
+
+ /*
+ * A fallback to GPIO is provided for I2C1.
+ */
+ i2chdmi: i2c-10 {
+ compatible = "i2c-demux-pinctrl";
+ i2c-parent = <&i2c1>, <&gpioi2c1>;
+ i2c-bus-name = "i2c-hdmi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ak4643: codec@12 {
+ compatible = "asahi-kasei,ak4643";
+ #sound-dai-cells = <0>;
+ reg = <0x12>;
+ };
+
+ composite-in@20 {
+ compatible = "adi,adv7180";
+ reg = <0x20>;
+ remote = <&vin0>;
+
+ port {
+ adv7180: endpoint {
+ bus-width = <8>;
+ remote-endpoint = <&vin0ep>;
+ };
+ };
+ };
+
+ hdmi@39 {
+ compatible = "adi,adv7511w";
+ reg = <0x39>;
+ interrupt-parent = <&gpio5>;
+ interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
+
+ adi,input-depth = <8>;
+ adi,input-colorspace = "rgb";
+ adi,input-clock = "1x";
+ adi,input-style = <1>;
+ adi,input-justification = "evenly";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7511_in: endpoint {
+ remote-endpoint = <&du_out_rgb0>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ adv7511_out: endpoint {
+ remote-endpoint = <&hdmi_con>;
+ };
+ };
+ };
+ };
+ };
};
&extal_clk {
@@ -268,61 +342,9 @@
&i2c1 {
pinctrl-0 = <&i2c1_pins>;
- pinctrl-names = "default";
+ pinctrl-names = "i2c-hdmi";
- status = "okay";
clock-frequency = <400000>;
-
- ak4643: codec@12 {
- compatible = "asahi-kasei,ak4643";
- #sound-dai-cells = <0>;
- reg = <0x12>;
- };
-
- composite-in@20 {
- compatible = "adi,adv7180";
- reg = <0x20>;
- remote = <&vin0>;
-
- port {
- adv7180: endpoint {
- bus-width = <8>;
- remote-endpoint = <&vin0ep>;
- };
- };
- };
-
- hdmi@39 {
- compatible = "adi,adv7511w";
- reg = <0x39>;
- interrupt-parent = <&gpio5>;
- interrupts = <23 IRQ_TYPE_LEVEL_LOW>;
-
- adi,input-depth = <8>;
- adi,input-colorspace = "rgb";
- adi,input-clock = "1x";
- adi,input-style = <1>;
- adi,input-justification = "evenly";
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- adv7511_in: endpoint {
- remote-endpoint = <&du_out_rgb0>;
- };
- };
-
- port@1 {
- reg = <1>;
- adv7511_out: endpoint {
- remote-endpoint = <&hdmi_con>;
- };
- };
- };
- };
};
&mmcif0 {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 8/9] ARM: dts: gose: use demuxer for I2C2
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
` (6 preceding siblings ...)
2017-12-31 11:23 ` [PATCH v2 7/9] ARM: dts: silk: " Wolfram Sang
@ 2017-12-31 11:23 ` Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 9/9] ARM: dts: gose: use demuxer for I2C4 Wolfram Sang
` (2 subsequent siblings)
10 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang, Simon Horman
Create a separate bus for HDMI related I2C2 and provide fallback to GPIO.
Based on work for the r8a7790/lager by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[wsa: rebased, corrected board name in subject, fixed aliases, switched
to named GPIOs]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
arch/arm/boot/dts/r8a7793-gose.dts | 218 ++++++++++++++++++++-----------------
1 file changed, 121 insertions(+), 97 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index 51b3ffac8efaad..2b330ef71f4c17 100644
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -48,6 +48,8 @@
aliases {
serial0 = &scif0;
serial1 = &scif1;
+ i2c9 = &gpioi2c2;
+ i2c11 = &i2chdmi;
};
chosen {
@@ -296,6 +298,124 @@
#clock-cells = <0>;
clock-frequency = <148500000>;
};
+
+ gpioi2c2: i2c-9 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "i2c-gpio";
+ status = "disabled";
+ scl-gpios = <&gpio2 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio2 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ i2c-gpio,delay-us = <5>;
+ };
+
+ /*
+ * A fallback to GPIO is provided for I2C2.
+ */
+ i2chdmi: i2c-11 {
+ compatible = "i2c-demux-pinctrl";
+ i2c-parent = <&i2c2>, <&gpioi2c2>;
+ i2c-bus-name = "i2c-hdmi";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ak4643: codec@12 {
+ compatible = "asahi-kasei,ak4643";
+ #sound-dai-cells = <0>;
+ reg = <0x12>;
+ };
+
+ composite-in@20 {
+ compatible = "adi,adv7180cp";
+ reg = <0x20>;
+ remote = <&vin1>;
+
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7180_in: endpoint {
+ remote-endpoint = <&composite_con_in>;
+ };
+ };
+
+ port@3 {
+ reg = <3>;
+ adv7180_out: endpoint {
+ bus-width = <8>;
+ remote-endpoint = <&vin1ep>;
+ };
+ };
+ };
+ };
+
+ hdmi@39 {
+ compatible = "adi,adv7511w";
+ reg = <0x39>;
+ interrupt-parent = <&gpio3>;
+ interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
+
+ adi,input-depth = <8>;
+ adi,input-colorspace = "rgb";
+ adi,input-clock = "1x";
+ adi,input-style = <1>;
+ adi,input-justification = "evenly";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7511_in: endpoint {
+ remote-endpoint = <&du_out_rgb>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+ adv7511_out: endpoint {
+ remote-endpoint = <&hdmi_con_out>;
+ };
+ };
+ };
+ };
+
+ hdmi-in@4c {
+ compatible = "adi,adv7612";
+ reg = <0x4c>;
+ interrupt-parent = <&gpio4>;
+ interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+ default-input = <0>;
+
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+ adv7612_in: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+ };
+
+ port@2 {
+ reg = <2>;
+ adv7612_out: endpoint {
+ remote-endpoint = <&vin0ep2>;
+ };
+ };
+ };
+ };
+
+ eeprom@50 {
+ compatible = "renesas,r1ex24002", "atmel,24c02";
+ reg = <0x50>;
+ pagesize = <16>;
+ };
+ };
};
&du {
@@ -544,107 +664,11 @@
&i2c2 {
pinctrl-0 = <&i2c2_pins>;
- pinctrl-names = "default";
+ pinctrl-names = "i2c-hdmi";
status = "okay";
clock-frequency = <100000>;
- ak4643: codec@12 {
- compatible = "asahi-kasei,ak4643";
- #sound-dai-cells = <0>;
- reg = <0x12>;
- };
-
- composite-in@20 {
- compatible = "adi,adv7180cp";
- reg = <0x20>;
- remote = <&vin1>;
-
- port {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- adv7180_in: endpoint {
- remote-endpoint = <&composite_con_in>;
- };
- };
-
- port@3 {
- reg = <3>;
- adv7180_out: endpoint {
- bus-width = <8>;
- remote-endpoint = <&vin1ep>;
- };
- };
- };
- };
-
- hdmi@39 {
- compatible = "adi,adv7511w";
- reg = <0x39>;
- interrupt-parent = <&gpio3>;
- interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
-
- adi,input-depth = <8>;
- adi,input-colorspace = "rgb";
- adi,input-clock = "1x";
- adi,input-style = <1>;
- adi,input-justification = "evenly";
-
- ports {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- adv7511_in: endpoint {
- remote-endpoint = <&du_out_rgb>;
- };
- };
-
- port@1 {
- reg = <1>;
- adv7511_out: endpoint {
- remote-endpoint = <&hdmi_con_out>;
- };
- };
- };
- };
-
- hdmi-in@4c {
- compatible = "adi,adv7612";
- reg = <0x4c>;
- interrupt-parent = <&gpio4>;
- interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
- default-input = <0>;
-
- port {
- #address-cells = <1>;
- #size-cells = <0>;
-
- port@0 {
- reg = <0>;
- adv7612_in: endpoint {
- remote-endpoint = <&hdmi_con_in>;
- };
- };
-
- port@2 {
- reg = <2>;
- adv7612_out: endpoint {
- remote-endpoint = <&vin0ep2>;
- };
- };
- };
- };
-
- eeprom@50 {
- compatible = "renesas,r1ex24002", "atmel,24c02";
- reg = <0x50>;
- pagesize = <16>;
- };
};
&i2c6 {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 9/9] ARM: dts: gose: use demuxer for I2C4
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
` (7 preceding siblings ...)
2017-12-31 11:23 ` [PATCH v2 8/9] ARM: dts: gose: use demuxer for I2C2 Wolfram Sang
@ 2017-12-31 11:23 ` Wolfram Sang
2018-01-02 21:58 ` [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Niklas Söderlund
2018-01-30 10:51 ` Wolfram Sang
10 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2017-12-31 11:23 UTC (permalink / raw)
To: linux-renesas-soc; +Cc: Simon Horman, Magnus Damm, Wolfram Sang, Simon Horman
Make it possible to fallback to GPIO for I2C4 on the EXIO-E connector.
This is based on reference work for the I2C0 core of the lager/r8a7790
by Wolfram Sang.
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
[wsa: rebased, corrected board name in subject, fixed aliases, switched
to named GPIOs, fixed pinmux for I2C4]
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Change since V1:
* fixed pinmux group for I2C4
arch/arm/boot/dts/r8a7793-gose.dts | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
index 2b330ef71f4c17..9ed6961f2d9a2c 100644
--- a/arch/arm/boot/dts/r8a7793-gose.dts
+++ b/arch/arm/boot/dts/r8a7793-gose.dts
@@ -49,7 +49,9 @@
serial0 = &scif0;
serial1 = &scif1;
i2c9 = &gpioi2c2;
+ i2c10 = &gpioi2c4;
i2c11 = &i2chdmi;
+ i2c12 = &i2cexio4;
};
chosen {
@@ -309,6 +311,16 @@
i2c-gpio,delay-us = <5>;
};
+ gpioi2c4: i2c-10 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "i2c-gpio";
+ status = "disabled";
+ scl-gpios = <&gpio7 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ sda-gpios = <&gpio7 14 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+ i2c-gpio,delay-us = <5>;
+ };
+
/*
* A fallback to GPIO is provided for I2C2.
*/
@@ -416,6 +428,18 @@
pagesize = <16>;
};
};
+
+ /*
+ * I2C4 is routed to EXIO connector E, pins 37 (SCL) + 39 (SDA).
+ * A fallback to GPIO is provided.
+ */
+ i2cexio4: i2c-12 {
+ compatible = "i2c-demux-pinctrl";
+ i2c-parent = <&i2c4>, <&gpioi2c4>;
+ i2c-bus-name = "i2c-exio4";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
&du {
@@ -454,6 +478,11 @@
function = "i2c2";
};
+ i2c4_pins: i2c4 {
+ groups = "i2c4_c";
+ function = "i2c4";
+ };
+
du_pins: du {
groups = "du_rgb888", "du_sync", "du_disp", "du_clk_out_0";
function = "du";
@@ -692,6 +721,11 @@
};
};
+&i2c4 {
+ pinctrl-0 = <&i2c4_pins>;
+ pinctrl-names = "i2c-exio4";
+};
+
&rcar_sound {
pinctrl-0 = <&sound_pins &sound_clk_pins>;
pinctrl-names = "default";
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
` (8 preceding siblings ...)
2017-12-31 11:23 ` [PATCH v2 9/9] ARM: dts: gose: use demuxer for I2C4 Wolfram Sang
@ 2018-01-02 21:58 ` Niklas Söderlund
2018-01-02 22:28 ` Wolfram Sang
2018-01-30 10:51 ` Wolfram Sang
10 siblings, 1 reply; 14+ messages in thread
From: Niklas Söderlund @ 2018-01-02 21:58 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-renesas-soc, Simon Horman, Magnus Damm
Hi Wolfram,
Thanks for your work.
On 2017-12-31 12:23:11 +0100, Wolfram Sang wrote:
> Here is the updated series to add the I2C IP core switcher to all busses of
> Gen2 boards where some kind of switching is possible (mostly to/from GPIO).
>
> These patches were tested locally on Lager and Alt, and remotely on Koelsch,
> Porter and Gose. We have no Silk board available but the patch follows the same
> style as the other patches. In addition, these patches have been double-checked
> by vimdiff-comparing the i2c-bus blobs before and after this patchset.
>
> As discussed previously: the tested boards boot fine. No regression encountered
> there. However, changing masters at runtime for HDMI-named busses and PWR-named
> busses will likely cause kernel warnings and maybe OOPSes. This is due to the
> rebind-issues in the V4L and regulator subsystems. For the former, fixing is
> WIP. For the latter, it is unknown how to deal with rebinding in general (but
> I'd need to look at this issue again if this is desired).
For V4L there is no fix that I know of in the near future. I have
previously posted series for rcar-vin which resolved this issue by
registering/unregistering the video devices at probe/remove time instead
of at bind/unbind time of subdevices of the video device. This solution
was not liked by Hans and was nacked in favor of the current scheme
which is used in V4L (and the VIN Gen2 driver), which unfortunately have
this drawback that the unbind/bind of subdevices are broken.
I fear not much can be done at a drive level to workaround this, more
framework changes will be needed to resolve this.
> It was decided that
> we consider those follow-up problems which should not hold back these patches
> anymore. The EXIO named busses seemed to work fine as far as this could be
> remotely tested.
>
> Changes since V1:
>
> * fixed I2C4 pinmux for Koelsch and Gose (thanks Geert for the report!)
> * rebased to current renesas/dt-for-v4.16
> * fixed typo in branch name (s/topc/topic/)
>
> The branch can be found here:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/topic/ip-switch-rework-2017
>
> It is based on v4.15-rc1 + renesas/dt-for-v4.16 merged in.
>
> Please review, comment...
>
> Thanks,
>
> Wolfram
>
>
> Wolfram Sang (9):
> ARM: dts: lager: use demuxer for IIC2/I2C2
> ARM: dts: lager: use demuxer for IIC3/I2C3
> ARM: dts: koelsch: use demuxer for I2C2
> ARM: dts: koelsch: use demuxer for I2C4
> ARM: dts: porter: use demuxer for I2C2
> ARM: dts: alt: use demuxer for I2C1
> ARM: dts: silk: use demuxer for I2C1
> ARM: dts: gose: use demuxer for I2C2
> ARM: dts: gose: use demuxer for I2C4
>
> arch/arm/boot/dts/r8a7790-lager.dts | 279 ++++++++++++++++++++--------------
> arch/arm/boot/dts/r8a7791-koelsch.dts | 232 +++++++++++++++++-----------
> arch/arm/boot/dts/r8a7791-porter.dts | 128 +++++++++-------
> arch/arm/boot/dts/r8a7793-gose.dts | 252 ++++++++++++++++++------------
> arch/arm/boot/dts/r8a7794-alt.dts | 53 +++++--
> arch/arm/boot/dts/r8a7794-silk.dts | 128 +++++++++-------
> 6 files changed, 654 insertions(+), 418 deletions(-)
>
> --
> 2.11.0
>
--
Regards,
Niklas S�derlund
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses
2018-01-02 21:58 ` [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Niklas Söderlund
@ 2018-01-02 22:28 ` Wolfram Sang
0 siblings, 0 replies; 14+ messages in thread
From: Wolfram Sang @ 2018-01-02 22:28 UTC (permalink / raw)
To: Niklas Söderlund
Cc: Wolfram Sang, linux-renesas-soc, Simon Horman, Magnus Damm
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
Hi Niklas,
happy new year to you!
> I fear not much can be done at a drive level to workaround this, more
> framework changes will be needed to resolve this.
I see, thanks for the heads up. Sounds pretty much like the regulator
issue then (from what I recall)...
Regards,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
` (9 preceding siblings ...)
2018-01-02 21:58 ` [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Niklas Söderlund
@ 2018-01-30 10:51 ` Wolfram Sang
2018-01-30 16:45 ` Simon Horman
10 siblings, 1 reply; 14+ messages in thread
From: Wolfram Sang @ 2018-01-30 10:51 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-renesas-soc, Simon Horman, Magnus Damm
[-- Attachment #1: Type: text/plain, Size: 1709 bytes --]
On Sun, Dec 31, 2017 at 12:23:11PM +0100, Wolfram Sang wrote:
> Here is the updated series to add the I2C IP core switcher to all busses of
> Gen2 boards where some kind of switching is possible (mostly to/from GPIO).
>
> These patches were tested locally on Lager and Alt, and remotely on Koelsch,
> Porter and Gose. We have no Silk board available but the patch follows the same
> style as the other patches. In addition, these patches have been double-checked
> by vimdiff-comparing the i2c-bus blobs before and after this patchset.
>
> As discussed previously: the tested boards boot fine. No regression encountered
> there. However, changing masters at runtime for HDMI-named busses and PWR-named
> busses will likely cause kernel warnings and maybe OOPSes. This is due to the
> rebind-issues in the V4L and regulator subsystems. For the former, fixing is
> WIP. For the latter, it is unknown how to deal with rebinding in general (but
> I'd need to look at this issue again if this is desired). It was decided that
> we consider those follow-up problems which should not hold back these patches
> anymore. The EXIO named busses seemed to work fine as far as this could be
> remotely tested.
>
> Changes since V1:
>
> * fixed I2C4 pinmux for Koelsch and Gose (thanks Geert for the report!)
> * rebased to current renesas/dt-for-v4.16
> * fixed typo in branch name (s/topc/topic/)
>
> The branch can be found here:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/topic/ip-switch-rework-2017
>
> It is based on v4.15-rc1 + renesas/dt-for-v4.16 merged in.
>
> Please review, comment...
Simon, any issues left before applying this series?
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses
2018-01-30 10:51 ` Wolfram Sang
@ 2018-01-30 16:45 ` Simon Horman
0 siblings, 0 replies; 14+ messages in thread
From: Simon Horman @ 2018-01-30 16:45 UTC (permalink / raw)
To: Wolfram Sang; +Cc: Wolfram Sang, linux-renesas-soc, Magnus Damm
On Tue, Jan 30, 2018 at 11:51:37AM +0100, Wolfram Sang wrote:
> On Sun, Dec 31, 2017 at 12:23:11PM +0100, Wolfram Sang wrote:
> > Here is the updated series to add the I2C IP core switcher to all busses of
> > Gen2 boards where some kind of switching is possible (mostly to/from GPIO).
> >
> > These patches were tested locally on Lager and Alt, and remotely on Koelsch,
> > Porter and Gose. We have no Silk board available but the patch follows the same
> > style as the other patches. In addition, these patches have been double-checked
> > by vimdiff-comparing the i2c-bus blobs before and after this patchset.
> >
> > As discussed previously: the tested boards boot fine. No regression encountered
> > there. However, changing masters at runtime for HDMI-named busses and PWR-named
> > busses will likely cause kernel warnings and maybe OOPSes. This is due to the
> > rebind-issues in the V4L and regulator subsystems. For the former, fixing is
> > WIP. For the latter, it is unknown how to deal with rebinding in general (but
> > I'd need to look at this issue again if this is desired). It was decided that
> > we consider those follow-up problems which should not hold back these patches
> > anymore. The EXIO named busses seemed to work fine as far as this could be
> > remotely tested.
> >
> > Changes since V1:
> >
> > * fixed I2C4 pinmux for Koelsch and Gose (thanks Geert for the report!)
> > * rebased to current renesas/dt-for-v4.16
> > * fixed typo in branch name (s/topc/topic/)
> >
> > The branch can be found here:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git renesas/topic/ip-switch-rework-2017
> >
> > It is based on v4.15-rc1 + renesas/dt-for-v4.16 merged in.
> >
> > Please review, comment...
>
> Simon, any issues left before applying this series?
I'm a bit uncomfortable about the OOpses, but if that was the consensus
(in San Sebastian?) then I'm happy to accept these patches.
Could you rebase the series? It does not seem to apply (likely due to my
recent clean-up efforts).
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2018-01-30 16:45 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-31 11:23 [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 1/9] ARM: dts: lager: use demuxer for IIC2/I2C2 Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 2/9] ARM: dts: lager: use demuxer for IIC3/I2C3 Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 3/9] ARM: dts: koelsch: use demuxer for I2C2 Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 4/9] ARM: dts: koelsch: use demuxer for I2C4 Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 5/9] ARM: dts: porter: use demuxer for I2C2 Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 6/9] ARM: dts: alt: use demuxer for I2C1 Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 7/9] ARM: dts: silk: " Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 8/9] ARM: dts: gose: use demuxer for I2C2 Wolfram Sang
2017-12-31 11:23 ` [PATCH v2 9/9] ARM: dts: gose: use demuxer for I2C4 Wolfram Sang
2018-01-02 21:58 ` [PATCH v2 0/9] ARM: dts: gen2: add IP core switcher for all busses Niklas Söderlund
2018-01-02 22:28 ` Wolfram Sang
2018-01-30 10:51 ` Wolfram Sang
2018-01-30 16:45 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.