diff options
| author | Jan Weitzel <j.weitzel@phytec.de> | 2013-12-10 15:30:08 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-12 09:09:06 +0100 |
| commit | db9d2e9f95c8dd2cd1c02facfe235bdc1a59f560 (patch) | |
| tree | 9e9fe3ed3afebe6203ba4c57244abd8606aa4045 /arch | |
| parent | 09783b9c450882f6c8e8f24e24573e343fd0e21a (diff) | |
| download | barebox-db9d2e9f95c8dd2cd1c02facfe235bdc1a59f560.tar.gz barebox-db9d2e9f95c8dd2cd1c02facfe235bdc1a59f560.tar.xz | |
pcm051: ethernet and dts fixes
add compatible phytec,pcm051
clean up pinmux_emac_rmii1_pins
introduce davinci_mdio_default pin group
set AM33XX_MAC_MII_SEL via dts rmii-clock-ext
use bch8 as ecc mode
add pagesize to 24c32@52
Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/pcm051/board.c | 3 | ||||
| -rw-r--r-- | arch/arm/dts/am335x-phytec-phycore.dts | 40 |
2 files changed, 29 insertions, 14 deletions
diff --git a/arch/arm/boards/pcm051/board.c b/arch/arm/boards/pcm051/board.c index a64d219a88..91e82084b5 100644 --- a/arch/arm/boards/pcm051/board.c +++ b/arch/arm/boards/pcm051/board.c @@ -39,11 +39,10 @@ static struct omap_barebox_part pcm051_barebox_part = { static int pcm051_devices_init(void) { - if (!of_machine_is_compatible("phytec,phycore-am335x")) + if (!of_machine_is_compatible("phytec,pcm051")) return 0; am33xx_register_ethaddr(0, 0); - writel(0x69, AM33XX_MAC_MII_SEL); switch (bootsource_get()) { case BOOTSOURCE_SPI: diff --git a/arch/arm/dts/am335x-phytec-phycore.dts b/arch/arm/dts/am335x-phytec-phycore.dts index 81c08fd804..6196eb3244 100644 --- a/arch/arm/dts/am335x-phytec-phycore.dts +++ b/arch/arm/dts/am335x-phytec-phycore.dts @@ -4,7 +4,7 @@ / { model = "Phytec phyCORE AM335x"; - compatible = "phytec,phycore-am335x", "ti,am33xx"; + compatible = "phytec,phycore-am335x", "phytec,pcm051", "ti,am33xx"; chosen { linux,stdout-path = &uart0; @@ -83,16 +83,14 @@ emac_rmii1_pins: pinmux_emac_rmii1_pins { pinctrl-single,pins = < - 0x10c (INPUT_EN | MUX_MODE1) - 0x110 (INPUT_EN | MUX_MODE1) - 0x114 MUX_MODE1 - 0x124 MUX_MODE1 - 0x128 MUX_MODE1 - 0x13c (INPUT_EN | MUX_MODE1) - 0x140 (INPUT_EN | MUX_MODE1) - 0x148 (PULL_UP | INPUT_EN | MUX_MODE0) - 0x14c (PULL_UP | MUX_MODE0) - 0x144 (INPUT_EN | MUX_MODE0) + 0x10c (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_crs.rmii1_crs_dv */ + 0x110 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_rxerr.rmii1_rxerr */ + 0x114 (PIN_OUTPUT | MUX_MODE1) /* mii1_txen.rmii1_txen */ + 0x124 (PIN_OUTPUT | MUX_MODE1) /* mii1_txd1.rmii1_txd1 */ + 0x128 (PIN_OUTPUT | MUX_MODE1) /* mii1_txd0.rmii1_txd0 */ + 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_rxd1.rmii1_rxd1 */ + 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_rxd0.rmii1_rxd0 */ + 0x144 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii1_refclk.rmii1_refclk */ /* Slave 2 */ 0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a0.rgmii2_tctl */ @@ -130,6 +128,14 @@ >; }; + davinci_mdio_default: davinci_mdio_default { + pinctrl-single,pins = < + /* MDIO */ + 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ + 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ + >; + }; + pcm051_led_pins: pinmux_pcm051_led_pins { pinctrl-single,pins = < 0x80 (MUX_MODE7) @@ -154,6 +160,7 @@ eeprom: 24c32@52 { compatible = "atmel,24c32"; + pagesize = <32>; reg = <0x52>; }; }; @@ -204,6 +211,15 @@ status = "okay"; }; +&davinci_mdio { + pinctrl-names = "default"; + pinctrl-0 = <&davinci_mdio_default>; +}; + +&phy_sel { + rmii-clock-ext; +}; + &cpsw_emac0 { phy_id = <&davinci_mdio>, <0>; phy-mode = "rmii"; @@ -230,7 +246,7 @@ nand: nand@0,0 { reg = <0 0 0>; /* CS0, offset 0 */ nand-bus-width = <8>; - ti,nand-ecc-opt = "bch8-romcode"; + ti,nand-ecc-opt = "bch8"; gpmc,device-nand = "true"; gpmc,device-width = <1>; gpmc,sync-clk-ps = <0>; |