diff mbox

[v2,06/14] sm501: Add missing arbitration control register

Message ID e160b509a76bcf00d1af4665e26c6870eb363cab.1488068248.git.balaton@eik.bme.hu
State New
Headers show

Commit Message

BALATON Zoltan Dec. 3, 2016, 3:32 p.m. UTC
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 hw/display/sm501.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Peter Maydell March 2, 2017, 8:08 p.m. UTC | #1
On 3 December 2016 at 15:32, BALATON Zoltan <balaton@eik.bme.hu> wrote:
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
>  hw/display/sm501.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
> index d9219bd..b977094 100644
> --- a/hw/display/sm501.c
> +++ b/hw/display/sm501.c
> @@ -477,6 +477,7 @@ typedef struct SM501State {
>      uint32_t gpio_31_0_control;
>      uint32_t gpio_63_32_control;
>      uint32_t dram_control;
> +    uint32_t arbitration_control;
>      uint32_t irq_mask;
>      uint32_t misc_timing;
>      uint32_t power_mode_control;
> @@ -760,6 +761,9 @@ static uint64_t sm501_system_config_read(void *opaque, hwaddr addr,
>      case SM501_DRAM_CONTROL:
>          ret = (s->dram_control & 0x07F107C0) | s->local_mem_size_index << 13;
>          break;
> +    case SM501_ARBTRTN_CONTROL:
> +        ret = s->arbitration_control;
> +        break;
>      case SM501_IRQ_MASK:
>          ret = s->irq_mask;
>          break;
> @@ -812,6 +816,9 @@ static void sm501_system_config_write(void *opaque, hwaddr addr,
>          /* TODO : check validity of size change */
>          s->dram_control |=  value & 0x7FFFFFC3;
>          break;
> +    case SM501_ARBTRTN_CONTROL:
> +        s->arbitration_control =  value & 0x37777777;
> +        break;
>      case SM501_IRQ_MASK:
>          s->irq_mask = value;
>          break;
> --
> 2.7.4

Applied, thanks.

-- PMM
Peter Maydell March 2, 2017, 8:09 p.m. UTC | #2
On 2 March 2017 at 20:08, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 3 December 2016 at 15:32, BALATON Zoltan <balaton@eik.bme.hu> wrote:
>> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
>> ---
>>  hw/display/sm501.c | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/hw/display/sm501.c b/hw/display/sm501.c
>> index d9219bd..b977094 100644
>> --- a/hw/display/sm501.c
>> +++ b/hw/display/sm501.c
>> @@ -477,6 +477,7 @@ typedef struct SM501State {
>>      uint32_t gpio_31_0_control;
>>      uint32_t gpio_63_32_control;
>>      uint32_t dram_control;
>> +    uint32_t arbitration_control;
>>      uint32_t irq_mask;
>>      uint32_t misc_timing;
>>      uint32_t power_mode_control;
>> @@ -760,6 +761,9 @@ static uint64_t sm501_system_config_read(void *opaque, hwaddr addr,
>>      case SM501_DRAM_CONTROL:
>>          ret = (s->dram_control & 0x07F107C0) | s->local_mem_size_index << 13;
>>          break;
>> +    case SM501_ARBTRTN_CONTROL:
>> +        ret = s->arbitration_control;
>> +        break;
>>      case SM501_IRQ_MASK:
>>          ret = s->irq_mask;
>>          break;
>> @@ -812,6 +816,9 @@ static void sm501_system_config_write(void *opaque, hwaddr addr,
>>          /* TODO : check validity of size change */
>>          s->dram_control |=  value & 0x7FFFFFC3;
>>          break;
>> +    case SM501_ARBTRTN_CONTROL:
>> +        s->arbitration_control =  value & 0x37777777;
>> +        break;
>>      case SM501_IRQ_MASK:
>>          s->irq_mask = value;
>>          break;
>> --
>> 2.7.4
>
> Applied, thanks.

Doh, wrong canned-email-reply template! I meant

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM
diff mbox

Patch

diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index d9219bd..b977094 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -477,6 +477,7 @@  typedef struct SM501State {
     uint32_t gpio_31_0_control;
     uint32_t gpio_63_32_control;
     uint32_t dram_control;
+    uint32_t arbitration_control;
     uint32_t irq_mask;
     uint32_t misc_timing;
     uint32_t power_mode_control;
@@ -760,6 +761,9 @@  static uint64_t sm501_system_config_read(void *opaque, hwaddr addr,
     case SM501_DRAM_CONTROL:
         ret = (s->dram_control & 0x07F107C0) | s->local_mem_size_index << 13;
         break;
+    case SM501_ARBTRTN_CONTROL:
+        ret = s->arbitration_control;
+        break;
     case SM501_IRQ_MASK:
         ret = s->irq_mask;
         break;
@@ -812,6 +816,9 @@  static void sm501_system_config_write(void *opaque, hwaddr addr,
         /* TODO : check validity of size change */
         s->dram_control |=  value & 0x7FFFFFC3;
         break;
+    case SM501_ARBTRTN_CONTROL:
+        s->arbitration_control =  value & 0x37777777;
+        break;
     case SM501_IRQ_MASK:
         s->irq_mask = value;
         break;