Skip to content

Commit 89bbc6f

Browse files
committed
ARM: dts: Fix incorrect dcan register mapping for am3, am4 and dra7
We are currently using a wrong register for dcan revision. Although this is currently only used for detecting the dcan module, let's fix it to avoid confusion. Tested-by: Keerthy <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent 2e8647b commit 89bbc6f

File tree

4 files changed

+12
-3
lines changed

4 files changed

+12
-3
lines changed

arch/arm/boot/dts/am33xx-l4.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,6 +1758,8 @@
17581758

17591759
target-module@cc000 { /* 0x481cc000, ap 60 46.0 */
17601760
compatible = "ti,sysc-omap4", "ti,sysc";
1761+
reg = <0xcc020 0x4>;
1762+
reg-names = "rev";
17611763
ti,hwmods = "d_can0";
17621764
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
17631765
clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN0_CLKCTRL 0>,
@@ -1780,6 +1782,8 @@
17801782

17811783
target-module@d0000 { /* 0x481d0000, ap 62 42.0 */
17821784
compatible = "ti,sysc-omap4", "ti,sysc";
1785+
reg = <0xd0020 0x4>;
1786+
reg-names = "rev";
17831787
ti,hwmods = "d_can1";
17841788
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
17851789
clocks = <&l4ls_clkctrl AM3_L4LS_D_CAN1_CLKCTRL 0>,

arch/arm/boot/dts/am437x-l4.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,6 +1574,8 @@
15741574

15751575
target-module@cc000 { /* 0x481cc000, ap 50 46.0 */
15761576
compatible = "ti,sysc-omap4", "ti,sysc";
1577+
reg = <0xcc020 0x4>;
1578+
reg-names = "rev";
15771579
ti,hwmods = "d_can0";
15781580
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
15791581
clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN0_CLKCTRL 0>;
@@ -1593,6 +1595,8 @@
15931595

15941596
target-module@d0000 { /* 0x481d0000, ap 52 3a.0 */
15951597
compatible = "ti,sysc-omap4", "ti,sysc";
1598+
reg = <0xd0020 0x4>;
1599+
reg-names = "rev";
15961600
ti,hwmods = "d_can1";
15971601
/* Domains (P, C): per_pwrdm, l4ls_clkdm */
15981602
clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN1_CLKCTRL 0>;

arch/arm/boot/dts/dra7-l4.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3025,7 +3025,7 @@
30253025

30263026
target-module@80000 { /* 0x48480000, ap 31 16.0 */
30273027
compatible = "ti,sysc-omap4", "ti,sysc";
3028-
reg = <0x80000 0x4>;
3028+
reg = <0x80020 0x4>;
30293029
reg-names = "rev";
30303030
clocks = <&l4per2_clkctrl DRA7_L4PER2_DCAN2_CLKCTRL 0>;
30313031
clock-names = "fck";
@@ -4577,7 +4577,7 @@
45774577

45784578
target-module@c000 { /* 0x4ae3c000, ap 30 04.0 */
45794579
compatible = "ti,sysc-omap4", "ti,sysc";
4580-
reg = <0xc000 0x4>;
4580+
reg = <0xc020 0x4>;
45814581
reg-names = "rev";
45824582
clocks = <&wkupaon_clkctrl DRA7_WKUPAON_DCAN1_CLKCTRL 0>;
45834583
clock-names = "fck";

drivers/bus/ti-sysc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,8 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = {
12671267
SYSC_QUIRK("control", 0, 0, 0x10, -1, 0x40000900, 0xffffffff, 0),
12681268
SYSC_QUIRK("cpgmac", 0, 0x1200, 0x1208, 0x1204, 0x4edb1902,
12691269
0xffff00f0, 0),
1270-
SYSC_QUIRK("dcan", 0, 0, -1, -1, 0xffffffff, 0xffffffff, 0),
1270+
SYSC_QUIRK("dcan", 0, 0x20, -1, -1, 0xa3170504, 0xffffffff, 0),
1271+
SYSC_QUIRK("dcan", 0, 0x20, -1, -1, 0x4edb1902, 0xffffffff, 0),
12711272
SYSC_QUIRK("dmic", 0, 0, 0x10, -1, 0x50010000, 0xffffffff, 0),
12721273
SYSC_QUIRK("dwc3", 0, 0, 0x10, -1, 0x500a0200, 0xffffffff, 0),
12731274
SYSC_QUIRK("epwmss", 0, 0, 0x4, -1, 0x47400001, 0xffffffff, 0),

0 commit comments

Comments
 (0)