summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/device-tree-bindings/w1/mxc-w1.txt37
-rw-r--r--doc/driver-model/MIGRATION.txt10
-rw-r--r--doc/imx/mkimage/imximage.txt2
-rw-r--r--doc/imx/mkimage/mxsimage.txt4
4 files changed, 47 insertions, 6 deletions
diff --git a/doc/device-tree-bindings/w1/mxc-w1.txt b/doc/device-tree-bindings/w1/mxc-w1.txt
new file mode 100644
index 0000000000..1fb49cc111
--- /dev/null
+++ b/doc/device-tree-bindings/w1/mxc-w1.txt
@@ -0,0 +1,37 @@
+NXP i.MX (MXC) One wire bus master controller
+=======================
+
+Child nodes are required in device tree. The driver will detect
+the devices serial number and then search in the child nodes in the device tree
+for the proper node and try to match it with the device.
+
+Also check doc/device-tree-bindings/w1-eeprom for possible child nodes drivers
+
+Driver:
+- drivers/w1/mxc_w1.c
+
+Required properties:
+- compatible : should be one of
+ "fsl,imx21-owire", "fsl,imx27-owire", "fsl,imx31-owire", "fsl,imx25-owire"
+ "fsl,imx25-owire", "fsl,imx35-owire", "fsl,imx50-owire", "fsl,imx53-owire"
+
+- reg : Address and length of the register set for the device
+
+Optional:
+* none
+
+Example:
+ onewire {
+ compatible = "fsl,imx53-owire";
+ reg = <0x63fa4000 0x4000>;
+ };
+
+Example with child:
+ onewire {
+ compatible = "fsl,imx53-owire";
+ reg = <0x63fa4000 0x4000>;
+
+ eeprom1: eeprom@0 {
+ compatible = "maxim,ds24xxx";
+ };
+ };
diff --git a/doc/driver-model/MIGRATION.txt b/doc/driver-model/MIGRATION.txt
index dce4aa3e1d..183d7f5293 100644
--- a/doc/driver-model/MIGRATION.txt
+++ b/doc/driver-model/MIGRATION.txt
@@ -55,9 +55,6 @@ CONFIG_DM_SPI_FLASH
Board Maintainers should submit the patches for enabling DM_SPI and DM_SPI_FLASH
to move the migration with in the deadline.
-Status: In progress
-Deadline: 2018.09
-
No dm conversion yet:
drivers/spi/cf_spi.c
drivers/spi/fsl_espi.c
@@ -69,6 +66,9 @@ No dm conversion yet:
drivers/spi/sh_spi.c
drivers/spi/soft_spi_legacy.c
+ Status: In progress
+ Deadline: 2019.04
+
Partially converted:
drivers/spi/atcspi200_spi.c
drivers/spi/davinci_spi.c
@@ -79,6 +79,10 @@ Partially converted:
drivers/spi/omap3_spi.c
drivers/spi/ti_qspi.c
+ Status: In progress
+ Deadline: 2019.07
+
--
Jagan Teki <jagan@openedev.com>
+12/24/2018
03/14/2018
diff --git a/doc/imx/mkimage/imximage.txt b/doc/imx/mkimage/imximage.txt
index 803682f558..f2cf23c5da 100644
--- a/doc/imx/mkimage/imximage.txt
+++ b/doc/imx/mkimage/imximage.txt
@@ -175,7 +175,7 @@ Warning: setting sector offset for DOS compatiblity
We have set 255 heads, 63 sector. We have to set the cylinder.
The value to be set can be calculated with:
- cilynder = <total size> / <heads> / <sectors> / <blocksize>
+ cylinder = <total size> / <heads> / <sectors> / <blocksize>
in this example,
1981284352 / 255 / 63 / 512 = 239.x = 239
diff --git a/doc/imx/mkimage/mxsimage.txt b/doc/imx/mkimage/mxsimage.txt
index c3975ee5e6..9159f93a97 100644
--- a/doc/imx/mkimage/mxsimage.txt
+++ b/doc/imx/mkimage/mxsimage.txt
@@ -46,7 +46,7 @@ These semantics and rules will be outlined now.
TAG [LAST]
- LAST :: Flag denoting the last section in the file
- - After a "TAG" unstruction, any of the following instructions may follow
+ - After a "TAG" instruction, any of the following instructions may follow
in any order and any quantity:
NOOP
@@ -142,7 +142,7 @@ These semantics and rules will be outlined now.
- An optional flags lines can be one of the following:
DISPLAYPROGRESS
- - Enable boot progress output form the BootROM.
+ - Enable boot progress output from the BootROM.
- If the boot progress output from the BootROM is enabled, the BootROM will
produce a letter on the Debug UART for each instruction it started processing.