Commit 7426aa72 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Peter Maydell
Browse files

nand: Don't inherit from Sysbus 



Nand chips are not sysbus devices - they do not have any sense of MMIO,
nor interrupts. Re-parent to TYPE_DEVICE accordingly.

Cc: afaerber@suse.de

Signed-off-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Reviewed-by: default avatarAndreas Färber <afaerber@suse.de>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent d47a5d9b

hw/block/nand.c

+4 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
# include "hw/hw.h"

# include "hw/block/flash.h"

# include "sysemu/blockdev.h"

# include "hw/sysbus.h"

#include "hw/qdev.h"

#include "qemu/error-report.h"



# define NAND_CMD_READ0		0x00
@@ -54,7 +54,8 @@ 


typedef struct NANDFlashState NANDFlashState;

struct NANDFlashState {

    SysBusDevice busdev;

    DeviceState parent_obj;



    uint8_t manf_id, chip_id;

    uint8_t buswidth; /* in BYTES */

    int size, pages;
@@ -440,7 +441,7 @@ static void nand_class_init(ObjectClass *klass, void *data) 


static const TypeInfo nand_info = {

    .name          = TYPE_NAND,

    .parent        = TYPE_SYS_BUS_DEVICE,

    .parent        = TYPE_DEVICE,

    .instance_size = sizeof(NANDFlashState),

    .class_init    = nand_class_init,

};