diff options
| author | jason <jason.jin@freescale.com> | 2015-06-01 08:30:34 (GMT) |
|---|---|---|
| committer | jason <jason.jin@freescale.com> | 2015-06-01 08:30:34 (GMT) |
| commit | 5217966a0624a33977766b5c5e91a0bc46d9cb36 (patch) | |
| tree | e55aabe4f6e5284bd863349d8d540d427d495e94 /arch | |
| parent | 02d571e96d41e475ad809326a94a1b3beb3b104e (diff) | |
| parent | 1b189c445fc54387c7a3bb94c61232d4f3846922 (diff) | |
| download | linux-fsl-qoriq-5217966a0624a33977766b5c5e91a0bc46d9cb36.tar.xz | |
Merge branch 'qoriq-sdk' into LS1-SDK-Rev2.0
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/boot/dts/t1023rdb.dts | 12 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/t1024rdb.dts | 7 | ||||
| -rw-r--r-- | arch/powerpc/configs/corenet32_smp_defconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/configs/corenet64_smp_defconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/kvm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/bsc913x_qds.c | 1 |
6 files changed, 23 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/t1023rdb.dts b/arch/powerpc/boot/dts/t1023rdb.dts index 0fd8dc8..4aa16c3 100644 --- a/arch/powerpc/boot/dts/t1023rdb.dts +++ b/arch/powerpc/boot/dts/t1023rdb.dts @@ -60,7 +60,7 @@ #address-cells = <1>; #size-cells = <1>; compatible = "fsl,ifc-nand"; - reg = <0x2 0x0 0x10000>; + reg = <0x1 0x0 0x10000>; }; }; @@ -107,7 +107,17 @@ }; i2c@118100 { + ina220@40 { + compatible = "ti,ina220"; + reg = <0x40>; + shunt-resistor = <1000>; + }; + ina220@41 { + compatible = "ti,ina220"; + reg = <0x41>; + shunt-resistor = <1000>; + }; }; fman0: fman@400000 { diff --git a/arch/powerpc/boot/dts/t1024rdb.dts b/arch/powerpc/boot/dts/t1024rdb.dts index af52aeb..559a422 100644 --- a/arch/powerpc/boot/dts/t1024rdb.dts +++ b/arch/powerpc/boot/dts/t1024rdb.dts @@ -126,6 +126,13 @@ reg = <0x4c>; }; + /* INA220 Current Sense */ + ina220@40 { + compatible = "ti,ina220"; + reg = <0x40>; + shunt-resistor = <1000>; + }; + eeprom@50 { compatible = "at24,24c256"; reg = <0x50>; diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig index 47b01412..605fd5a 100644 --- a/arch/powerpc/configs/corenet32_smp_defconfig +++ b/arch/powerpc/configs/corenet32_smp_defconfig @@ -156,6 +156,7 @@ CONFIG_FSL_PME2=y CONFIG_FSL_PAMU=y CONFIG_VIRT_DRIVERS=y CONFIG_FSL_HV_MANAGER=y +CONFIG_CLK_QORIQ=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig index c063a2c..e9fe78a 100644 --- a/arch/powerpc/configs/corenet64_smp_defconfig +++ b/arch/powerpc/configs/corenet64_smp_defconfig @@ -93,6 +93,7 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_IDS=y CONFIG_MTD_NAND_FSL_ELBC=y CONFIG_MTD_NAND_FSL_IFC=y +CONFIG_MTD_SPI_NOR_BASE=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MTD_UBI_BEB_RESERVE=1 @@ -173,6 +174,7 @@ CONFIG_FSL_PME2=y CONFIG_FSL_PAMU=y CONFIG_VIRT_DRIVERS=y CONFIG_FSL_HV_MANAGER=y +CONFIG_CLK_QORIQ=y CONFIG_MEMORY=y CONFIG_EXT2_FS=y CONFIG_EXT3_FS=y diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig index ffaef2c..78c3c30 100644 --- a/arch/powerpc/kvm/Kconfig +++ b/arch/powerpc/kvm/Kconfig @@ -155,6 +155,7 @@ config KVM_E500MC config KVM_MPIC bool "KVM in-kernel MPIC emulation" depends on KVM && E500 + depends on !PREEMPT_RT_FULL select HAVE_KVM_IRQCHIP select HAVE_KVM_IRQ_ROUTING select HAVE_KVM_MSI diff --git a/arch/powerpc/platforms/85xx/bsc913x_qds.c b/arch/powerpc/platforms/85xx/bsc913x_qds.c index 2812784..428973f 100644 --- a/arch/powerpc/platforms/85xx/bsc913x_qds.c +++ b/arch/powerpc/platforms/85xx/bsc913x_qds.c @@ -72,6 +72,7 @@ define_machine(bsc9132_qds) { .init_IRQ = bsc913x_qds_pic_init, #ifdef CONFIG_PCI .pcibios_fixup_bus = fsl_pcibios_fixup_bus, + .pcibios_fixup_phb = fsl_pcibios_fixup_phb, #endif .get_irq = mpic_get_irq, .restart = fsl_rstcr_restart, |