Commit dc85e4cd authored by Paul Kocialkowski's avatar Paul Kocialkowski Committed by Mauro Carvalho Chehab
Browse files

media: sun6i-csi: Cleanup headers and includes, update copyright lines 



Cleanup includes, update copyright lines and some cosmetic changes.

Signed-off-by: default avatarPaul Kocialkowski <paul.kocialkowski@bootlin.com>
Acked-by: default avatarJernej Skrabec <jernej.skrabec@gmail.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 28bfb418

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c

+6 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)

 * All rights reserved.

 * Author: Yong Deng <yong.deng@magewell.com>

 * Copyright 2021-2022 Bootlin

 * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

 */



#include <linux/clk.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/err.h>

#include <linux/fs.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/ioctl.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/of_device.h>
@@ -20,12 +16,12 @@ 
#include <linux/pm_runtime.h>

#include <linux/regmap.h>

#include <linux/reset.h>

#include <linux/sched.h>

#include <linux/sizes.h>

#include <linux/slab.h>

#include <media/v4l2-device.h>

#include <media/v4l2-mc.h>



#include "sun6i_csi.h"

#include "sun6i_csi_bridge.h"

#include "sun6i_csi_capture.h"

#include "sun6i_csi_reg.h"



/* Media */
@@ -374,4 +370,5 @@ module_platform_driver(sun6i_csi_platform_driver); 


MODULE_DESCRIPTION("Allwinner A31 Camera Sensor Interface driver");

MODULE_AUTHOR("Yong Deng <yong.deng@magewell.com>");

MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski@bootlin.com>");

MODULE_LICENSE("GPL");

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h

+5 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)

 * All rights reserved.

 * Author: Yong Deng <yong.deng@magewell.com>

 * Copyright 2021-2022 Bootlin

 * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

 */



#ifndef __SUN6I_CSI_H__

#define __SUN6I_CSI_H__

#ifndef _SUN6I_CSI_H_

#define _SUN6I_CSI_H_



#include <media/v4l2-device.h>

#include <media/v4l2-fwnode.h>

#include <media/videobuf2-v4l2.h>



#include "sun6i_csi_bridge.h"
@@ -49,4 +49,4 @@ struct sun6i_csi_variant { 
	unsigned long	clock_mod_rate;

};



#endif /* __SUN6I_CSI_H__ */
 
#endif

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)

 * All rights reserved.

 * Author: Yong Deng <yong.deng@magewell.com>

 * Copyright 2021-2022 Bootlin

 * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

 */



#include <linux/of.h>

#include <linux/regmap.h>



#include <media/v4l2-device.h>

#include <media/v4l2-event.h>

#include <media/v4l2-ioctl.h>

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.h

+16 −6
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)

 * All rights reserved.

 * Author: Yong Deng <yong.deng@magewell.com>

 * Copyright 2021-2022 Bootlin

 * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

 */



#ifndef __SUN6I_CAPTURE_H__

#define __SUN6I_CAPTURE_H__

#ifndef _SUN6I_CAPTURE_H_

#define _SUN6I_CAPTURE_H_



#include <media/v4l2-dev.h>

#include <media/videobuf2-core.h>

#include <media/v4l2-device.h>



#define SUN6I_CSI_CAPTURE_NAME	"sun6i-csi-capture"
@@ -57,21 +57,31 @@ struct sun6i_csi_capture { 
	struct v4l2_format		format;

};



/* Helpers */



void sun6i_csi_capture_dimensions(struct sun6i_csi_device *csi_dev,

				  unsigned int *width, unsigned int *height);

void sun6i_csi_capture_format(struct sun6i_csi_device *csi_dev,

			      u32 *pixelformat, u32 *field);



/* Format */



const

struct sun6i_csi_capture_format *sun6i_csi_capture_format_find(u32 pixelformat);



/* Capture */



void sun6i_csi_capture_configure(struct sun6i_csi_device *csi_dev);

void sun6i_csi_capture_state_update(struct sun6i_csi_device *csi_dev);



/* State */



void sun6i_csi_capture_sync(struct sun6i_csi_device *csi_dev);

void sun6i_csi_capture_frame_done(struct sun6i_csi_device *csi_dev);



/* Capture */



int sun6i_csi_capture_setup(struct sun6i_csi_device *csi_dev);

void sun6i_csi_capture_cleanup(struct sun6i_csi_device *csi_dev);



#endif /* __SUN6I_CAPTURE_H__ */
 
#endif

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h

+5 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ */

/*

 * Copyright (c) 2011-2018 Magewell Electronics Co., Ltd. (Nanjing)

 * All rights reserved.

 * Author: Yong Deng <yong.deng@magewell.com>

 * Copyright 2021-2022 Bootlin

 * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com>

 */



#ifndef __SUN6I_CSI_REG_H__

#define __SUN6I_CSI_REG_H__

#ifndef _SUN6I_CSI_REG_H_

#define _SUN6I_CSI_REG_H_



#include <linux/kernel.h>
@@ -180,4 +181,4 @@ 
#define SUN6I_CSI_CH_FIFO_STAT_REG		0x98

#define SUN6I_CSI_CH_PCLK_STAT_REG		0x9c



#endif /* __SUN6I_CSI_REG_H__ */
 
#endif