aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2012-10-08 06:46:32 -0400
committerWolfram Sang <w.sang@pengutronix.de>2012-10-08 06:46:32 -0400
commit102084d3d3969646cc89ea159e50898aeafc6649 (patch)
treee92924469b3fab3ee6fa29e338e0a3a4cb167e82 /arch/arm/boot
parent6ccbe607132bd823abbad8d32b13af89161707da (diff)
parent979570e02981d4a8fc20b3cc8fd651856c98ee9d (diff)
Merge tag 'v3.6-rc7' into i2c-embedded/for-next
Linux 3.6-rc7 Needed to get updates from i2c-embedded/for-current into i2c-embedded/for-next
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/compressed/head.S5
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi3
-rw-r--r--arch/arm/boot/dts/at91sam9263.dtsi5
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi5
-rw-r--r--arch/arm/boot/dts/at91sam9n12.dtsi4
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi4
6 files changed, 26 insertions, 0 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index b8c64b80baf..bc67cbff394 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -653,16 +653,21 @@ __armv7_mmu_cache_on:
653 mcrne p15, 0, r0, c8, c7, 0 @ flush I,D TLBs 653 mcrne p15, 0, r0, c8, c7, 0 @ flush I,D TLBs
654#endif 654#endif
655 mrc p15, 0, r0, c1, c0, 0 @ read control reg 655 mrc p15, 0, r0, c1, c0, 0 @ read control reg
656 bic r0, r0, #1 << 28 @ clear SCTLR.TRE
656 orr r0, r0, #0x5000 @ I-cache enable, RR cache replacement 657 orr r0, r0, #0x5000 @ I-cache enable, RR cache replacement
657 orr r0, r0, #0x003c @ write buffer 658 orr r0, r0, #0x003c @ write buffer
658#ifdef CONFIG_MMU 659#ifdef CONFIG_MMU
659#ifdef CONFIG_CPU_ENDIAN_BE8 660#ifdef CONFIG_CPU_ENDIAN_BE8
660 orr r0, r0, #1 << 25 @ big-endian page tables 661 orr r0, r0, #1 << 25 @ big-endian page tables
661#endif 662#endif
663 mrcne p15, 0, r6, c2, c0, 2 @ read ttb control reg
662 orrne r0, r0, #1 @ MMU enabled 664 orrne r0, r0, #1 @ MMU enabled
663 movne r1, #0xfffffffd @ domain 0 = client 665 movne r1, #0xfffffffd @ domain 0 = client
666 bic r6, r6, #1 << 31 @ 32-bit translation system
667 bic r6, r6, #3 << 0 @ use only ttbr0
664 mcrne p15, 0, r3, c2, c0, 0 @ load page table pointer 668 mcrne p15, 0, r3, c2, c0, 0 @ load page table pointer
665 mcrne p15, 0, r1, c3, c0, 0 @ load domain access control 669 mcrne p15, 0, r1, c3, c0, 0 @ load domain access control
670 mcrne p15, 0, r6, c2, c0, 2 @ load ttb control
666#endif 671#endif
667 mcr p15, 0, r0, c7, c5, 4 @ ISB 672 mcr p15, 0, r0, c7, c5, 4 @ ISB
668 mcr p15, 0, r0, c1, c0, 0 @ load control register 673 mcr p15, 0, r0, c1, c0, 0 @ load control register
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index edef4521cef..d410581a5a8 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -105,6 +105,7 @@
105 #gpio-cells = <2>; 105 #gpio-cells = <2>;
106 gpio-controller; 106 gpio-controller;
107 interrupt-controller; 107 interrupt-controller;
108 #interrupt-cells = <2>;
108 }; 109 };
109 110
110 pioB: gpio@fffff600 { 111 pioB: gpio@fffff600 {
@@ -114,6 +115,7 @@
114 #gpio-cells = <2>; 115 #gpio-cells = <2>;
115 gpio-controller; 116 gpio-controller;
116 interrupt-controller; 117 interrupt-controller;
118 #interrupt-cells = <2>;
117 }; 119 };
118 120
119 pioC: gpio@fffff800 { 121 pioC: gpio@fffff800 {
@@ -123,6 +125,7 @@
123 #gpio-cells = <2>; 125 #gpio-cells = <2>;
124 gpio-controller; 126 gpio-controller;
125 interrupt-controller; 127 interrupt-controller;
128 #interrupt-cells = <2>;
126 }; 129 };
127 130
128 dbgu: serial@fffff200 { 131 dbgu: serial@fffff200 {
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index e7942c7e3f6..3e6e5c1abbf 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -96,6 +96,7 @@
96 #gpio-cells = <2>; 96 #gpio-cells = <2>;
97 gpio-controller; 97 gpio-controller;
98 interrupt-controller; 98 interrupt-controller;
99 #interrupt-cells = <2>;
99 }; 100 };
100 101
101 pioB: gpio@fffff400 { 102 pioB: gpio@fffff400 {
@@ -105,6 +106,7 @@
105 #gpio-cells = <2>; 106 #gpio-cells = <2>;
106 gpio-controller; 107 gpio-controller;
107 interrupt-controller; 108 interrupt-controller;
109 #interrupt-cells = <2>;
108 }; 110 };
109 111
110 pioC: gpio@fffff600 { 112 pioC: gpio@fffff600 {
@@ -114,6 +116,7 @@
114 #gpio-cells = <2>; 116 #gpio-cells = <2>;
115 gpio-controller; 117 gpio-controller;
116 interrupt-controller; 118 interrupt-controller;
119 #interrupt-cells = <2>;
117 }; 120 };
118 121
119 pioD: gpio@fffff800 { 122 pioD: gpio@fffff800 {
@@ -123,6 +126,7 @@
123 #gpio-cells = <2>; 126 #gpio-cells = <2>;
124 gpio-controller; 127 gpio-controller;
125 interrupt-controller; 128 interrupt-controller;
129 #interrupt-cells = <2>;
126 }; 130 };
127 131
128 pioE: gpio@fffffa00 { 132 pioE: gpio@fffffa00 {
@@ -132,6 +136,7 @@
132 #gpio-cells = <2>; 136 #gpio-cells = <2>;
133 gpio-controller; 137 gpio-controller;
134 interrupt-controller; 138 interrupt-controller;
139 #interrupt-cells = <2>;
135 }; 140 };
136 141
137 dbgu: serial@ffffee00 { 142 dbgu: serial@ffffee00 {
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index ae4bb6da287..3add030d61f 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -115,6 +115,7 @@
115 #gpio-cells = <2>; 115 #gpio-cells = <2>;
116 gpio-controller; 116 gpio-controller;
117 interrupt-controller; 117 interrupt-controller;
118 #interrupt-cells = <2>;
118 }; 119 };
119 120
120 pioB: gpio@fffff400 { 121 pioB: gpio@fffff400 {
@@ -124,6 +125,7 @@
124 #gpio-cells = <2>; 125 #gpio-cells = <2>;
125 gpio-controller; 126 gpio-controller;
126 interrupt-controller; 127 interrupt-controller;
128 #interrupt-cells = <2>;
127 }; 129 };
128 130
129 pioC: gpio@fffff600 { 131 pioC: gpio@fffff600 {
@@ -133,6 +135,7 @@
133 #gpio-cells = <2>; 135 #gpio-cells = <2>;
134 gpio-controller; 136 gpio-controller;
135 interrupt-controller; 137 interrupt-controller;
138 #interrupt-cells = <2>;
136 }; 139 };
137 140
138 pioD: gpio@fffff800 { 141 pioD: gpio@fffff800 {
@@ -142,6 +145,7 @@
142 #gpio-cells = <2>; 145 #gpio-cells = <2>;
143 gpio-controller; 146 gpio-controller;
144 interrupt-controller; 147 interrupt-controller;
148 #interrupt-cells = <2>;
145 }; 149 };
146 150
147 pioE: gpio@fffffa00 { 151 pioE: gpio@fffffa00 {
@@ -151,6 +155,7 @@
151 #gpio-cells = <2>; 155 #gpio-cells = <2>;
152 gpio-controller; 156 gpio-controller;
153 interrupt-controller; 157 interrupt-controller;
158 #interrupt-cells = <2>;
154 }; 159 };
155 160
156 dbgu: serial@ffffee00 { 161 dbgu: serial@ffffee00 {
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 42e9fba4423..82508d68aa7 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -109,6 +109,7 @@
109 #gpio-cells = <2>; 109 #gpio-cells = <2>;
110 gpio-controller; 110 gpio-controller;
111 interrupt-controller; 111 interrupt-controller;
112 #interrupt-cells = <2>;
112 }; 113 };
113 114
114 pioB: gpio@fffff600 { 115 pioB: gpio@fffff600 {
@@ -118,6 +119,7 @@
118 #gpio-cells = <2>; 119 #gpio-cells = <2>;
119 gpio-controller; 120 gpio-controller;
120 interrupt-controller; 121 interrupt-controller;
122 #interrupt-cells = <2>;
121 }; 123 };
122 124
123 pioC: gpio@fffff800 { 125 pioC: gpio@fffff800 {
@@ -127,6 +129,7 @@
127 #gpio-cells = <2>; 129 #gpio-cells = <2>;
128 gpio-controller; 130 gpio-controller;
129 interrupt-controller; 131 interrupt-controller;
132 #interrupt-cells = <2>;
130 }; 133 };
131 134
132 pioD: gpio@fffffa00 { 135 pioD: gpio@fffffa00 {
@@ -136,6 +139,7 @@
136 #gpio-cells = <2>; 139 #gpio-cells = <2>;
137 gpio-controller; 140 gpio-controller;
138 interrupt-controller; 141 interrupt-controller;
142 #interrupt-cells = <2>;
139 }; 143 };
140 144
141 dbgu: serial@fffff200 { 145 dbgu: serial@fffff200 {
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index e05afbc3e04..03fc136421c 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -118,6 +118,7 @@
118 #gpio-cells = <2>; 118 #gpio-cells = <2>;
119 gpio-controller; 119 gpio-controller;
120 interrupt-controller; 120 interrupt-controller;
121 #interrupt-cells = <2>;
121 }; 122 };
122 123
123 pioB: gpio@fffff600 { 124 pioB: gpio@fffff600 {
@@ -127,6 +128,7 @@
127 #gpio-cells = <2>; 128 #gpio-cells = <2>;
128 gpio-controller; 129 gpio-controller;
129 interrupt-controller; 130 interrupt-controller;
131 #interrupt-cells = <2>;
130 }; 132 };
131 133
132 pioC: gpio@fffff800 { 134 pioC: gpio@fffff800 {
@@ -136,6 +138,7 @@
136 #gpio-cells = <2>; 138 #gpio-cells = <2>;
137 gpio-controller; 139 gpio-controller;
138 interrupt-controller; 140 interrupt-controller;
141 #interrupt-cells = <2>;
139 }; 142 };
140 143
141 pioD: gpio@fffffa00 { 144 pioD: gpio@fffffa00 {
@@ -145,6 +148,7 @@
145 #gpio-cells = <2>; 148 #gpio-cells = <2>;
146 gpio-controller; 149 gpio-controller;
147 interrupt-controller; 150 interrupt-controller;
151 #interrupt-cells = <2>;
148 }; 152 };
149 153
150 dbgu: serial@fffff200 { 154 dbgu: serial@fffff200 {
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-31 17:51:54 -0400