[PATCH 3/4] ppc: bootm: relocate fdt to valid boot memory
For the MPC85xx family of SOCs Linux expects any boot firmware
information to be passed in the first 64MiB of memory. This adds support
to ensure that the device tree is relocated to a valid location if it is
outside that address range.
Signed-off-by: Renaud Barbier
---
arch/ppc/include/asm/processor.h |1 +
arch/ppc/lib/ppclinux.c | 49 +-
2 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/arch/ppc/include/asm/processor.h b/arch/ppc/include/asm/processor.h
index 04cfb60..6b9b7dd 100644
--- a/arch/ppc/include/asm/processor.h
+++ b/arch/ppc/include/asm/processor.h
@@ -966,6 +966,7 @@ struct cpu_type {
struct cpu_type *identify_cpu(u32 ver);
#if defined(CONFIG_MPC85xx)
+#define LINUX_TLB1_MAX_ADDR((void *)(64 << 20))
#define CPU_TYPE_ENTRY(n, v, nc) \
{ .name = #n, .soc_ver = SVR_##v, .num_cores = (nc), }
#endif
diff --git a/arch/ppc/lib/ppclinux.c b/arch/ppc/lib/ppclinux.c
index ef69ead..e6cdcad 100644
--- a/arch/ppc/lib/ppclinux.c
+++ b/arch/ppc/lib/ppclinux.c
@@ -4,12 +4,45 @@
#include
#include
#include
+#include
#include
#include
+#include
#include
#include
#include
+static int bootm_relocate_fdt(void *addr, struct image_data *data)
+{
+ if (addr < LINUX_TLB1_MAX_ADDR) {
+ /* The kernel is within the boot TLB mapping.
+* Put the DTB above if there is no space
+* below.
+*/
+ if (addr < (void *)data->oftree->totalsize) {
+ addr = (void *)PAGE_ALIGN((phys_addr_t)addr +
+ data->os->header.ih_size);
+ addr += data->oftree->totalsize;
+ if (addr < LINUX_TLB1_MAX_ADDR)
+ addr = LINUX_TLB1_MAX_ADDR;
+ }
+ }
+
+ if (addr > LINUX_TLB1_MAX_ADDR) {
+ pr_crit("Unable to relocate DTB to Linux TLB\n");
+ return 1;
+ }
+
+ addr = (void *)PAGE_ALIGN_DOWN((phys_addr_t)addr -
+ data->oftree->totalsize);
+ memcpy(addr, data->oftree, data->oftree->totalsize);
+ free(data->oftree);
+ data->oftree = addr;
+
+ pr_info("Relocating device tree to 0x%p\n", addr);
+ return 0;
+}
+
static int do_bootm_linux(struct image_data *data)
{
void(*kernel)(void *, void *, unsigned long,
@@ -24,6 +57,20 @@ static int do_bootm_linux(struct image_data *data)
return -EINVAL;
}
+ /* Relocate the device tree if outside the initial
+* Linux mapped TLB.
+*/
+ if (IS_ENABLED(CONFIG_MPC85xx)) {
+ void *addr = data->oftree;
+
+ if ((addr + data->oftree->totalsize) > LINUX_TLB1_MAX_ADDR) {
+ addr = (void *)data->os_address;
+
+ if (bootm_relocate_fdt(addr, data))
+ goto error;
+ }
+ }
+
fdt_add_reserve_map(data->oftree);
kernel = (void *)(data->os_address + data->os_entry);
@@ -37,9 +84,9 @@ static int do_bootm_linux(struct image_data *data)
* r7: NULL
*/
kernel(data->oftree, kernel, 0, 0, 0);
-
reset_cpu(0);
+error:
/* not reached */
return -1;
}
--
1.7.1
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
[PATCH 4/4] ppc: P2020RDB configuration update
The P2020rdb defconfig has been updated to include
device tree, environment and boot command support for
booting Linux.
Also the P2020RDB board support defines a flash area to
store its environment for users to configure the boot process.
Signed-off-by: Renaud Barbier
---
arch/ppc/boards/freescale-p2020rdb/env/bin/init |3 +++
arch/ppc/boards/freescale-p2020rdb/env/config |2 ++
arch/ppc/boards/freescale-p2020rdb/p2020rdb.c |7 +++
arch/ppc/configs/p2020rdb_defconfig | 13 -
4 files changed, 24 insertions(+), 1 deletions(-)
create mode 100644 arch/ppc/boards/freescale-p2020rdb/env/bin/init
create mode 100644 arch/ppc/boards/freescale-p2020rdb/env/config
diff --git a/arch/ppc/boards/freescale-p2020rdb/env/bin/init
b/arch/ppc/boards/freescale-p2020rdb/env/bin/init
new file mode 100644
index 000..6bd125c
--- /dev/null
+++ b/arch/ppc/boards/freescale-p2020rdb/env/bin/init
@@ -0,0 +1,3 @@
+#!/bin/sh
+export PATH=/env/bin
+source /env/config
diff --git a/arch/ppc/boards/freescale-p2020rdb/env/config
b/arch/ppc/boards/freescale-p2020rdb/env/config
new file mode 100644
index 000..26b1a9a
--- /dev/null
+++ b/arch/ppc/boards/freescale-p2020rdb/env/config
@@ -0,0 +1,2 @@
+#!/bin/sh
+export bootargs="root=/dev/nfs rw ip=bootp panic=10"
diff --git a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
index 537565d..3d3a80d 100644
--- a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
+++ b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c
@@ -92,6 +92,13 @@ static int devices_init(void)
fsl_eth_init(2, &gfar_info[0]);
fsl_eth_init(3, &gfar_info[1]);
+ /* The env0 offset 0x77 is from the base address of the alternate
+* boot area where barebox boots from. Programming barebox in the
+* primary boot area in place of U-Boot may lead to loss of data when
+* saving the environment.
+*/
+ devfs_add_partition("nor0", 0x77, 0x1, DEVFS_PARTITION_FIXED,
+ "env0");
devfs_add_partition("nor0", 0xf8, 0x8, DEVFS_PARTITION_FIXED,
"self0");
return 0;
diff --git a/arch/ppc/configs/p2020rdb_defconfig
b/arch/ppc/configs/p2020rdb_defconfig
index 0f77903..35dd094 100644
--- a/arch/ppc/configs/p2020rdb_defconfig
+++ b/arch/ppc/configs/p2020rdb_defconfig
@@ -5,10 +5,18 @@ CONFIG_LONGHELP=y
CONFIG_GLOB=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
+CONFIG_CMD_PARTITION=y
CONFIG_CMD_SLEEP=y
CONFIG_CMD_FLASH=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC=n
+CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/ppc/boards/freescale-p2020rdb/env"
+CONFIG_CMD_LOADENV=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_PRINTENV=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_EDIT=y
CONFIG_FSL_ELBC=y
CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_AMD=y
@@ -17,7 +25,7 @@ CONFIG_DRIVER_CFI_BANK_WIDTH_1=n
CONFIG_DRIVER_CFI_BANK_WIDTH_2=y
CONFIG_DRIVER_CFI_BANK_WIDTH_4=n
CONFIG_MTD=y
-CONFIG_MALLOC_SIZE=0x20
+CONFIG_MALLOC_SIZE=0x80
CONFIG_BAUDRATE=115200
CONFIG_DRIVER_SERIAL_NS16550=y
CONFIG_RELOCATABLE=y
@@ -32,3 +40,6 @@ CONFIG_I2C=y
CONFIG_I2C_IMX=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MIITOOL=y
+CONFIG_OFTREE=y
+CONFIG_ZLIB=y
+CONFIG_CMD_OFTREE=y
--
1.7.1
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
[PATCH 0/4] Update P2020RDB board support to allow NFS booting.
This patchset updates the PPC and board support to enable NFS boot. Device tree fixup functionality for SOC version specific properties has been added, these were imported from U-Boot files commom/fdt_support.c and arch/powerpc/cpu/mpc85xx/fdt.c - version git-2b26201. Since the boot memory mapping for the MPC85xx is limited to the first 64MiB, support has been added to ensure that the device tree is located in this region before booting. The P2020RDB configuration is updated to have device tree support to boot Linux and environment support for the user to automate the boot mechanism. These modifications have been tested using a recent kernel (3.7-rc8). There is no guarantee that older kernel and dtb versions will boot correctly since support for older device tree fixup properties has not been included. Renaud Barbier (4): of: base: import of_find_node_by_type ppc: add mpc85xx device tree fixup functions ppc: bootm: relocate fdt to valid boot memory ppc: P2020RDB configuration update arch/ppc/boards/freescale-p2020rdb/env/bin/init |3 + arch/ppc/boards/freescale-p2020rdb/env/config |2 + arch/ppc/boards/freescale-p2020rdb/p2020rdb.c |7 + arch/ppc/configs/p2020rdb_defconfig | 13 ++- arch/ppc/include/asm/processor.h|2 + arch/ppc/lib/ppclinux.c | 49 ++- arch/ppc/mach-mpc85xx/Makefile |1 + arch/ppc/mach-mpc85xx/eth-devices.c |2 +- arch/ppc/mach-mpc85xx/fdt.c | 197 +++ drivers/of/base.c | 29 include/of.h|2 + 11 files changed, 304 insertions(+), 3 deletions(-) create mode 100644 arch/ppc/boards/freescale-p2020rdb/env/bin/init create mode 100644 arch/ppc/boards/freescale-p2020rdb/env/config create mode 100644 arch/ppc/mach-mpc85xx/fdt.c ___ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
[PATCH 2/4] ppc: add mpc85xx device tree fixup functions
This commit is based on U-Boot code from common/fdt_support.c
and arch/powerpc/cpu/mpc85xx/fdt.c - version git-2b26201.
This adds support for populating derived properties of the SOC which
are not typically included in the dtb directly.
Adding gianfar instances is modified to explicitly configure the driver
instance so that the "local-mac-address" property can be correctly
assigned.
Signed-off-by: Renaud Barbier
---
arch/ppc/include/asm/processor.h|1 +
arch/ppc/mach-mpc85xx/Makefile |1 +
arch/ppc/mach-mpc85xx/eth-devices.c |2 +-
arch/ppc/mach-mpc85xx/fdt.c | 197 +++
4 files changed, 200 insertions(+), 1 deletions(-)
create mode 100644 arch/ppc/mach-mpc85xx/fdt.c
diff --git a/arch/ppc/include/asm/processor.h b/arch/ppc/include/asm/processor.h
index 29e0622..04cfb60 100644
--- a/arch/ppc/include/asm/processor.h
+++ b/arch/ppc/include/asm/processor.h
@@ -845,6 +845,7 @@
/* Some parts define SVR[0:23] as the SOC version */
#define SVR_SOC_VER(svr) (((svr) >> 8) & 0xFF) /* SOC Version fields */
+#define IS_E_PROCESSOR(svr)((svr) & 0x8)
/*
* SVR_VER() Version Values
diff --git a/arch/ppc/mach-mpc85xx/Makefile b/arch/ppc/mach-mpc85xx/Makefile
index cc412c5..81d6853 100644
--- a/arch/ppc/mach-mpc85xx/Makefile
+++ b/arch/ppc/mach-mpc85xx/Makefile
@@ -5,4 +5,5 @@ obj-y += fsl_law.o
obj-y += speed.o
obj-y +=time.o
obj-$(CONFIG_MP) += mp.o
+obj-$(CONFIG_OFTREE) += fdt.o
obj-$(CONFIG_DRIVER_NET_GIANFAR) += eth-devices.o
diff --git a/arch/ppc/mach-mpc85xx/eth-devices.c
b/arch/ppc/mach-mpc85xx/eth-devices.c
index 611a578..09464f4 100644
--- a/arch/ppc/mach-mpc85xx/eth-devices.c
+++ b/arch/ppc/mach-mpc85xx/eth-devices.c
@@ -54,7 +54,7 @@ coredevice_initcall(fsl_phy_init);
int fsl_eth_init(int num, struct gfar_info_struct *gf)
{
- add_generic_device("gfar", DEVICE_ID_DYNAMIC, NULL,
+ add_generic_device("gfar", num - 1, NULL,
GFAR_BASE_ADDR + ((num - 1) * 0x1000), 0x1000,
IORESOURCE_MEM, gf);
return 0;
diff --git a/arch/ppc/mach-mpc85xx/fdt.c b/arch/ppc/mach-mpc85xx/fdt.c
new file mode 100644
index 000..737550f
--- /dev/null
+++ b/arch/ppc/mach-mpc85xx/fdt.c
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2013 GE Intelligent Platforms, Inc.
+ * Copyright 2007-2011 Freescale Semiconductor, Inc.
+ *
+ * (C) Copyright 2000
+ * Wolfgang Denk, DENX Software Engineering, w...@denx.de.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Based on U-Boot arch/powerpc/cpu/mpc85xx/fdt.c and
+ * common/fdt_support.c - version git-2b26201.
+ */
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+static void of_setup_crypto_node(void *blob)
+{
+ struct device_node *crypto_node;
+
+ crypto_node = of_find_compatible_node(blob, NULL, "fsl,sec2.0");
+ if (crypto_node == NULL)
+ return;
+
+ of_delete_node(crypto_node);
+}
+
+/* These properties specify whether the hardware supports the stashing
+ * of buffer descriptors in L2 cache.
+ */
+static void fdt_add_enet_stashing(void *fdt)
+{
+ struct device_node *node;
+
+ node = of_find_compatible_node(fdt, NULL, "gianfar");
+ while (node) {
+ of_set_property(node, "bd-stash", NULL, 0, 1);
+ of_property_write_u32(node, "rx-stash-len", 96);
+ of_property_write_u32(node, "rx-stash-idx", 0);
+ node = of_find_compatible_node(node, NULL, "gianfar");
+ }
+}
+
+static int fdt_stdout_setup(struct device_node *blob)
+{
+ struct device_node *node, *alias;
+ char sername[9] = { 0 };
+ const char *prop;
+ struct console_device *cdev;
+ int len;
+
+ node = of_find_node_by_path("/chosen");
+ if (node == NULL)
+ node = of_create_node(blob, "/chosen");
+
+ if (node == NULL) {
+ pr_err("%s: could not open /chosen node\n", __func__);
+ goto error;
+ }
+
+ for_each_console(cdev)
+ if ((cdev->f_active & (CONSOLE_STDIN | CONSOLE_STDOUT)))
+ break;
+ if (cdev)
+ sprintf(sername, "serial%d", cdev->dev->id);
+ else
+ sprintf(sername, "serial%d", 0);
+
+ alias = of_find_node_by_path_from(blob, "/aliases");
+ if (!alias) {
+
[PATCH 1/4] of: base: import of_find_node_by_type
Import of_find_node_by_type from Linux drivers/of/base.c -
commit id d8dfad3.
This function retrieves a node pointer based on the "device_type"
property of the node.
This is used by device tree update functions in PPC support.
Signed-off-by: Renaud Barbier
---
drivers/of/base.c | 29 +
include/of.h |2 ++
2 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 4770421..2f19ea5 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -319,6 +319,35 @@ struct device_node *of_find_node_by_name(struct
device_node *from,
EXPORT_SYMBOL(of_find_node_by_name);
/**
+ * of_find_node_by_type - Find a node by its "device_type" property
+ * @from: The node to start searching from, or NULL to start searching
+ * the entire device tree. The node you pass will not be
+ * searched, only the next one will; typically, you pass
+ * what the previous call returned.
+ * @type: The type string to match against.
+ *
+ * Returns a pointer to the node found or NULL.
+ */
+struct device_node *of_find_node_by_type(struct device_node *from,
+ const char *type)
+{
+ struct device_node *np;
+ const char *device_type;
+ int ret;
+
+ if (!from)
+ from = root_node;
+
+ of_tree_for_each_node_from(np, from) {
+ ret = of_property_read_string(np, "device_type", &device_type);
+ if (!ret && !of_node_cmp(device_type, type))
+ return np;
+ }
+ return NULL;
+}
+EXPORT_SYMBOL(of_find_node_by_type)
+
+/**
* of_find_compatible_node - Find a node based on type and one of the
*tokens in its "compatible" property
* @from: The node to start searching from or NULL, the node
diff --git a/include/of.h b/include/of.h
index b99f0b2..a565190 100644
--- a/include/of.h
+++ b/include/of.h
@@ -124,6 +124,8 @@ extern struct device_node *of_find_node_by_path_from(struct
device_node *from,
const char *path);
extern struct device_node *of_find_node_by_path(const char *path);
extern struct device_node *of_find_node_by_phandle(phandle phandle);
+extern struct device_node *of_find_node_by_type(struct device_node *from,
+ const char *type);
extern struct device_node *of_find_compatible_node(struct device_node *from,
const char *type, const char *compat);
extern const struct of_device_id *of_match_node(
--
1.7.1
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
[PATCHi v2] i2c-omap: fix am33xx and omap3 fclk_rate
commit f64ed12b accidentally swap fclk_rate from am33xx and omap3.
Revert this change.
Signed-off-by: Jan Weitzel
---
v2:
Fix also omap3 fclk_rate
Rename patch "i2c-omap: fix am33xx fclk_rate"
drivers/i2c/busses/i2c-omap.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index b2a74c0..2eb5133 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -246,7 +246,7 @@ struct omap_i2c_driver_data {
static struct omap_i2c_driver_data omap3_data = {
.flags =OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |
OMAP_I2C_FLAG_BUS_SHIFT_2,
- .fclk_rate =48000,
+ .fclk_rate =96000,
.regs = (u8 *) reg_map,
};
@@ -259,7 +259,7 @@ static struct omap_i2c_driver_data omap4_data = {
static struct omap_i2c_driver_data am33xx_data = {
.flags =OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |
OMAP_I2C_FLAG_BUS_SHIFT_NONE,
- .fclk_rate =96000,
+ .fclk_rate =48000,
.regs = (u8 *) omap4_reg_map,
};
--
1.7.0.4
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
[PATCH] i2c-omap: fix am33xx fclk_rate
commit f64ed12b change the clock accidentally from 48000 to 96000.
Revert this change.
Signed-off-by: Jan Weitzel
---
drivers/i2c/busses/i2c-omap.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index b2a74c0..c38f669 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -259,7 +259,7 @@ static struct omap_i2c_driver_data omap4_data = {
static struct omap_i2c_driver_data am33xx_data = {
.flags =OMAP_I2C_FLAG_RESET_REGS_POSTIDLE |
OMAP_I2C_FLAG_BUS_SHIFT_NONE,
- .fclk_rate =96000,
+ .fclk_rate =48000,
.regs = (u8 *) omap4_reg_map,
};
--
1.7.0.4
___
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
[PATCH] net/phy: support of mmd register read and write
Add function for indirect access of the mmd registers, based on linux.
phy_read_mmd_indirect
phy_write_mmd_indirect
Also clean some private mmd functions
Signed-off-by: Jan Weitzel
---
arch/arm/boards/dmo-mx6-realq7/board.c | 14 ++--
arch/arm/boards/tqma6x/board.c | 14 ++--
drivers/net/phy/phy.c | 63
include/linux/phy.h|4 ++
4 files changed, 73 insertions(+), 22 deletions(-)
diff --git a/arch/arm/boards/dmo-mx6-realq7/board.c
b/arch/arm/boards/dmo-mx6-realq7/board.c
index 69d93f8..628f5cb 100644
--- a/arch/arm/boards/dmo-mx6-realq7/board.c
+++ b/arch/arm/boards/dmo-mx6-realq7/board.c
@@ -58,23 +58,15 @@ static iomux_v3_cfg_t realq7_pads_gpio[] = {
MX6Q_PAD_RGMII_RX_CTL__GPIO_6_24,
};
-static void mmd_write_reg(struct phy_device *dev, int device, int reg, int val)
-{
- phy_write(dev, 0x0d, device);
- phy_write(dev, 0x0e, reg);
- phy_write(dev, 0x0d, (1 << 14) | device);
- phy_write(dev, 0x0e, val);
-}
-
static int ksz9031rn_phy_fixup(struct phy_device *dev)
{
/*
* min rx data delay, max rx/tx clock delay,
* min rx/tx control delay
*/
- mmd_write_reg(dev, 2, 4, 0);
- mmd_write_reg(dev, 2, 5, 0);
- mmd_write_reg(dev, 2, 8, 0x003ff);
+ phy_write_mmd_indirect(dev, 4, 2, 0);
+ phy_write_mmd_indirect(dev, 5, 2, 0);
+ phy_write_mmd_indirect(dev, 8, 2, 0x03ff);
return 0;
}
diff --git a/arch/arm/boards/tqma6x/board.c b/arch/arm/boards/tqma6x/board.c
index 9e81a1d..3e051a5 100644
--- a/arch/arm/boards/tqma6x/board.c
+++ b/arch/arm/boards/tqma6x/board.c
@@ -58,23 +58,15 @@ static iomux_v3_cfg_t tqma6x_pads_gpio[] = {
MX6Q_PAD_RGMII_RX_CTL__GPIO_6_24,
};
-static void mmd_write_reg(struct phy_device *dev, int device, int reg, int val)
-{
- phy_write(dev, 0x0d, device);
- phy_write(dev, 0x0e, reg);
- phy_write(dev, 0x0d, (1 << 14) | device);
- phy_write(dev, 0x0e, val);
-}
-
static int ksz9031rn_phy_fixup(struct phy_device *dev)
{
/*
* min rx data delay, max rx/tx clock delay,
* min rx/tx control delay
*/
- mmd_write_reg(dev, 2, 4, 0);
- mmd_write_reg(dev, 2, 5, 0);
- mmd_write_reg(dev, 2, 8, 0x003ff);
+ phy_write_mmd_indirect(dev, 4, 2, 0);
+ phy_write_mmd_indirect(dev, 5, 2, 0);
+ phy_write_mmd_indirect(dev, 8, 2, 0x003ff);
return 0;
}
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 112ff13..db00e38 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -632,6 +632,69 @@ int genphy_read_status(struct phy_device *phydev)
return 0;
}
+static inline void mmd_phy_indirect(struct phy_device *phydev, int prtad,
+ int devad)
+{
+ /* Write the desired MMD Devad */
+ phy_write(phydev, MII_MMD_CTRL, devad);
+
+ /* Write the desired MMD register address */
+ phy_write(phydev, MII_MMD_DATA, prtad);
+
+ /* Select the Function : DATA with no post increment */
+ phy_write(phydev, MII_MMD_CTRL, (devad | MII_MMD_CTRL_NOINCR));
+}
+
+/**
+ * phy_read_mmd_indirect - reads data from the MMD registers
+ * @phy_device: phy device
+ * @prtad: MMD Address
+ * @devad: MMD DEVAD
+ *
+ * Description: it reads data from the MMD registers (clause 22 to access to
+ * clause 45) of the specified phy address.
+ * To read these register we have:
+ * 1) Write reg 13 // DEVAD
+ * 2) Write reg 14 // MMD Address
+ * 3) Write reg 13 // MMD Data Command for MMD DEVAD
+ * 3) Read reg 14 // Read MMD data
+ */
+int phy_read_mmd_indirect(struct phy_device *phydev, int prtad, int devad)
+{
+ u32 ret;
+
+ mmd_phy_indirect(phydev, prtad, devad);
+
+ /* Read the content of the MMD's selected register */
+ ret = phy_read(phydev, MII_MMD_DATA);
+
+ return ret;
+}
+
+/**
+ * phy_write_mmd_indirect - writes data to the MMD registers
+ * @phy_device: phy device
+ * @prtad: MMD Address
+ * @devad: MMD DEVAD
+ * @data: data to write in the MMD register
+ *
+ * Description: Write data from the MMD registers of the specified
+ * phy address.
+ * To write these register we have:
+ * 1) Write reg 13 // DEVAD
+ * 2) Write reg 14 // MMD Address
+ * 3) Write reg 13 // MMD Data Command for MMD DEVAD
+ * 3) Write reg 14 // Write MMD data
+ */
+void phy_write_mmd_indirect(struct phy_device *phydev, int prtad, int devad,
+ u16 data)
+{
+ mmd_phy_indirect(phydev, prtad, devad);
+
+ /* Write the data into MMD's selected register */
+ phy_write(phydev, MII_MMD_DATA, data);
+}
+
static int genphy_config_init(struct phy_device *phydev)
{
int val;
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 8e60758..94f631b 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -288,5 +288,9 @@ int phy_register_fixup_for_uid(u32 phy_uid, u32
