On Tue, Jul 30, 2019 at 11:14 AM Geert Uytterhoeven
<[email protected]> wrote:
> On Tue, Jul 23, 2019 at 8:03 PM Yoshihiro Kaneko <[email protected]>
> wrote:
> > Sort nodes.
> >
> > If node address is present
> > * Sort by node address, grouping all nodes with the same compat string
> > and sorting the group alphabetically.
> > Else
> > * Sort alphabetically
> >
> > This should not have any run-time effect.
> >
> > Signed-off-by: Yoshihiro Kaneko <[email protected]>
>
> You forgot to sort the i2c slave nodes.
> As this kind of patches is hard to rebase and rework, I'm fixing that up while
> applying:
>
> --- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
> +++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
> @@ -83,6 +83,56 @@
> };
>
> &i2c2 {
> + i2cswitch2: i2c-switch@71 {
> + compatible = "nxp,pca9548";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <0x71>;
> + reset-gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
> +
> + /* Audio_SDA, Audio_SCL */
> + i2c@7 {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + reg = <7>;
> +
> + pcm3168a: audio-codec@44 {
> + #sound-dai-cells = <0>;
> + compatible = "ti,pcm3168a";
> + reg = <0x44>;
> + clocks = <&clksndsel>;
> + clock-names = "scki";
> +
> + VDD1-supply = <&snd_3p3v>;
> + VDD2-supply = <&snd_3p3v>;
> + VCCAD1-supply = <&snd_vcc5v>;
> + VCCAD2-supply = <&snd_vcc5v>;
> + VCCDA1-supply = <&snd_vcc5v>;
> + VCCDA2-supply = <&snd_vcc5v>;
> +
> + ports {
> + #address-cells = <1>;
> + #size-cells = <0>;
> + mclk-fs = <512>;
> + port@0 {
> + reg = <0>;
> + pcm3168a_endpoint_p: endpoint
> {
> +
> remote-endpoint = <&rsnd_for_pcm3168a_play>;
> + clocks = <&clksndsel>;
> + };
> + };
> + port@1 {
> + reg = <1>;
> + pcm3168a_endpoint_c: endpoint
> {
> +
> remote-endpoint = <&rsnd_for_pcm3168a_capture>;
> + clocks = <&clksndsel>;
> + };
> + };
> + };
> + };
> + };
> + };
> +
> /* U11 */
> gpio_exp_74: gpio@74 {
> compatible = "ti,tca9539";
> @@ -153,56 +203,6 @@
> interrupt-parent = <&gpio6>;
> interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
> };
> -
> - i2cswitch2: i2c-switch@71 {
> - compatible = "nxp,pca9548";
> - #address-cells = <1>;
> - #size-cells = <0>;
> - reg = <0x71>;
> - reset-gpios = <&gpio5 3 GPIO_ACTIVE_LOW>;
> -
> - /* Audio_SDA, Audio_SCL */
> - i2c@7 {
> - #address-cells = <1>;
> - #size-cells = <0>;
> - reg = <7>;
> -
> - pcm3168a: audio-codec@44 {
> - #sound-dai-cells = <0>;
> - compatible = "ti,pcm3168a";
> - reg = <0x44>;
> - clocks = <&clksndsel>;
> - clock-names = "scki";
> -
> - VDD1-supply = <&snd_3p3v>;
> - VDD2-supply = <&snd_3p3v>;
> - VCCAD1-supply = <&snd_vcc5v>;
> - VCCAD2-supply = <&snd_vcc5v>;
> - VCCDA1-supply = <&snd_vcc5v>;
> - VCCDA2-supply = <&snd_vcc5v>;
> -
> - ports {
> - #address-cells = <1>;
> - #size-cells = <0>;
> - mclk-fs = <512>;
> - port@0 {
> - reg = <0>;
> - pcm3168a_endpoint_p: endpoint
> {
> -
> remote-endpoint = <&rsnd_for_pcm3168a_play>;
> - clocks = <&clksndsel>;
> - };
> - };
> - port@1 {
> - reg = <1>;
> - pcm3168a_endpoint_c: endpoint
> {
> -
> remote-endpoint = <&rsnd_for_pcm3168a_capture>;
> - clocks = <&clksndsel>;
> - };
> - };
> - };
> - };
> - };
> - };
> };
>
> &i2c4 {
>
and the second i2c bus, too, of course:
--- a/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
+++ b/arch/arm64/boot/dts/renesas/ulcb-kf.dtsi
@@ -206,6 +206,14 @@
};
&i2c4 {
+ i2cswitch4: i2c-switch@71 {
+ compatible = "nxp,pca9548";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0x71>;
+ reset-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
+ };
+
gpio_exp_76: gpio@76 {
compatible = "ti,tca9539";
reg = <0x76>;
@@ -225,14 +233,6 @@
interrupt-parent = <&gpio5>;
interrupts = <9 IRQ_TYPE_EDGE_FALLING>;
};
-
- i2cswitch4: i2c-switch@71 {
- compatible = "nxp,pca9548";
- #address-cells = <1>;
- #size-cells = <0>;
- reg = <0x71>;
- reset-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;
- };
};
&ohci0 {
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
