Merge tag 'mips-fixes-for-2019.01' of git://git.denx.de/u-boot-mips
- mips: bcm: disable CONFIG_SWAP_IO_SPACE to force native endianess in readl() & co.
this fixes 09ace9161b95ad3a04b33d1d6a65a929901d28c8
- mips: bcm6838: fix device tree warning
diff --git a/arch/mips/dts/brcm,bcm6838.dtsi b/arch/mips/dts/brcm,bcm6838.dtsi
index 1018f9e..77d6a8e 100644
--- a/arch/mips/dts/brcm,bcm6838.dtsi
+++ b/arch/mips/dts/brcm,bcm6838.dtsi
@@ -31,8 +31,6 @@
clocks {
compatible = "simple-bus";
- #address-cells = <1>;
- #size-cells = <1>;
u-boot,dm-pre-reloc;
periph_osc: periph-osc {
diff --git a/arch/mips/mach-bmips/Kconfig b/arch/mips/mach-bmips/Kconfig
index 5219965..b259a93 100644
--- a/arch/mips/mach-bmips/Kconfig
+++ b/arch/mips/mach-bmips/Kconfig
@@ -25,7 +25,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_WATCHDOG
help
This supports BMIPS BCM3380 family.
@@ -36,7 +35,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_SYSCON
help
This supports BMIPS BCM6318 family.
@@ -47,7 +45,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_SYSCON
help
This supports BMIPS BCM6328 family including BCM63281 and BCM63283.
@@ -58,7 +55,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_SYSCON
help
This supports BMIPS BCM6338 family.
@@ -69,7 +65,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_WATCHDOG
help
This supports BMIPS BCM6348 family.
@@ -80,7 +75,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_SYSCON
help
This supports BMIPS BCM6358 family including BCM6358 and BCM6359.
@@ -91,7 +85,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_SYSCON
help
This supports BMIPS BCM6368 family including BCM6368 and BCM6369.
@@ -102,7 +95,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_SYSCON
help
This supports BMIPS BCM6362 family including BCM6361 and BCM6362.
@@ -113,7 +105,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_SYSCON
help
This supports BMIPS BCM63268 family including BCM63168, BCM63169,
@@ -125,7 +116,6 @@
select MIPS_TUNE_4KC
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
- select SWAP_IO_SPACE
select SYSRESET_SYSCON
help
This supports BMIPS BCM6838 family including BCM68380, BCM68381,