diff options
Diffstat (limited to 'arch/mips/dts')
| -rw-r--r-- | arch/mips/dts/ar9331-dptechnics-dpt-module.dts | 20 | ||||
| -rw-r--r-- | arch/mips/dts/ar9331-okud-max9331.dts | 4 | ||||
| -rw-r--r-- | arch/mips/dts/ar9331-openembed-som9331-board.dts | 4 | ||||
| -rw-r--r-- | arch/mips/dts/ar9331.dtsi | 12 | ||||
| -rw-r--r-- | arch/mips/dts/ar9331_tl_mr3020.dts | 4 | ||||
| -rw-r--r-- | arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts | 4 | ||||
| -rw-r--r-- | arch/mips/dts/qca4531-8devices-lima.dts | 4 | ||||
| -rw-r--r-- | arch/mips/dts/qemu-malta.dts | 24 |
8 files changed, 45 insertions, 31 deletions
diff --git a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts index 24ce0d0d67..25eabc9b7e 100644 --- a/arch/mips/dts/ar9331-dptechnics-dpt-module.dts +++ b/arch/mips/dts/ar9331-dptechnics-dpt-module.dts @@ -11,7 +11,7 @@ environment { compatible = "barebox,environment"; - device-path = &spiflash, "partname:barebox-environment"; + device-path = &env_nor; }; art@0 { @@ -20,18 +20,14 @@ barebox,provide-mac-address = <ð0>; }; }; +}; - leds { - system { - barebox,default-trigger = "heartbeat"; - }; - }; +&{/leds/led-0} { + barebox,default-trigger = "heartbeat"; +}; - gpio-keys { - button@0 { - gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; - }; - }; +&{/gpio-keys/button-0} { + gpios = <&gpio 11 GPIO_ACTIVE_HIGH>; }; &spiflash { @@ -40,7 +36,7 @@ reg = <0 0x80000>; }; - partition@80000 { + env_nor: partition@80000 { label = "barebox-environment"; reg = <0x80000 0x10000>; }; diff --git a/arch/mips/dts/ar9331-okud-max9331.dts b/arch/mips/dts/ar9331-okud-max9331.dts index 3b93bee93b..f65272905b 100644 --- a/arch/mips/dts/ar9331-okud-max9331.dts +++ b/arch/mips/dts/ar9331-okud-max9331.dts @@ -21,7 +21,7 @@ environment { compatible = "barebox,environment"; - device-path = &spiflash, "partname:barebox-environment"; + device-path = &env_nor; }; art@0 { @@ -120,7 +120,7 @@ reg = <0 0x10000>; }; - partition@10000 { + env_nor: partition@10000 { label = "barebox-environment"; reg = <0x10000 0x10000>; }; diff --git a/arch/mips/dts/ar9331-openembed-som9331-board.dts b/arch/mips/dts/ar9331-openembed-som9331-board.dts index 4736332f8f..78f5ef1ea2 100644 --- a/arch/mips/dts/ar9331-openembed-som9331-board.dts +++ b/arch/mips/dts/ar9331-openembed-som9331-board.dts @@ -37,7 +37,7 @@ environment { compatible = "barebox,environment"; - device-path = &spiflash, "partname:barebox-environment"; + device-path = &env_nor; }; art@0 { @@ -95,7 +95,7 @@ reg = <0 0x80000>; }; - partition@80000 { + env_nor: partition@80000 { label = "barebox-environment"; reg = <0x80000 0x10000>; }; diff --git a/arch/mips/dts/ar9331.dtsi b/arch/mips/dts/ar9331.dtsi index 72f029754e..20e4d64c04 100644 --- a/arch/mips/dts/ar9331.dtsi +++ b/arch/mips/dts/ar9331.dtsi @@ -1,10 +1,8 @@ -/ { - ahb { - wdt0: wdt@18060008 { - compatible = "qca,ar9331-wdt", "qca,ar9344-wdt"; - reg = <0x18060008 0x8>; - clocks = <&pll ATH79_CLK_CPU>; - }; +&{/ahb} { + wdt0: wdt@18060008 { + compatible = "qca,ar9331-wdt", "qca,ar9344-wdt"; + reg = <0x18060008 0x8>; + clocks = <&pll ATH79_CLK_CPU>; }; }; diff --git a/arch/mips/dts/ar9331_tl_mr3020.dts b/arch/mips/dts/ar9331_tl_mr3020.dts index c6ae154f4f..66587912c4 100644 --- a/arch/mips/dts/ar9331_tl_mr3020.dts +++ b/arch/mips/dts/ar9331_tl_mr3020.dts @@ -11,7 +11,7 @@ environment { compatible = "barebox,environment"; - device-path = &spiflash, "partname:barebox-environment"; + device-path = &env_nor; }; }; }; @@ -22,7 +22,7 @@ reg = <0 0x80000>; }; - partition@80000 { + env_nor: partition@80000 { label = "barebox-environment"; reg = <0x80000 0x10000>; }; diff --git a/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts b/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts index 82daabbdd4..d788b5ed63 100644 --- a/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts +++ b/arch/mips/dts/ar9344-tl-wdr4300-v1.7.dts @@ -24,7 +24,7 @@ environment { compatible = "barebox,environment"; - device-path = &spiflash, "partname:barebox-environment"; + device-path = &env_nor; }; art@0 { @@ -65,7 +65,7 @@ reg = <0 0x80000>; }; - partition@80000 { + env_nor: partition@80000 { label = "barebox-environment"; reg = <0x80000 0x10000>; }; diff --git a/arch/mips/dts/qca4531-8devices-lima.dts b/arch/mips/dts/qca4531-8devices-lima.dts index 4b960e12bf..bb3e5247dc 100644 --- a/arch/mips/dts/qca4531-8devices-lima.dts +++ b/arch/mips/dts/qca4531-8devices-lima.dts @@ -24,7 +24,7 @@ environment { compatible = "barebox,environment"; - device-path = &spiflash, "partname:barebox-environment"; + device-path = &env_nor; }; }; }; @@ -59,7 +59,7 @@ reg = <0 0x80000>; }; - partition@80000 { + env_nor: partition@80000 { label = "barebox-environment"; reg = <0x80000 0x10000>; }; diff --git a/arch/mips/dts/qemu-malta.dts b/arch/mips/dts/qemu-malta.dts index 2d6f4a0ca3..c2bc03dd46 100644 --- a/arch/mips/dts/qemu-malta.dts +++ b/arch/mips/dts/qemu-malta.dts @@ -10,7 +10,7 @@ chosen { environment { compatible = "barebox,environment"; - device-path = &nor0, "partname:barebox-environment"; + device-path = &env_nor; }; }; @@ -19,6 +19,26 @@ reg = <0x00000000 0x10000000>; }; + clocks { + ref_clk: ref_clk { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <320000000>; + }; + }; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + device_type = "cpu"; + compatible = "mips,mips24Kf"; + clocks = <&ref_clk>; + reg = <0>; + }; + }; + uart0: serial@180003f8 { compatible = "ns16550a"; reg = <0x180003f8 0x08>; @@ -79,7 +99,7 @@ read-only; }; - partition@80000 { + env_nor: partition@80000 { label = "barebox-environment"; reg = <0x80000 0x10000>; }; |