Peter Lemenkov has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 43 insertions(+), 198 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/1
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index d1ba6a8..4b3303b 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -37,9 +37,9 @@ string default "lenovo/t530"
-config DEVICETREE +config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb similarity index 97% rename from src/mainboard/lenovo/t530/variants/t530/devicetree.cb rename to src/mainboard/lenovo/t530/devicetree.cb index c2a9259..62b622f 100644 --- a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb +++ b/src/mainboard/lenovo/t530/devicetree.cb @@ -142,10 +142,6 @@ register "has_bdc_detection" = "1" register "bdc_gpio_num" = "54" register "bdc_gpio_lvl" = "0" - - register "has_wwan_detection" = "1" - register "wwan_gpio_num" = "70" - register "wwan_gpio_lvl" = "0" end chip drivers/lenovo/hybrid_graphics device pnp ff.f on end # dummy diff --git a/src/mainboard/lenovo/t530/variants/t530/overridetree.cb b/src/mainboard/lenovo/t530/variants/t530/overridetree.cb new file mode 100644 index 0000000..e106aa6 --- /dev/null +++ b/src/mainboard/lenovo/t530/variants/t530/overridetree.cb @@ -0,0 +1,13 @@ +chip northbridge/intel/sandybridge + device domain 0 on + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH + device pci 1f.0 on # PCI-LPC bridge + chip ec/lenovo/h8 + register "has_wwan_detection" = "1" + register "wwan_gpio_num" = "70" + register "wwan_gpio_lvl" = "0" + end + end + end + end +end diff --git a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb deleted file mode 100644 index f814c3f..0000000 --- a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb +++ /dev/null @@ -1,192 +0,0 @@ -chip northbridge/intel/sandybridge - # IGD Displays - register "gfx.ndid" = "3" - register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" - - # Enable DisplayPort Hotplug with 6ms pulse - register "gpu_dp_d_hotplug" = "0x06" - - register "gpu_dp_b_hotplug" = "0" - register "gpu_dp_c_hotplug" = "0" - - # Enable Panel as LVDS and configure power delays - register "gpu_panel_port_select" = "0" # LVDS - register "gpu_panel_power_cycle_delay" = "6" # T7: 500ms - register "gpu_panel_power_up_delay" = "100" # T1+T2: 10ms - register "gpu_panel_power_down_delay" = "100" # T5+T6: 10ms - register "gpu_panel_power_backlight_on_delay" = "2000" # T3: 200ms - register "gpu_panel_power_backlight_off_delay" = "2000" # T4: 200ms - register "gfx.use_spread_spectrum_clock" = "1" - register "gfx.link_frequency_270_mhz" = "1" - register "gpu_cpu_backlight" = "0x1155" - register "gpu_pch_backlight" = "0x11551155" - - device cpu_cluster 0 on - chip cpu/intel/model_206ax - # Magic APIC ID to locate this chip - device lapic 0x0 on end - device lapic 0xacac off end - - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) - end - end - - register "pci_mmio_size" = "2048" - - device domain 0 on - subsystemid 0x17aa 0x21f6 inherit - - device pci 00.0 on end # Host bridge - device pci 01.0 on end # PCIe bridge for discrete graphics - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x17aa 0x21f5 - end - - chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH - # GPI routing - # 0 No effect (default) - # 1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set) - # 2 SCI (if corresponding GPIO_EN bit is also set) - register "alt_gp_smi_en" = "0x0000" - register "gpi1_routing" = "2" - register "gpi13_routing" = "2" - - # Enable SATA ports 0 (HDD bay) & 1 (ODD bay) & 2 (mSATA) & 3 (eSATA) & 4 (dock) - register "sata_port_map" = "0x3f" - # Set max SATA speed to 6.0 Gb/s - register "sata_interface_speed_support" = "0x3" - - register "gen1_dec" = "0x7c1601" - register "gen2_dec" = "0x0c15e1" - register "gen4_dec" = "0x0c06a1" - - # Enable zero-based linear PCIe root port functions - register "pcie_port_coalesce" = "1" - register "c2_latency" = "101" # c2 not supported - - register "pcie_hotplug_map" = "{ 0, 0, 1, 0, 0, 0, 0, 0 }" - - register "xhci_switchable_ports" = "0xf" - register "superspeed_capable_ports" = "0xf" - register "xhci_overcurrent_mapping" = "0x4000201" - - register "docking_supported" = "1" - - register "spi_uvscc" = "0x2005" - register "spi_lvscc" = "0x2005" - - device pci 14.0 on end # USB 3.0 Controller - device pci 16.0 on end # Management Engine Interface 1 - device pci 16.1 off end # Management Engine Interface 2 - device pci 16.2 off end # Management Engine IDE-R - device pci 16.3 on end # Management Engine KT - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x17aa 0x21f3 - end - device pci 1a.0 on end # USB2 EHCI #2 - device pci 1b.0 on end # High Definition Audio - device pci 1c.0 on # PCIe Port #1 - chip drivers/ricoh/rce822 # Ricoh cardreader - register "disable_mask" = "0x83" - register "sdwppol" = "1" - device pci 00.0 on end # Ricoh SD card reader - end - end - device pci 1c.1 on end # PCIe Port #2 - device pci 1c.2 on # PCIe Port #3 - smbios_slot_desc "7" "3" "ExpressCard Slot" "8" - end - device pci 1c.3 off end # PCIe Port #4 - device pci 1c.4 off end # PCIe Port #5 - device pci 1c.5 off end # PCIe Port #6 - device pci 1c.6 off end # PCIe Port #7 - device pci 1c.7 off end # PCIe Port #8 - device pci 1d.0 on end # USB2 EHCI #1 - device pci 1e.0 off end # PCI bridge - device pci 1f.0 on # PCI-LPC bridge - chip ec/lenovo/pmh7 - device pnp ff.1 on end # dummy - register "backlight_enable" = "0x01" - register "dock_event_enable" = "0x01" - end - - chip drivers/pc80/tpm - device pnp 0c31.0 on end - end - - chip ec/lenovo/h8 - device pnp ff.2 on # dummy - io 0x60 = 0x62 - io 0x62 = 0x66 - io 0x64 = 0x1600 - io 0x66 = 0x1604 - end - - register "config0" = "0xa7" - register "config1" = "0x01" - register "config2" = "0xa0" - register "config3" = "0xe2" - - register "has_keyboard_backlight" = "1" - - register "beepmask0" = "0x00" - register "beepmask1" = "0x86" - register "has_power_management_beeps" = "0" - register "event2_enable" = "0xff" - register "event3_enable" = "0xff" - register "event4_enable" = "0xd0" - register "event5_enable" = "0xfc" - register "event6_enable" = "0x00" - register "event7_enable" = "0x01" - register "event8_enable" = "0x7b" - register "event9_enable" = "0xff" - register "eventa_enable" = "0x01" - register "eventb_enable" = "0x00" - register "eventc_enable" = "0xff" - register "eventd_enable" = "0xff" - register "evente_enable" = "0x0d" - - register "has_bdc_detection" = "1" - register "bdc_gpio_num" = "54" - register "bdc_gpio_lvl" = "0" - end - chip drivers/lenovo/hybrid_graphics - device pnp ff.f on end # dummy - - register "detect_gpio" = "21" - - register "has_panel_hybrid_gpio" = "1" - register "panel_hybrid_gpio" = "52" - register "panel_integrated_lvl" = "1" - - register "has_backlight_gpio" = "0" - register "has_dgpu_power_gpio" = "0" - - register "has_thinker1" = "1" - end - end - device pci 1f.2 on end # SATA Controller 1 - device pci 1f.3 on # SMBus - # eeprom, 8 virtual devices, same chip - chip drivers/i2c/at24rf08c - device i2c 54 on end - device i2c 55 on end - device i2c 56 on end - device i2c 57 on end - device i2c 5c on end - device i2c 5d on end - device i2c 5e on end - device i2c 5f on end - end - end - device pci 1f.5 off end # SATA Controller 2 - device pci 1f.6 off end # Thermal - end - end -end diff --git a/src/mainboard/lenovo/t530/variants/w530/overridetree.cb b/src/mainboard/lenovo/t530/variants/w530/overridetree.cb new file mode 100644 index 0000000..31de364 --- /dev/null +++ b/src/mainboard/lenovo/t530/variants/w530/overridetree.cb @@ -0,0 +1,28 @@ +chip northbridge/intel/sandybridge + register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" + register "gpu_dp_b_hotplug" = "0" + register "gpu_dp_c_hotplug" = "0" + device domain 0 on + device pci 02.0 on # Internal graphics VGA controller + subsystemid 0x17aa 0x21f5 + end + chip southbridge/intel/bd82x6x # Intel Series 6 Cougar Point PCH + register "docking_supported" = "1" + device pci 16.3 on end # Management Engine KT + device pci 1c.0 on # PCIe Port #1 + chip drivers/ricoh/rce822 # Ricoh cardreader + register "disable_mask" = "0x83" + register "sdwppol" = "1" + device pci 00.0 on end # Ricoh SD card reader + end + end + device pci 1f.0 on # PCI-LPC bridge + chip ec/lenovo/h8 + register "config1" = "0x01" + register "config3" = "0xe2" + end + end + device pci 1f.6 off end # Thermal + end + end +end
Hello Alexander Couzens, Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37602
to look at the new patch set (#3).
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 43 insertions(+), 198 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/3
Hello Alexander Couzens, Patrick Rudolph, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37602
to look at the new patch set (#4).
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 43 insertions(+), 198 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/4
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 7: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/37602/7/src/mainboard/lenovo/t530/K... File src/mainboard/lenovo/t530/Kconfig:
https://review.coreboot.org/c/coreboot/+/37602/7/src/mainboard/lenovo/t530/K... PS7, Line 42: default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" Isn't this the default already?
Peter Lemenkov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37602/7/src/mainboard/lenovo/t530/K... File src/mainboard/lenovo/t530/Kconfig:
https://review.coreboot.org/c/coreboot/+/37602/7/src/mainboard/lenovo/t530/K... PS7, Line 42: default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
Isn't this the default already?
Nope, it's default value is an empty string (see src/Kconfig)
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 7:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37602/7/src/mainboard/lenovo/t530/K... File src/mainboard/lenovo/t530/Kconfig:
https://review.coreboot.org/c/coreboot/+/37602/7/src/mainboard/lenovo/t530/K... PS7, Line 42: default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
Nope, it's default value is an empty string (see src/Kconfig)
Ack, sorry for the noise
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 9: Code-Review+1
(5 comments)
Um, I saw things.
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/d... File src/mainboard/lenovo/t530/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/d... PS9, Line 4: { 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 } This should be trimmed to size. Then, it's the same as w530
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/d... PS9, Line 46: 6 Cougar Point It's actually Panther Point (should be handled in another patch). Basically, look for boards selecting the C216 southbridge
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/d... PS9, Line 55: # Enable SATA ports 0 (HDD bay) & 1 (ODD bay) & 2 (mSATA) & 3 (eSATA) & 4 (dock) Meh, this comment is wrong as well
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/v... File src/mainboard/lenovo/t530/variants/w530/overridetree.cb:
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/v... PS9, Line 3: register "gpu_dp_b_hotplug" = "0" : register "gpu_dp_c_hotplug" = "0" These are zero and can be dropped
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/v... PS9, Line 10: register "docking_supported" = "1" Shouldn't T530 also select this?
Hello Alexander Couzens, Patrick Rudolph, Angel Pons, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37602
to look at the new patch set (#10).
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 43 insertions(+), 197 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/10
Peter Lemenkov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 10:
(5 comments)
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/d... File src/mainboard/lenovo/t530/devicetree.cb:
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/d... PS9, Line 4: { 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }
This should be trimmed to size. […]
Done in a previous commit. Will do the same for the rest of the Lenovo boards in a separate branch.
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/d... PS9, Line 46: 6 Cougar Point
It's actually Panther Point (should be handled in another patch). […]
Done in a separate commit
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/d... PS9, Line 55: # Enable SATA ports 0 (HDD bay) & 1 (ODD bay) & 2 (mSATA) & 3 (eSATA) & 4 (dock)
Meh, this comment is wrong as well
Done in a different commit
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/v... File src/mainboard/lenovo/t530/variants/w530/overridetree.cb:
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/v... PS9, Line 3: register "gpu_dp_b_hotplug" = "0" : register "gpu_dp_c_hotplug" = "0"
These are zero and can be dropped
Done in a separate commit
https://review.coreboot.org/c/coreboot/+/37602/9/src/mainboard/lenovo/t530/v... PS9, Line 10: register "docking_supported" = "1"
Shouldn't T530 also select this?
Done. I think all Lenovo xx20/xx30 should select this but I'm not sure. I'll propose it for other Lenovo boards in a separate branch.
Hello Alexander Couzens, Patrick Rudolph, Angel Pons, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37602
to look at the new patch set (#11).
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 39 insertions(+), 194 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/11
Hello build bot (Jenkins), Angel Pons, Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37602
to look at the new patch set (#13).
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 39 insertions(+), 194 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/13
Hello build bot (Jenkins), Angel Pons, Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37602
to look at the new patch set (#14).
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 39 insertions(+), 194 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/14
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 14: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 14:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37602/14/src/mainboard/lenovo/t530/... File src/mainboard/lenovo/t530/variants/t530/overridetree.cb:
https://review.coreboot.org/c/coreboot/+/37602/14/src/mainboard/lenovo/t530/... PS14, Line 3: 6 Er... Series 7, actually.
https://review.coreboot.org/c/coreboot/+/37602/14/src/mainboard/lenovo/t530/... File src/mainboard/lenovo/t530/variants/w530/overridetree.cb:
https://review.coreboot.org/c/coreboot/+/37602/14/src/mainboard/lenovo/t530/... PS14, Line 6: 6 Same here
Peter Lemenkov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 14:
(2 comments)
https://review.coreboot.org/c/coreboot/+/37602/14/src/mainboard/lenovo/t530/... File src/mainboard/lenovo/t530/variants/t530/overridetree.cb:
https://review.coreboot.org/c/coreboot/+/37602/14/src/mainboard/lenovo/t530/... PS14, Line 3: 6
Er... Series 7, actually.
Done
https://review.coreboot.org/c/coreboot/+/37602/14/src/mainboard/lenovo/t530/... File src/mainboard/lenovo/t530/variants/w530/overridetree.cb:
https://review.coreboot.org/c/coreboot/+/37602/14/src/mainboard/lenovo/t530/... PS14, Line 6: 6
Same here
Done
Hello build bot (Jenkins), Angel Pons, Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37602
to look at the new patch set (#15).
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 40 insertions(+), 195 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/15
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 15: Code-Review+2
Hello build bot (Jenkins), Angel Pons, Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37602
to look at the new patch set (#18).
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 40 insertions(+), 194 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/18
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 18: Code-Review+2
Hello build bot (Jenkins), Angel Pons, Alexander Couzens, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/37602
to look at the new patch set (#19).
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 40 insertions(+), 192 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/37602/19
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
Patch Set 19: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37602 )
Change subject: mb/lenovo/t530: Switch to overridetree ......................................................................
mb/lenovo/t530: Switch to overridetree
Change-Id: I3dfa303b6aae2446fa3a1d67a6e31448277cacdb Signed-off-by: Peter Lemenkov lemenkov@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/37602 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com --- M src/mainboard/lenovo/t530/Kconfig R src/mainboard/lenovo/t530/devicetree.cb A src/mainboard/lenovo/t530/variants/t530/overridetree.cb D src/mainboard/lenovo/t530/variants/w530/devicetree.cb A src/mainboard/lenovo/t530/variants/w530/overridetree.cb 5 files changed, 40 insertions(+), 192 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index bef0dee..0f8d326 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -56,9 +56,9 @@ string default "lenovo/t530"
-config DEVICETREE +config OVERRIDE_DEVICETREE string - default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb" + default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
config MAINBOARD_PART_NUMBER string diff --git a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb b/src/mainboard/lenovo/t530/devicetree.cb similarity index 96% rename from src/mainboard/lenovo/t530/variants/t530/devicetree.cb rename to src/mainboard/lenovo/t530/devicetree.cb index cedb478..1b16ca3 100644 --- a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb +++ b/src/mainboard/lenovo/t530/devicetree.cb @@ -40,7 +40,7 @@ device pci 01.0 on end # PCIe bridge for discrete graphics device pci 02.0 on end # Internal graphics VGA controller
- chip southbridge/intel/bd82x6x # Intel Series 6 Panther Point PCH + chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH # GPI routing # 0 No effect (default) # 1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set) @@ -140,10 +140,6 @@ register "has_bdc_detection" = "1" register "bdc_gpio_num" = "54" register "bdc_gpio_lvl" = "0" - - register "has_wwan_detection" = "1" - register "wwan_gpio_num" = "70" - register "wwan_gpio_lvl" = "0" end chip drivers/lenovo/hybrid_graphics device pnp ff.f on end # dummy diff --git a/src/mainboard/lenovo/t530/variants/t530/overridetree.cb b/src/mainboard/lenovo/t530/variants/t530/overridetree.cb new file mode 100644 index 0000000..e48a702 --- /dev/null +++ b/src/mainboard/lenovo/t530/variants/t530/overridetree.cb @@ -0,0 +1,13 @@ +chip northbridge/intel/sandybridge + device domain 0 on + chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH + device pci 1f.0 on # PCI-LPC bridge + chip ec/lenovo/h8 + register "has_wwan_detection" = "1" + register "wwan_gpio_num" = "70" + register "wwan_gpio_lvl" = "0" + end + end + end + end +end diff --git a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb deleted file mode 100644 index be6cc7d..0000000 --- a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb +++ /dev/null @@ -1,185 +0,0 @@ -chip northbridge/intel/sandybridge - # IGD Displays - register "gfx" = "GMA_STATIC_DISPLAYS(1)" - - # Enable DisplayPort Hotplug with 6ms pulse - register "gpu_dp_d_hotplug" = "0x06" - - # Enable Panel as LVDS and configure power delays - register "gpu_panel_port_select" = "0" # LVDS - register "gpu_panel_power_cycle_delay" = "6" # T7: 500ms - register "gpu_panel_power_up_delay" = "100" # T1+T2: 10ms - register "gpu_panel_power_down_delay" = "100" # T5+T6: 10ms - register "gpu_panel_power_backlight_on_delay" = "2000" # T3: 200ms - register "gpu_panel_power_backlight_off_delay" = "2000" # T4: 200ms - register "gpu_cpu_backlight" = "0x1155" - register "gpu_pch_backlight" = "0x11551155" - - device cpu_cluster 0 on - chip cpu/intel/model_206ax - # Magic APIC ID to locate this chip - device lapic 0x0 on end - device lapic 0xacac off end - - register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_acpower" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_acpower" = "5" # ACPI(C3) = MWAIT(C7) - - register "c1_battery" = "1" # ACPI(C1) = MWAIT(C1) - register "c2_battery" = "3" # ACPI(C2) = MWAIT(C3) - register "c3_battery" = "5" # ACPI(C3) = MWAIT(C7) - end - end - - register "pci_mmio_size" = "2048" - - device domain 0 on - subsystemid 0x17aa 0x21f6 inherit - - device pci 00.0 on end # Host bridge - device pci 01.0 on end # PCIe bridge for discrete graphics - device pci 02.0 on # Internal graphics VGA controller - subsystemid 0x17aa 0x21f5 - end - - chip southbridge/intel/bd82x6x # Intel Series 6 Panther Point PCH - # GPI routing - # 0 No effect (default) - # 1 SMI# (if corresponding ALT_GPI_SMI_EN bit is also set) - # 2 SCI (if corresponding GPIO_EN bit is also set) - register "alt_gp_smi_en" = "0x0000" - register "gpi1_routing" = "2" - register "gpi13_routing" = "2" - - register "sata_port_map" = "0x3f" - # Set max SATA speed to 6.0 Gb/s - register "sata_interface_speed_support" = "0x3" - - register "gen1_dec" = "0x7c1601" - register "gen2_dec" = "0x0c15e1" - register "gen4_dec" = "0x0c06a1" - - # Enable zero-based linear PCIe root port functions - register "pcie_port_coalesce" = "1" - register "c2_latency" = "101" # c2 not supported - - register "pcie_hotplug_map" = "{ 0, 0, 1, 0, 0, 0, 0, 0 }" - - register "xhci_switchable_ports" = "0xf" - register "superspeed_capable_ports" = "0xf" - register "xhci_overcurrent_mapping" = "0x04000201" - - register "docking_supported" = "1" - - register "spi_uvscc" = "0x2005" - register "spi_lvscc" = "0x2005" - - device pci 14.0 on end # USB 3.0 Controller - device pci 16.0 on end # Management Engine Interface 1 - device pci 16.1 off end # Management Engine Interface 2 - device pci 16.2 off end # Management Engine IDE-R - device pci 16.3 on end # Management Engine KT - device pci 19.0 on # Intel Gigabit Ethernet - subsystemid 0x17aa 0x21f3 - end - device pci 1a.0 on end # USB2 EHCI #2 - device pci 1b.0 on end # High Definition Audio - device pci 1c.0 on # PCIe Port #1 - chip drivers/ricoh/rce822 # Ricoh cardreader - register "disable_mask" = "0x83" - register "sdwppol" = "1" - device pci 00.0 on end # Ricoh SD card reader - end - end - device pci 1c.1 on end # PCIe Port #2 - device pci 1c.2 on # PCIe Port #3 - smbios_slot_desc "7" "3" "ExpressCard Slot" "8" - end - device pci 1c.3 off end # PCIe Port #4 - device pci 1c.4 off end # PCIe Port #5 - device pci 1c.5 off end # PCIe Port #6 - device pci 1c.6 off end # PCIe Port #7 - device pci 1c.7 off end # PCIe Port #8 - device pci 1d.0 on end # USB2 EHCI #1 - device pci 1e.0 off end # PCI bridge - device pci 1f.0 on # PCI-LPC bridge - chip ec/lenovo/pmh7 - device pnp ff.1 on end # dummy - register "backlight_enable" = "0x01" - register "dock_event_enable" = "0x01" - end - - chip drivers/pc80/tpm - device pnp 0c31.0 on end - end - - chip ec/lenovo/h8 - device pnp ff.2 on # dummy - io 0x60 = 0x62 - io 0x62 = 0x66 - io 0x64 = 0x1600 - io 0x66 = 0x1604 - end - - register "config0" = "0xa7" - register "config1" = "0x01" - register "config2" = "0xa0" - register "config3" = "0xe2" - - register "has_keyboard_backlight" = "1" - - register "beepmask0" = "0x00" - register "beepmask1" = "0x86" - register "has_power_management_beeps" = "0" - register "event2_enable" = "0xff" - register "event3_enable" = "0xff" - register "event4_enable" = "0xd0" - register "event5_enable" = "0xfc" - register "event6_enable" = "0x00" - register "event7_enable" = "0x01" - register "event8_enable" = "0x7b" - register "event9_enable" = "0xff" - register "eventa_enable" = "0x01" - register "eventb_enable" = "0x00" - register "eventc_enable" = "0xff" - register "eventd_enable" = "0xff" - register "evente_enable" = "0x0d" - - register "has_bdc_detection" = "1" - register "bdc_gpio_num" = "54" - register "bdc_gpio_lvl" = "0" - end - chip drivers/lenovo/hybrid_graphics - device pnp ff.f on end # dummy - - register "detect_gpio" = "21" - - register "has_panel_hybrid_gpio" = "1" - register "panel_hybrid_gpio" = "52" - register "panel_integrated_lvl" = "1" - - register "has_backlight_gpio" = "0" - register "has_dgpu_power_gpio" = "0" - - register "has_thinker1" = "1" - end - end - device pci 1f.2 on end # SATA Controller 1 - device pci 1f.3 on # SMBus - # eeprom, 8 virtual devices, same chip - chip drivers/i2c/at24rf08c - device i2c 54 on end - device i2c 55 on end - device i2c 56 on end - device i2c 57 on end - device i2c 5c on end - device i2c 5d on end - device i2c 5e on end - device i2c 5f on end - end - end - device pci 1f.5 off end # SATA Controller 2 - device pci 1f.6 off end # Thermal - end - end -end diff --git a/src/mainboard/lenovo/t530/variants/w530/overridetree.cb b/src/mainboard/lenovo/t530/variants/w530/overridetree.cb new file mode 100644 index 0000000..fc5b31e --- /dev/null +++ b/src/mainboard/lenovo/t530/variants/w530/overridetree.cb @@ -0,0 +1,24 @@ +chip northbridge/intel/sandybridge + device domain 0 on + device pci 02.0 on # Internal graphics VGA controller + subsystemid 0x17aa 0x21f5 + end + chip southbridge/intel/bd82x6x # Intel Series 7 Panther Point PCH + device pci 16.3 on end # Management Engine KT + device pci 1c.0 on # PCIe Port #1 + chip drivers/ricoh/rce822 # Ricoh cardreader + register "disable_mask" = "0x83" + register "sdwppol" = "1" + device pci 00.0 on end # Ricoh SD card reader + end + end + device pci 1f.0 on # PCI-LPC bridge + chip ec/lenovo/h8 + register "config1" = "0x01" + register "config3" = "0xe2" + end + end + device pci 1f.6 off end # Thermal + end + end +end
-
Angel Pons (Code Review) -
Patrick Georgi (Code Review)
-
Peter Lemenkov (Code Review)