aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/ti
AgeCommit message (Expand)AuthorFilesLines
2025-11-17ASoC: ti: rx51: convert to snd_soc_dapm_xxx()Kuninori Morimoto1-7/+10
2025-11-17ASoC: ti: omap3pandora: convert to snd_soc_dapm_xxx()Kuninori Morimoto1-17/+19
2025-11-17ASoC: ti: omap-twl4030: convert to snd_soc_dapm_xxx()Kuninori Morimoto1-1/+1
2025-11-17ASoC: ti: omap-abe-twl6040: convert to snd_soc_dapm_xxx()Kuninori Morimoto1-1/+1
2025-11-17ASoC: ti: n810: convert to snd_soc_dapm_xxx()Kuninori Morimoto1-4/+8
2025-11-17ASoC: ti: j721e-evm: convert to snd_soc_dapm_xxx()Kuninori Morimoto1-1/+1
2025-11-17ASoC: ti: davinci-evm: convert to snd_soc_dapm_xxx()Kuninori Morimoto1-5/+6
2025-11-17ASoC: ti: ams-delta: convert to snd_soc_dapm_xxx()Kuninori Morimoto1-4/+4
2025-08-07treewide: rename GPIO set callbacks back to their original namesBartosz Golaszewski1-1/+1
2025-06-24ASoC: ti: Standardize ASoC menuKuninori Morimoto1-1/+1
2025-06-02ASoC: ti: omap-hdmi: Re-add dai_link->platform to fix card initYuuki NAGAO1-2/+5
2025-04-13ASoC: ti: davinci-mcasp:: use new GPIO line value setter callbacksBartosz Golaszewski1-3/+5
2025-04-05treewide: Switch/rename to timer_delete[_sync]()Thomas Gleixner1-1/+1
2025-03-24Merge tag 'asoc-v6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/bro...Takashi Iwai9-17/+16
2025-03-18ASoC: ti: j721e-evm: Fix clock configuration for ti,j7200-cpb-audio compatibleJayesh Choudhary1-0/+2
2025-03-18ASoC: ti: j721e-evm: Reduce log level for EPROBE_DEFERJayesh Choudhary1-2/+3
2025-03-16ASoC: ti: davinci-i2s: remove unnecessary NULL check before clk_disable_unpre...Chen Ni1-4/+2
2025-03-03ASoC: ti: omap3pandora: use inclusive language for SND_SOC_DAIFMT_CBx_CFxKuninori Morimoto1-2/+2
2025-03-03ASoC: ti: omap-twl4030: use inclusive language for SND_SOC_DAIFMT_CBx_CFxKuninori Morimoto1-3/+3
2025-03-03ASoC: ti: davinci-evm: use inclusive language for SND_SOC_DAIFMT_CBx_CFxKuninori Morimoto1-1/+1
2025-03-03ASoC: ti: j721e-evm: use inclusive language for SND_SOC_DAIFMT_CBx_CFxKuninori Morimoto1-1/+1
2025-03-03ASoC: ti: ams-delta: use inclusive language for SND_SOC_DAIFMT_CBx_CFxKuninori Morimoto1-1/+1
2025-03-03ASoC: ti: osk5912: use inclusive language for SND_SOC_DAIFMT_CBx_CFxKuninori Morimoto1-1/+1
2025-03-03ASoC: ti: n810: use inclusive language for SND_SOC_DAIFMT_CBx_CFxKuninori Morimoto1-1/+1
2025-02-25ASoC: ti: rx51: use inclusive language for SND_SOC_DAIFMT_CBx_CFxKuninori Morimoto1-1/+1
2024-10-18ASoC: rx651: Use card->dev in replace of the &pdev->dev argument in the dev_e...Liu Jing1-6/+6
2024-09-09ASoC: Switch back to struct platform_driver::remove()Uwe Kleine-König4-4/+4
2024-06-12Fixes for McASP and dmaengine_pcmMark Brown1-2/+7
2024-06-11ASoC: ti: omap-hdmi: Fix too long driver namePrimoz Fiser1-5/+1
2024-06-11ASoC: ti: davinci-mcasp: Set min period size using FIFO configJai Luthra1-2/+7
2024-05-08ASoC: ti: Use *-y instead of *-objs in MakefileTakashi Iwai1-18/+18
2024-05-06ASoC: ti: Use snd_soc_substream_to_rtd() for accessing private_dataKrzysztof Kozlowski1-1/+1
2024-04-30ASoC: Merge up fixesMark Brown1-6/+6
2024-04-19ASoC: ti: davinci-mcasp: Fix race condition during probeJoao Paulo Goncalves1-6/+6
2024-04-09ASoC: ti: davinci-i2s: Add T1 framing supportBastien Curutchet1-0/+15
2024-04-09ASoC: ti: davinci-i2s: Add S24_LE to supported formatsBastien Curutchet1-13/+21
2024-04-09ASoC: ti: davinci-i2s: Link free-run mode to SND_SOC_DAIFMT_[GATED/CONT]Bastien Curutchet1-2/+20
2024-04-09ASoC: ti: davinci-i2s: Enable unexpected frame pulses detectionBastien Curutchet1-3/+3
2024-04-09ASoC: ti: davinci-i2s: Add handling of BP_FC formatBastien Curutchet1-0/+23
2024-04-09ASoC: ti: davinci-i2s: Add TDM supportBastien Curutchet1-5/+87
2024-04-09ASoC: ti: davinci-i2s: Delete unnecessary assignmentBastien Curutchet1-1/+0
2024-04-09ASoC: ti: davinci-i2s: Use external clock to drive sample rate generatorBastien Curutchet1-16/+49
2024-04-09ASoC: ti: davinci-i2s: Replace dev_err with dev_err_probeBastien Curutchet1-1/+1
2024-04-09ASoC: ti: davinci-i2s: Remove the unused clk_input_pin attributeBastien Curutchet1-20/+4
2024-01-22ASoC: use devm_snd_soc_register_card()Mark Brown1-9/+1
2024-01-22ASoC: ti: j721e-evm: Use devm_kcalloc() instead of devm_kzalloc()Erick Archer1-2/+2
2024-01-22ASoC: ti: use devm_snd_soc_register_card()Kuninori Morimoto1-9/+1
2023-10-30ASoC: ti: omap-mcbsp: Fix runtime PM underflow warningsTony Lindgren1-2/+4
2023-10-27ASoC: ams-delta.c: use component after checkKuninori Morimoto1-1/+3
2023-10-23ASoC: ti: ams-delta: Allow it to be test compiledJanusz Krzysztofik2-4/+3
2023-10-23ASoC: Merge up v6.6-rc7Mark Brown1-2/+2
2023-10-09ASoC: Use device_get_match_data()Rob Herring3-16/+10
2023-10-09ASoC: Explicitly include correct DT includesRob Herring2-2/+2
2023-10-08ASoC: ti: ams-delta: Fix cx81801_receive() argument typesJanusz Krzysztofik1-2/+2
2023-10-02GPIO descriptors for TI ASoC codecsMark Brown5-82/+52
2023-10-02ASoC: ti: osk5912: Drop unused includeLinus Walleij1-1/+0
2023-10-02ASoC: ti: Convert Pandora ASoC to GPIO descriptorsLinus Walleij1-40/+23
2023-10-02ASoC: ti: Convert TWL4030 to use GPIO descriptorsLinus Walleij1-12/+8
2023-10-02ASoC: ti: Convert N810 ASoC to GPIO descriptorsLinus Walleij1-14/+17
2023-10-02ASoC: ti: Convert RX51 to use exclusively GPIO descriptorsLinus Walleij1-15/+4
2023-09-25ASoC: ti: convert not to use asoc_xxx()Kuninori Morimoto13-37/+37
2023-09-01Merge tag 'tty-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/greg...Linus Torvalds1-1/+1
2023-08-14ASoC: ti: merge DAI call back functions into opsKuninori Morimoto5-61/+60
2023-08-11tty: use u8 for charsJiri Slaby (SUSE)1-1/+1
2023-08-04ASoC: ti: davinci-evm: simplify the code with module_platform_driverYang Yingliang1-12/+1
2023-07-19ASoC: ti: omap-mcbsp: Ignore errors for getting fck_srcAndreas Kemnade1-2/+2
2023-07-17ASoC: ti: Convert to devm_platform_ioremap_resource_byname()Yangtao Li2-5/+2
2023-05-30ASoC: ti: davinci-mcasp: Use pcm_for_each_format() macroMin-Hua Chen1-12/+15
2023-05-23ASoC: do not include pm_runtime.h if not usedClaudiu Beznea1-1/+0
2023-05-08ASoC: ti: use asoc_dummy_dlcKuninori Morimoto1-5/+3
2023-03-24ASoC: ti: remove unnecessary dai_link->platformKuninori Morimoto1-4/+1
2023-03-20ASoC: ti: omap-mcbsp: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-03-20ASoC: ti: omap-hdmi: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-03-20ASoC: ti: davinci-mcasp: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-03-20ASoC: ti: davinci-i2s: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-03-20ASoC: ti: ams-delta: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-02-22Merge tag 'sound-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ti...Linus Torvalds2-4/+6
2023-01-31ASoC: ti: use helper functionKuninori Morimoto3-6/+9
2023-01-12ASoC: remove unused davinci supportArnd Bergmann4-553/+3
2022-10-17ASoC: ti: davinci-mcasp: Use DIV_ROUND_UP() instead of open-coding itShang XiaoJing1-4/+3
2022-08-31ASoC: ti: omap-mcbsp: remove useless assignmentPierre-Louis Bossart1-1/+1
2022-08-15ASoC: omap: Replace sprintf() with sysfs_emit()Takashi Iwai2-7/+7
2022-07-11ASoC: Merge up fixesMark Brown3-31/+4
2022-07-07ASoC: ti: omap-mcbsp: duplicate sysfs errorDavid Owens3-31/+4
2022-06-29ASoC: Refactor non_legacy_dai_naming flagMark Brown7-8/+15
2022-06-27ASoC: ti: davinci-mcasp: use pm_runtime_resume_and_get()Pierre-Louis Bossart1-2/+1
2022-06-27ASoC: ti: Migrate to new style legacy DAI naming flagCharles Keepax7-8/+15
2022-06-06ASoC: ti: Rename set_fmt_new back to set_fmtCharles Keepax3-3/+3
2022-06-06ASoC: ti: Update to use set_fmt_new callbackCharles Keepax3-30/+30
2022-05-16ASoC: ti: j721e-evm: Fix refcount leak in j721e_soc_probe_*Miaoqian Lin1-11/+33
2022-05-05ASoC: ti: davinci-mcasp: Add dma-type for bcdmaJayesh Choudhary1-0/+2
2022-04-14ASoC: soc-card: Create jack kcontrol without pinsAkihiko Odaki4-11/+11
2022-04-12ASoC: ti: osk5912: Make it CCF clk API compatibleJanusz Krzysztofik1-2/+2
2022-03-16ASoC: ti: Fix spelling mistake "cant" -> "can't"Colin Ian King1-1/+1
2022-02-28ASoC: ti: davinci-i2s: Add check for clk_enable()Jiasheng Jiang1-1/+4
2021-12-20ASoC: ti: Use dev_err_probe() helperKuninori Morimoto2-14/+6
2021-12-06ASoC: ti: davinci-mcasp: Remove unnecessary conditionalAndy Shevchenko1-5/+3
2021-12-06ASoC: ti: davinci-mcasp: Get rid of duplicate of_node assignmentAndy Shevchenko1-3/+0
2021-11-04Merge tag 'tty-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds1-2/+1
2021-09-29ASoC: ti: Constify static snd_soc_opsRikard Falkeborn2-2/+2
2021-09-22tty: make tty_ldisc_ops::hangup return voidJiri Slaby1-2/+1
2021-09-13ASoC: ti: rename CONFIG_SND_SOC_DM365_VOICE_CODEC_MODULEMasahiro Yamada1-1/+1
2021-08-06Merge some cs42l42 patches into asoc-5.15Mark Brown1-6/+12
2021-07-19ASoC: ti: j721e-evm: Convert the audio domain IDs to enumPeter Ujfalusi1-13/+17
2021-07-19ASoC: ti: j721e-evm: Check for not initialized parent_clk_idPeter Ujfalusi1-1/+1
2021-07-19ASoC: ti: j721e-evm: Fix unbalanced domain activity tracking during startupPeter Ujfalusi1-5/+11
2021-07-12Merge series "ASoC: ti: davinci-mcasp: Fix the DIT mode and OMAP4 support" fr...Mark Brown2-24/+153
2021-07-11ASoC: ti: delete some dead code in omap_abe_probe()Dan Carpenter1-5/+0
2021-07-11ASoC: ti: davinci-mcasp: Add support for the OMAP4 version of McASPPeter Ujfalusi2-3/+24
2021-07-11ASoC: ti: davinci-mcasp: Fix DIT mode supportPeter Ujfalusi1-21/+129
2021-07-05Merge tag 'tty-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gre...Linus Torvalds1-6/+5
2021-06-04ASoC: ti: davinci-mcasp: Fix fall-through warning for ClangGustavo A. R. Silva1-0/+1
2021-06-01ASoC: ti: omap-mcbsp: use DEVICE_ATTR_RW macroYueHaibing1-1/+1
2021-05-13tty: no checking of tty_unregister_ldiscJiri Slaby1-3/+1
2021-05-13tty: make tty_ldisc_ops a param in tty_unregister_ldiscJiri Slaby1-1/+1
2021-05-13tty: set tty_ldisc_ops::num staticallyJiri Slaby1-1/+2
2021-05-13tty: make fp of tty_ldisc_ops::receive_buf{,2} constJiri Slaby1-2/+2
2021-04-30Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/t...Linus Torvalds3-4/+3
2021-03-31ASoC: ti: omap-mcsp: remove duplicate testPierre-Louis Bossart1-2/+1
2021-03-31ASoC: ti: omap-abe-twl6040: remove useless assignmentPierre-Louis Bossart1-1/+1
2021-03-17ASoC: ti: Fix a typo in the file ams-delta.cBhaskar Chowdhury1-1/+1
2021-03-10tty: remove TTY_LDISC_MAGICJiri Slaby1-1/+0
2021-01-21ASoC: ti: sync parameter naming (rate/sample_bits)Kuninori Morimoto1-1/+1
2020-12-14Merge tag 'asoc-v5.11' of https://git.kernel.org/pub/scm/linux/kernel/git/bro...Takashi Iwai4-186/+126
2020-11-26ASoC: ti: davinci: mark OF related data as maybe unusedKrzysztof Kozlowski1-1/+1
2020-11-23ASoC: ti: depend on COMMON_CLK to fix compile testsKrzysztof Kozlowski1-4/+5
2020-11-06ASoC: ti: davinci-mcasp: Handle missing required DT propertiesPeter Ujfalusi1-19/+58
2020-11-06ASoC: ti: davinci-mcasp: Simplify the configuration parameter handlingPeter Ujfalusi1-104/+60
2020-11-06ASoC: ti: davinci-mcasp: Remove legacy dma_request parsingPeter Ujfalusi1-54/+3
2020-11-06ASoC: ti: davinci-mcasp: Use platform_get_irq_byname_optionalPeter Ujfalusi1-6/+6
2020-11-03ASoC: ti: davinci-mcasp: remove always zero of davinci_mcasp_get_dt_paramsZhang Qilong1-7/+3
2020-11-02ASoC: ti: davinci-evm: Remove redundant null check before clk_disable_unprepareXu Wang1-2/+1
2020-10-26ALSA: remove unneeded breakTom Rix1-1/+0
2020-10-08ASoC: ti: davinci-mcasp: Use &pdev->dev for early dev_warnPeter Ujfalusi1-1/+1
2020-10-06Merge tag 'v5.9-rc5' into asoc-5.10Mark Brown5-9/+9
2020-10-06ASoC: omap-mcbsp: Fix use of uninitialised pointerAlex Dewar1-1/+5
2020-10-01ASoC: ti: omap-mcbsp: use devm_platform_ioremap_resource_bynameZhang Qilong1-5/+1
2020-09-28ASoC: ti: j721e-evm: Fix compiler warning when CONFIG_OF=nPeter Ujfalusi1-1/+1
2020-09-17Merge branch 'asoc-5.9' into asoc-5.10Mark Brown1-2/+2
2020-09-11ASoC: ti: j721e-evm: Add support for j7200-cpb audioPeter Ujfalusi1-0/+11
2020-09-08ASoC: ti: Kconfig: Allow the j721e machine driver to be used on K3 platformPeter Ujfalusi1-1/+1
2020-08-25ASoC: ti: fixup ams_delta_mute() function nameKuninori Morimoto1-2/+2
2020-08-23treewide: Use fallthrough pseudo-keywordGustavo A. R. Silva5-9/+9
2020-08-18ASoC: various vendors: delete repeated words in commentsRandy Dunlap1-1/+1
2020-07-23Merge series "ASoC: add asoc_substream_to_rtd() macro" from Kuninori Morimoto...Mark Brown10-19/+19
2020-07-23ASoC: ti: fix SND_SOC_J721E_EVM warnings & errorsRandy Dunlap1-0/+1
2020-07-23ASoC: omap: Replace HTTP links with HTTPS onesAlexander A. Klimov4-4/+4
2020-07-23ASoC: ti: Replace HTTP links with HTTPS onesAlexander A. Klimov2-2/+2
2020-07-23ASoC: ti: use asoc_substream_to_rtd()Kuninori Morimoto10-19/+19
2020-07-16ASoC: ti: merge .digital_mute() into .mute_stream()Kuninori Morimoto1-4/+5
2020-07-09ASoC: ti: omap-mcbsp-st: Remove set, but unused variable 'w'Lee Jones1-3/+0
2020-07-03ASoC: ti: j721e-evm: Fix missing unlock on error in j721e_audio_hw_params()Wei Yongjun1-1/+1
2020-07-01ASoC: ti: Add custom machine driver for j721e EVM (CPB and IVI)Peter Ujfalusi3-0/+906
2020-07-01ASoC: ti: davinci-mcasp: Specify stream_name for playback/capturePeter Ujfalusi1-0/+3
2020-05-26ASoC: ti: Fix runtime PM imbalance in omap2_mcbsp_set_clks_srcDinghao Liu1-5/+2
2020-05-18ASoC: ti: use snd_soc_xxx_active()Kuninori Morimoto4-9/+9
2020-05-12ASoC: ti: omap-mcbsp: Fix an error handling path in 'asoc_mcbsp_probe()'Christophe JAILLET1-6/+2
2020-05-12Merge branch 'for-5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/bro...Mark Brown1-1/+3
2020-04-28ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma typeXiyu Yang1-1/+3
2020-04-27ASoC: ti: remove comparison to bool in omap_mcbsp_dai_set_dai_fmt()Jason Yan1-1/+1
2020-04-02Merge tag 'sound-5.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ti...Linus Torvalds16-23/+97
2020-03-27ASoC: ti: use asoc_rtd_to_cpu() / asoc_rtd_to_codec() macro for DAI pointerKuninori Morimoto11-18/+18
2020-02-14sound: Call cpu_latency_qos_*() instead of pm_qos_*()Rafael J. Wysocki3-19/+20
2020-02-11ASoC: ti: davinci-mcasp: remove redundant assignment to variable retColin Ian King1-4/+2
2020-02-11ASoC: ti: davinci-mcasp: Add support for platforms using UDMAPeter Ujfalusi2-1/+10
2020-02-11ASoC: ti: Add udma-pcm platform driver for UDMAPeter Ujfalusi4-0/+67
2020-01-21ASoC: ti: omap-mcpdm: move .suspend/.resume to componentKuninori Morimoto1-8/+8
2019-12-16ASoC: ti: rx51: use snd_soc_dai_link_component for codec_confKuninori Morimoto1-6/+6
2019-12-09ASoC: ti: davinci-mcasp: Improve the sysclk selectionPeter Ujfalusi2-7/+32
2019-11-15ASoC: ti: davinci-mcasp: Use dma_request_chan() directly for channel requestPeter Ujfalusi1-1/+1
2019-11-06Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/bro...Mark Brown1-1/+1
2019-10-28ASoC: ti: sdma-pcm: Add back the flags parameter for non standard dma namesPeter Ujfalusi1-1/+1
2019-09-23Merge tag 'asoc-fix-v5.4-rc1' of https://git.kernel.org/pub/scm/linux/kernel/...Takashi Iwai1-2/+9
2019-09-20ASoC: ti: fix SND_SOC_DM365_VOICE_CODEC dependenciesArnd Bergmann1-2/+9
2019-09-09Merge branch 'asoc-5.4' into asoc-nextMark Brown7-81/+151
2019-09-09Merge branch 'asoc-5.3' into asoc-linusMark Brown2-50/+63
2019-09-09ASoC: ams-delta: Take control over audio mute GPIO pinsJanusz Krzysztofik1-2/+29
2019-08-30ASoC: ti: davinci-evm: Do not fail if the dai_set_sysclk returns -ENOTSUPPPeter Ujfalusi1-1/+1
2019-08-30ASoC: ti: edma-pcm: Fix for legacy dma_slave_map based channel lookupPeter Ujfalusi1-1/+16
2019-08-30ASoC: ti: davinci-i2s: Add S32_LE as support formatPeter Ujfalusi1-2/+6
2019-08-30ASoC: ti: davinci-i2s: Move the XSYNCERR workaround to .prepare callbackPeter Ujfalusi1-48/+34
2019-08-13ASoC: ti: Fix typos in ti/KconfigMasanari Iida1-2/+2
2019-08-09ASoC: ti: rx51: use snd_soc_dai_link_component for aux_devKuninori Morimoto1-8/+6
2019-08-06Merge tag 'asoc-fix-v5.3-rc3' of https://git.kernel.org/pub/scm/linux/kernel/...Takashi Iwai1-10/+36
2019-07-31ASoC: ti: Mark expected switch fall-throughsGustavo A. R. Silva2-0/+2
2019-07-26ASoC: ti: davinci-mcasp: Support for correct symmetric sample bitsPeter Ujfalusi1-4/+46
2019-07-26Merge branch 'asoc-5.3' into asoc-5.4Mark Brown1-10/+36
2019-07-26ASoC: ti: davinci-mcasp: Correct slot_width posed constraintPeter Ujfalusi1-9/+34
2019-07-26ASoC: ti: davinci-mcasp: Fix clk PDIR handling for i2s master modePeter Ujfalusi1-1/+2
2019-07-25ASoC: ti: davinci-mcasp: Improve serializer handling in multi AXR setupsPeter Ujfalusi1-39/+53
2019-07-25ASoC: ti: davinci-mcasp: Add support for RIGHT_J formatPeter Ujfalusi1-24/+19
2019-07-06Merge branch 'asoc-5.3' into asoc-nextMark Brown10-117/+234
2019-07-06Merge branch 'asoc-5.2' into asoc-linusMark Brown2-2/+2
2019-06-28ASoC: ti: rx51: consider CPU-Platform possibilityKuninori Morimoto1-1/+4
2019-06-28ASoC: ti: omap-twl4030: consider CPU-Platform possibilityKuninori Morimoto1-2/+10
2019-06-28ASoC: ti: omap-hdmi: consider CPU-Platform possibilityKuninori Morimoto1-1/+4
2019-06-28ASoC: ti: omap-abe-twl6040: consider CPU-Platform possibilityKuninori Morimoto1-8/+14
2019-06-28ASoC: ti: davinci-evm: consider CPU-Platform possibilityKuninori Morimoto1-1/+4
2019-06-26Merge tag 'v5.2-rc6' into asoc-5.3Mark Brown23-246/+23
2019-06-20ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRsPeter Ujfalusi1-7/+6