aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@linux.intel.com>2016-06-27 10:15:57 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-09-09 10:16:36 -0400
commit82dec0a7db16f7691470b58c28e79a2f65e829c4 (patch)
treecb9ea973b5f9ac2433ce54b21806aa26029294b1
parentcfe41359942b933ee0058c73df7dcc00dae64885 (diff)
[media] media: Add 1X16 16-bit raw bayer media bus code definitions
The codes will be called: MEDIA_BUS_FMT_SBGGR16_1X16 MEDIA_BUS_FMT_SGBRG16_1X16 MEDIA_BUS_FMT_SGRBG16_1X16 MEDIA_BUS_FMT_SRGGB16_1X16 Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--Documentation/media/uapi/v4l/subdev-formats.rst290
-rw-r--r--include/uapi/linux/media-bus-format.h6
2 files changed, 294 insertions, 2 deletions
diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst
index 273ca484983d..08d6532b0a26 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -2812,7 +2812,7 @@ organization is given as an example for the first pixel only.
2812 - Code 2812 - Code
2813 2813
2814 - 2814 -
2815 - :cspan:`13` Data organization 2815 - :cspan:`15` Data organization
2816 2816
2817 - .. row 2 2817 - .. row 2
2818 2818
@@ -2820,6 +2820,10 @@ organization is given as an example for the first pixel only.
2820 - 2820 -
2821 - Bit 2821 - Bit
2822 2822
2823 - 15
2824
2825 - 14
2826
2823 - 13 2827 - 13
2824 2828
2825 - 12 2829 - 12
@@ -2867,6 +2871,10 @@ organization is given as an example for the first pixel only.
2867 2871
2868 - - 2872 - -
2869 2873
2874 - -
2875
2876 - -
2877
2870 - b\ :sub:`7` 2878 - b\ :sub:`7`
2871 2879
2872 - b\ :sub:`6` 2880 - b\ :sub:`6`
@@ -2902,6 +2910,10 @@ organization is given as an example for the first pixel only.
2902 2910
2903 - - 2911 - -
2904 2912
2913 - -
2914
2915 - -
2916
2905 - g\ :sub:`7` 2917 - g\ :sub:`7`
2906 2918
2907 - g\ :sub:`6` 2919 - g\ :sub:`6`
@@ -2937,6 +2949,10 @@ organization is given as an example for the first pixel only.
2937 2949
2938 - - 2950 - -
2939 2951
2952 - -
2953
2954 - -
2955
2940 - g\ :sub:`7` 2956 - g\ :sub:`7`
2941 2957
2942 - g\ :sub:`6` 2958 - g\ :sub:`6`
@@ -2972,6 +2988,10 @@ organization is given as an example for the first pixel only.
2972 2988
2973 - - 2989 - -
2974 2990
2991 - -
2992
2993 - -
2994
2975 - r\ :sub:`7` 2995 - r\ :sub:`7`
2976 2996
2977 - r\ :sub:`6` 2997 - r\ :sub:`6`
@@ -3007,6 +3027,10 @@ organization is given as an example for the first pixel only.
3007 3027
3008 - - 3028 - -
3009 3029
3030 - -
3031
3032 - -
3033
3010 - b\ :sub:`7` 3034 - b\ :sub:`7`
3011 3035
3012 - b\ :sub:`6` 3036 - b\ :sub:`6`
@@ -3042,6 +3066,10 @@ organization is given as an example for the first pixel only.
3042 3066
3043 - - 3067 - -
3044 3068
3069 - -
3070
3071 - -
3072
3045 - g\ :sub:`7` 3073 - g\ :sub:`7`
3046 3074
3047 - g\ :sub:`6` 3075 - g\ :sub:`6`
@@ -3077,6 +3105,10 @@ organization is given as an example for the first pixel only.
3077 3105
3078 - - 3106 - -
3079 3107
3108 - -
3109
3110 - -
3111
3080 - g\ :sub:`7` 3112 - g\ :sub:`7`
3081 3113
3082 - g\ :sub:`6` 3114 - g\ :sub:`6`
@@ -3112,6 +3144,10 @@ organization is given as an example for the first pixel only.
3112 3144
3113 - - 3145 - -
3114 3146
3147 - -
3148
3149 - -
3150
3115 - r\ :sub:`7` 3151 - r\ :sub:`7`
3116 3152
3117 - r\ :sub:`6` 3153 - r\ :sub:`6`
@@ -3147,6 +3183,10 @@ organization is given as an example for the first pixel only.
3147 3183
3148 - - 3184 - -
3149 3185
3186 - -
3187
3188 - -
3189
3150 - b\ :sub:`7` 3190 - b\ :sub:`7`
3151 3191
3152 - b\ :sub:`6` 3192 - b\ :sub:`6`
@@ -3182,6 +3222,10 @@ organization is given as an example for the first pixel only.
3182 3222
3183 - - 3223 - -
3184 3224
3225 - -
3226
3227 - -
3228
3185 - g\ :sub:`7` 3229 - g\ :sub:`7`
3186 3230
3187 - g\ :sub:`6` 3231 - g\ :sub:`6`
@@ -3217,6 +3261,10 @@ organization is given as an example for the first pixel only.
3217 3261
3218 - - 3262 - -
3219 3263
3264 - -
3265
3266 - -
3267
3220 - g\ :sub:`7` 3268 - g\ :sub:`7`
3221 3269
3222 - g\ :sub:`6` 3270 - g\ :sub:`6`
@@ -3252,6 +3300,10 @@ organization is given as an example for the first pixel only.
3252 3300
3253 - - 3301 - -
3254 3302
3303 - -
3304
3305 - -
3306
3255 - r\ :sub:`7` 3307 - r\ :sub:`7`
3256 3308
3257 - r\ :sub:`6` 3309 - r\ :sub:`6`
@@ -3287,6 +3339,10 @@ organization is given as an example for the first pixel only.
3287 3339
3288 - - 3340 - -
3289 3341
3342 - -
3343
3344 - -
3345
3290 - 0 3346 - 0
3291 3347
3292 - 0 3348 - 0
@@ -3320,6 +3376,10 @@ organization is given as an example for the first pixel only.
3320 3376
3321 - - 3377 - -
3322 3378
3379 - -
3380
3381 - -
3382
3323 - b\ :sub:`7` 3383 - b\ :sub:`7`
3324 3384
3325 - b\ :sub:`6` 3385 - b\ :sub:`6`
@@ -3355,6 +3415,10 @@ organization is given as an example for the first pixel only.
3355 3415
3356 - - 3416 - -
3357 3417
3418 - -
3419
3420 - -
3421
3358 - b\ :sub:`7` 3422 - b\ :sub:`7`
3359 3423
3360 - b\ :sub:`6` 3424 - b\ :sub:`6`
@@ -3388,6 +3452,10 @@ organization is given as an example for the first pixel only.
3388 3452
3389 - - 3453 - -
3390 3454
3455 - -
3456
3457 - -
3458
3391 - 0 3459 - 0
3392 3460
3393 - 0 3461 - 0
@@ -3423,6 +3491,10 @@ organization is given as an example for the first pixel only.
3423 3491
3424 - - 3492 - -
3425 3493
3494 - -
3495
3496 - -
3497
3426 - b\ :sub:`9` 3498 - b\ :sub:`9`
3427 3499
3428 - b\ :sub:`8` 3500 - b\ :sub:`8`
@@ -3456,6 +3528,10 @@ organization is given as an example for the first pixel only.
3456 3528
3457 - - 3529 - -
3458 3530
3531 - -
3532
3533 - -
3534
3459 - b\ :sub:`1` 3535 - b\ :sub:`1`
3460 3536
3461 - b\ :sub:`0` 3537 - b\ :sub:`0`
@@ -3491,6 +3567,10 @@ organization is given as an example for the first pixel only.
3491 3567
3492 - - 3568 - -
3493 3569
3570 - -
3571
3572 - -
3573
3494 - b\ :sub:`1` 3574 - b\ :sub:`1`
3495 3575
3496 - b\ :sub:`0` 3576 - b\ :sub:`0`
@@ -3524,6 +3604,10 @@ organization is given as an example for the first pixel only.
3524 3604
3525 - - 3605 - -
3526 3606
3607 - -
3608
3609 - -
3610
3527 - b\ :sub:`9` 3611 - b\ :sub:`9`
3528 3612
3529 - b\ :sub:`8` 3613 - b\ :sub:`8`
@@ -3555,6 +3639,10 @@ organization is given as an example for the first pixel only.
3555 3639
3556 - - 3640 - -
3557 3641
3642 - -
3643
3644 - -
3645
3558 - b\ :sub:`9` 3646 - b\ :sub:`9`
3559 3647
3560 - b\ :sub:`8` 3648 - b\ :sub:`8`
@@ -3590,6 +3678,10 @@ organization is given as an example for the first pixel only.
3590 3678
3591 - - 3679 - -
3592 3680
3681 - -
3682
3683 - -
3684
3593 - g\ :sub:`9` 3685 - g\ :sub:`9`
3594 3686
3595 - g\ :sub:`8` 3687 - g\ :sub:`8`
@@ -3625,6 +3717,10 @@ organization is given as an example for the first pixel only.
3625 3717
3626 - - 3718 - -
3627 3719
3720 - -
3721
3722 - -
3723
3628 - g\ :sub:`9` 3724 - g\ :sub:`9`
3629 3725
3630 - g\ :sub:`8` 3726 - g\ :sub:`8`
@@ -3660,6 +3756,10 @@ organization is given as an example for the first pixel only.
3660 3756
3661 - - 3757 - -
3662 3758
3759 - -
3760
3761 - -
3762
3663 - r\ :sub:`9` 3763 - r\ :sub:`9`
3664 3764
3665 - r\ :sub:`8` 3765 - r\ :sub:`8`
@@ -3691,6 +3791,10 @@ organization is given as an example for the first pixel only.
3691 3791
3692 - - 3792 - -
3693 3793
3794 - -
3795
3796 - -
3797
3694 - b\ :sub:`11` 3798 - b\ :sub:`11`
3695 3799
3696 - b\ :sub:`10` 3800 - b\ :sub:`10`
@@ -3726,6 +3830,10 @@ organization is given as an example for the first pixel only.
3726 3830
3727 - - 3831 - -
3728 3832
3833 - -
3834
3835 - -
3836
3729 - g\ :sub:`11` 3837 - g\ :sub:`11`
3730 3838
3731 - g\ :sub:`10` 3839 - g\ :sub:`10`
@@ -3761,6 +3869,10 @@ organization is given as an example for the first pixel only.
3761 3869
3762 - - 3870 - -
3763 3871
3872 - -
3873
3874 - -
3875
3764 - g\ :sub:`11` 3876 - g\ :sub:`11`
3765 3877
3766 - g\ :sub:`10` 3878 - g\ :sub:`10`
@@ -3796,6 +3908,10 @@ organization is given as an example for the first pixel only.
3796 3908
3797 - - 3909 - -
3798 3910
3911 - -
3912
3913 - -
3914
3799 - r\ :sub:`11` 3915 - r\ :sub:`11`
3800 3916
3801 - r\ :sub:`10` 3917 - r\ :sub:`10`
@@ -3827,6 +3943,10 @@ organization is given as an example for the first pixel only.
3827 - 0x3019 3943 - 0x3019
3828 3944
3829 - 3945 -
3946 - -
3947
3948 - -
3949
3830 - b\ :sub:`13` 3950 - b\ :sub:`13`
3831 3951
3832 - b\ :sub:`12` 3952 - b\ :sub:`12`
@@ -3862,6 +3982,10 @@ organization is given as an example for the first pixel only.
3862 - 0x301a 3982 - 0x301a
3863 3983
3864 - 3984 -
3985 - -
3986
3987 - -
3988
3865 - g\ :sub:`13` 3989 - g\ :sub:`13`
3866 3990
3867 - g\ :sub:`12` 3991 - g\ :sub:`12`
@@ -3897,6 +4021,10 @@ organization is given as an example for the first pixel only.
3897 - 0x301b 4021 - 0x301b
3898 4022
3899 - 4023 -
4024 - -
4025
4026 - -
4027
3900 - g\ :sub:`13` 4028 - g\ :sub:`13`
3901 4029
3902 - g\ :sub:`12` 4030 - g\ :sub:`12`
@@ -3932,6 +4060,166 @@ organization is given as an example for the first pixel only.
3932 - 0x301c 4060 - 0x301c
3933 4061
3934 - 4062 -
4063 - -
4064
4065 - -
4066
4067 - r\ :sub:`13`
4068
4069 - r\ :sub:`12`
4070
4071 - r\ :sub:`11`
4072
4073 - r\ :sub:`10`
4074
4075 - r\ :sub:`9`
4076
4077 - r\ :sub:`8`
4078
4079 - r\ :sub:`7`
4080
4081 - r\ :sub:`6`
4082
4083 - r\ :sub:`5`
4084
4085 - r\ :sub:`4`
4086
4087 - r\ :sub:`3`
4088
4089 - r\ :sub:`2`
4090
4091 - r\ :sub:`1`
4092
4093 - r\ :sub:`0`
4094
4095 - .. _MEDIA-BUS-FMT-SBGGR16-1X16:
4096
4097 - MEDIA_BUS_FMT_SBGGR16_1X16
4098
4099 - 0x301d
4100
4101 -
4102 - b\ :sub:`15`
4103
4104 - b\ :sub:`14`
4105
4106 - b\ :sub:`13`
4107
4108 - b\ :sub:`12`
4109
4110 - b\ :sub:`11`
4111
4112 - b\ :sub:`10`
4113
4114 - b\ :sub:`9`
4115
4116 - b\ :sub:`8`
4117
4118 - b\ :sub:`7`
4119
4120 - b\ :sub:`6`
4121
4122 - b\ :sub:`5`
4123
4124 - b\ :sub:`4`
4125
4126 - b\ :sub:`3`
4127
4128 - b\ :sub:`2`
4129
4130 - b\ :sub:`1`
4131
4132 - b\ :sub:`0`
4133
4134 - .. _MEDIA-BUS-FMT-SGBRG16-1X16:
4135
4136 - MEDIA_BUS_FMT_SGBRG16_1X16
4137
4138 - 0x301e
4139
4140 -
4141 - g\ :sub:`15`
4142
4143 - g\ :sub:`14`
4144
4145 - g\ :sub:`13`
4146
4147 - g\ :sub:`12`
4148
4149 - g\ :sub:`11`
4150
4151 - g\ :sub:`10`
4152
4153 - g\ :sub:`9`
4154
4155 - g\ :sub:`8`
4156
4157 - g\ :sub:`7`
4158
4159 - g\ :sub:`6`
4160
4161 - g\ :sub:`5`
4162
4163 - g\ :sub:`4`
4164
4165 - g\ :sub:`3`
4166
4167 - g\ :sub:`2`
4168
4169 - g\ :sub:`1`
4170
4171 - g\ :sub:`0`
4172
4173 - .. _MEDIA-BUS-FMT-SGRBG16-1X16:
4174
4175 - MEDIA_BUS_FMT_SGRBG16_1X16
4176
4177 - 0x301f
4178
4179 -
4180 - g\ :sub:`15`
4181
4182 - g\ :sub:`14`
4183
4184 - g\ :sub:`13`
4185
4186 - g\ :sub:`12`
4187
4188 - g\ :sub:`11`
4189
4190 - g\ :sub:`10`
4191
4192 - g\ :sub:`9`
4193
4194 - g\ :sub:`8`
4195
4196 - g\ :sub:`7`
4197
4198 - g\ :sub:`6`
4199
4200 - g\ :sub:`5`
4201
4202 - g\ :sub:`4`
4203
4204 - g\ :sub:`3`
4205
4206 - g\ :sub:`2`
4207
4208 - g\ :sub:`1`
4209
4210 - g\ :sub:`0`
4211
4212 - .. _MEDIA-BUS-FMT-SRGGB16-1X16:
4213
4214 - MEDIA_BUS_FMT_SRGGB16_1X16
4215
4216 - 0x3020
4217
4218 -
4219 - r\ :sub:`15`
4220
4221 - r\ :sub:`14`
4222
3935 - r\ :sub:`13` 4223 - r\ :sub:`13`
3936 4224
3937 - r\ :sub:`12` 4225 - r\ :sub:`12`
diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
index 1dff459ab6ff..2168759c1287 100644
--- a/include/uapi/linux/media-bus-format.h
+++ b/include/uapi/linux/media-bus-format.h
@@ -97,7 +97,7 @@
97#define MEDIA_BUS_FMT_YUV10_1X30 0x2016 97#define MEDIA_BUS_FMT_YUV10_1X30 0x2016
98#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017 98#define MEDIA_BUS_FMT_AYUV8_1X32 0x2017
99 99
100/* Bayer - next is 0x301d */ 100/* Bayer - next is 0x3021 */
101#define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001 101#define MEDIA_BUS_FMT_SBGGR8_1X8 0x3001
102#define MEDIA_BUS_FMT_SGBRG8_1X8 0x3013 102#define MEDIA_BUS_FMT_SGBRG8_1X8 0x3013
103#define MEDIA_BUS_FMT_SGRBG8_1X8 0x3002 103#define MEDIA_BUS_FMT_SGRBG8_1X8 0x3002
@@ -126,6 +126,10 @@
126#define MEDIA_BUS_FMT_SGBRG14_1X14 0x301a 126#define MEDIA_BUS_FMT_SGBRG14_1X14 0x301a
127#define MEDIA_BUS_FMT_SGRBG14_1X14 0x301b 127#define MEDIA_BUS_FMT_SGRBG14_1X14 0x301b
128#define MEDIA_BUS_FMT_SRGGB14_1X14 0x301c 128#define MEDIA_BUS_FMT_SRGGB14_1X14 0x301c
129#define MEDIA_BUS_FMT_SBGGR16_1X16 0x301d
130#define MEDIA_BUS_FMT_SGBRG16_1X16 0x301e
131#define MEDIA_BUS_FMT_SGRBG16_1X16 0x301f
132#define MEDIA_BUS_FMT_SRGGB16_1X16 0x3020
129 133
130/* JPEG compressed formats - next is 0x4002 */ 134/* JPEG compressed formats - next is 0x4002 */
131#define MEDIA_BUS_FMT_JPEG_1X8 0x4001 135#define MEDIA_BUS_FMT_JPEG_1X8 0x4001