diff options
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm6328.dtsi | 1 | ||||
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm7125.dtsi | 1 | ||||
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm7346.dtsi | 1 | ||||
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm7358.dtsi | 1 | ||||
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm7360.dtsi | 1 | ||||
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm7362.dtsi | 1 | ||||
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm7420.dtsi | 1 | ||||
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm7425.dtsi | 1 | ||||
| -rw-r--r-- | arch/mips/boot/dts/brcm/bcm7435.dtsi | 1 | ||||
| -rw-r--r-- | drivers/base/regmap/regmap-mmio.c | 16 |
10 files changed, 17 insertions, 8 deletions
diff --git a/arch/mips/boot/dts/brcm/bcm6328.dtsi b/arch/mips/boot/dts/brcm/bcm6328.dtsi index 459b9b252c3b..d61b1616b604 100644 --- a/arch/mips/boot/dts/brcm/bcm6328.dtsi +++ b/arch/mips/boot/dts/brcm/bcm6328.dtsi | |||
| @@ -74,6 +74,7 @@ | |||
| 74 | timer: timer@10000040 { | 74 | timer: timer@10000040 { |
| 75 | compatible = "syscon"; | 75 | compatible = "syscon"; |
| 76 | reg = <0x10000040 0x2c>; | 76 | reg = <0x10000040 0x2c>; |
| 77 | little-endian; | ||
| 77 | }; | 78 | }; |
| 78 | 79 | ||
| 79 | reboot { | 80 | reboot { |
diff --git a/arch/mips/boot/dts/brcm/bcm7125.dtsi b/arch/mips/boot/dts/brcm/bcm7125.dtsi index 4fc7ecee273c..1a7efa883c5e 100644 --- a/arch/mips/boot/dts/brcm/bcm7125.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7125.dtsi | |||
| @@ -98,6 +98,7 @@ | |||
| 98 | sun_top_ctrl: syscon@404000 { | 98 | sun_top_ctrl: syscon@404000 { |
| 99 | compatible = "brcm,bcm7125-sun-top-ctrl", "syscon"; | 99 | compatible = "brcm,bcm7125-sun-top-ctrl", "syscon"; |
| 100 | reg = <0x404000 0x60c>; | 100 | reg = <0x404000 0x60c>; |
| 101 | little-endian; | ||
| 101 | }; | 102 | }; |
| 102 | 103 | ||
| 103 | reboot { | 104 | reboot { |
diff --git a/arch/mips/boot/dts/brcm/bcm7346.dtsi b/arch/mips/boot/dts/brcm/bcm7346.dtsi index a3039bb53477..d4bf52cfcf17 100644 --- a/arch/mips/boot/dts/brcm/bcm7346.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7346.dtsi | |||
| @@ -118,6 +118,7 @@ | |||
| 118 | sun_top_ctrl: syscon@404000 { | 118 | sun_top_ctrl: syscon@404000 { |
| 119 | compatible = "brcm,bcm7346-sun-top-ctrl", "syscon"; | 119 | compatible = "brcm,bcm7346-sun-top-ctrl", "syscon"; |
| 120 | reg = <0x404000 0x51c>; | 120 | reg = <0x404000 0x51c>; |
| 121 | little-endian; | ||
| 121 | }; | 122 | }; |
| 122 | 123 | ||
| 123 | reboot { | 124 | reboot { |
diff --git a/arch/mips/boot/dts/brcm/bcm7358.dtsi b/arch/mips/boot/dts/brcm/bcm7358.dtsi index 4274ff41ec21..8e2501694d03 100644 --- a/arch/mips/boot/dts/brcm/bcm7358.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7358.dtsi | |||
| @@ -112,6 +112,7 @@ | |||
| 112 | sun_top_ctrl: syscon@404000 { | 112 | sun_top_ctrl: syscon@404000 { |
| 113 | compatible = "brcm,bcm7358-sun-top-ctrl", "syscon"; | 113 | compatible = "brcm,bcm7358-sun-top-ctrl", "syscon"; |
| 114 | reg = <0x404000 0x51c>; | 114 | reg = <0x404000 0x51c>; |
| 115 | little-endian; | ||
| 115 | }; | 116 | }; |
| 116 | 117 | ||
| 117 | reboot { | 118 | reboot { |
diff --git a/arch/mips/boot/dts/brcm/bcm7360.dtsi b/arch/mips/boot/dts/brcm/bcm7360.dtsi index 0dcc9163c27b..7e5f76040fb8 100644 --- a/arch/mips/boot/dts/brcm/bcm7360.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7360.dtsi | |||
| @@ -112,6 +112,7 @@ | |||
| 112 | sun_top_ctrl: syscon@404000 { | 112 | sun_top_ctrl: syscon@404000 { |
| 113 | compatible = "brcm,bcm7360-sun-top-ctrl", "syscon"; | 113 | compatible = "brcm,bcm7360-sun-top-ctrl", "syscon"; |
| 114 | reg = <0x404000 0x51c>; | 114 | reg = <0x404000 0x51c>; |
| 115 | little-endian; | ||
| 115 | }; | 116 | }; |
| 116 | 117 | ||
| 117 | reboot { | 118 | reboot { |
diff --git a/arch/mips/boot/dts/brcm/bcm7362.dtsi b/arch/mips/boot/dts/brcm/bcm7362.dtsi index 2f3f9fc2c478..c739ea77acb0 100644 --- a/arch/mips/boot/dts/brcm/bcm7362.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7362.dtsi | |||
| @@ -118,6 +118,7 @@ | |||
| 118 | sun_top_ctrl: syscon@404000 { | 118 | sun_top_ctrl: syscon@404000 { |
| 119 | compatible = "brcm,bcm7362-sun-top-ctrl", "syscon"; | 119 | compatible = "brcm,bcm7362-sun-top-ctrl", "syscon"; |
| 120 | reg = <0x404000 0x51c>; | 120 | reg = <0x404000 0x51c>; |
| 121 | little-endian; | ||
| 121 | }; | 122 | }; |
| 122 | 123 | ||
| 123 | reboot { | 124 | reboot { |
diff --git a/arch/mips/boot/dts/brcm/bcm7420.dtsi b/arch/mips/boot/dts/brcm/bcm7420.dtsi index bee221b3b568..5f55d0a50a28 100644 --- a/arch/mips/boot/dts/brcm/bcm7420.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7420.dtsi | |||
| @@ -99,6 +99,7 @@ | |||
| 99 | sun_top_ctrl: syscon@404000 { | 99 | sun_top_ctrl: syscon@404000 { |
| 100 | compatible = "brcm,bcm7420-sun-top-ctrl", "syscon"; | 100 | compatible = "brcm,bcm7420-sun-top-ctrl", "syscon"; |
| 101 | reg = <0x404000 0x60c>; | 101 | reg = <0x404000 0x60c>; |
| 102 | little-endian; | ||
| 102 | }; | 103 | }; |
| 103 | 104 | ||
| 104 | reboot { | 105 | reboot { |
diff --git a/arch/mips/boot/dts/brcm/bcm7425.dtsi b/arch/mips/boot/dts/brcm/bcm7425.dtsi index 571f30f52e3f..e24d41ab4e30 100644 --- a/arch/mips/boot/dts/brcm/bcm7425.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7425.dtsi | |||
| @@ -100,6 +100,7 @@ | |||
| 100 | sun_top_ctrl: syscon@404000 { | 100 | sun_top_ctrl: syscon@404000 { |
| 101 | compatible = "brcm,bcm7425-sun-top-ctrl", "syscon"; | 101 | compatible = "brcm,bcm7425-sun-top-ctrl", "syscon"; |
| 102 | reg = <0x404000 0x51c>; | 102 | reg = <0x404000 0x51c>; |
| 103 | little-endian; | ||
| 103 | }; | 104 | }; |
| 104 | 105 | ||
| 105 | reboot { | 106 | reboot { |
diff --git a/arch/mips/boot/dts/brcm/bcm7435.dtsi b/arch/mips/boot/dts/brcm/bcm7435.dtsi index 614ee211f71a..8b9432cc062b 100644 --- a/arch/mips/boot/dts/brcm/bcm7435.dtsi +++ b/arch/mips/boot/dts/brcm/bcm7435.dtsi | |||
| @@ -114,6 +114,7 @@ | |||
| 114 | sun_top_ctrl: syscon@404000 { | 114 | sun_top_ctrl: syscon@404000 { |
| 115 | compatible = "brcm,bcm7425-sun-top-ctrl", "syscon"; | 115 | compatible = "brcm,bcm7425-sun-top-ctrl", "syscon"; |
| 116 | reg = <0x404000 0x51c>; | 116 | reg = <0x404000 0x51c>; |
| 117 | little-endian; | ||
| 117 | }; | 118 | }; |
| 118 | 119 | ||
| 119 | reboot { | 120 | reboot { |
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c index 8812bfb9e3b8..eea51569f0eb 100644 --- a/drivers/base/regmap/regmap-mmio.c +++ b/drivers/base/regmap/regmap-mmio.c | |||
| @@ -133,17 +133,17 @@ static int regmap_mmio_gather_write(void *context, | |||
| 133 | while (val_size) { | 133 | while (val_size) { |
| 134 | switch (ctx->val_bytes) { | 134 | switch (ctx->val_bytes) { |
| 135 | case 1: | 135 | case 1: |
| 136 | __raw_writeb(*(u8 *)val, ctx->regs + offset); | 136 | writeb(*(u8 *)val, ctx->regs + offset); |
| 137 | break; | 137 | break; |
| 138 | case 2: | 138 | case 2: |
| 139 | __raw_writew(*(u16 *)val, ctx->regs + offset); | 139 | writew(*(u16 *)val, ctx->regs + offset); |
| 140 | break; | 140 | break; |
| 141 | case 4: | 141 | case 4: |
| 142 | __raw_writel(*(u32 *)val, ctx->regs + offset); | 142 | writel(*(u32 *)val, ctx->regs + offset); |
| 143 | break; | 143 | break; |
| 144 | #ifdef CONFIG_64BIT | 144 | #ifdef CONFIG_64BIT |
| 145 | case 8: | 145 | case 8: |
| 146 | __raw_writeq(*(u64 *)val, ctx->regs + offset); | 146 | writeq(*(u64 *)val, ctx->regs + offset); |
| 147 | break; | 147 | break; |
| 148 | #endif | 148 | #endif |
| 149 | default: | 149 | default: |
| @@ -193,17 +193,17 @@ static int regmap_mmio_read(void *context, | |||
| 193 | while (val_size) { | 193 | while (val_size) { |
| 194 | switch (ctx->val_bytes) { | 194 | switch (ctx->val_bytes) { |
| 195 | case 1: | 195 | case 1: |
| 196 | *(u8 *)val = __raw_readb(ctx->regs + offset); | 196 | *(u8 *)val = readb(ctx->regs + offset); |
| 197 | break; | 197 | break; |
| 198 | case 2: | 198 | case 2: |
| 199 | *(u16 *)val = __raw_readw(ctx->regs + offset); | 199 | *(u16 *)val = readw(ctx->regs + offset); |
| 200 | break; | 200 | break; |
| 201 | case 4: | 201 | case 4: |
| 202 | *(u32 *)val = __raw_readl(ctx->regs + offset); | 202 | *(u32 *)val = readl(ctx->regs + offset); |
| 203 | break; | 203 | break; |
| 204 | #ifdef CONFIG_64BIT | 204 | #ifdef CONFIG_64BIT |
| 205 | case 8: | 205 | case 8: |
| 206 | *(u64 *)val = __raw_readq(ctx->regs + offset); | 206 | *(u64 *)val = readq(ctx->regs + offset); |
| 207 | break; | 207 | break; |
| 208 | #endif | 208 | #endif |
| 209 | default: | 209 | default: |
