Deleted Added
full compact
70,73c70,73
< 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
< 0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a6.gpio1_22 */
< 0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a7.gpio1_23 */
< 0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a8.gpio1_24 */
---
> AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a5.gpio1_21 */
> AM33XX_IOPAD(0x858, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a6.gpio1_22 */
> AM33XX_IOPAD(0x85c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_a7.gpio1_23 */
> AM33XX_IOPAD(0x860, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_a8.gpio1_24 */
79,80c79,80
< 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 */
83a84,90
> i2c2_pins: pinmux_i2c2_pins {
> pinctrl-single,pins = <
> AM33XX_IOPAD(0x978, PIN_INPUT_PULLUP | MUX_MODE3) /* uart1_ctsn.i2c2_sda */
> AM33XX_IOPAD(0x97c, PIN_INPUT_PULLUP | MUX_MODE3) /* uart1_rtsn.i2c2_scl */
> >;
> };
>
86,87c93,94
< 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 */
93c100
< 0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
---
> AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
100,112c107,119
< 0x110 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxerr.mii1_rxerr */
< 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txen.mii1_txen */
< 0x118 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxdv.mii1_rxdv */
< 0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd3.mii1_txd3 */
< 0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd2.mii1_txd2 */
< 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd1.mii1_txd1 */
< 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd0.mii1_txd0 */
< 0x12c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_txclk.mii1_txclk */
< 0x130 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxclk.mii1_rxclk */
< 0x134 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd3.mii1_rxd3 */
< 0x138 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd2.mii1_rxd2 */
< 0x13c (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd1.mii1_rxd1 */
< 0x140 (PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd0.mii1_rxd0 */
---
> AM33XX_IOPAD(0x910, PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxerr.mii1_rxerr */
> AM33XX_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txen.mii1_txen */
> AM33XX_IOPAD(0x918, PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxdv.mii1_rxdv */
> AM33XX_IOPAD(0x91c, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd3.mii1_txd3 */
> AM33XX_IOPAD(0x920, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd2.mii1_txd2 */
> AM33XX_IOPAD(0x924, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd1.mii1_txd1 */
> AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd0.mii1_txd0 */
> AM33XX_IOPAD(0x92c, PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_txclk.mii1_txclk */
> AM33XX_IOPAD(0x930, PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxclk.mii1_rxclk */
> AM33XX_IOPAD(0x934, PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd3.mii1_rxd3 */
> AM33XX_IOPAD(0x938, PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd2.mii1_rxd2 */
> AM33XX_IOPAD(0x93c, PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd1.mii1_rxd1 */
> AM33XX_IOPAD(0x940, PIN_INPUT_PULLUP | MUX_MODE0) /* mii1_rxd0.mii1_rxd0 */
119,131c126,138
< 0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
< 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(0x910, 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)
138,139c145,146
< 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 */
146,147c153,154
< 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)
153c160
< 0x160 (PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
---
> AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* GPIO0_6 */
159,168c166,175
< 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 */
< 0x10 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */
< 0x14 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */
< 0x18 (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */
< 0x1c (PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
---
> 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 */
> AM33XX_IOPAD(0x810, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad4.mmc1_dat4 */
> AM33XX_IOPAD(0x814, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad5.mmc1_dat5 */
> AM33XX_IOPAD(0x818, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad6.mmc1_dat6 */
> AM33XX_IOPAD(0x81c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad7.mmc1_dat7 */
197a205
> dr_mode = "peripheral";
219a228,237
> baseboard_eeprom: baseboard_eeprom@50 {
> compatible = "at,24c256";
> reg = <0x50>;
>
> #address-cells = <1>;
> #size-cells = <1>;
> baseboard_data: baseboard_data@0 {
> reg = <0 0x100>;
> };
> };
222c240,242
< /include/ "tps65217.dtsi"
---
> &i2c2 {
> pinctrl-names = "default";
> pinctrl-0 = <&i2c2_pins>;
223a244,287
> status = "okay";
> clock-frequency = <100000>;
>
> cape_eeprom0: cape_eeprom0@54 {
> compatible = "at,24c256";
> reg = <0x54>;
> #address-cells = <1>;
> #size-cells = <1>;
> cape0_data: cape_data@0 {
> reg = <0 0x100>;
> };
> };
>
> cape_eeprom1: cape_eeprom1@55 {
> compatible = "at,24c256";
> reg = <0x55>;
> #address-cells = <1>;
> #size-cells = <1>;
> cape1_data: cape_data@0 {
> reg = <0 0x100>;
> };
> };
>
> cape_eeprom2: cape_eeprom2@56 {
> compatible = "at,24c256";
> reg = <0x56>;
> #address-cells = <1>;
> #size-cells = <1>;
> cape2_data: cape_data@0 {
> reg = <0 0x100>;
> };
> };
>
> cape_eeprom3: cape_eeprom3@57 {
> compatible = "at,24c256";
> reg = <0x57>;
> #address-cells = <1>;
> #size-cells = <1>;
> cape3_data: cape_data@0 {
> reg = <0 0x100>;
> };
> };
> };
>
224a289,308
> compatible = "ti,tps65217";
> /*
> * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
> * mode") at poweroff. Most BeagleBone versions do not support RTC-only
> * mode and risk hardware damage if this mode is entered.
> *
> * For details, see linux-omap mailing list May 2015 thread
> * [PATCH] ARM: dts: am335x-bone* enable pmic-shutdown-controller
> * In particular, messages:
> * http://www.spinics.net/lists/linux-omap/msg118585.html
> * http://www.spinics.net/lists/linux-omap/msg118615.html
> *
> * You can override this later with
> * &tps { /delete-property/ ti,pmic-shutdown-controller; }
> * if you want to use RTC-only mode and made sure you are not affected
> * by the hardware problems. (Tip: double-check by performing a current
> * measurement after shutdown: it should be less than 1 mA.)
> */
> ti,pmic-shutdown-controller;
>
225a310,312
> #address-cells = <1>;
> #size-cells = <0>;
>
226a314
> reg = <0>;
231a320
> reg = <1>;
240a330
> reg = <2>;
249a340
> reg = <3>;
254a346
> reg = <4>;
259a352
> reg = <5>;
264a358
> reg = <6>;
300,301c394
< cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
< cd-inverted;
---
> cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
302a396,403
>
> &aes {
> status = "okay";
> };
>
> &sham {
> status = "okay";
> };