From 95fa82256fe3fdf6db0e2f22d0884419989a1e8c Mon Sep 17 00:00:00 2001 From: ThomasKaiser Date: Sat, 13 Aug 2016 10:42:12 +0200 Subject: [PATCH] Various NanoPi fixes --- config/boards/nanopim1.conf | 4 +-- config/boards/nanopineo.conf | 10 +++--- config/fex/nanopim1.fex | 6 ++-- config/fex/nanopineo.fex | 20 +++++++---- ...-lower-minimal-dram-clock-to-132-mhz.patch | 13 +++++++ .../u-boot-99-add-missing-boards.patch | 35 ++++++++++++++++++- .../u-boot-99-add-missing-boards.patch | 35 ++++++++++++++++++- 7 files changed, 105 insertions(+), 18 deletions(-) create mode 100644 patch/kernel/sun8i-default/0028-lower-minimal-dram-clock-to-132-mhz.patch diff --git a/config/boards/nanopim1.conf b/config/boards/nanopim1.conf index 63db79efec..5167828543 100644 --- a/config/boards/nanopim1.conf +++ b/config/boards/nanopim1.conf @@ -1,9 +1,9 @@ -# H3 quad core 1Gb SoC Wifi +# H3 quad core 1Gb SoC BOARD_NAME="NanoPi M1" LINUXFAMILY=sun8i BOOTCONFIG=FriendlyARM_NanoPi_M1_defconfig MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir" -MODULES_NEXT="brcmfmac" +MODULES_NEXT="" CPUMIN=240000 CPUMAX=1200000 CLI_TARGET="jessie:default" diff --git a/config/boards/nanopineo.conf b/config/boards/nanopineo.conf index 8e5c7f8b5d..61a366a66c 100644 --- a/config/boards/nanopineo.conf +++ b/config/boards/nanopineo.conf @@ -1,11 +1,11 @@ # H3 quad core 256/512MB SoC Headless BOARD_NAME="NanoPi Neo" LINUXFAMILY=sun8i -BOOTCONFIG=FriendlyARM_NanoPi_M1_defconfig +BOOTCONFIG=FriendlyARM_NanoPi_NEO_defconfig MODULES="#gpio_sunxi #w1-sunxi #w1-gpio #w1-therm #sunxi-cir" -MODULES_NEXT="brcmfmac" +MODULES_NEXT="" CPUMIN=240000 -CPUMAX=1200000 -CLI_TARGET="jessie:default" -DESKTOP_TARGET="jessie:default" +CPUMAX=912000 +CLI_TARGET="jessie,xenial:default" +DESKTOP_TARGET="" KERNEL_TARGET="default,dev" diff --git a/config/fex/nanopim1.fex b/config/fex/nanopim1.fex index a90cc8e2af..d63821dea2 100644 --- a/config/fex/nanopim1.fex +++ b/config/fex/nanopim1.fex @@ -730,8 +730,8 @@ pmu_gpio0 = port:PL06<1><1><2><1> pmu_level0 = 11300 pmu_level1 = 1100 max_freq = 1200000000 -min_freq = 480000000 -LV_count = 5 +min_freq = 240000000 +LV_count = 6 LV1_freq = 1200000000 LV1_volt = 1300 LV2_freq = 1008000000 @@ -742,6 +742,8 @@ LV4_freq = 648000000 LV4_volt = 1100 LV5_freq = 480000000 LV5_volt = 1100 +LV6_freq = 240000000 +LV6_volt = 1100 [gpu_dvfs_table] G_LV_count = 3 diff --git a/config/fex/nanopineo.fex b/config/fex/nanopineo.fex index db0037af02..615f0a26cd 100644 --- a/config/fex/nanopineo.fex +++ b/config/fex/nanopineo.fex @@ -106,7 +106,7 @@ pll_periph1 = 600 pll_de = 864 [dram_para] -dram_clk = 432 +dram_clk = 408 dram_type = 3 dram_zq = 0x3b3bfb dram_odt_en = 1 @@ -327,7 +327,7 @@ output_full = 1 hdmi_mode_check = 1 [disp_init] -disp_init_enable = 1 +disp_init_enable = 0 disp_mode = 0 screen0_output_type = 3 screen0_output_mode = 5 @@ -521,7 +521,7 @@ usb_regulator_vol = 0 usb_not_suspend = 0 [usbc1] -usb_used = 1 +usb_used = 0 usb_drv_vbus_gpio = usb_restrict_gpio = usb_host_init_state = 1 @@ -531,7 +531,7 @@ usb_regulator_vol = 0 usb_not_suspend = 0 [usbc2] -usb_used = 1 +usb_used = 0 usb_drv_vbus_gpio = usb_restrict_gpio = usb_host_init_state = 1 @@ -666,7 +666,7 @@ spdif_used = 1 hdmi_used = 0 [s_cir0] -ir_used = 1 +ir_used = 0 ir_rx = port:PL11<2><1> ir_power_key_code0 = 0x00 ir_addr_code0 = 0xC43B @@ -760,6 +760,12 @@ G_LV1_volt = 1200000 G_LV2_freq = 456000000 G_LV2_volt = 1200000 +[board_vendor] +vid_used = 0 +vid_count = 2 +vid_bit_0 = port:PC04<0><1> +vid_bit_1 = port:PC07<0><1> + [Vdevice] Vdevice_used = 0 Vdevice_0 = port:PH10<5><1><2> @@ -803,7 +809,7 @@ tsc_d6 = port:PE10<3> tsc_d7 = port:PE11<3> [gpio_power_key] -key_used = 1 +key_used = 0 key_io = port:PL03<6><0> [key_para] @@ -834,7 +840,7 @@ mali_extreme_vol = 1400 ;1wire parameters (default - PA20) ;---------------------------------------------------------------------------------- [w1_para] -w1_used = 1 +w1_used = 0 gpio = 20 [corekeeper] diff --git a/patch/kernel/sun8i-default/0028-lower-minimal-dram-clock-to-132-mhz.patch b/patch/kernel/sun8i-default/0028-lower-minimal-dram-clock-to-132-mhz.patch new file mode 100644 index 0000000000..0602f97ee3 --- /dev/null +++ b/patch/kernel/sun8i-default/0028-lower-minimal-dram-clock-to-132-mhz.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/devfreq/dramfreq/sunxi-ddrfreq.c b/drivers/devfreq/dramfreq/sunxi-ddrfreq.c +index c7c20b7..7581087 100755 +--- a/drivers/devfreq/dramfreq/sunxi-ddrfreq.c ++++ b/drivers/devfreq/dramfreq/sunxi-ddrfreq.c +@@ -1666,7 +1666,7 @@ static __devinit int sunxi_ddrfreq_probe(struct platform_device *pdev) + if (sunxi_ddrfreq_min < SUNXI_DDRFREQ_MINFREQ_MIN) + sunxi_ddrfreq_min = sunxi_ddrfreq_max / 3; + #elif defined(CONFIG_ARCH_SUN8IW7P1) +- sunxi_ddrfreq_min = 408000; ++ sunxi_ddrfreq_min = 132000; + #else + type = script_get_item("dram_para", "dram_tpr12", &val); + if (SCIRPT_ITEM_VALUE_TYPE_INT != type) { diff --git a/patch/u-boot/u-boot-default/u-boot-99-add-missing-boards.patch b/patch/u-boot/u-boot-default/u-boot-99-add-missing-boards.patch index 916f0b8b5d..be5847650d 100644 --- a/patch/u-boot/u-boot-default/u-boot-99-add-missing-boards.patch +++ b/patch/u-boot/u-boot-default/u-boot-99-add-missing-boards.patch @@ -27,7 +27,7 @@ index 0000000..83fae20 +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y -+CONFIG_SY8106A_POWER=y ++# CONFIG_SY8106A_POWER=y +# CONFIG_USB_EHCI_HCD is not set +CONFIG_GPIO=y +CONFIG_SYS_CLK_FREQ=816000000 @@ -108,3 +108,36 @@ index 7bade8f..d149431 100644 +# CONFIG_USB_EHCI_HCD is not set +CONFIG_SY8106A_VOUT1_VOLT=1100 +CONFIG_SYS_CLK_FREQ=1008000000 +diff --git a/configs/FriendlyARM_NanoPi_NEO_defconfig b/configs/FriendlyARM_NanoPi_NEO_defconfig +new file mode 100644 +index 0000000..83fae20 +--- /dev/null ++++ b/configs/FriendlyARM_NanoPi_NEO_defconfig +@@ -0,0 +1,27 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=408 ++CONFIG_DRAM_ZQ=3881979 ++CONFIG_DRAM_ODT_EN=y ++# CONFIG_VIDEO is not set ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SPL=y ++CONFIG_HUSH_PARSER=y ++CONFIG_CMD_BOOTZ=y ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++CONFIG_CMD_MMC=y ++# CONFIG_CMD_FPGA is not set ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_MII=y ++CONFIG_CMD_PING=y ++CONFIG_CMD_EXT2=y ++CONFIG_CMD_EXT4=y ++CONFIG_CMD_FAT=y ++CONFIG_CMD_FS_GENERIC=y ++#CONFIG_SY8106A_POWER=y ++# CONFIG_USB_EHCI_HCD is not set ++CONFIG_GPIO=y ++CONFIG_SYS_CLK_FREQ=480000000 diff --git a/patch/u-boot/u-boot-dev/u-boot-99-add-missing-boards.patch b/patch/u-boot/u-boot-dev/u-boot-99-add-missing-boards.patch index e66de602ac..728772e948 100644 --- a/patch/u-boot/u-boot-dev/u-boot-99-add-missing-boards.patch +++ b/patch/u-boot/u-boot-dev/u-boot-99-add-missing-boards.patch @@ -27,7 +27,7 @@ index 0000000..83fae20 +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y -+CONFIG_SY8106A_POWER=y ++# CONFIG_SY8106A_POWER=y +# CONFIG_USB_EHCI_HCD is not set +CONFIG_GPIO=y +CONFIG_SYS_CLK_FREQ=816000000 @@ -108,3 +108,36 @@ index 7bade8f..d149431 100644 +# CONFIG_USB_EHCI_HCD is not set +CONFIG_SY8106A_VOUT1_VOLT=1320 +CONFIG_SYS_CLK_FREQ=1296000000 +diff --git a/configs/FriendlyARM_NanoPi_NEO_defconfig b/configs/FriendlyARM_NanoPi_NEO_defconfig +new file mode 100644 +index 0000000..83fae20 +--- /dev/null ++++ b/configs/FriendlyARM_NanoPi_NEO_defconfig +@@ -0,0 +1,27 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN8I_H3=y ++CONFIG_DRAM_CLK=408 ++CONFIG_DRAM_ZQ=3881979 ++CONFIG_DRAM_ODT_EN=y ++# CONFIG_VIDEO is not set ++CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc" ++# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set ++CONFIG_SPL=y ++CONFIG_HUSH_PARSER=y ++CONFIG_CMD_BOOTZ=y ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++CONFIG_CMD_MMC=y ++# CONFIG_CMD_FPGA is not set ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_MII=y ++CONFIG_CMD_PING=y ++CONFIG_CMD_EXT2=y ++CONFIG_CMD_EXT4=y ++CONFIG_CMD_FAT=y ++CONFIG_CMD_FS_GENERIC=y ++#CONFIG_SY8106A_POWER=y ++# CONFIG_USB_EHCI_HCD is not set ++CONFIG_GPIO=y ++CONFIG_SYS_CLK_FREQ=816000000