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

ARM: dts: am437x-idk-evm: Use AM4372_IOPAD pinmux macro

Use the pinmux IOPAD macro to define the register absolute physical
address instead of the offset from the padconf base address. This
makes the DTS easier to read since matches the addresses listed in
the Technical Reference Manual.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Javier Martinez Canillas and committed by
Tony Lindgren 8e7d3dd9 596bad7d

+64 -64
+64 -64
arch/arm/boot/dts/am437x-idk-evm.dts
··· 122 122 &am43xx_pinmux { 123 123 gpio_keys_pins_default: gpio_keys_pins_default { 124 124 pinctrl-single,pins = < 125 - 0x1b8 (PIN_INPUT | MUX_MODE7) /* cam0_field.gpio4_2 */ 125 + AM4372_IOPAD(0x9b8, PIN_INPUT | MUX_MODE7) /* cam0_field.gpio4_2 */ 126 126 >; 127 127 }; 128 128 129 129 i2c0_pins_default: i2c0_pins_default { 130 130 pinctrl-single,pins = < 131 - 0x188 (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE0) /* i2c0_sda.i2c0_sda */ 132 - 0x18c (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE0) /* i2c0_scl.i2c0_scl */ 131 + AM4372_IOPAD(0x988, PIN_INPUT | SLEWCTRL_FAST | MUX_MODE0) /* i2c0_sda.i2c0_sda */ 132 + AM4372_IOPAD(0x98c, PIN_INPUT | SLEWCTRL_FAST | MUX_MODE0) /* i2c0_scl.i2c0_scl */ 133 133 >; 134 134 }; 135 135 136 136 i2c0_pins_sleep: i2c0_pins_sleep { 137 137 pinctrl-single,pins = < 138 - 0x188 (PIN_INPUT_PULLDOWN | MUX_MODE7) 139 - 0x18c (PIN_INPUT_PULLDOWN | MUX_MODE7) 138 + AM4372_IOPAD(0x988, PIN_INPUT_PULLDOWN | MUX_MODE7) 139 + AM4372_IOPAD(0x98c, PIN_INPUT_PULLDOWN | MUX_MODE7) 140 140 >; 141 141 }; 142 142 143 143 i2c2_pins_default: i2c2_pins_default { 144 144 pinctrl-single,pins = < 145 - 0x1e8 (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE3) /* cam1_data1.i2c2_scl */ 146 - 0x1ec (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE3) /* cam1_data0.i2c2_sda */ 145 + AM4372_IOPAD(0x9e8, PIN_INPUT | SLEWCTRL_FAST | MUX_MODE3) /* cam1_data1.i2c2_scl */ 146 + AM4372_IOPAD(0x9ec, PIN_INPUT | SLEWCTRL_FAST | MUX_MODE3) /* cam1_data0.i2c2_sda */ 147 147 >; 148 148 }; 149 149 150 150 i2c2_pins_sleep: i2c2_pins_sleep { 151 151 pinctrl-single,pins = < 152 - 0x1e8 (PIN_INPUT_PULLDOWN | MUX_MODE7) 153 - 0x1ec (PIN_INPUT_PULLDOWN | MUX_MODE7) 152 + AM4372_IOPAD(0x9e8, PIN_INPUT_PULLDOWN | MUX_MODE7) 153 + AM4372_IOPAD(0x9ec, PIN_INPUT_PULLDOWN | MUX_MODE7) 154 154 >; 155 155 }; 156 156 157 157 mmc1_pins_default: pinmux_mmc1_pins_default { 158 158 pinctrl-single,pins = < 159 - 0x100 (PIN_INPUT | MUX_MODE0) /* mmc0_clk.mmc0_clk */ 160 - 0x104 (PIN_INPUT | MUX_MODE0) /* mmc0_cmd.mmc0_cmd */ 161 - 0x1f0 (PIN_INPUT | MUX_MODE0) /* mmc0_dat3.mmc0_dat3 */ 162 - 0x1f4 (PIN_INPUT | MUX_MODE0) /* mmc0_dat2.mmc0_dat2 */ 163 - 0x1f8 (PIN_INPUT | MUX_MODE0) /* mmc0_dat1.mmc0_dat1 */ 164 - 0x1fc (PIN_INPUT | MUX_MODE0) /* mmc0_dat0.mmc0_dat0 */ 165 - 0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */ 159 + AM4372_IOPAD(0x900, PIN_INPUT | MUX_MODE0) /* mmc0_clk.mmc0_clk */ 160 + AM4372_IOPAD(0x904, PIN_INPUT | MUX_MODE0) /* mmc0_cmd.mmc0_cmd */ 161 + AM4372_IOPAD(0x9f0, PIN_INPUT | MUX_MODE0) /* mmc0_dat3.mmc0_dat3 */ 162 + AM4372_IOPAD(0x9f4, PIN_INPUT | MUX_MODE0) /* mmc0_dat2.mmc0_dat2 */ 163 + AM4372_IOPAD(0x9f8, PIN_INPUT | MUX_MODE0) /* mmc0_dat1.mmc0_dat1 */ 164 + AM4372_IOPAD(0x9fc, PIN_INPUT | MUX_MODE0) /* mmc0_dat0.mmc0_dat0 */ 165 + AM4372_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */ 166 166 >; 167 167 }; 168 168 169 169 mmc1_pins_sleep: pinmux_mmc1_pins_sleep { 170 170 pinctrl-single,pins = < 171 - 0x100 (PIN_INPUT_PULLDOWN | MUX_MODE7) 172 - 0x104 (PIN_INPUT_PULLDOWN | MUX_MODE7) 173 - 0x1f0 (PIN_INPUT_PULLDOWN | MUX_MODE7) 174 - 0x1f4 (PIN_INPUT_PULLDOWN | MUX_MODE7) 175 - 0x1f8 (PIN_INPUT_PULLDOWN | MUX_MODE7) 176 - 0x1fc (PIN_INPUT_PULLDOWN | MUX_MODE7) 177 - 0x160 (PIN_INPUT_PULLDOWN | MUX_MODE7) 171 + AM4372_IOPAD(0x900, PIN_INPUT_PULLDOWN | MUX_MODE7) 172 + AM4372_IOPAD(0x904, PIN_INPUT_PULLDOWN | MUX_MODE7) 173 + AM4372_IOPAD(0x9f0, PIN_INPUT_PULLDOWN | MUX_MODE7) 174 + AM4372_IOPAD(0x9f4, PIN_INPUT_PULLDOWN | MUX_MODE7) 175 + AM4372_IOPAD(0x9f8, PIN_INPUT_PULLDOWN | MUX_MODE7) 176 + AM4372_IOPAD(0x9fc, PIN_INPUT_PULLDOWN | MUX_MODE7) 177 + AM4372_IOPAD(0x960, PIN_INPUT_PULLDOWN | MUX_MODE7) 178 178 >; 179 179 }; 180 180 181 181 ecap0_pins_default: backlight_pins_default { 182 182 pinctrl-single,pins = < 183 - 0x164 (PIN_OUTPUT | MUX_MODE0) /* ecap0_in_pwm0_out.ecap0_in_pwm0_out */ 183 + AM4372_IOPAD(0x964, PIN_OUTPUT | MUX_MODE0) /* ecap0_in_pwm0_out.ecap0_in_pwm0_out */ 184 184 >; 185 185 }; 186 186 187 187 cpsw_default: cpsw_default { 188 188 pinctrl-single,pins = < 189 - 0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */ 190 - 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */ 191 - 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */ 192 - 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */ 193 - 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td2 */ 194 - 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td3 */ 195 - 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rmii1_rclk */ 196 - 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */ 197 - 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */ 198 - 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */ 199 - 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd2 */ 200 - 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd3 */ 189 + AM4372_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */ 190 + AM4372_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */ 191 + AM4372_IOPAD(0x928, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */ 192 + AM4372_IOPAD(0x924, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */ 193 + AM4372_IOPAD(0x920, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td2 */ 194 + AM4372_IOPAD(0x91c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td3 */ 195 + AM4372_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rmii1_rclk */ 196 + AM4372_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */ 197 + AM4372_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */ 198 + AM4372_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */ 199 + AM4372_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd2 */ 200 + AM4372_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd3 */ 201 201 >; 202 202 }; 203 203 204 204 cpsw_sleep: cpsw_sleep { 205 205 pinctrl-single,pins = < 206 - 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7) 207 - 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7) 208 - 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7) 209 - 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7) 210 - 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7) 211 - 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7) 212 - 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7) 213 - 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7) 214 - 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7) 215 - 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7) 216 - 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7) 217 - 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7) 206 + AM4372_IOPAD(0x92c, PIN_INPUT_PULLDOWN | MUX_MODE7) 207 + AM4372_IOPAD(0x914, PIN_INPUT_PULLDOWN | MUX_MODE7) 208 + AM4372_IOPAD(0x928, PIN_INPUT_PULLDOWN | MUX_MODE7) 209 + AM4372_IOPAD(0x924, PIN_INPUT_PULLDOWN | MUX_MODE7) 210 + AM4372_IOPAD(0x920, PIN_INPUT_PULLDOWN | MUX_MODE7) 211 + AM4372_IOPAD(0x91c, PIN_INPUT_PULLDOWN | MUX_MODE7) 212 + AM4372_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE7) 213 + AM4372_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE7) 214 + AM4372_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE7) 215 + AM4372_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE7) 216 + AM4372_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE7) 217 + AM4372_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE7) 218 218 >; 219 219 }; 220 220 221 221 davinci_mdio_default: davinci_mdio_default { 222 222 pinctrl-single,pins = < 223 223 /* MDIO */ 224 - 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ 225 - 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ 224 + AM4372_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ 225 + AM4372_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ 226 226 >; 227 227 }; 228 228 229 229 davinci_mdio_sleep: davinci_mdio_sleep { 230 230 pinctrl-single,pins = < 231 231 /* MDIO reset value */ 232 - 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7) 233 - 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) 232 + AM4372_IOPAD(0x948, PIN_INPUT_PULLDOWN | MUX_MODE7) 233 + AM4372_IOPAD(0x94c, PIN_INPUT_PULLDOWN | MUX_MODE7) 234 234 >; 235 235 }; 236 236 237 237 qspi_pins_default: qspi_pins_default { 238 238 pinctrl-single,pins = < 239 - 0x7c (PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_csn0.qspi_csn */ 240 - 0x88 (PIN_OUTPUT | MUX_MODE2) /* gpmc_csn3.qspi_clk */ 241 - 0x90 (PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_advn_ale.qspi_d0 */ 242 - 0x94 (PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_oen_ren.qspi_d1 */ 243 - 0x98 (PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_wen.qspi_d2 */ 244 - 0x9c (PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_be0n_cle.qspi_d3 */ 239 + AM4372_IOPAD(0x87c, PIN_OUTPUT_PULLUP | MUX_MODE3) /* gpmc_csn0.qspi_csn */ 240 + AM4372_IOPAD(0x888, PIN_OUTPUT | MUX_MODE2) /* gpmc_csn3.qspi_clk */ 241 + AM4372_IOPAD(0x890, PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_advn_ale.qspi_d0 */ 242 + AM4372_IOPAD(0x894, PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_oen_ren.qspi_d1 */ 243 + AM4372_IOPAD(0x898, PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_wen.qspi_d2 */ 244 + AM4372_IOPAD(0x89c, PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_be0n_cle.qspi_d3 */ 245 245 >; 246 246 }; 247 247 248 248 qspi_pins_sleep: qspi_pins_sleep{ 249 249 pinctrl-single,pins = < 250 - 0x7c (PIN_INPUT_PULLDOWN | MUX_MODE7) 251 - 0x88 (PIN_INPUT_PULLDOWN | MUX_MODE7) 252 - 0x90 (PIN_INPUT_PULLDOWN | MUX_MODE7) 253 - 0x94 (PIN_INPUT_PULLDOWN | MUX_MODE7) 254 - 0x98 (PIN_INPUT_PULLDOWN | MUX_MODE7) 255 - 0x9c (PIN_INPUT_PULLDOWN | MUX_MODE7) 250 + AM4372_IOPAD(0x87c, PIN_INPUT_PULLDOWN | MUX_MODE7) 251 + AM4372_IOPAD(0x888, PIN_INPUT_PULLDOWN | MUX_MODE7) 252 + AM4372_IOPAD(0x890, PIN_INPUT_PULLDOWN | MUX_MODE7) 253 + AM4372_IOPAD(0x894, PIN_INPUT_PULLDOWN | MUX_MODE7) 254 + AM4372_IOPAD(0x898, PIN_INPUT_PULLDOWN | MUX_MODE7) 255 + AM4372_IOPAD(0x89c, PIN_INPUT_PULLDOWN | MUX_MODE7) 256 256 >; 257 257 }; 258 258 };