Deleted Added
full compact
17a18
> #include <dt-bindings/interrupt-controller/irq.h>
125c126
< gpio-key,wakeup;
---
> wakeup-source;
143,150c144,163
< compatible = "ti,da830-evm-audio";
< ti,model = "AM335x-EVMSK";
< ti,audio-codec = <&tlv320aic3106>;
< ti,mcasp-controller = <&mcasp1>;
< ti,codec-clock-rate = <24000000>;
< ti,audio-routing =
< "Headphone Jack", "HPLOUT",
< "Headphone Jack", "HPROUT";
---
> compatible = "simple-audio-card";
> simple-audio-card,name = "AM335x-EVMSK";
> simple-audio-card,widgets =
> "Headphone", "Headphone Jack";
> simple-audio-card,routing =
> "Headphone Jack", "HPLOUT",
> "Headphone Jack", "HPROUT";
> simple-audio-card,format = "dsp_b";
> simple-audio-card,bitclock-master = <&sound_master>;
> simple-audio-card,frame-master = <&sound_master>;
> simple-audio-card,bitclock-inversion;
>
> simple-audio-card,cpu {
> sound-dai = <&mcasp1>;
> };
>
> sound_master: simple-audio-card,codec {
> sound-dai = <&tlv320aic3106>;
> system-clock-frequency = <24000000>;
> };
194,221c207,234
< 0x20 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad8.lcd_data23 */
< 0x24 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad9.lcd_data22 */
< 0x28 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad10.lcd_data21 */
< 0x2c (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad11.lcd_data20 */
< 0x30 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad12.lcd_data19 */
< 0x34 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad13.lcd_data18 */
< 0x38 (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad14.lcd_data17 */
< 0x3c (PIN_OUTPUT | MUX_MODE1) /* gpmc_ad15.lcd_data16 */
< 0xa0 (PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */
< 0xa4 (PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */
< 0xa8 (PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */
< 0xac (PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */
< 0xb0 (PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */
< 0xb4 (PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */
< 0xb8 (PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */
< 0xbc (PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */
< 0xc0 (PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */
< 0xc4 (PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */
< 0xc8 (PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */
< 0xcc (PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */
< 0xd0 (PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */
< 0xd4 (PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */
< 0xd8 (PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */
< 0xdc (PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */
< 0xe0 (PIN_OUTPUT | MUX_MODE0) /* lcd_vsync.lcd_vsync */
< 0xe4 (PIN_OUTPUT | MUX_MODE0) /* lcd_hsync.lcd_hsync */
< 0xe8 (PIN_OUTPUT | MUX_MODE0) /* lcd_pclk.lcd_pclk */
< 0xec (PIN_OUTPUT | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */
---
> AM33XX_IOPAD(0x820, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad8.lcd_data23 */
> AM33XX_IOPAD(0x824, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad9.lcd_data22 */
> AM33XX_IOPAD(0x828, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad10.lcd_data21 */
> AM33XX_IOPAD(0x82c, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad11.lcd_data20 */
> AM33XX_IOPAD(0x830, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad12.lcd_data19 */
> AM33XX_IOPAD(0x834, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad13.lcd_data18 */
> AM33XX_IOPAD(0x838, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad14.lcd_data17 */
> AM33XX_IOPAD(0x83c, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad15.lcd_data16 */
> AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */
> AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */
> AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */
> AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */
> AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */
> AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */
> AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */
> AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */
> AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */
> AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */
> AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */
> AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */
> AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */
> AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */
> AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */
> AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */
> AM33XX_IOPAD(0x8e0, PIN_OUTPUT | MUX_MODE0) /* lcd_vsync.lcd_vsync */
> AM33XX_IOPAD(0x8e4, PIN_OUTPUT | MUX_MODE0) /* lcd_hsync.lcd_hsync */
> AM33XX_IOPAD(0x8e8, PIN_OUTPUT | MUX_MODE0) /* lcd_pclk.lcd_pclk */
> AM33XX_IOPAD(0x8ec, PIN_OUTPUT | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */
227,254c240,267
< 0x20 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad8.lcd_data23 */
< 0x24 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad9.lcd_data22 */
< 0x28 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad10.lcd_data21 */
< 0x2c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad11.lcd_data20 */
< 0x30 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad12.lcd_data19 */
< 0x34 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad13.lcd_data18 */
< 0x38 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad14.lcd_data17 */
< 0x3c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad15.lcd_data16 */
< 0xa0 (PULL_DISABLE | MUX_MODE7) /* lcd_data0.lcd_data0 */
< 0xa4 (PULL_DISABLE | MUX_MODE7) /* lcd_data1.lcd_data1 */
< 0xa8 (PULL_DISABLE | MUX_MODE7) /* lcd_data2.lcd_data2 */
< 0xac (PULL_DISABLE | MUX_MODE7) /* lcd_data3.lcd_data3 */
< 0xb0 (PULL_DISABLE | MUX_MODE7) /* lcd_data4.lcd_data4 */
< 0xb4 (PULL_DISABLE | MUX_MODE7) /* lcd_data5.lcd_data5 */
< 0xb8 (PULL_DISABLE | MUX_MODE7) /* lcd_data6.lcd_data6 */
< 0xbc (PULL_DISABLE | MUX_MODE7) /* lcd_data7.lcd_data7 */
< 0xc0 (PULL_DISABLE | MUX_MODE7) /* lcd_data8.lcd_data8 */
< 0xc4 (PULL_DISABLE | MUX_MODE7) /* lcd_data9.lcd_data9 */
< 0xc8 (PULL_DISABLE | MUX_MODE7) /* lcd_data10.lcd_data10 */
< 0xcc (PULL_DISABLE | MUX_MODE7) /* lcd_data11.lcd_data11 */
< 0xd0 (PULL_DISABLE | MUX_MODE7) /* lcd_data12.lcd_data12 */
< 0xd4 (PULL_DISABLE | MUX_MODE7) /* lcd_data13.lcd_data13 */
< 0xd8 (PULL_DISABLE | MUX_MODE7) /* lcd_data14.lcd_data14 */
< 0xdc (PULL_DISABLE | MUX_MODE7) /* lcd_data15.lcd_data15 */
< 0xe0 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_vsync.lcd_vsync */
< 0xe4 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_hsync.lcd_hsync */
< 0xe8 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_pclk.lcd_pclk */
< 0xec (PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_ac_bias_en.lcd_ac_bias_en */
---
> AM33XX_IOPAD(0x820, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad8.lcd_data23 */
> AM33XX_IOPAD(0x824, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad9.lcd_data22 */
> AM33XX_IOPAD(0x828, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad10.lcd_data21 */
> AM33XX_IOPAD(0x82c, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad11.lcd_data20 */
> AM33XX_IOPAD(0x830, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad12.lcd_data19 */
> AM33XX_IOPAD(0x834, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad13.lcd_data18 */
> AM33XX_IOPAD(0x838, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad14.lcd_data17 */
> AM33XX_IOPAD(0x83c, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad15.lcd_data16 */
> AM33XX_IOPAD(0x8a0, PULL_DISABLE | MUX_MODE7) /* lcd_data0.lcd_data0 */
> AM33XX_IOPAD(0x8a4, PULL_DISABLE | MUX_MODE7) /* lcd_data1.lcd_data1 */
> AM33XX_IOPAD(0x8a8, PULL_DISABLE | MUX_MODE7) /* lcd_data2.lcd_data2 */
> AM33XX_IOPAD(0x8ac, PULL_DISABLE | MUX_MODE7) /* lcd_data3.lcd_data3 */
> AM33XX_IOPAD(0x8b0, PULL_DISABLE | MUX_MODE7) /* lcd_data4.lcd_data4 */
> AM33XX_IOPAD(0x8b4, PULL_DISABLE | MUX_MODE7) /* lcd_data5.lcd_data5 */
> AM33XX_IOPAD(0x8b8, PULL_DISABLE | MUX_MODE7) /* lcd_data6.lcd_data6 */
> AM33XX_IOPAD(0x8bc, PULL_DISABLE | MUX_MODE7) /* lcd_data7.lcd_data7 */
> AM33XX_IOPAD(0x8c0, PULL_DISABLE | MUX_MODE7) /* lcd_data8.lcd_data8 */
> AM33XX_IOPAD(0x8c4, PULL_DISABLE | MUX_MODE7) /* lcd_data9.lcd_data9 */
> AM33XX_IOPAD(0x8c8, PULL_DISABLE | MUX_MODE7) /* lcd_data10.lcd_data10 */
> AM33XX_IOPAD(0x8cc, PULL_DISABLE | MUX_MODE7) /* lcd_data11.lcd_data11 */
> AM33XX_IOPAD(0x8d0, PULL_DISABLE | MUX_MODE7) /* lcd_data12.lcd_data12 */
> AM33XX_IOPAD(0x8d4, PULL_DISABLE | MUX_MODE7) /* lcd_data13.lcd_data13 */
> AM33XX_IOPAD(0x8d8, PULL_DISABLE | MUX_MODE7) /* lcd_data14.lcd_data14 */
> AM33XX_IOPAD(0x8dc, PULL_DISABLE | MUX_MODE7) /* lcd_data15.lcd_data15 */
> AM33XX_IOPAD(0x8e0, PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_vsync.lcd_vsync */
> AM33XX_IOPAD(0x8e4, PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_hsync.lcd_hsync */
> AM33XX_IOPAD(0x8e8, PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_pclk.lcd_pclk */
> AM33XX_IOPAD(0x8ec, PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_ac_bias_en.lcd_ac_bias_en */
261,264c274,277
< 0x10 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad4.gpio1_4 */
< 0x14 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad5.gpio1_5 */
< 0x18 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad6.gpio1_6 */
< 0x1c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad7.gpio1_7 */
---
> AM33XX_IOPAD(0x810, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad4.gpio1_4 */
> AM33XX_IOPAD(0x814, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad5.gpio1_5 */
> AM33XX_IOPAD(0x818, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad6.gpio1_6 */
> AM33XX_IOPAD(0x81c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad7.gpio1_7 */
270,273c283,286
< 0x94 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_oen_ren.gpio2_3 */
< 0x90 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_advn_ale.gpio2_2 */
< 0x70 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_wait0.gpio0_30 */
< 0x9c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ben0_cle.gpio2_5 */
---
> AM33XX_IOPAD(0x894, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_oen_ren.gpio2_3 */
> AM33XX_IOPAD(0x890, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_advn_ale.gpio2_2 */
> AM33XX_IOPAD(0x870, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_wait0.gpio0_30 */
> AM33XX_IOPAD(0x89c, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ben0_cle.gpio2_5 */
279,280c292,293
< 0x188 (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
< 0x18c (PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
---
> AM33XX_IOPAD(0x988, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
> AM33XX_IOPAD(0x98c, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
286,287c299,300
< 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
< 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
---
> AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */
> AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
293c306
< 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
---
> AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
299c312
< 0x19c 0x4 /* mcasp0_ahclkr.ecap2_in_pwm2_out MODE4 */
---
> AM33XX_IOPAD(0x99c, MUX_MODE4) /* mcasp0_ahclkr.ecap2_in_pwm2_out */
306,317c319,330
< 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
< 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */
< 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
< 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
< 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
< 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
< 0x12c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
< 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */
< 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */
< 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */
< 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */
< 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */
---
> AM33XX_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */
> AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */
> AM33XX_IOPAD(0x91c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */
> AM33XX_IOPAD(0x920, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */
> AM33XX_IOPAD(0x924, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */
> AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */
> AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */
> AM33XX_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */
> AM33XX_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */
> AM33XX_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */
> AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */
> AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */
320,331c333,344
< 0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a0.rgmii2_tctl */
< 0x44 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a1.rgmii2_rctl */
< 0x48 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a2.rgmii2_td3 */
< 0x4c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a3.rgmii2_td2 */
< 0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a4.rgmii2_td1 */
< 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a5.rgmii2_td0 */
< 0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a6.rgmii2_tclk */
< 0x5c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a7.rgmii2_rclk */
< 0x60 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a8.rgmii2_rd3 */
< 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a9.rgmii2_rd2 */
< 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a10.rgmii2_rd1 */
< 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a11.rgmii2_rd0 */
---
> AM33XX_IOPAD(0x840, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a0.rgmii2_tctl */
> AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a1.rgmii2_rctl */
> AM33XX_IOPAD(0x848, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a2.rgmii2_td3 */
> AM33XX_IOPAD(0x84c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a3.rgmii2_td2 */
> AM33XX_IOPAD(0x850, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a4.rgmii2_td1 */
> AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a5.rgmii2_td0 */
> AM33XX_IOPAD(0x858, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a6.rgmii2_tclk */
> AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a7.rgmii2_rclk */
> AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a8.rgmii2_rd3 */
> AM33XX_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a9.rgmii2_rd2 */
> AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a10.rgmii2_rd1 */
> AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a11.rgmii2_rd0 */
338,349c351,362
< 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
---
> AM33XX_IOPAD(0x914, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x91c, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x920, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x924, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x928, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x92c, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE7)
352,363c365,376
< 0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x44 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x48 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x4c (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x58 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x5c (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x60 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7)
---
> AM33XX_IOPAD(0x840, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x848, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x84c, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x850, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x854, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x858, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE7)
370,371c383,384
< 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */
< 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */
---
> AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */
> AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */
378,379c391,392
< 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
---
> AM33XX_IOPAD(0x948, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x94c, PIN_INPUT_PULLDOWN | MUX_MODE7)
385c398
< 0x160 (PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
---
> AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */
391,394c404,407
< 0x10c (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
< 0x110 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */
< 0x108 (PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */
< 0x144 (PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */
---
> AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
> AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */
> AM33XX_IOPAD(0x908, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */
> AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */
397a411,419
> mcasp1_pins_sleep: mcasp1_pins_sleep {
> pinctrl-single,pins = <
> AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x908, PIN_INPUT_PULLDOWN | MUX_MODE7)
> AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE7)
> >;
> };
>
400,406c422,428
< 0x74 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_31 */
< 0x80 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */
< 0x84 (PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
< 0x00 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
< 0x04 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */
< 0x08 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */
< 0x0c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */
---
> AM33XX_IOPAD(0x874, PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_31 */
> AM33XX_IOPAD(0x880, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */
> AM33XX_IOPAD(0x884, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
> AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */
> AM33XX_IOPAD(0x804, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */
> AM33XX_IOPAD(0x808, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */
> AM33XX_IOPAD(0x80c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */
412c434
< 0x7c (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_csn0.gpio1_29 */
---
> AM33XX_IOPAD(0x87c, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_csn0.gpio1_29 */
463a486
> #sound-dai-cells = <0>;
627c650
< cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
---
> cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
649a673,682
>
> #address-cells = <1>;
> #size-cells = <0>;
> wlcore: wlcore@2 {
> compatible = "ti,wl1271";
> reg = <2>;
> interrupt-parent = <&gpio0>;
> interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; /* gpio 31 */
> ref-clock-frequency = <38400000>;
> };
653,654c686,689
< pinctrl-names = "default";
< pinctrl-0 = <&mcasp1_pins>;
---
> #sound-dai-cells = <0>;
> pinctrl-names = "default", "sleep";
> pinctrl-0 = <&mcasp1_pins>;
> pinctrl-1 = <&mcasp1_pins_sleep>;
656c691
< status = "okay";
---
> status = "okay";
658,665c693,700
< op-mode = <0>; /* MCASP_IIS_MODE */
< tdm-slots = <2>;
< /* 4 serializers */
< serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
< 0 0 1 2
< >;
< tx-num-evt = <32>;
< rx-num-evt = <32>;
---
> op-mode = <0>; /* MCASP_IIS_MODE */
> tdm-slots = <2>;
> /* 4 serializers */
> serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */
> 0 0 1 2
> >;
> tx-num-evt = <32>;
> rx-num-evt = <32>;