Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Olof Johansson <olof@lixom.net>

+23 -23
+23 -23
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
··· 146 146 pinctrl-names = "default"; 147 147 148 148 scif1_pins: scif1 { 149 - renesas,groups = "scif1_data_a", "scif1_ctrl"; 150 - renesas,function = "scif1"; 149 + groups = "scif1_data_a", "scif1_ctrl"; 150 + function = "scif1"; 151 151 }; 152 152 scif2_pins: scif2 { 153 - renesas,groups = "scif2_data_a"; 154 - renesas,function = "scif2"; 153 + groups = "scif2_data_a"; 154 + function = "scif2"; 155 155 }; 156 156 scif_clk_pins: scif_clk { 157 - renesas,groups = "scif_clk_a"; 158 - renesas,function = "scif_clk"; 157 + groups = "scif_clk_a"; 158 + function = "scif_clk"; 159 159 }; 160 160 161 161 i2c2_pins: i2c2 { 162 - renesas,groups = "i2c2_a"; 163 - renesas,function = "i2c2"; 162 + groups = "i2c2_a"; 163 + function = "i2c2"; 164 164 }; 165 165 166 166 avb_pins: avb { 167 - renesas,groups = "avb_mdc"; 168 - renesas,function = "avb"; 167 + groups = "avb_mdc"; 168 + function = "avb"; 169 169 }; 170 170 171 171 sdhi0_pins: sd0 { 172 - renesas,groups = "sdhi0_data4", "sdhi0_ctrl"; 173 - renesas,function = "sdhi0"; 172 + groups = "sdhi0_data4", "sdhi0_ctrl"; 173 + function = "sdhi0"; 174 174 }; 175 175 176 176 sdhi3_pins: sd3 { 177 - renesas,groups = "sdhi3_data4", "sdhi3_ctrl"; 178 - renesas,function = "sdhi3"; 177 + groups = "sdhi3_data4", "sdhi3_ctrl"; 178 + function = "sdhi3"; 179 179 }; 180 180 181 181 sound_pins: sound { 182 - renesas,groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a"; 183 - renesas,function = "ssi"; 182 + groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a"; 183 + function = "ssi"; 184 184 }; 185 185 186 186 sound_clk_pins: sound_clk { 187 - renesas,groups = "audio_clk_a_a", "audio_clk_b_a", "audio_clk_c_a", 188 - "audio_clkout_a", "audio_clkout3_a"; 189 - renesas,function = "audio_clk"; 187 + groups = "audio_clk_a_a", "audio_clk_b_a", "audio_clk_c_a", 188 + "audio_clkout_a", "audio_clkout3_a"; 189 + function = "audio_clk"; 190 190 }; 191 191 192 192 usb1_pins: usb1 { 193 - renesas,groups = "usb1"; 194 - renesas,function = "usb1"; 193 + groups = "usb1"; 194 + function = "usb1"; 195 195 }; 196 196 197 197 usb2_pins: usb2 { 198 - renesas,groups = "usb2"; 199 - renesas,function = "usb2"; 198 + groups = "usb2"; 199 + function = "usb2"; 200 200 }; 201 201 }; 202 202