Commit 49695dfa authored by Olof Johansson's avatar Olof Johansson

Merge tag 'renesas-arm64-cleanup-for-v4.7' of...

Merge tag 'renesas-arm64-cleanup-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt64

Renesas ARM64 Based SoC Cleanup for v4.7

* Use generic pinctrl properties in DT for salvator-x board

* tag 'renesas-arm64-cleanup-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: salvator-x: use generic pinctrl properties
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents be0b0700 fa3d2aed
...@@ -146,57 +146,57 @@ &pfc { ...@@ -146,57 +146,57 @@ &pfc {
pinctrl-names = "default"; pinctrl-names = "default";
scif1_pins: scif1 { scif1_pins: scif1 {
renesas,groups = "scif1_data_a", "scif1_ctrl"; groups = "scif1_data_a", "scif1_ctrl";
renesas,function = "scif1"; function = "scif1";
}; };
scif2_pins: scif2 { scif2_pins: scif2 {
renesas,groups = "scif2_data_a"; groups = "scif2_data_a";
renesas,function = "scif2"; function = "scif2";
}; };
scif_clk_pins: scif_clk { scif_clk_pins: scif_clk {
renesas,groups = "scif_clk_a"; groups = "scif_clk_a";
renesas,function = "scif_clk"; function = "scif_clk";
}; };
i2c2_pins: i2c2 { i2c2_pins: i2c2 {
renesas,groups = "i2c2_a"; groups = "i2c2_a";
renesas,function = "i2c2"; function = "i2c2";
}; };
avb_pins: avb { avb_pins: avb {
renesas,groups = "avb_mdc"; groups = "avb_mdc";
renesas,function = "avb"; function = "avb";
}; };
sdhi0_pins: sd0 { sdhi0_pins: sd0 {
renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; groups = "sdhi0_data4", "sdhi0_ctrl";
renesas,function = "sdhi0"; function = "sdhi0";
}; };
sdhi3_pins: sd3 { sdhi3_pins: sd3 {
renesas,groups = "sdhi3_data4", "sdhi3_ctrl"; groups = "sdhi3_data4", "sdhi3_ctrl";
renesas,function = "sdhi3"; function = "sdhi3";
}; };
sound_pins: sound { sound_pins: sound {
renesas,groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a"; groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a";
renesas,function = "ssi"; function = "ssi";
}; };
sound_clk_pins: sound_clk { sound_clk_pins: sound_clk {
renesas,groups = "audio_clk_a_a", "audio_clk_b_a", "audio_clk_c_a", groups = "audio_clk_a_a", "audio_clk_b_a", "audio_clk_c_a",
"audio_clkout_a", "audio_clkout3_a"; "audio_clkout_a", "audio_clkout3_a";
renesas,function = "audio_clk"; function = "audio_clk";
}; };
usb1_pins: usb1 { usb1_pins: usb1 {
renesas,groups = "usb1"; groups = "usb1";
renesas,function = "usb1"; function = "usb1";
}; };
usb2_pins: usb2 { usb2_pins: usb2 {
renesas,groups = "usb2"; groups = "usb2";
renesas,function = "usb2"; function = "usb2";
}; };
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment