diff options
-rw-r--r-- | recipes-kernel/linux/files/dra7xx/am572x-pru-uio.dtsi | 36 | ||||
-rw-r--r-- | recipes-kernel/linux/linux-ti-staging_4.4.bb | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/recipes-kernel/linux/files/dra7xx/am572x-pru-uio.dtsi b/recipes-kernel/linux/files/dra7xx/am572x-pru-uio.dtsi index fe21b2f7..828a0cee 100644 --- a/recipes-kernel/linux/files/dra7xx/am572x-pru-uio.dtsi +++ b/recipes-kernel/linux/files/dra7xx/am572x-pru-uio.dtsi | |||
@@ -11,12 +11,18 @@ | |||
11 | <0x4b210000 0x8000>, | 11 | <0x4b210000 0x8000>, |
12 | <0x4b220000 0x2000>, | 12 | <0x4b220000 0x2000>, |
13 | <0x4b226000 0x2000>, | 13 | <0x4b226000 0x2000>, |
14 | <0x4b228000 0x38>, | ||
15 | <0x4b22e000 0x31c>, | 14 | <0x4b22e000 0x31c>, |
16 | <0x4b230000 0x60>, | ||
17 | <0x4b232000 0x58>; | 15 | <0x4b232000 0x58>; |
18 | mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", | 16 | mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", |
19 | "ecap", "iep", "uart", "mii_rt"; | 17 | "iep", "mii_rt"; |
18 | status = "okay"; | ||
19 | }; | ||
20 | uio_pruss1_mem2: uio_pruss1_mem2 { | ||
21 | compatible = "ti,uio-module-drv"; | ||
22 | mem = <0x4b228000 0x38>, | ||
23 | <0x4b230000 0x60>, | ||
24 | <0x4b232400 0x90>; | ||
25 | mem-names = "uart", "ecap", "mdio"; | ||
20 | status = "okay"; | 26 | status = "okay"; |
21 | }; | 27 | }; |
22 | uio_pruss1_evt0: uio_pruss1_evt0 { | 28 | uio_pruss1_evt0: uio_pruss1_evt0 { |
@@ -78,12 +84,6 @@ | |||
78 | status = "okay"; | 84 | status = "okay"; |
79 | }; | 85 | }; |
80 | 86 | ||
81 | uio_pruss1_mdio: uio_pruss1_mdio { | ||
82 | compatible = "ti,uio-module-drv"; | ||
83 | mem = <0x4b232400 0x90>; | ||
84 | status = "okay"; | ||
85 | }; | ||
86 | |||
87 | uio_pruss2_mem: uio_pruss2_mem { | 87 | uio_pruss2_mem: uio_pruss2_mem { |
88 | compatible = "ti,uio-module-drv"; | 88 | compatible = "ti,uio-module-drv"; |
89 | ti,hwmods = "pruss2"; | 89 | ti,hwmods = "pruss2"; |
@@ -92,12 +92,18 @@ | |||
92 | <0x4b290000 0x8000>, | 92 | <0x4b290000 0x8000>, |
93 | <0x4b2a0000 0x2000>, | 93 | <0x4b2a0000 0x2000>, |
94 | <0x4b2a6000 0x2000>, | 94 | <0x4b2a6000 0x2000>, |
95 | <0x4b2a8000 0x38>, | ||
96 | <0x4b2ae000 0x31c>, | 95 | <0x4b2ae000 0x31c>, |
97 | <0x4b2b0000 0x60>, | ||
98 | <0x4b2b2000 0x58>; | 96 | <0x4b2b2000 0x58>; |
99 | mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", | 97 | mem-names = "dram0", "dram1", "shrdram2", "intc", "cfg", |
100 | "ecap", "iep", "uart", "mii_rt"; | 98 | "iep", "mii_rt"; |
99 | status = "okay"; | ||
100 | }; | ||
101 | uio_pruss2_mem2: uio_pruss2_mem2 { | ||
102 | compatible = "ti,uio-module-drv"; | ||
103 | mem = <0x4b2a8000 0x38>, | ||
104 | <0x4b2b0000 0x60>, | ||
105 | <0x4b2b2400 0x90>; | ||
106 | mem-names = "uart", "ecap", "mdio"; | ||
101 | status = "okay"; | 107 | status = "okay"; |
102 | }; | 108 | }; |
103 | uio_pruss2_evt0: uio_pruss2_evt0 { | 109 | uio_pruss2_evt0: uio_pruss2_evt0 { |
@@ -157,12 +163,6 @@ | |||
157 | mem-names = "iram", "control", "debug"; | 163 | mem-names = "iram", "control", "debug"; |
158 | status = "okay"; | 164 | status = "okay"; |
159 | }; | 165 | }; |
160 | uio_pruss2_mdio: uio_pruss2_mdio { | ||
161 | compatible = "ti,uio-module-drv"; | ||
162 | mem = <0x4b2b2400 0x90>; | ||
163 | mem-names = "mdio"; | ||
164 | status = "okay"; | ||
165 | }; | ||
166 | }; | 166 | }; |
167 | }; | 167 | }; |
168 | 168 | ||
diff --git a/recipes-kernel/linux/linux-ti-staging_4.4.bb b/recipes-kernel/linux/linux-ti-staging_4.4.bb index cba9c89f..2ce97e58 100644 --- a/recipes-kernel/linux/linux-ti-staging_4.4.bb +++ b/recipes-kernel/linux/linux-ti-staging_4.4.bb | |||
@@ -75,7 +75,7 @@ SRCREV = "1d85a66844655b0cbd99c00870d77956494c59ab" | |||
75 | PV = "4.4.11+git${SRCPV}" | 75 | PV = "4.4.11+git${SRCPV}" |
76 | 76 | ||
77 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild | 77 | # Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild |
78 | MACHINE_KERNEL_PR_append = "b" | 78 | MACHINE_KERNEL_PR_append = "c" |
79 | PR = "${MACHINE_KERNEL_PR}" | 79 | PR = "${MACHINE_KERNEL_PR}" |
80 | 80 | ||
81 | KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" | 81 | KERNEL_CONFIG_DIR = "${S}/ti_config_fragments" |