Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7203
-gerrit
commit b5471cc47ad136711aec8731a31c8d70291be924 Author: Vladimir Serbinenko phcoder@gmail.com Date: Mon Oct 27 02:45:22 2014 +0100
lenovo/x2[23]0: Handle Ricoh SD cardreader
Change-Id: Id0aecbd3e45bdf9661168ebd0e55f17dc6febaaa Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/drivers/Kconfig | 1 + src/drivers/Makefile.inc | 1 + src/drivers/ricoh/rce822/Kconfig | 3 ++ src/drivers/ricoh/rce822/Makefile.inc | 1 + src/drivers/ricoh/rce822/chip.h | 29 ++++++++++++ src/drivers/ricoh/rce822/rce822.c | 79 +++++++++++++++++++++++++++++++++ src/mainboard/lenovo/x220/Kconfig | 1 + src/mainboard/lenovo/x220/devicetree.cb | 11 ++--- src/mainboard/lenovo/x230/Kconfig | 1 + src/mainboard/lenovo/x230/devicetree.cb | 11 ++--- 10 files changed, 128 insertions(+), 10 deletions(-)
diff --git a/src/drivers/Kconfig b/src/drivers/Kconfig index 42d1583..12f9a79 100644 --- a/src/drivers/Kconfig +++ b/src/drivers/Kconfig @@ -39,3 +39,4 @@ source src/drivers/trident/Kconfig source src/drivers/uart/Kconfig source src/drivers/usb/Kconfig source src/drivers/xpowers/Kconfig +source src/drivers/ricoh/rce822/Kconfig diff --git a/src/drivers/Makefile.inc b/src/drivers/Makefile.inc index cb26643..7ae3eb2 100644 --- a/src/drivers/Makefile.inc +++ b/src/drivers/Makefile.inc @@ -38,3 +38,4 @@ subdirs-y += ipmi subdirs-y += elog subdirs-y += xpowers subdirs-$(CONFIG_ARCH_X86) += pc80 +subdirs-y += ricoh/rce822 diff --git a/src/drivers/ricoh/rce822/Kconfig b/src/drivers/ricoh/rce822/Kconfig new file mode 100644 index 0000000..6b0c790 --- /dev/null +++ b/src/drivers/ricoh/rce822/Kconfig @@ -0,0 +1,3 @@ +config DRIVERS_RICOH_RCE822 + bool + default n diff --git a/src/drivers/ricoh/rce822/Makefile.inc b/src/drivers/ricoh/rce822/Makefile.inc new file mode 100644 index 0000000..738bd0e --- /dev/null +++ b/src/drivers/ricoh/rce822/Makefile.inc @@ -0,0 +1 @@ +ramstage-$(CONFIG_DRIVERS_RICOH_RCE822) += rce822.c diff --git a/src/drivers/ricoh/rce822/chip.h b/src/drivers/ricoh/rce822/chip.h new file mode 100644 index 0000000..cfed32e --- /dev/null +++ b/src/drivers/ricoh/rce822/chip.h @@ -0,0 +1,29 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Vladimir Serbinenko + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef DRIVERS_RICOH_RC822_CHIP_H +#define DRIVERS_RICOH_RC822_CHIP_H + +struct drivers_ricoh_rce822_config { + u8 sdwppol:1; + u8 disable_mask; +}; + +#endif diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c new file mode 100644 index 0000000..2383f4b --- /dev/null +++ b/src/drivers/ricoh/rce822/rce822.c @@ -0,0 +1,79 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Vladimir Serbinenko + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <kconfig.h> +#include <console/console.h> +#include <device/device.h> +#include <device/pci.h> +#include <device/pci_ids.h> +#include <arch/io.h> +#include "chip.h" + +static void rce822_enable(struct device *dev) +{ + struct drivers_ricoh_rce822_config *config = dev->chip_info; + + pci_write_config8(dev, 0xca, 0x57); + pci_write_config8(dev, 0xcb, config->disable_mask); + pci_write_config8(dev, 0xca, 0x00); +} + +static void rce822_init(struct device *dev) +{ + struct drivers_ricoh_rce822_config *config = dev->chip_info; + + pci_write_config8(dev, 0xf9, 0xfc); + pci_write_config8(dev, 0xfb, config->sdwppol << 1); + pci_write_config8(dev, 0xf9, 0x00); +} + +static void rce822_set_subsystem(device_t dev, unsigned vendor, unsigned device) +{ + + if (!vendor || !device) { + pci_write_config32(dev, 0xac, + pci_read_config32(dev, PCI_VENDOR_ID)); + } else { + pci_write_config32(dev, 0xac, + ((device & 0xffff) << 16) | (vendor & 0xffff)); + } +} + +static struct pci_operations lops_pci = { + .set_subsystem = &rce822_set_subsystem, +}; + +static struct device_operations usb_ehci_ops = { + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = rce822_init, + .enable = rce822_enable, + .scan_bus = 0, + .ops_pci = &lops_pci, +}; + +static const unsigned short pci_device_ids[] = { 0xe822, 0xe823, 0 }; + +static const struct pci_driver pch_usb_ehci __pci_driver = { + .ops = &usb_ehci_ops, + .vendor = PCI_VENDOR_ID_RICOH, + .devices = pci_device_ids, +}; diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 9a9b143..861f3a4 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select SANDYBRIDGE_LVDS + select DRIVERS_RICOH_RCE822
# Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb index c1ed116..c3b8ad9 100644 --- a/src/mainboard/lenovo/x220/devicetree.cb +++ b/src/mainboard/lenovo/x220/devicetree.cb @@ -100,11 +100,12 @@ chip northbridge/intel/sandybridge end # PCIe Port #4 device pci 1c.4 on subsystemid 0x17aa 0x21db - device pci 00.0 on - subsystemid 0x17aa 0x21db - end - device pci 00.1 on - subsystemid 0x17aa 0x21db + chip drivers/ricoh/rce822 + register "sdwppol" = "1" + register "disable_mask" = "0x87" + device pci 00.0 on + subsystemid 0x17aa 0x21fa + end end end # PCIe Port #5 (SD) device pci 1c.5 off end # PCIe Port #6 diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 839fc42..49dab80 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT_TEXTMODECFG select IVYBRIDGE_LVDS + select DRIVERS_RICOH_RCE822
# Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb index f9f8d26..f2fed1f 100644 --- a/src/mainboard/lenovo/x230/devicetree.cb +++ b/src/mainboard/lenovo/x230/devicetree.cb @@ -90,11 +90,12 @@ chip northbridge/intel/sandybridge end # High Definition Audio device pci 1c.0 on subsystemid 0x17aa 0x21fa - device pci 00.0 on - subsystemid 0x17aa 0x21fa - end - device pci 00.1 on - subsystemid 0x17aa 0x21fa + chip drivers/ricoh/rce822 + register "sdwppol" = "1" + register "disable_mask" = "0x87" + device pci 00.0 on + subsystemid 0x17aa 0x21fa + end end end # PCIe Port #1 device pci 1c.1 on