From d533aa718f76e14f551485564faa3f89f5659553 Mon Sep 17 00:00:00 2001 From: Eric Lee Date: Fri, 26 Aug 2016 14:16:27 +0800 Subject: [PATCH] Apply TI's patches and modify defconfig files --- arch/arm/boot/dts/am335x-smarc-common.dtsi | 10 +++++++--- arch/arm/configs/smarc_t335x_defconfig | 14 +++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/am335x-smarc-common.dtsi b/arch/arm/boot/dts/am335x-smarc-common.dtsi index 9c0c1f2..05da78e 100644 --- a/arch/arm/boot/dts/am335x-smarc-common.dtsi +++ b/arch/arm/boot/dts/am335x-smarc-common.dtsi @@ -89,6 +89,11 @@ model = "TI AM335x SMARCT335X"; compatible = "ti,am335x-smarct335x", "ti,am33xx"; + aliases { + rtc0 = &s35390a; + rtc1 = &rtc; + }; + cpus { cpu@0 { cpu0-supply = <&dcdc2_reg>; @@ -650,7 +655,7 @@ /* VDD_MPU voltage limits 0.95V - 1.325V with +/-4% tolerance */ regulator-name = "vdd_mpu"; regulator-min-microvolt = <925000>; - regulator-max-microvolt = <1378000>; + regulator-max-microvolt = <1351500>; regulator-boot-on; regulator-always-on; }; @@ -808,6 +813,5 @@ }; &rtc { - status = "disabled"; - ext-clk-src; + ext-clk-src; }; diff --git a/arch/arm/configs/smarc_t335x_defconfig b/arch/arm/configs/smarc_t335x_defconfig index 0a661e8..837b925 100644 --- a/arch/arm/configs/smarc_t335x_defconfig +++ b/arch/arm/configs/smarc_t335x_defconfig @@ -616,12 +616,11 @@ CONFIG_ARM_TI_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_DT_IDLE_STATES=y # # ARM CPU Idle Drivers # -CONFIG_ARM_CPUIDLE=y +# CONFIG_ARM_CPUIDLE is not set # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set # @@ -1169,7 +1168,8 @@ CONFIG_FW_LOADER=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_EXTRA_FIRMWARE="am335x-pm-firmware.elf am335x-evm-scale-data.bin" CONFIG_EXTRA_FIRMWARE_DIR="firmware" -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y CONFIG_WANT_DEV_COREDUMP=y CONFIG_ALLOW_DEV_COREDUMP=y CONFIG_DEV_COREDUMP=y @@ -4071,10 +4071,10 @@ CONFIG_DW_DMAC=y # CONFIG_ASYNC_TX_DMA is not set # CONFIG_DMATEST is not set # CONFIG_AUXDISPLAY is not set -CONFIG_UIO=m +CONFIG_UIO=y # CONFIG_UIO_CIF is not set -# CONFIG_UIO_PDRV_GENIRQ is not set -# CONFIG_UIO_DMEM_GENIRQ is not set +CONFIG_UIO_PDRV_GENIRQ=y +CONFIG_UIO_DMEM_GENIRQ=y # CONFIG_UIO_AEC is not set # CONFIG_UIO_SERCOS3 is not set # CONFIG_UIO_PCI_GENERIC is not set @@ -4189,7 +4189,7 @@ CONFIG_EXTCON_PALMAS=m # CONFIG_EXTCON_SM5502 is not set CONFIG_EXTCON_USB_GPIO=m CONFIG_MEMORY=y -CONFIG_TI_EMIF=m +CONFIG_TI_EMIF=y CONFIG_OMAP_GPMC=y CONFIG_OMAP_GPMC_DEBUG=y CONFIG_TI_EMIF_SRAM=y -- 1.9.1