diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/imx51.dtsi | 7 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx53.dtsi | 7 | ||||
-rw-r--r-- | arch/arm/mach-imx/clk-imx51-imx53.c | 2 |
3 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi index bfa65abe8ef2..39eb88e9971c 100644 --- a/arch/arm/boot/dts/imx51.dtsi +++ b/arch/arm/boot/dts/imx51.dtsi | |||
@@ -259,6 +259,13 @@ | |||
259 | status = "disabled"; | 259 | status = "disabled"; |
260 | }; | 260 | }; |
261 | 261 | ||
262 | nand@83fdb000 { | ||
263 | compatible = "fsl,imx51-nand"; | ||
264 | reg = <0x83fdb000 0x1000 0xcfff0000 0x10000>; | ||
265 | interrupts = <8>; | ||
266 | status = "disabled"; | ||
267 | }; | ||
268 | |||
262 | ssi3: ssi@83fe8000 { | 269 | ssi3: ssi@83fe8000 { |
263 | compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; | 270 | compatible = "fsl,imx51-ssi", "fsl,imx21-ssi"; |
264 | reg = <0x83fe8000 0x4000>; | 271 | reg = <0x83fe8000 0x4000>; |
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index e3e869470cd3..2b5caf9fe660 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi | |||
@@ -314,6 +314,13 @@ | |||
314 | status = "disabled"; | 314 | status = "disabled"; |
315 | }; | 315 | }; |
316 | 316 | ||
317 | nand@63fdb000 { | ||
318 | compatible = "fsl,imx53-nand"; | ||
319 | reg = <0x63fdb000 0x1000 0xf7ff0000 0x10000>; | ||
320 | interrupts = <8>; | ||
321 | status = "disabled"; | ||
322 | }; | ||
323 | |||
317 | ssi3: ssi@63fe8000 { | 324 | ssi3: ssi@63fe8000 { |
318 | compatible = "fsl,imx53-ssi", "fsl,imx21-ssi"; | 325 | compatible = "fsl,imx53-ssi", "fsl,imx21-ssi"; |
319 | reg = <0x63fe8000 0x4000>; | 326 | reg = <0x63fe8000 0x4000>; |
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c index fcd94f3b0f0e..7b525c1230d9 100644 --- a/arch/arm/mach-imx/clk-imx51-imx53.c +++ b/arch/arm/mach-imx/clk-imx51-imx53.c | |||
@@ -357,6 +357,7 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, | |||
357 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "83fcc000.ssi"); | 357 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "83fcc000.ssi"); |
358 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "70014000.ssi"); | 358 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "70014000.ssi"); |
359 | clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "83fe8000.ssi"); | 359 | clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "83fe8000.ssi"); |
360 | clk_register_clkdev(clk[nfc_gate], NULL, "83fdb000.nand"); | ||
360 | 361 | ||
361 | /* set the usboh3 parent to pll2_sw */ | 362 | /* set the usboh3 parent to pll2_sw */ |
362 | clk_set_parent(clk[usboh3_sel], clk[pll2_sw]); | 363 | clk_set_parent(clk[usboh3_sel], clk[pll2_sw]); |
@@ -446,6 +447,7 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc, | |||
446 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi"); | 447 | clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi"); |
447 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi"); | 448 | clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi"); |
448 | clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi"); | 449 | clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi"); |
450 | clk_register_clkdev(clk[nfc_gate], NULL, "63fdb000.nand"); | ||
449 | 451 | ||
450 | /* set SDHC root clock to 200MHZ*/ | 452 | /* set SDHC root clock to 200MHZ*/ |
451 | clk_set_rate(clk[esdhc_a_podf], 200000000); | 453 | clk_set_rate(clk[esdhc_a_podf], 200000000); |