aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/soc
AgeCommit message (Expand)AuthorFilesLines
2023-12-06soc: microchip: mpfs: add auto-update subdev to system controllerConor Dooley1-2/+7
2023-12-06soc: microchip: mpfs: print service status in warning messageConor Dooley1-1/+3
2023-12-06soc: microchip: mpfs: enable access to the system controller's flashConor Dooley2-0/+21
2023-12-04soc: qcom: pmic-glink: switch to DRM_AUX_HPD_BRIDGEDmitry Baryshkov2-24/+10
2023-12-03soc: qcom: stats: Add DDR sleep statsKonrad Dybcio1-1/+186
2023-11-23soc: apple: mailbox: Add explicit include of platform_device.hRob Herring1-0/+1
2023-11-23soc: apple: mailbox: Rename config symbol to APPLE_MAILBOXHector Martin2-4/+3
2023-11-23soc: apple: rtkit: Port to the internal mailbox driverHector Martin3-80/+31
2023-11-23soc: apple: mailbox: Add ASC/M3 mailbox driverHector Martin4-0/+502
2023-11-23soc: apple: rtkit: Get rid of apple_rtkit_send_message_waitHector Martin1-32/+0
2023-11-22soc: sifive: shunt ccache driver to drivers/cacheConor Dooley5-287/+0
2023-11-15soc: xilinx: fix unhandled SGI warning messageTanmay Shah1-1/+1
2023-11-15soc: xilinx: fix quoted string split across linesMichal Simek1-4/+4
2023-11-15soc: xilinx: Fix for call trace due to the usage of smp_processor_id()HariBabu Gattem1-1/+4
2023-11-15soc/xilinx: zynqmp_power: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-11-15soc: samsung: exynos-chipid: add exynosautov920 SoC supportJaewon Kim1-0/+1
2023-11-14soc: qcom: add ADSP PDCharger ULOG driverNeil Armstrong4-0/+215
2023-11-03Merge tag 'powerpc-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/po...Linus Torvalds1-2/+2
2023-11-01Merge tag 'docs-6.7' of git://git.lwn.net/linuxLinus Torvalds1-1/+1
2023-11-01Merge tag 'soc-drivers-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds58-334/+674
2023-11-01Merge tag 'pmdomain-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ul...Linus Torvalds16-365/+0
2023-10-31Merge tag 'acpi-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/raf...Linus Torvalds1-6/+2
2023-10-26Merge tag 'renesas-fixes-for-v6.6-tag3' of git://git.kernel.org/pub/scm/linux...Arnd Bergmann1-0/+1
2023-10-26Merge branches 'acpi-video', 'acpi-prm', 'acpi-apei' and 'acpi-pcc'Rafael J. Wysocki1-6/+2
2023-10-26soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOMChristoph Hellwig1-0/+1
2023-10-25Merge tag 'qcom-drivers-for-6.7-2' of https://git.kernel.org/pub/scm/linux/ke...Arnd Bergmann2-10/+10
2023-10-25Merge tag 'arm-soc/for-6.7/drivers' of https://github.com/Broadcom/stblinux i...Arnd Bergmann1-1/+1
2023-10-25Merge tag 'mvebu-arm-6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...Arnd Bergmann1-1/+4
2023-10-25Merge tag 'ti-driver-soc-for-v6.7' of https://git.kernel.org/pub/scm/linux/ke...Arnd Bergmann8-32/+21
2023-10-22soc: qcom: pmic_glink_altmode: Print return value on errorLuca Weiss1-7/+7
2023-10-20powerpc: Remove cpm_dp...() macrosChristophe Leroy1-2/+2
2023-10-18Merge tag 'v6.7-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kern...Arnd Bergmann1-4/+2
2023-10-18Merge tag 'qcom-drivers-for-6.7' of https://git.kernel.org/pub/scm/linux/kern...Arnd Bergmann22-198/+398
2023-10-16Merge tag 'riscv-soc-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel...Arnd Bergmann2-5/+3
2023-10-16Merge tag 'aspeed-6.7-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/j...Arnd Bergmann4-16/+8
2023-10-16Merge tag 'tegra-for-6.7-soc' of git://git.kernel.org/pub/scm/linux/kernel/gi...Arnd Bergmann2-12/+2
2023-10-16Merge tag 'v6.6-next-soc' of https://git.kernel.org/pub/scm/linux/kernel/git/...Arnd Bergmann1-4/+180
2023-10-16Merge tag 'renesas-drivers-for-v6.7-tag1' of git://git.kernel.org/pub/scm/lin...Arnd Bergmann2-3/+19
2023-10-16Merge tag 'platform-remove-void-soc-for-6.7-rc' of https://git.pengutronix.de...Arnd Bergmann12-45/+24
2023-10-16soc: samsung: exynos-chipid: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-16soc: qcom: apr: Add __counted_by for struct apr_rx_buf and use struct_size()Gustavo A. R. Silva1-2/+2
2023-10-16soc: qcom: pmic_glink: fix connector type to be DisplayPortDmitry Baryshkov1-1/+1
2023-10-16soc: ti: k3-socinfo: Avoid overriding return valueNeha Malcom Francis1-3/+2
2023-10-16soc: ti: k3-socinfo: Fix typo in bitfield documentationNeha Malcom Francis1-1/+1
2023-10-16soc: ti: knav_qmss_queue: Use device_get_match_data()Rob Herring1-4/+4
2023-10-16Merge tag 'renesas-fixes-for-v6.6-tag2' of git://git.kernel.org/pub/scm/linux...Arnd Bergmann1-4/+5
2023-10-14soc/pxa: ssp: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-14soc/mediatek: mtk-mmsys: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-14soc/mediatek: mtk-devapc: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-14soc/loongson: loongson2_guts: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-14soc/litex: litex_soc_ctrl: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-10-14soc/ixp4xx: ixp4xx-qmgr: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-10-14soc/ixp4xx: ixp4xx-npe: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-14soc/hisilicon: kunpeng_hccs: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-14soc/fujitsu: a64fx-diag: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-14soc/fsl: cpm: tsa: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-10-14soc/fsl: cpm: qmc: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-14soc/fsl: dpaa2-console: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-13soc/tegra: pmc: Drop the ->opp_to_performance_state() callbackUlf Hansson1-8/+0
2023-10-13soc/aspeed: Convert to platform remove callback returning voidUwe Kleine-König4-16/+8
2023-10-12Merge tag 'soc-fixes-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds1-0/+1
2023-10-12soc: renesas: Make ARCH_R9A07G043 depend on required optionsConor Dooley1-4/+5
2023-10-11soc/tegra: cbb: tegra194-cbb: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-10docs: move powerpc under archCosta Shulyupin1-1/+1
2023-10-09soc: bcm: brcmstb: depend on ARCH_BRCMSTB over arm archesPeter Robinson1-1/+1
2023-10-06Merge tag 'acpi-pcc-updates-6.7' of git://git.kernel.org/pub/scm/linux/kernel...Rafael J. Wysocki1-6/+2
2023-10-05soc: renesas: Make ARCH_R9A07G043 (riscv version) depend on NONPORTABLEJisheng Zhang1-0/+1
2023-10-05soc: mediatek: svs: Add support for voltage binsMark Tseng1-4/+53
2023-10-05soc: mediatek: svs: Add support for MT8188 SoCMark Tseng1-0/+127
2023-10-04pmdomain: xilinx: Move Kconfig option to the pmdomain subsystemUlf Hansson1-9/+0
2023-10-04pmdomain: ti: Move and add Kconfig options to the pmdomain subsystemUlf Hansson1-12/+0
2023-10-04pmdomain: tegra: Move Kconfig option to the pmdomain subsystemUlf Hansson1-5/+0
2023-10-04pmdomain: sunxi: Move Kconfig option to the pmdomain subsystemUlf Hansson1-9/+0
2023-10-04pmdomain: starfive: Move Kconfig file to the pmdomain subsystemUlf Hansson2-13/+0
2023-10-04pmdomain: samsung: Move Kconfig option to the pmdomain subsystemUlf Hansson1-4/+0
2023-10-04pmdomain: rockchip: Move Kconfig option to the pmdomain subsystemUlf Hansson1-12/+0
2023-10-04pmdomain: renesas: Move Kconfig options to the pmdomain subsystemUlf Hansson1-105/+0
2023-10-04pmdomain: qcom: Move Kconfig options to the pmdomain subsystemUlf Hansson1-37/+0
2023-10-04pmdomain: mediatek: Move Kconfig options to the pmdomain subsystemUlf Hansson1-23/+0
2023-10-04pmdomain: imx: Move Kconfig options to the pmdomain subsystemUlf Hansson1-19/+0
2023-10-02soc: qcom: socinfo: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: smsm: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: smp2p: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: smem: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: rmtfs_mem: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: qcom_stats: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: qcom_gsbi: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: qcom_aoss: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: pmic_glink: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: ocmem: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc: qcom: llcc-qcom: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-10-02soc: qcom: icc-bwmon: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc/ti: wkup_m3_ipc: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc/ti: smartreflex: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-10-02soc/ti: pruss: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc/ti: pm33xx: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-10-02soc/ti: knav_qmss_queue: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-10-02soc/ti: knav_dma: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-10-02soc/ti: k3-ringacc: Convert to platform remove callback returning voidUwe Kleine-König1-3/+2
2023-10-02soc/rockchip: io-domain: Convert to platform remove callback returning voidUwe Kleine-König1-4/+2
2023-09-29soc: kunpeng_hccs: Migrate to use generic PCC shmem related macrosSudeep Holla1-6/+2
2023-09-27soc: qcom: llcc: Handle a second device without data corruptionUwe Kleine-König1-0/+3
2023-09-27soc: qcom: Switch to EXPORT_SYMBOL_GPL()Unnathi Chalicheemala12-55/+55
2023-09-27soc: qcom: smem: Annotate struct qcom_smem with __counted_byKees Cook1-1/+1
2023-09-27soc: qcom: rmtfs: Support discarding guard pagesBjorn Andersson1-0/+9
2023-09-27soc: loongson: loongson2_guts: Remove unneeded semicolonMingtong Bao1-1/+1
2023-09-27soc: loongson: loongson2_guts: Convert to devm_platform_ioremap_resource()Dongliang Mu1-3/+1
2023-09-27soc: loongson: loongson_pm2: Populate children syscon nodesBinbin Zhou1-0/+6
2023-09-27soc: loongson: loongson_pm2: Drop useless of_device_id compatibleBinbin Zhou1-1/+0
2023-09-27soc: loongson: loongson_pm2: Add dependency for INPUTBinbin Zhou1-0/+1
2023-09-25soc/microchip: mpfs-sys-controller: Convert to platform remove callback retur...Uwe Kleine-König1-4/+2
2023-09-24soc: imx8m: Enable OCOTP clock for imx8mm before reading registersNathan Rossi1-0/+10
2023-09-20pmdomain: bcm: Move Kconfig options to the pmdomain subsystemUlf Hansson1-51/+0
2023-09-20soc: dove: add missing of_node_putJulia Lawall1-1/+4
2023-09-20pmdomain: apple: Move Kconfig option to the pmdomain subsystemUlf Hansson1-13/+0
2023-09-20pmdomain: amlogic: Move Kconfig options to the pmdomain subsystemUlf Hansson1-35/+0
2023-09-20pmdomain: actions: Move Kconfig file to the pmdomain subsystemUlf Hansson2-18/+0
2023-09-19soc: qcom: llcc: Add QDU1000 and QRU1000 LLCC supportKomal Bajaj1-0/+67
2023-09-19soc: qcom: llcc: Updating the macro nameKomal Bajaj1-1/+1
2023-09-19soc: qcom: Add LLCC support for multi channel DDRKomal Bajaj1-1/+24
2023-09-19soc: qcom: llcc: Refactor llcc driver to support multiple configurationKomal Bajaj1-86/+181
2023-09-19soc: qcom: pmic: Fix resource leaks in a device_for_each_child_node() loopLu Hongfei1-7/+23
2023-09-18soc: sifive: replace SOC_FOO with ARCH_FOOConor Dooley1-1/+1
2023-09-18soc: renesas: Kconfig: Remove blank line before ARCH_R9A07G043 help textGeert Uytterhoeven1-1/+0
2023-09-18soc: renesas: renesas-soc: Remove blank linesClaudiu Beznea1-2/+0
2023-09-18soc: renesas: Identify RZ/G3S SoCClaudiu Beznea2-0/+19
2023-09-14pmdomain: starfive: Replace SOC_STARFIVE with ARCH_STARFIVEChanghuang Liang1-2/+2
2023-09-13soc: qcom: socinfo: Add IDs for IPQ8174 familyRobert Marko1-0/+3
2023-09-13soc: qcom: socinfo: Add SoC ID for QCM6490Luca Weiss1-0/+1
2023-09-13soc: qcom: socinfo: Add SM8550-adjacent PMICsKonrad Dybcio1-0/+6
2023-09-13soc: qcom: wcnss_ctrl: Remove redundant initialization owner in wcnss_ctrl_dr...Li Zetao1-1/+0
2023-09-13soc: qcom: socinfo: Add Soc ID for SM7150PDanila Tikhonov1-0/+1
2023-09-08soc: renesas: Kconfig: For ARCH_R9A07G043 select the required configs if depe...Lad Prabhakar1-3/+4
2023-09-08Merge patch series "Add non-coherent DMA support for AX45MP"Palmer Dabbelt1-0/+4
2023-09-01soc: renesas: Kconfig: Select the required configs for RZ/Five SoCLad Prabhakar1-0/+4
2023-08-30Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cl...Linus Torvalds1-16/+1
2023-08-30Merge tag 'soc-arm-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/socLinus Torvalds15-18/+15
2023-08-30Merge tag 'soc-drivers-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds47-196/+2026
2023-08-30Merge tag 'genpd-v6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/...Linus Torvalds85-22705/+22
2023-08-28Merge tag 'hardening-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds1-2/+2
2023-08-21Merge tag 'qcom-drivers-for-6.6' of https://git.kernel.org/pub/scm/linux/kern...Arnd Bergmann20-138/+260
2023-08-21Merge tag 'v6.6-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kern...Arnd Bergmann1-0/+14
2023-08-21soc: kunpeng_hccs: fix some sparse warnings about incorrect typeHuisong Li2-7/+8
2023-08-21soc: loongson2_pm: add power management supportYinbo Zhu3-0/+226
2023-08-16soc: rockchip: grf: Fix SDMMC not working on RK3588 with bus-width > 1Ondrej Jirman1-0/+14
2023-08-14Merge tag 'ti-driver-soc-for-v6.6' of https://git.kernel.org/pub/scm/linux/ke...Arnd Bergmann4-22/+17
2023-08-14soc: kunpeng_hccs: add MAILBOX dependencyArnd Bergmann1-0/+1
2023-08-13soc: qcom: aoss: Tidy up qmp_send() callersBjorn Andersson1-10/+4
2023-08-13soc: qcom: aoss: Format string in qmp_send()Bjorn Andersson1-7/+13
2023-08-13soc: qcom: aoss: Move length requirements from callerBjorn Andersson1-13/+12
2023-08-12soc: kunpeng_hccs: fix size_t format stringArnd Bergmann1-1/+1
2023-08-12soc: aspeed: socinfo: Add kfree for kstrdupJiasheng Jiang1-0/+1
2023-08-12soc: aspeed: uart-routing: Use __sysfs_match_stringZev Weiss1-1/+1
2023-08-12Merge tag 'hisi-drivers-for-6.6' of https://github.com/hisilicon/linux-hisi i...Arnd Bergmann6-0/+1490
2023-08-12Merge tag 'samsung-drivers-6.6' of https://git.kernel.org/pub/scm/linux/kerne...Arnd Bergmann2-2/+1
2023-08-12Merge tag 'sunxi-drivers-for-6.6-1' of https://git.kernel.org/pub/scm/linux/k...Arnd Bergmann1-1/+1
2023-08-12Merge tag 'amlogic-drivers-for-v6.6' of https://git.kernel.org/pub/scm/linux/...Arnd Bergmann1-0/+1
2023-08-12Merge tag 'zynqmp-soc-for-6.6' of https://github.com/Xilinx/linux-xlnx into s...Arnd Bergmann2-6/+5
2023-08-12Merge tag 'tegra-for-6.6-soc' of git://git.kernel.org/pub/scm/linux/kernel/gi...Arnd Bergmann7-27/+9
2023-08-12Merge tag 'at91-soc-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/a...Arnd Bergmann2-2/+1
2023-08-12soc: fsl: Explicitly include correct DT includesRob Herring4-6/+5
2023-08-12soc: xilinx: Explicitly include correct DT includesRob Herring1-0/+1
2023-08-12soc: sunxi: Explicitly include correct DT includesRob Herring1-1/+1
2023-08-12soc: rockchip: Explicitly include correct DT includesRob Herring1-1/+1
2023-08-12soc: mediatek: Explicitly include correct DT includesRob Herring5-5/+6
2023-08-12soc: aspeed: Explicitly include correct DT includesRob Herring3-4/+2
2023-08-11soc: ti: k3-socinfo.c: Add JTAG ID for AM62PXVignesh Raghavendra1-0/+1
2023-08-09soc: ti: Use devm_platform_ioremap_resource_byname simplify logicZhang Zekun1-13/+6
2023-08-08soc: hisilicon: add sysfs entry to query information of HCCSHuisong Li2-0/+660
2023-08-08soc: hisilicon: Support HCCS driver on Kunpeng SoCHuisong Li6-0/+830
2023-08-06soc: sunxi: Explicitly include correct DT includesRob Herring1-1/+1
2023-08-04soc: amlogic: Explicitly include correct DT includesRob Herring1-0/+1
2023-08-04soc: xilinx: Do not check for 0 return after calling platform_get_irq()Ruan Jinjie1-2/+2
2023-08-04soc: xilinx: Explicitly include correct DT includesRob Herring1-0/+1
2023-08-03Merge branch 'genpd_create_dir' of git://git.kernel.org/pub/scm/linux/kernel/...Bjorn Andersson85-22751/+22
2023-08-03soc: qcom: qmi_encdec: Restrict string length in decodeChris Lew1-2/+2
2023-08-03soc: qcom: smem: Fix incompatible types in comparisonChen Jiahao1-1/+1
2023-08-03soc: qcom: ocmem: add missing clk_disable_unprepare() in ocmem_dev_probe()Yang Yingliang1-1/+3
2023-08-01soc: ti: k3-ringacc: remove non-fatal probe deferral logJayesh Choudhary1-3/+1
2023-07-31soc: qcom: socinfo: Add SoC ID for SM7125David Wronek1-0/+1
2023-07-31soc: qcom: socinfo: drop the IPQ5019 SoC IDKathiravan T1-1/+0
2023-07-31soc: qcom: socinfo: add SM4450 IDTengfei Fan1-0/+1
2023-07-31soc: qcom: pmic_glink: enable altmode for SM8550Neil Armstrong1-5/+1
2023-07-31soc: qcom: pmic_glink_altmode: add retimer-switch supportNeil Armstrong1-0/+43
2023-07-31soc: qcom: pmic_glink_altmode: handle safe mode when disconnectNeil Armstrong1-1/+17
2023-07-31soc: qcom: rpmhpd: Add SDX75 power domainsRohit Agarwal1-0/+16
2023-07-29soc: microchip: Explicitly include correct DT includesRob Herring2-2/+1
2023-07-27soc/tegra: cbb: Remove unnecessary print function dev_err()Jiapeng Chong1-6/+2
2023-07-27soc/tegra: fuse: Sort includes alphabeticallyThierry Reding1-2/+2
2023-07-26genpd: move owl-sps-helper.c from drivers/socArnd Bergmann3-52/+0
2023-07-26soc: starfive: remove stale Makefile entryArnd Bergmann1-1/+0
2023-07-25soc: ti: Explicitly include correct DT includesRob Herring4-4/+5
2023-07-25soc: ti: omap-prm: Use devm_platform_get_and_ioremap_resource()Yangtao Li1-8/+4
2023-07-21soc: qcom: use devm_clk_get_enabled() in gsbi_probe()Yuanjun Gong1-8/+3
2023-07-21soc: qcom: rpmhpd: Use the newly created generic RPMHPD bindingsRohit Agarwal1-50/+51
2023-07-21soc/tegra: fuse: Use devm_platform_get_and_ioremap_resource()Yangtao Li1-6/+3
2023-07-21soc/tegra: Explicitly include correct DT includesRob Herring5-13/+2
2023-07-20soc: samsung: Explicitly include correct DT includesRob Herring3-3/+3
2023-07-19soc: imx: imx8mp-blk-ctrl: register HSIO PLL clock as bus_power_dev childLucas Stach1-1/+1
2023-07-17soc: fsl: qe: Replace all non-returning strlcpy with strscpyAzeem Shaikh1-2/+2