| Message ID | 1426576524-22315-4-git-send-email-wsa@the-dreams.de (mailing list archive) |
|---|---|
| State | RFC |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
Hi Wolfram, Thank you for the patch. On Tuesday 17 March 2015 08:15:23 Wolfram Sang wrote: > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > > Changes since RFC V1: rebased, added the sound-codec entry, fixed a typo > > arch/arm/boot/dts/r8a7790-lager.dts | 66 ++++++++++++++++++++++++---------- > 1 file changed, 46 insertions(+), 20 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a7790-lager.dts > b/arch/arm/boot/dts/r8a7790-lager.dts index 0c3b6783b72add..bf0065d676428d > 100644 > --- a/arch/arm/boot/dts/r8a7790-lager.dts > +++ b/arch/arm/boot/dts/r8a7790-lager.dts > @@ -222,6 +222,40 @@ > }; > }; > }; > + > + i2c-demux { > + > + compatible = "i2c-demux-pinctrl"; > + i2c-parent = <&iic2>, <&i2c2>; Purely from a DT point of view, wouldn't it make sense to call the node i2c- bus and rename the i2c-parent property to i2c-masters ? > + #address-cells = <1>; > + #size-cells = <0>; > + > + i2c@0 { > + reg = <0>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + > + ak4643: sound-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>; > + }; > + }; > + }; > + }; > + }; > }; > > &du { > @@ -303,6 +337,11 @@ > renesas,function = "iic1"; > }; > > + i2c2_pins: i2c2 { > + renesas,groups = "i2c2"; > + renesas,function = "i2c2"; > + }; > + > iic2_pins: iic2 { > renesas,groups = "iic2"; > renesas,function = "iic2"; > @@ -481,31 +520,18 @@ > pinctrl-names = "default"; > }; > > +&i2c2 { > + status = "ok"; > + pinctrl-0 = <&i2c2_pins>; > + pinctrl-names = "active"; > +}; > + > &iic2 { > status = "okay"; > pinctrl-0 = <&iic2_pins>; > - pinctrl-names = "default"; > + pinctrl-names = "active"; > > clock-frequency = <100000>; > - > - ak4643: sound-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>; > - }; > - }; > - }; > }; > > &iic3 {
On Tue, Mar 17, 2015 at 11:13:02AM +0200, Laurent Pinchart wrote: > Hi Wolfram, > > Thank you for the patch. > > On Tuesday 17 March 2015 08:15:23 Wolfram Sang wrote: > > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > > > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > > --- > > > > Changes since RFC V1: rebased, added the sound-codec entry, fixed a typo > > > > arch/arm/boot/dts/r8a7790-lager.dts | 66 ++++++++++++++++++++++++---------- > > 1 file changed, 46 insertions(+), 20 deletions(-) > > > > diff --git a/arch/arm/boot/dts/r8a7790-lager.dts > > b/arch/arm/boot/dts/r8a7790-lager.dts index 0c3b6783b72add..bf0065d676428d > > 100644 > > --- a/arch/arm/boot/dts/r8a7790-lager.dts > > +++ b/arch/arm/boot/dts/r8a7790-lager.dts > > @@ -222,6 +222,40 @@ > > }; > > }; > > }; > > + > > + i2c-demux { > > + > > + compatible = "i2c-demux-pinctrl"; > > + i2c-parent = <&iic2>, <&i2c2>; > > Purely from a DT point of view, wouldn't it make sense to call the node i2c- > bus and rename the i2c-parent property to i2c-masters ? I'd think so. I chose "i2c-parent" to be consistent with the existing i2c-pinctrl-mux driver. But I don't think we need to uphold this.
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts index 0c3b6783b72add..bf0065d676428d 100644 --- a/arch/arm/boot/dts/r8a7790-lager.dts +++ b/arch/arm/boot/dts/r8a7790-lager.dts @@ -222,6 +222,40 @@ }; }; }; + + i2c-demux { + + compatible = "i2c-demux-pinctrl"; + i2c-parent = <&iic2>, <&i2c2>; + #address-cells = <1>; + #size-cells = <0>; + + i2c@0 { + reg = <0>; + #address-cells = <1>; + #size-cells = <0>; + + + ak4643: sound-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>; + }; + }; + }; + }; + }; }; &du { @@ -303,6 +337,11 @@ renesas,function = "iic1"; }; + i2c2_pins: i2c2 { + renesas,groups = "i2c2"; + renesas,function = "i2c2"; + }; + iic2_pins: iic2 { renesas,groups = "iic2"; renesas,function = "iic2"; @@ -481,31 +520,18 @@ pinctrl-names = "default"; }; +&i2c2 { + status = "ok"; + pinctrl-0 = <&i2c2_pins>; + pinctrl-names = "active"; +}; + &iic2 { status = "okay"; pinctrl-0 = <&iic2_pins>; - pinctrl-names = "default"; + pinctrl-names = "active"; clock-frequency = <100000>; - - ak4643: sound-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>; - }; - }; - }; }; &iic3 {