Commit ce207be3 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'ti-keystone-dt-for-v6.5' of...

Merge tag 'ti-keystone-dt-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/dt

Keystone2 device tree updates for v6.5

Cosmetic cleanups:
* Do not capitalize hex digits
* Unify pinctrl-single pin group nodes for keystone
* Fix eeprom node names

* tag 'ti-keystone-dt-for-v6.5' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
  ARM: dts: keystone: Do not capitalize hex digits
  ARM: dts: keystone: Remove ti,keystone from soc node compatible
  ARM: dts: keystone: Fix EEPROM node names
  ARM: dts: Unify pinctrl-single pin group nodes for keystone

Link: https://lore.kernel.org/r/20230615164127.qcgwrbwpmclx5wlm@landscapeSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d09d747e 2d62aab5
...@@ -78,7 +78,7 @@ &usb1 { ...@@ -78,7 +78,7 @@ &usb1 {
}; };
&i2c0 { &i2c0 {
dtt@50 { eeprom@50 {
compatible = "atmel,24c1024"; compatible = "atmel,24c1024";
reg = <0x50>; reg = <0x50>;
}; };
...@@ -130,7 +130,7 @@ partition@100000 { ...@@ -130,7 +130,7 @@ partition@100000 {
partition@180000 { partition@180000 {
label = "ubifs"; label = "ubifs";
reg = <0x180000 0x1FE80000>; reg = <0x180000 0x1fe80000>;
}; };
}; };
}; };
......
...@@ -167,7 +167,7 @@ cpts_refclk_mux: cpts-refclk-mux { ...@@ -167,7 +167,7 @@ cpts_refclk_mux: cpts-refclk-mux {
<&tsipclka>, <&tsrefclk>, <&tsipclka>, <&tsrefclk>,
<&tsipclkb>; <&tsipclkb>;
ti,mux-tbl = <0x0>, <0x1>, <0x2>, ti,mux-tbl = <0x0>, <0x1>, <0x2>,
<0x3>, <0x4>, <0x8>, <0xC>; <0x3>, <0x4>, <0x8>, <0xc>;
assigned-clocks = <&cpts_refclk_mux>; assigned-clocks = <&cpts_refclk_mux>;
assigned-clock-parents = <&chipclk12>; assigned-clock-parents = <&chipclk12>;
}; };
......
...@@ -120,14 +120,14 @@ codec { ...@@ -120,14 +120,14 @@ codec {
}; };
&k2g_pinctrl { &k2g_pinctrl {
uart0_pins: pinmux_uart0_pins { uart0_pins: uart0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x11cc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* uart0_rxd.uart0_rxd */ K2G_CORE_IOPAD(0x11cc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* uart0_rxd.uart0_rxd */
K2G_CORE_IOPAD(0x11d0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */ K2G_CORE_IOPAD(0x11d0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
>; >;
}; };
mmc0_pins: pinmux_mmc0_pins { mmc0_pins: mmc0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x1300) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat3.mmc0_dat3 */ K2G_CORE_IOPAD(0x1300) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat3.mmc0_dat3 */
K2G_CORE_IOPAD(0x1304) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat2.mmc0_dat2 */ K2G_CORE_IOPAD(0x1304) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE2) /* mmc0_dat2.mmc0_dat2 */
...@@ -139,7 +139,7 @@ K2G_CORE_IOPAD(0x12ec) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* mmc0_sdcd.gp ...@@ -139,7 +139,7 @@ K2G_CORE_IOPAD(0x12ec) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* mmc0_sdcd.gp
>; >;
}; };
mmc1_pins: pinmux_mmc1_pins { mmc1_pins: mmc1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x10ec) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat7.mmc1_dat7 */ K2G_CORE_IOPAD(0x10ec) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat7.mmc1_dat7 */
K2G_CORE_IOPAD(0x10f0) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat6.mmc1_dat6 */ K2G_CORE_IOPAD(0x10f0) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat6.mmc1_dat6 */
...@@ -154,27 +154,27 @@ K2G_CORE_IOPAD(0x1110) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_cmd.mmc ...@@ -154,27 +154,27 @@ K2G_CORE_IOPAD(0x1110) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_cmd.mmc
>; >;
}; };
i2c0_pins: pinmux_i2c0_pins { i2c0_pins: i2c0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x137c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */ K2G_CORE_IOPAD(0x137c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
K2G_CORE_IOPAD(0x1380) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */ K2G_CORE_IOPAD(0x1380) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
>; >;
}; };
i2c1_pins: pinmux_i2c1_pins { i2c1_pins: i2c1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x1384) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_scl.i2c1_scl */ K2G_CORE_IOPAD(0x1384) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_scl.i2c1_scl */
K2G_CORE_IOPAD(0x1388) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_sda.i2c1_sda */ K2G_CORE_IOPAD(0x1388) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_sda.i2c1_sda */
>; >;
}; };
ecap0_pins: ecap0_pins { ecap0_pins: ecap0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x1374) (BUFFER_CLASS_B | MUX_MODE4) /* pr1_mdio_data.ecap0_in_apwm0_out */ K2G_CORE_IOPAD(0x1374) (BUFFER_CLASS_B | MUX_MODE4) /* pr1_mdio_data.ecap0_in_apwm0_out */
>; >;
}; };
spi1_pins: pinmux_spi1_pins { spi1_pins: spi1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x11a4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_scs0.spi1_scs0 */ K2G_CORE_IOPAD(0x11a4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_scs0.spi1_scs0 */
K2G_CORE_IOPAD(0x11ac) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_clk.spi1_clk */ K2G_CORE_IOPAD(0x11ac) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_clk.spi1_clk */
...@@ -183,7 +183,7 @@ K2G_CORE_IOPAD(0x11b4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_mosi. ...@@ -183,7 +183,7 @@ K2G_CORE_IOPAD(0x11b4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* spi1_mosi.
>; >;
}; };
qspi_pins: pinmux_qspi_pins { qspi_pins: qspi-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x1204) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_clk.qspi_clk */ K2G_CORE_IOPAD(0x1204) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_clk.qspi_clk */
K2G_CORE_IOPAD(0x1208) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_rclk.qspi_rclk */ K2G_CORE_IOPAD(0x1208) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_rclk.qspi_rclk */
...@@ -195,52 +195,52 @@ K2G_CORE_IOPAD(0x121c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_csn0. ...@@ -195,52 +195,52 @@ K2G_CORE_IOPAD(0x121c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_csn0.
>; >;
}; };
uart2_pins: pinmux_uart2_pins { uart2_pins: uart2-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x11ec) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* uart2_rxd.uart2_rxd */ K2G_CORE_IOPAD(0x11ec) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* uart2_rxd.uart2_rxd */
K2G_CORE_IOPAD(0x11f0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart2_txd.uart2_txd */ K2G_CORE_IOPAD(0x11f0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart2_txd.uart2_txd */
>; >;
}; };
dcan0_pins: pinmux_dcan0_pins { dcan0_pins: dcan0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x11fc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dcan0tx.dcan0tx */ K2G_CORE_IOPAD(0x11fc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dcan0tx.dcan0tx */
K2G_CORE_IOPAD(0x1200) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* dcan0rx.dcan0rx */ K2G_CORE_IOPAD(0x1200) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* dcan0rx.dcan0rx */
>; >;
}; };
dcan1_pins: pinmux_dcan1_pins { dcan1_pins: dcan1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x1224) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE1) /* qspicsn2.dcan1tx */ K2G_CORE_IOPAD(0x1224) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE1) /* qspicsn2.dcan1tx */
K2G_CORE_IOPAD(0x1228) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE1) /* qspicsn3.dcan1rx */ K2G_CORE_IOPAD(0x1228) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE1) /* qspicsn3.dcan1rx */
>; >;
}; };
emac_pins: pinmux_emac_pins { emac_pins: emac-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x113C) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD1.RGMII_RXD1 */ K2G_CORE_IOPAD(0x113c) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD1.RGMII_RXD1 */
K2G_CORE_IOPAD(0x1138) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD2.RGMII_RXD2 */ K2G_CORE_IOPAD(0x1138) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD2.RGMII_RXD2 */
K2G_CORE_IOPAD(0x1134) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD3.RGMII_RXD3 */ K2G_CORE_IOPAD(0x1134) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD3.RGMII_RXD3 */
K2G_CORE_IOPAD(0x1140) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD0.RGMII_RXD0 */ K2G_CORE_IOPAD(0x1140) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD0.RGMII_RXD0 */
K2G_CORE_IOPAD(0x1178) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD0.RGMII_TXD0 */ K2G_CORE_IOPAD(0x1178) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD0.RGMII_TXD0 */
K2G_CORE_IOPAD(0x1174) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD1.RGMII_TXD1 */ K2G_CORE_IOPAD(0x1174) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD1.RGMII_TXD1 */
K2G_CORE_IOPAD(0x1170) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD2.RGMII_TXD2 */ K2G_CORE_IOPAD(0x1170) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD2.RGMII_TXD2 */
K2G_CORE_IOPAD(0x116C) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD3.RGMII_TXD3 */ K2G_CORE_IOPAD(0x116c) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD3.RGMII_TXD3 */
K2G_CORE_IOPAD(0x1154) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXCLK.RGMII_TXC */ K2G_CORE_IOPAD(0x1154) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXCLK.RGMII_TXC */
K2G_CORE_IOPAD(0x117C) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXEN.RGMII_TXCTL */ K2G_CORE_IOPAD(0x117c) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXEN.RGMII_TXCTL */
K2G_CORE_IOPAD(0x1120) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXCLK.RGMII_RXC */ K2G_CORE_IOPAD(0x1120) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXCLK.RGMII_RXC */
K2G_CORE_IOPAD(0x1144) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXDV.RGMII_RXCTL */ K2G_CORE_IOPAD(0x1144) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXDV.RGMII_RXCTL */
>; >;
}; };
mdio_pins: pinmux_mdio_pins { mdio_pins: mdio-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x118C) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_CLK.MDIO_CLK */ K2G_CORE_IOPAD(0x118c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_CLK.MDIO_CLK */
K2G_CORE_IOPAD(0x1188) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_DATA.MDIO_DATA */ K2G_CORE_IOPAD(0x1188) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_DATA.MDIO_DATA */
>; >;
}; };
vout_pins: pinmux_vout_pins { vout_pins: vout-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x1078) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata23.dssdata23 */ K2G_CORE_IOPAD(0x1078) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata23.dssdata23 */
K2G_CORE_IOPAD(0x107c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata22.dssdata22 */ K2G_CORE_IOPAD(0x107c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssdata22.dssdata22 */
...@@ -274,7 +274,7 @@ K2G_CORE_IOPAD(0x10e8) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssfid.dss ...@@ -274,7 +274,7 @@ K2G_CORE_IOPAD(0x10e8) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* dssfid.dss
>; >;
}; };
mcasp2_pins: pinmux_mcasp2_pins { mcasp2_pins: mcasp2-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x1234) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo2.mcasp2_axr2 */ K2G_CORE_IOPAD(0x1234) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo2.mcasp2_axr2 */
K2G_CORE_IOPAD(0x1238) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo3.mcasp2_axr3 */ K2G_CORE_IOPAD(0x1238) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE4) /* pr0_pru_gpo3.mcasp2_axr3 */
...@@ -424,11 +424,11 @@ partition@3 { ...@@ -424,11 +424,11 @@ partition@3 {
}; };
partition@4 { partition@4 {
label = "QSPI.kernel"; label = "QSPI.kernel";
reg = <0x001C0000 0x0800000>; reg = <0x001c0000 0x0800000>;
}; };
partition@5 { partition@5 {
label = "QSPI.file-system"; label = "QSPI.file-system";
reg = <0x009C0000 0x3640000>; reg = <0x009c0000 0x3640000>;
}; };
}; };
}; };
......
...@@ -218,14 +218,14 @@ led12 { ...@@ -218,14 +218,14 @@ led12 {
}; };
&k2g_pinctrl { &k2g_pinctrl {
uart0_pins: pinmux_uart0_pins { uart0_pins: uart0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x11cc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* uart0_rxd.uart0_rxd */ K2G_CORE_IOPAD(0x11cc) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* uart0_rxd.uart0_rxd */
K2G_CORE_IOPAD(0x11d0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */ K2G_CORE_IOPAD(0x11d0) (BUFFER_CLASS_B | PIN_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
>; >;
}; };
qspi_pins: pinmux_qspi_pins { qspi_pins: qspi-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x1204) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_clk.qspi_clk */ K2G_CORE_IOPAD(0x1204) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_clk.qspi_clk */
K2G_CORE_IOPAD(0x1208) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_rclk.qspi_rclk */ K2G_CORE_IOPAD(0x1208) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_rclk.qspi_rclk */
...@@ -237,35 +237,35 @@ K2G_CORE_IOPAD(0x121c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_csn0. ...@@ -237,35 +237,35 @@ K2G_CORE_IOPAD(0x121c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* qspi_csn0.
>; >;
}; };
mmc1_pins: pinmux_mmc1_pins { mmc1_pins: mmc1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x10FC) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat3.mmc1_dat3 */ K2G_CORE_IOPAD(0x10fc) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat3.mmc1_dat3 */
K2G_CORE_IOPAD(0x1100) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat2.mmc1_dat2 */ K2G_CORE_IOPAD(0x1100) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat2.mmc1_dat2 */
K2G_CORE_IOPAD(0x1104) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat1.mmc1_dat1 */ K2G_CORE_IOPAD(0x1104) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat1.mmc1_dat1 */
K2G_CORE_IOPAD(0x1108) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat0.mmc1_dat0 */ K2G_CORE_IOPAD(0x1108) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_dat0.mmc1_dat0 */
K2G_CORE_IOPAD(0x110C) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_clk.mmc1_clk */ K2G_CORE_IOPAD(0x110c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_clk.mmc1_clk */
K2G_CORE_IOPAD(0x1110) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_cmd.mmc1_cmd */ K2G_CORE_IOPAD(0x1110) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_cmd.mmc1_cmd */
K2G_CORE_IOPAD(0x1114) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* mmc1_sdcd.gpio0_69 */ K2G_CORE_IOPAD(0x1114) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* mmc1_sdcd.gpio0_69 */
K2G_CORE_IOPAD(0x1118) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_sdwp.mmc1_sdwp */ K2G_CORE_IOPAD(0x1118) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_sdwp.mmc1_sdwp */
K2G_CORE_IOPAD(0x111C) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_pow.mmc1_pow */ K2G_CORE_IOPAD(0x111c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* mmc1_pow.mmc1_pow */
>; >;
}; };
i2c0_pins: pinmux_i2c0_pins { i2c0_pins: i2c0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x137c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */ K2G_CORE_IOPAD(0x137c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
K2G_CORE_IOPAD(0x1380) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */ K2G_CORE_IOPAD(0x1380) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
>; >;
}; };
i2c1_pins: pinmux_i2c1_pins { i2c1_pins: i2c1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x1384) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_scl.i2c1_scl */ K2G_CORE_IOPAD(0x1384) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_scl.i2c1_scl */
K2G_CORE_IOPAD(0x1388) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_sda.i2c1_sda */ K2G_CORE_IOPAD(0x1388) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE0) /* i2c1_sda.i2c1_sda */
>; >;
}; };
user_leds: pinmux_user_leds { user_leds: user-leds-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x102c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* gpmc_ad11.gpio0_11 */ K2G_CORE_IOPAD(0x102c) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* gpmc_ad11.gpio0_11 */
K2G_CORE_IOPAD(0x1030) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* gpmc_ad12.gpio0_12 */ K2G_CORE_IOPAD(0x1030) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* gpmc_ad12.gpio0_12 */
...@@ -283,26 +283,26 @@ K2G_CORE_IOPAD(0x11bc) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* spi2_scsn1.g ...@@ -283,26 +283,26 @@ K2G_CORE_IOPAD(0x11bc) (BUFFER_CLASS_B | PIN_PULLUP | MUX_MODE3) /* spi2_scsn1.g
>; >;
}; };
emac_pins: pinmux_emac_pins { emac_pins: emac-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x113C) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD1.RGMII_RXD1 */ K2G_CORE_IOPAD(0x113c) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD1.RGMII_RXD1 */
K2G_CORE_IOPAD(0x1138) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD2.RGMII_RXD2 */ K2G_CORE_IOPAD(0x1138) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD2.RGMII_RXD2 */
K2G_CORE_IOPAD(0x1134) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD3.RGMII_RXD3 */ K2G_CORE_IOPAD(0x1134) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD3.RGMII_RXD3 */
K2G_CORE_IOPAD(0x1140) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD0.RGMII_RXD0 */ K2G_CORE_IOPAD(0x1140) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXD0.RGMII_RXD0 */
K2G_CORE_IOPAD(0x1178) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD0.RGMII_TXD0 */ K2G_CORE_IOPAD(0x1178) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD0.RGMII_TXD0 */
K2G_CORE_IOPAD(0x1174) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD1.RGMII_TXD1 */ K2G_CORE_IOPAD(0x1174) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD1.RGMII_TXD1 */
K2G_CORE_IOPAD(0x1170) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD2.RGMII_TXD2 */ K2G_CORE_IOPAD(0x1170) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD2.RGMII_TXD2 */
K2G_CORE_IOPAD(0x116C) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD3.RGMII_TXD3 */ K2G_CORE_IOPAD(0x116c) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXD3.RGMII_TXD3 */
K2G_CORE_IOPAD(0x1154) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXCLK.RGMII_TXC */ K2G_CORE_IOPAD(0x1154) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXCLK.RGMII_TXC */
K2G_CORE_IOPAD(0x117C) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXEN.RGMII_TXCTL */ K2G_CORE_IOPAD(0x117c) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_TXEN.RGMII_TXCTL */
K2G_CORE_IOPAD(0x1120) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXCLK.RGMII_RXC */ K2G_CORE_IOPAD(0x1120) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXCLK.RGMII_RXC */
K2G_CORE_IOPAD(0x1144) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXDV.RGMII_RXCTL */ K2G_CORE_IOPAD(0x1144) (BUFFER_CLASS_D | PULL_DISABLE | MUX_MODE1) /* MII_RXDV.RGMII_RXCTL */
>; >;
}; };
mdio_pins: pinmux_mdio_pins { mdio_pins: mdio-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
K2G_CORE_IOPAD(0x118C) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_CLK.MDIO_CLK */ K2G_CORE_IOPAD(0x118c) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_CLK.MDIO_CLK */
K2G_CORE_IOPAD(0x1188) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_DATA.MDIO_DATA */ K2G_CORE_IOPAD(0x1188) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0) /* MDIO_DATA.MDIO_DATA */
>; >;
}; };
......
...@@ -177,7 +177,7 @@ uart2: serial@2531400 { ...@@ -177,7 +177,7 @@ uart2: serial@2531400 {
dcan0: can@260b200 { dcan0: can@260b200 {
compatible = "ti,am4372-d_can", "ti,am3352-d_can"; compatible = "ti,am4372-d_can", "ti,am3352-d_can";
reg = <0x0260B200 0x200>; reg = <0x0260b200 0x200>;
interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 190 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
power-domains = <&k2g_pds 0x0008>; power-domains = <&k2g_pds 0x0008>;
...@@ -186,7 +186,7 @@ dcan0: can@260b200 { ...@@ -186,7 +186,7 @@ dcan0: can@260b200 {
dcan1: can@260b400 { dcan1: can@260b400 {
compatible = "ti,am4372-d_can", "ti,am3352-d_can"; compatible = "ti,am4372-d_can", "ti,am3352-d_can";
reg = <0x0260B400 0x200>; reg = <0x0260b400 0x200>;
interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
power-domains = <&k2g_pds 0x0009>; power-domains = <&k2g_pds 0x0009>;
...@@ -593,7 +593,7 @@ spi1: spi@21805800 { ...@@ -593,7 +593,7 @@ spi1: spi@21805800 {
spi2: spi@21805c00 { spi2: spi@21805c00 {
compatible = "ti,keystone-spi"; compatible = "ti,keystone-spi";
reg = <0x21805C00 0x200>; reg = <0x21805c00 0x200>;
num-cs = <4>; num-cs = <4>;
ti,davinci-spi-intr-line = <0>; ti,davinci-spi-intr-line = <0>;
interrupts = <GIC_SPI 68 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 68 IRQ_TYPE_EDGE_RISING>;
......
...@@ -154,7 +154,7 @@ partition@180000 { ...@@ -154,7 +154,7 @@ partition@180000 {
}; };
&i2c0 { &i2c0 {
dtt@50 { eeprom@50 {
compatible = "atmel,24c1024"; compatible = "atmel,24c1024";
reg = <0x50>; reg = <0x50>;
}; };
......
...@@ -51,7 +51,7 @@ &usb0 { ...@@ -51,7 +51,7 @@ &usb0 {
}; };
&i2c0 { &i2c0 {
dtt@50 { eeprom@50 {
compatible = "atmel,24c1024"; compatible = "atmel,24c1024";
reg = <0x50>; reg = <0x50>;
}; };
...@@ -103,7 +103,7 @@ partition@100000 { ...@@ -103,7 +103,7 @@ partition@100000 {
partition@180000 { partition@180000 {
label = "ubifs"; label = "ubifs";
reg = <0x180000 0x7FE80000>; reg = <0x180000 0x7fe80000>;
}; };
}; };
}; };
......
...@@ -116,42 +116,42 @@ k2l_pmx: pinmux@2620690 { ...@@ -116,42 +116,42 @@ k2l_pmx: pinmux@2620690 {
pinctrl-single,function-mask = <0x1>; pinctrl-single,function-mask = <0x1>;
status = "disabled"; status = "disabled";
uart3_emifa_pins: pinmux_uart3_emifa_pins { uart3_emifa_pins: uart3-emifa-pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* UART3_EMIFA_SEL */ /* UART3_EMIFA_SEL */
0x0 0x0 0xc0 0x0 0x0 0xc0
>; >;
}; };
uart2_emifa_pins: pinmux_uart2_emifa_pins { uart2_emifa_pins: uart2-emifa-pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* UART2_EMIFA_SEL */ /* UART2_EMIFA_SEL */
0x0 0x0 0x30 0x0 0x0 0x30
>; >;
}; };
uart01_spi2_pins: pinmux_uart01_spi2_pins { uart01_spi2_pins: uart01-spi2-pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* UART01_SPI2_SEL */ /* UART01_SPI2_SEL */
0x0 0x0 0x4 0x0 0x0 0x4
>; >;
}; };
dfesync_rp1_pins: pinmux_dfesync_rp1_pins{ dfesync_rp1_pins: dfesync-rp1-pins{
pinctrl-single,bits = < pinctrl-single,bits = <
/* DFESYNC_RP1_SEL */ /* DFESYNC_RP1_SEL */
0x0 0x0 0x2 0x0 0x0 0x2
>; >;
}; };
avsif_pins: pinmux_avsif_pins { avsif_pins: avsif-pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* AVSIF_SEL */ /* AVSIF_SEL */
0x0 0x0 0x1 0x0 0x0 0x1
>; >;
}; };
gpio_emu_pins: pinmux_gpio_emu_pins { gpio_emu_pins: gpio-emu-pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* /*
* GPIO_EMU_SEL[31]: 0-GPIO31, 1-EMU33 * GPIO_EMU_SEL[31]: 0-GPIO31, 1-EMU33
...@@ -170,11 +170,11 @@ gpio_emu_pins: pinmux_gpio_emu_pins { ...@@ -170,11 +170,11 @@ gpio_emu_pins: pinmux_gpio_emu_pins {
* GPIO_EMU_SEL[18]: 0-GPIO18, 1-EMU20 * GPIO_EMU_SEL[18]: 0-GPIO18, 1-EMU20
* GPIO_EMU_SEL[17]: 0-GPIO17, 1-EMU19 * GPIO_EMU_SEL[17]: 0-GPIO17, 1-EMU19
*/ */
0x4 0x0000 0xFFFE0000 0x4 0x0000 0xfffe0000
>; >;
}; };
gpio_timio_pins: pinmux_gpio_timio_pins { gpio_timio_pins: gpio-timio-pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* /*
* GPIO_TIMIO_SEL[15]: 0-GPIO15, 1-TIMO7 * GPIO_TIMIO_SEL[15]: 0-GPIO15, 1-TIMO7
...@@ -190,11 +190,11 @@ gpio_timio_pins: pinmux_gpio_timio_pins { ...@@ -190,11 +190,11 @@ gpio_timio_pins: pinmux_gpio_timio_pins {
* GPIO_TIMIO_SEL[5]: 0-GPIO5, 1-TIMI3 * GPIO_TIMIO_SEL[5]: 0-GPIO5, 1-TIMI3
* GPIO_TIMIO_SEL[4]: 0-GPIO4, 1-TIMI2 * GPIO_TIMIO_SEL[4]: 0-GPIO4, 1-TIMI2
*/ */
0x4 0x0 0xFFF0 0x4 0x0 0xfff0
>; >;
}; };
gpio_spi2cs_pins: pinmux_gpio_spi2cs_pins { gpio_spi2cs_pins: gpio-spi2cs-pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* /*
* GPIO_SPI2CS_SEL[3]: 0-GPIO3, 1-SPI2CS4 * GPIO_SPI2CS_SEL[3]: 0-GPIO3, 1-SPI2CS4
...@@ -202,11 +202,11 @@ gpio_spi2cs_pins: pinmux_gpio_spi2cs_pins { ...@@ -202,11 +202,11 @@ gpio_spi2cs_pins: pinmux_gpio_spi2cs_pins {
* GPIO_SPI2CS_SEL[1]: 0-GPIO1, 1-SPI2CS2 * GPIO_SPI2CS_SEL[1]: 0-GPIO1, 1-SPI2CS2
* GPIO_SPI2CS_SEL[0]: 0-GPIO0, 1-SPI2CS1 * GPIO_SPI2CS_SEL[0]: 0-GPIO0, 1-SPI2CS1
*/ */
0x4 0x0 0xF 0x4 0x0 0xf
>; >;
}; };
gpio_dfeio_pins: pinmux_gpio_dfeio_pins { gpio_dfeio_pins: gpio-dfeio-pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* /*
* GPIO_DFEIO_SEL[31]: 0-DFEIO17, 1-GPIO63 * GPIO_DFEIO_SEL[31]: 0-DFEIO17, 1-GPIO63
...@@ -226,11 +226,11 @@ gpio_dfeio_pins: pinmux_gpio_dfeio_pins { ...@@ -226,11 +226,11 @@ gpio_dfeio_pins: pinmux_gpio_dfeio_pins {
* GPIO_DFEIO_SEL[17]: 0-DFEIO3, 1-GPIO49 * GPIO_DFEIO_SEL[17]: 0-DFEIO3, 1-GPIO49
* GPIO_DFEIO_SEL[16]: 0-DFEIO2, 1-GPIO48 * GPIO_DFEIO_SEL[16]: 0-DFEIO2, 1-GPIO48
*/ */
0x8 0x0 0xFFFF0000 0x8 0x0 0xffff0000
>; >;
}; };
gpio_emifa_pins: pinmux_gpio_emifa_pins { gpio_emifa_pins: gpio-emifa-pins {
pinctrl-single,bits = < pinctrl-single,bits = <
/* /*
* GPIO_EMIFA_SEL[15]: 0-EMIFA17, 1-GPIO47 * GPIO_EMIFA_SEL[15]: 0-EMIFA17, 1-GPIO47
...@@ -250,7 +250,7 @@ gpio_emifa_pins: pinmux_gpio_emifa_pins { ...@@ -250,7 +250,7 @@ gpio_emifa_pins: pinmux_gpio_emifa_pins {
* GPIO_EMIFA_SEL[1]: 0-EMIFA1, 1-GPIO33 * GPIO_EMIFA_SEL[1]: 0-EMIFA1, 1-GPIO33
* GPIO_EMIFA_SEL[0]: 0-EMIFA0, 1-GPIO32 * GPIO_EMIFA_SEL[0]: 0-EMIFA0, 1-GPIO32
*/ */
0x8 0x0 0xFFFF 0x8 0x0 0xffff
>; >;
}; };
}; };
......
...@@ -69,9 +69,9 @@ psci { ...@@ -69,9 +69,9 @@ psci {
}; };
soc0: soc@0 { soc0: soc@0 {
compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "ti,keystone","simple-bus";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
ranges = <0x0 0x0 0x0 0xc0000000>; ranges = <0x0 0x0 0x0 0xc0000000>;
dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>; dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
...@@ -282,7 +282,7 @@ gpio0: gpio@260bf00 { ...@@ -282,7 +282,7 @@ gpio0: gpio@260bf00 {
ti,davinci-gpio-unbanked = <32>; ti,davinci-gpio-unbanked = <32>;
}; };
aemif: aemif@21000A00 { aemif: aemif@21000a00 {
compatible = "ti,keystone-aemif", "ti,davinci-aemif"; compatible = "ti,keystone-aemif", "ti,davinci-aemif";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <1>;
...@@ -290,9 +290,9 @@ aemif: aemif@21000A00 { ...@@ -290,9 +290,9 @@ aemif: aemif@21000A00 {
clock-names = "aemif"; clock-names = "aemif";
clock-ranges; clock-ranges;
reg = <0x21000A00 0x00000100>; reg = <0x21000a00 0x00000100>;
ranges = <0 0 0x30000000 0x10000000 ranges = <0 0 0x30000000 0x10000000
1 0 0x21000A00 0x00000100>; 1 0 0x21000a00 0x00000100>;
}; };
pcie0: pcie@21800000 { pcie0: pcie@21800000 {
......
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