Message ID | 1426591491-3685-1-git-send-email-kishon@ti.com |
---|---|
State | Accepted, archived |
Commit | 20431db949ce5eec0ff6012688c0ff6d9feb3319 |
Headers | show |
* Kishon Vijay Abraham I <kishon@ti.com> [150317 04:25]: > As per the TRMs of AM572x, OMAP4430, OMAP4460, OMAP543x, the value of > SYNC2 must be set to 0x6 in order to ensure correct operation. > > So modified the SYNC2 value of OCP2SCP TIMING register to 0x6 in all the > platforms that use OCP2SCP driver except AM437x. Also introduced a new > compatible property since we don't want to modify the OCP2SCP TIMING > register for AM437x. OK thanks I'll apply both into omap-for-v4.1/fixes-not-urgent as it seems we've gotten away with it for quite a few years now, and I don't see any specific description of what these fix. If that's not the case, please let me know. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt index 63dd805..18729f6 100644 --- a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt +++ b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt @@ -1,7 +1,8 @@ * OMAP OCP2SCP - ocp interface to scp interface properties: -- compatible : Should be "ti,omap-ocp2scp" +- compatible : Should be "ti,am437x-ocp2scp" for AM437x processor + Should be "ti,omap-ocp2scp" for all others - reg : Address and length of the register set for the device - #address-cells, #size-cells : Must be present if the device has sub-nodes - ranges : the child address space are mapped 1:1 onto the parent address space diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 1943fc3..286e317 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -787,7 +787,7 @@ }; ocp2scp0: ocp2scp@483a8000 { - compatible = "ti,omap-ocp2scp"; + compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp"; #address-cells = <1>; #size-cells = <1>; ranges; @@ -806,7 +806,7 @@ }; ocp2scp1: ocp2scp@483e8000 { - compatible = "ti,omap-ocp2scp"; + compatible = "ti,am437x-ocp2scp", "ti,omap-ocp2scp"; #address-cells = <1>; #size-cells = <1>; ranges;
Added a new compatible string "ti,am437x-ocp2scp" for OCP2SCP module. This is needed since except for the OCP2SCP used in AM437x, SYNC2 value in OCP2SCP TIMING should be changed whereas the default value is sufficient in AM437x. Cc: Tony Lindgren <tony@atomide.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- .../devicetree/bindings/bus/omap-ocp2scp.txt | 3 ++- arch/arm/boot/dts/am4372.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)